diff --git a/doc/training-guides/bk_preface.xml b/doc/training-guides/bk_preface.xml index 28a9a3ab..b35198ed 100644 --- a/doc/training-guides/bk_preface.xml +++ b/doc/training-guides/bk_preface.xml @@ -78,7 +78,7 @@ Here are more details on committing changes to OpenStack fixing a documentation bug - , OpenStack Gerrit + , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation diff --git a/doc/training-guides/common/editing-code.xml b/doc/training-guides/common/editing-code.xml index 4b7a1218..1b939df3 100644 --- a/doc/training-guides/common/editing-code.xml +++ b/doc/training-guides/common/editing-code.xml @@ -498,7 +498,7 @@ blueprint training-manuals More details on branching can be found here under Gerrit + xlink:href="http://docs.openstack.org/infra/manual/developers.html#development-workflow">Gerrit Workflow and the Git docs. diff --git a/doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml b/doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml index 585c426f..f70e51e2 100644 --- a/doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml +++ b/doc/training-guides/developer-guide/ch_developer-apis-day-two-lab.xml @@ -18,7 +18,7 @@ - Gerrit Basics + Gerrit Basics diff --git a/doc/training-guides/locale/training-guides.pot b/doc/training-guides/locale/training-guides.pot index 7984968e..794b7f33 100644 --- a/doc/training-guides/locale/training-guides.pot +++ b/doc/training-guides/locale/training-guides.pot @@ -66,7 +66,7 @@ msgid "Create the Content: Each card / user s msgstr "" #: ./doc/training-guides/under-contruction-notice.xml:77(para) -msgid "Here are more details on committing changes to OpenStack fixing a documentation bug , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation" +msgid "Here are more details on committing changes to OpenStack fixing a documentation bug , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation" msgstr "" #: ./doc/training-guides/under-contruction-notice.xml:86(para) ./doc/training-guides/bk_preface.xml:88(para) @@ -332,7 +332,7 @@ msgid "Create the Content: Each bug from the msgstr "" #: ./doc/training-guides/bk_preface.xml:79(para) -msgid "Here are more details on committing changes to OpenStack fixing a documentation bug , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation" +msgid "Here are more details on committing changes to OpenStack fixing a documentation bug , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation" msgstr "" #: ./doc/training-guides/bk_preface.xml:115(link) @@ -3356,7 +3356,7 @@ msgid "Getting-The-Code" msgstr "" #: ./doc/training-guides/sources/cinder/development.environment.xml:91(para) -msgid "---------------- Grab the code from GitHub:: git clone https://github.com/openstack/cinder.git cd cinder" +msgid "---------------- Grab the code:: git clone https://github.com/openstack/cinder.git cd cinder" msgstr "" #: ./doc/training-guides/sources/cinder/development.environment.xml:99(title) @@ -4039,7 +4039,7 @@ msgid "One last step. Go to the review page listed after you submitted your revi msgstr "" #: ./doc/training-guides/common/editing-code.xml:500(para) -msgid "More details on branching can be found here under Gerrit Workflow and the Git docs." +msgid "More details on branching can be found here under Gerrit Workflow and the Git docs." msgstr "" #: ./doc/training-guides/common/editing-code.xml:508(title) diff --git a/doc/training-guides/sources/cinder/development.environment.xml b/doc/training-guides/sources/cinder/development.environment.xml index 5a9e93d5..1a414125 100644 --- a/doc/training-guides/sources/cinder/development.environment.xml +++ b/doc/training-guides/sources/cinder/development.environment.xml @@ -90,7 +90,7 @@ or Mac OS X 10.7 (OpenSSL 0.9.8r) works fine with cinder. Getting-The-Code ---------------- -Grab the code from GitHub:: +Grab the code:: git clone https://github.com/openstack/cinder.git cd cinder diff --git a/doc/training-guides/under-contruction-notice.xml b/doc/training-guides/under-contruction-notice.xml index d3493456..e6e22d68 100644 --- a/doc/training-guides/under-contruction-notice.xml +++ b/doc/training-guides/under-contruction-notice.xml @@ -76,7 +76,7 @@ Here are more details on committing changes to OpenStack fixing a documentation bug - , OpenStack Gerrit + , OpenStack Gerrit Workflow, OpenStack Documentation HowTo and , Git Documentation diff --git a/doc/upstream-training/12-howtocontribute.rst b/doc/upstream-training/12-howtocontribute.rst index d9bdc3e8..b691cdf1 100644 --- a/doc/upstream-training/12-howtocontribute.rst +++ b/doc/upstream-training/12-howtocontribute.rst @@ -46,7 +46,7 @@ Do you work at a company? ========================= - If your contribution is on behalf of a company, have your managers sign the Corporate Contributor License Agreement -- https://wiki.openstack.org/wiki/How_To_Contribute#Contributors_License_Agreement +- http://docs.openstack.org/infra/manual/developers.html#account-setup ---- diff --git a/labs/HACKING.rst b/labs/HACKING.rst index 1bdc2635..16e0881c 100644 --- a/labs/HACKING.rst +++ b/labs/HACKING.rst @@ -9,7 +9,7 @@ as described in `How To Contribute`__ in the OpenStack wiki. Our `main blueprint`__ contains the usual links for blueprints, bugs, etc. __ contribute_ -.. _contribute: http://wiki.openstack.org/HowToContribute +.. _contribute: http://docs.openstack.org/infra/manual/developers.html __ lp_ .. _lp: https://blueprints.launchpad.net/openstack-training-guides/+spec/openstack-training-labs @@ -43,7 +43,7 @@ currently all written in bash, the examples to follow are this project and `devstack `_. DevStack bash style guidelines can be found at the bottom of: -https://github.com/openstack-dev/devstack/blob/master/HACKING.rst +https://git.openstack.org/cgit/openstack-dev/devstack/blob/master/HACKING.rst Structure --------- @@ -100,7 +100,7 @@ Submitting patches These documents will help you submit patches to OpenStack projects (including this one): -- https://wiki.openstack.org/wiki/GerritWorkflow +- http://docs.openstack.org/infra/manual/developers.html#development-workflow - https://wiki.openstack.org/wiki/GitCommitMessages If you change the behavior of the scripts as documented in the training-guides, @@ -115,7 +115,7 @@ Reviewing --------- Learn how to review (or what to expect when having your patches reviewed) here: -- https://wiki.openstack.org/wiki/GerritWorkflow +- http://docs.openstack.org/infra/manual/developers.html#development-workflow TODO ---- diff --git a/specs/README.rst b/specs/README.rst index 880803fd..f86d97f8 100644 --- a/specs/README.rst +++ b/specs/README.rst @@ -27,4 +27,4 @@ Approved specs will be created on Launchpad blueprints:: For more information about working with gerrit, see:: - https://wiki.openstack.org/wiki/Gerrit_Workflow + http://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/specs/juno/developer-training-guide-how-to-participate-classroom.rst b/specs/juno/developer-training-guide-how-to-participate-classroom.rst index 40f1b240..113f502e 100644 --- a/specs/juno/developer-training-guide-how-to-participate-classroom.rst +++ b/specs/juno/developer-training-guide-how-to-participate-classroom.rst @@ -51,7 +51,7 @@ http://docs.openstack.org/training-guides/content/operator-getting-started-lab.h git-review http://www.mediawiki.org/wiki/Gerrit/git-review https://pypi.python.org/pypi/git-review -https://wiki.openstack.org/wiki/GerritWorkflow#Git_Review_Installation +http://docs.openstack.org/infra/manual/developers.html#installing-git-review Understanding the submission process in-depth: Review submission syntax @@ -64,7 +64,7 @@ Links to source locations: https://wiki.openstack.org/wiki/Documentation/Builds CI Pipeline Workflow Overview Gerrit Workflow -https://wiki.openstack.org/wiki/GerritWorkflow +http://docs.openstack.org/infra/manual/developers.html#development-workflow Understanding the remote tools in-depth: sources @@ -74,7 +74,7 @@ github (same links as above) gerrit https://gerrit-documentation.storage.googleapis.com/Documentation/2.8.1/index.html http://www.mediawiki.org/wiki/Gerrit/Tutorial -https://wiki.openstack.org/wiki/Gerrit_Workflow +http://docs.openstack.org/infra/manual/developers.html#development-workflow jenkins http://jenkins-ci.org https://wiki.jenkins-ci.org/display/JENKINS/Meet+Jenkins