Merge "Workflow documentation is now in infra-manual"

CONTRIBUTING.rst

@@ -1,13 +1,15 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps documented at:
 
-   http://wiki.openstack.org/HowToContribute#If_you.27re_a_developer
+   http://docs.openstack.org/infra/manual/developers.html
 
-Once those steps have been completed, changes to OpenStack
-should be submitted for review via the Gerrit tool, following
-the workflow documented at:
+If you already have a good understanding of how the system works
+and your OpenStack accounts are set up, you can skip to the
+development workflow section of this documentation to learn how
+changes to OpenStack should be submitted for review via the
+Gerrit tool:
 
-   http://wiki.openstack.org/GerritWorkflow
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 

README.rst

@@ -6,8 +6,8 @@ There's a Python API (the ``keystoneclient`` module), and a command-line script
 (``keystone``).
 
 Development takes place via the usual OpenStack processes as outlined in the
-`OpenStack wiki <http://wiki.openstack.org/HowToContribute>`_.  The master
-repository is on `GitHub <http://github.com/openstack/python-keystoneclient>`_.
+`developer guide <http://docs.openstack.org/infra/manual/developers.html>`_.  The master
+repository is in `Git <http://git.openstack.org/cgit/openstack/python-keystoneclient>`_.
 
 This code is a fork of Rackspace's python-novaclient which is in turn a fork of
 `Jacobian's python-cloudservers

doc/source/index.rst

@@ -27,7 +27,7 @@ using `Gerrit`_.
 
 .. _on GitHub: https://github.com/openstack/python-keystoneclient
 .. _Launchpad: https://launchpad.net/python-keystoneclient
-.. _Gerrit: http://wiki.openstack.org/GerritWorkflow
+.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Run tests with ``python setup.py test``.