diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7a37e40f7d..b1697fef7a 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,8 +1,7 @@ If you would like to contribute to the development of OpenStack, -you must follow the steps in the "If you're a developer" -section of this page: +you must follow the steps in this page: - http://wiki.openstack.org/HowToContribute + http://docs.openstack.org/infra/manual/developers.html You can find more Sahara-specific info in our How To Participate guide: @@ -12,7 +11,7 @@ Once those steps have been completed, changes to OpenStack should be submitted for review via the Gerrit tool, following the workflow documented at: - http://wiki.openstack.org/GerritWorkflow + http://docs.openstack.org/infra/manual/developers.html#development-workflow Pull requests submitted through GitHub will be ignored. diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index 0323b6dbcf..c2696b9ef2 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -45,7 +45,7 @@ On openSUSE-based distributions (SLES 12, openSUSE, Factory or Tumbleweed):: $ sudo zypper in gcc git libmysqlclient-devel postgresql-devel python-devel python-pip python-tox python-virtualenv -2. Grab the code from GitHub: +2. Grab the code: .. sourcecode:: console diff --git a/doc/source/devref/devstack.rst b/doc/source/devref/devstack.rst index 88bbb523a6..0c8f9e5115 100644 --- a/doc/source/devref/devstack.rst +++ b/doc/source/devref/devstack.rst @@ -52,7 +52,7 @@ Ubuntu 12.04 system. .. sourcecode:: console $ sudo apt-get install git-core - $ git clone https://github.com/openstack-dev/devstack.git + $ git clone https://git.openstack.org/cgit/openstack-dev/devstack.git 2. Create file ``local.conf`` in devstack directory with the following content: diff --git a/doc/source/devref/gerrit.rst b/doc/source/devref/gerrit.rst index f17cf13fa8..ebd7b54c00 100644 --- a/doc/source/devref/gerrit.rst +++ b/doc/source/devref/gerrit.rst @@ -8,9 +8,9 @@ Gerrit is a complete replacement for Github pull requests. `All Github pull requests to the Sahara repository will be ignored`. See `Gerrit Workflow Quick Reference`_ for information about how to get -started using Gerrit. See `Gerrit, Jenkins and Github`_ for more detailed +started using Gerrit. See `Development Workflow`_ for more detailed documentation on how to work with Gerrit. .. _Gerrit: http://code.google.com/p/gerrit -.. _Gerrit, Jenkins and Github: http://wiki.openstack.org/GerritJenkinsGithub -.. _Gerrit Workflow Quick Reference: http://wiki.openstack.org/GerritWorkflow +.. _Development Workflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow +.. _Gerrit Workflow Quick Reference: http://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/doc/source/devref/how_to_participate.rst b/doc/source/devref/how_to_participate.rst index f9d527625f..652b33f3ac 100644 --- a/doc/source/devref/how_to_participate.rst +++ b/doc/source/devref/how_to_participate.rst @@ -51,9 +51,9 @@ How to send your first patch on review? * Checkout Sahara code from `Github `_ -* Carefully read https://wiki.openstack.org/wiki/Gerrit_Workflow +* Carefully read http://docs.openstack.org/infra/manual/developers.html#development-workflow - * Pay special attention to https://wiki.openstack.org/wiki/Gerrit_Workflow#Committing_Changes + * Pay special attention to http://docs.openstack.org/infra/manual/developers.html#committing-a-change * Apply and commit your changes