diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 1e1421b621..7f62f3f6f6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,13 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps documented at:
 
-   https://wiki.openstack.org/wiki/How_To_Contribute#If_you.27re_a_developer
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   https://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/TESTING.rst b/TESTING.rst
index d99696f8bf..9c0d167e94 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -27,7 +27,7 @@ current tests should be passing.
 Virtual environments
 ~~~~~~~~~~~~~~~~~~~~
 
-Testing OpenStack projects, including Neutron, is made easier with `DevStack <https://github.com/openstack-dev/devstack>`_.
+Testing OpenStack projects, including Neutron, is made easier with `DevStack <https://git.openstack.org/cgit/openstack-dev/devstack>`_.
 
 Create a machine (such as a VM or Vagrant box) running a distribution supported
 by DevStack and install DevStack there. For example, there is a Vagrant script
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index dc4be08385..21b90b4ebf 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -23,24 +23,24 @@ environment that can be used in developing Neutron on Ubuntu, Fedora or
 Mac OS X. These instructions assume you're already familiar with
 Git and Gerrit, which is a code repository mirror and code review toolset
 , however if you aren't please see `this Git tutorial`_ for an introduction
-to using Git and `this wiki page`_ for a tutorial on using Gerrit and Git for
+to using Git and `this guide`_ for a tutorial on using Gerrit and Git for
 code contribution to Openstack projects.
 
 .. _this Git tutorial: http://git-scm.com/book/en/Getting-Started
-.. _this wiki page: https://wiki.openstack.org/wiki/Gerrit_Workflow
+.. _this guide: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Following these instructions will allow you to run the Neutron unit
 tests. If you want to be able to run Neutron in a full OpenStack environment,
 you can use the excellent `DevStack`_ project to do so. There is a wiki page
 that describes `setting up Neutron using DevStack`_.
 
-.. _DevStack: https://github.com/openstack-dev/devstack
+.. _DevStack: https://git.openstack.org/cgit/openstack-dev/devstack
 .. _setting up Neutron using Devstack: https://wiki.openstack.org/wiki/NeutronDevstack
 
 Getting the code
 ----------------
 
-Grab the code from GitHub::
+Grab the code::
 
     git clone git://git.openstack.org/openstack/neutron.git
     cd neutron