From c74ac6ab8b02c8bb644369b5fe5278ceb4953857 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 21 Dec 2012 15:53:34 -0800 Subject: [PATCH] Correct stackforge .gitreview docs. The manage projects script adds a gitreview file for you if the new projects does not have an upstream. Make it clear that you only need to add the .gitreview file on projects with an existing upstream. Also, fix a tiny typo in the Jenkins document. Change-Id: I74c07d9cd952509bd9ddc883a833cb3e22b13b38 Reviewed-on: https://review.openstack.org/18570 Reviewed-by: Monty Taylor Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- doc/source/jenkins.rst | 2 +- doc/source/stackforge.rst | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/jenkins.rst b/doc/source/jenkins.rst index 1e24889290..88308531d0 100644 --- a/doc/source/jenkins.rst +++ b/doc/source/jenkins.rst @@ -15,7 +15,7 @@ all code should be reviewed and tested before being merged in to trunk, and that as many tasks around review, testing, merging and release that can be automated should be. -Jenkis is essentially a job queing system, and everything that is done +Jenkins is essentially a job queing system, and everything that is done through Jenkins can be thought of as having a few discreet components: * Triggers - What causes a job to be run diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst index cddfeb5894..b7fe566401 100644 --- a/doc/source/stackforge.rst +++ b/doc/source/stackforge.rst @@ -185,9 +185,9 @@ change to review.openstack.org. Add .gitreview file to project ============================== -Once the change created following the above steps is merged and applied -to Gerrit, Jenkins, et al you will want to add a ``.gitreview`` file to -your repository in order to use the ``git review`` tool. +If the new project you have added has a specified upstream you will need +to add a ``.gitreview`` file to the project once it has been created. This +new file will allow you to use ``git review``. The basic process is clone from stackforge, add file, push to Gerrit, review and approve.::