diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fc3d366364..b6d701b5e0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,14 @@
-If you would like to contribute to the development of OpenStack,
-you must follow the steps documented at:
+If you would like to contribute to the development of OpenStack, you must
+follow the steps in this page:
 
-   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.
 
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index efbb6dd8f7..81b18fb3d1 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -396,7 +396,7 @@ You may also be interested in either the
 `OpenStack Continuous Integration Infrastructure`_ or the
 `OpenStack Integration Testing Project`_.
 
-.. _devstack: http://devstack.org/
+.. _devstack: http://docs.openstack.org/developer/devstack/
 .. _OpenStack Continuous Integration Infrastructure: http://docs.openstack.org/infra/system-config
 .. _OpenStack Integration Testing Project: https://git.openstack.org/cgit/openstack/tempest
 
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index d4d0b27d20..e38663b718 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -82,12 +82,12 @@ An excellent reference implementation of setting up Keystone is DEVSTACK_,
 most commonly used for development and testing setup of not only Keystone,
 but all of the core OpenStack projects.
 
-.. _DEVSTACK: http://devstack.org/
+.. _DEVSTACK: http://docs.openstack.org/developer/devstack/
 
 The script with the latest examples of initializing data in Keystone is a
-bash script called keystone_data.sh_
+bash script called `lib/keystone`_
 
-.. _keystone_data.sh: https://github.com/openstack-dev/devstack/blob/master/files/keystone_data.sh
+.. _lib/keystone: https://git.openstack.org/cgit/openstack-dev/devstack/tree/lib/keystone
 
 Installing from packages: Ubuntu
 --------------------------------