Merge "Update links to Cloud Admin Guide"

doc/user-guide-admin/source/cli_admin_manage_ip_addresses.rst

@@ -16,8 +16,8 @@ Internet.
 
 - For details on creating public networks using OpenStack Networking
   (``neutron``), refer to the `OpenStack Cloud Administrator Guide
-  <http://docs.openstack.org/admin-guide-cloud/content/>`_. No
-  floating IP addresses are created by default in OpenStack Networking.
+  <http://docs.openstack.org/admin-guide-cloud/networking_adv-features.html>`_
+  . No floating IP addresses are created by default in OpenStack Networking.
 
 As an administrator using legacy networking (``nova-network``), you
 can use the following bulk commands to list, create, and delete ranges

doc/user-guide-admin/source/cli_manage_flavors.rst

@@ -12,7 +12,7 @@ that can be launched.
    Flavors can also determine on which compute host a flavor
    can be used to launch an instance. For information
    about customizing flavors, refer to the `OpenStack Cloud Administrator Guide
-   <http://docs.openstack.org/admin-guide-cloud/content/>`_.
+   <http://docs.openstack.org/admin-guide-cloud/compute-flavors.html>`_.
 
 A flavor consists of the following parameters:
 
@@ -120,7 +120,7 @@ Create a flavor
    **Random-number generator**.
    For information about supporting metadata keys, see the
    `OpenStack Cloud Administrator Guide
-   <http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html>`__.
+   <http://docs.openstack.org/admin-guide-cloud/compute-flavors.html>`__.
 
    For a list of optional parameters, run this command::
 

doc/user-guide-admin/source/dashboard_manage_flavors.rst

@@ -147,7 +147,7 @@ Update Metadata
 
    For information about supporting metadata keys, see the
    `OpenStack Cloud Administrator Guide
-   <http://docs.openstack.org/admin-guide-cloud/content/customize-flavors.html>`__.
+   <http://docs.openstack.org/admin-guide-cloud/compute-flavors.html>`__.
 
 Delete flavors
 ~~~~~~~~~~~~~~