Merge "Remove dev prefix in magnum/doc/source/dev"

doc/source/dev/functional-test.rst

@@ -11,7 +11,7 @@ Prerequisite
 You need to follow the developer quickstart guide to deploy Magnum in a
 devstack environment
 
-`<http://docs.openstack.org/developer/magnum/dev/dev-quickstart.html>`_
+`<http://docs.openstack.org/developer/magnum/dev/quickstart.html>`_
 
 Preparation
 ===========

doc/source/dev/manual-devstack.rst

@@ -1,11 +1,11 @@
-.. _dev-manual-install:
+.. _manual-install:
 
 ==================================
 Manually Adding Magnum to DevStack
 ==================================
 
 If you are getting started with magnum it is recommended you follow the
-:ref:`dev-quickstart` to get up and running with magnum. This guide covers
+:ref:`quickstart` to get up and running with magnum. This guide covers
 a more in-depth process to setup magnum with devstack.
 
 Magnum depends on nova, glance, heat, barbican, and neutron to create and
@@ -235,4 +235,4 @@ Start the conductor service in a new screen::
 Magnum should now be up and running!
 
 Further details on utilizing magnum and deploying containers can be found in
-the guide :ref:`dev-quickstart`.
+the guide :ref:`quickstart`.

doc/source/dev/quickstart.rst

@@ -1,4 +1,4 @@
-.. _dev-quickstart:
+.. _quickstart:
 
 =====================
 Developer Quick-Start
@@ -79,7 +79,7 @@ To run unit test coverage and check percentage of code covered::
     tox -e cover
 
 To discover and interact with templates, please refer to
-`<http://docs.openstack.org/developer/magnum/dev/dev-bay-template-example.html>`_
+`<http://docs.openstack.org/developer/magnum/dev/bay-template-example.html>`_
 
 Exercising the Services Using Devstack
 ======================================
@@ -96,7 +96,7 @@ This session has only been tested on Ubuntu 14.04 (Trusty) and Fedora 20/21.
 We recommend users to select one of them if it is possible.
 
 For in-depth guidance on adding magnum manually to a devstack instance, please
-refer to the `<http://docs.openstack.org/developer/magnum/dev/dev-manual-devstack.html>`_
+refer to the `<http://docs.openstack.org/developer/magnum/dev/manual-devstack.html>`_
 
 Clone devstack::
 
@@ -121,7 +121,7 @@ Kilo, and heat is enabled by the magnum plugin)::
     PUBLIC_INTERFACE=eth1
     enable_plugin magnum https://git.openstack.org/openstack/magnum
     # Enable barbican service and use it to store TLS certificates
-    # For details http://docs.openstack.org/developer/magnum/dev/dev-tls.html
+    # For details http://docs.openstack.org/developer/magnum/dev/tls.html
     enable_plugin barbican https://git.openstack.org/openstack/barbican
     VOLUME_BACKING_FILE_SIZE=20G
     END
@@ -470,7 +470,7 @@ Building and Using a Mesos Bay
 
 Provisioning a mesos bay requires a Ubuntu-based image with some packages
 pre-installed. To build and upload such image, please refer to
-`<http://docs.openstack.org/developer/magnum/dev/dev-mesos.html>`_
+`<http://docs.openstack.org/developer/magnum/dev/mesos.html>`_
 
 Alternatively, you can download and upload a pre-built image::
 

doc/source/index.rst

@@ -75,12 +75,12 @@ Developer Info
 .. toctree::
    :maxdepth: 1
 
-   dev/dev-quickstart
+   dev/quickstart
-   dev/dev-manual-devstack
+   dev/manual-devstack
-   dev/dev-build-atomic-image.rst
+   dev/build-atomic-image.rst
-   dev/dev-kubernetes-load-balancer.rst
+   dev/kubernetes-load-balancer.rst
-   dev/dev-tls.rst
+   dev/tls.rst
-   dev/dev-functional-test.rst
+   dev/functional-test.rst
    contributing
    heat-templates
    objects