Merge "Clean up broken links due to doc-migration" into stable/pike

13 files changed, 25 insertions, 75 deletions

diff --git a/doc/source/admin/index.rst b/doc/source/admin/index.rst
index 71795ddf4..8bb65a8c0 100644
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -21,7 +21,7 @@ Dashboard, see the :doc:`/install/index` for your operating system.
    manage-volumes.rst
    manage-shares.rst
    set-quotas.rst
-   manage-resources.rst
+   manage-services.rst
    manage-host-aggregates.rst
    admin-manage-stacks.rst
 
diff --git a/doc/source/admin/manage-host-aggregates.rst b/doc/source/admin/manage-host-aggregates.rst
index c3134850c..36c936b1d 100644
--- a/doc/source/admin/manage-host-aggregates.rst
+++ b/doc/source/admin/manage-host-aggregates.rst
@@ -11,7 +11,7 @@ multiple aggregates.
 
 The scheduler uses this information to make scheduling decisions.
 For information, see
-`Scheduling <https://docs.openstack.org/ocata/config-reference/compute/schedulers.html>`__.
+`Scheduling <https://docs.openstack.org/nova/latest/admin/configuration/schedulers.html>`__.
 
 To create a host aggregate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/admin/manage-images.rst b/doc/source/admin/manage-images.rst
index 689a820b4..acde6dcd3 100644
--- a/doc/source/admin/manage-images.rst
+++ b/doc/source/admin/manage-images.rst
@@ -8,11 +8,10 @@ and manage images for users in all projects to which you have
 access.
 
 To create and manage images in specified projects as an end
-user, see the `upload and manage images with Dashboard in
-OpenStack End User Guide
-<https://docs.openstack.org/user-guide/dashboard-manage-images.html>`_
+user, see the :doc:`upload and manage images with Dashboard in
+OpenStack End User Guide </user/manage-images>`
 and `manage images with CLI in OpenStack End User Guide
-<https://docs.openstack.org/user-guide/common/cli-manage-images.html>`_ .
+<https://docs.openstack.org/glance/latest/admin/manage-images.html>`_.
 
 To create and manage images as an administrator for other
 users, use the following procedures.
diff --git a/doc/source/admin/manage-instances.rst b/doc/source/admin/manage-instances.rst
index 9116f3321..64a70d6e4 100644
--- a/doc/source/admin/manage-instances.rst
+++ b/doc/source/admin/manage-instances.rst
@@ -8,7 +8,7 @@ create a snapshot from, and migrate instances. You can also view the
 logs for instances or launch a VNC console for an instance.
 
 For information about using the Dashboard to launch instances as an end
-user, see the `OpenStack End User Guide <https://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
+user, see the :doc:`OpenStack End User Guide </user/launch-instances>`.
 
 Create instance snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -30,7 +30,7 @@ Create instance snapshots
 #. To launch an instance from the snapshot, select the snapshot and
    click :guilabel:`Launch`. For information about launching
    instances, see the
-   `OpenStack End User Guide <https://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
+   :doc:`OpenStack End User Guide </user/launch-instances>`.
 
 Control the state of an instance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/admin/manage-resources.rst b/doc/source/admin/manage-resources.rst
deleted file mode 100644
index 7d4ed0bc1..000000000
--- a/doc/source/admin/manage-resources.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-====================
-View cloud resources
-====================
-
-
-.. toctree::
-   :maxdepth: 2
-
-   manage-services.rst
-   view-cloud-resources.rst
diff --git a/doc/source/admin/manage-shares.rst b/doc/source/admin/manage-shares.rst
index 4c0933a43..9f99e2fe8 100644
--- a/doc/source/admin/manage-shares.rst
+++ b/doc/source/admin/manage-shares.rst
@@ -6,7 +6,7 @@ Shares are file storage that instances can access. Users can
 allow or deny a running instance to have access to a share at any time.
 For information about using the Dashboard to create and manage shares as
 an end user, see the
-`OpenStack End User Guide <https://docs.openstack.org/user-guide/dashboard-manage-shares.html>`_.
+:doc:`OpenStack End User Guide </user/manage-shares>`.
 
 As an administrative user, you can manage shares and share types for users
 in various projects. You can create and delete share types, and view
diff --git a/doc/source/admin/manage-volumes.rst b/doc/source/admin/manage-volumes.rst
index 04d12e8ce..8f187be5a 100644
--- a/doc/source/admin/manage-volumes.rst
+++ b/doc/source/admin/manage-volumes.rst
@@ -6,7 +6,7 @@ Volumes are the Block Storage devices that you attach to instances to enable
 persistent storage. Users can attach a volume to a running instance or detach
 a volume and attach it to another instance at any time. For information about
 using the dashboard to create and manage volumes as an end user, see the
-`OpenStack End User Guide <https://docs.openstack.org/user-guide/dashboard-manage-volumes.html>`_.
+:doc:`OpenStack End User Guide </user/manage-volumes>`.
 
 As an administrative user, you can manage volumes and volume types for users
 in various projects. You can create and delete volume types, and you can view
@@ -118,7 +118,7 @@ volumes.
 
       To see further information and CLI instructions, see
       `Create an encrypted volume type
-      <https://docs.openstack.org/ocata/config-reference/block-storage/volume-encryption.html>`_
+      <https://docs.openstack.org/cinder/latest/configuration/block-storage/volume-encryption.html>`__
       in the OpenStack Configuration Reference.
 
 Delete volume types
diff --git a/doc/source/admin/sessions.rst b/doc/source/admin/sessions.rst
index b9a906831..cb0208e8c 100644
--- a/doc/source/admin/sessions.rst
+++ b/doc/source/admin/sessions.rst
@@ -11,8 +11,8 @@ back end. You customize the session back end through the
 After architecting and implementing the core OpenStack
 services and other required services, combined with the Dashboard
 service steps below, users and administrators can use
-the OpenStack dashboard. Refer to the `OpenStack Dashboard
-<https://docs.openstack.org/user-guide/dashboard.html>`__
+the OpenStack dashboard. Refer to the
+:doc:`OpenStack User Documentation </user/index>`
 chapter of the OpenStack End User Guide for
 further instructions on logging in to the Dashboard.
 
diff --git a/doc/source/admin/set-quotas.rst b/doc/source/admin/set-quotas.rst
index 904476a1c..7ed7451ed 100644
--- a/doc/source/admin/set-quotas.rst
+++ b/doc/source/admin/set-quotas.rst
@@ -21,13 +21,18 @@ quotas for new projects, as well as update quotas for existing projects.
 
 .. note::
 
-   Using the command-line interface, you can manage quotas for the
-   OpenStack Compute service, the OpenStack Block Storage service, and
-   the OpenStack Networking service (see `OpenStack Administrator Guide
-   <https://docs.openstack.org/admin-guide/cli-set-quotas.html>`_).
+   Using the command-line interface, you can manage quotas for
+   `the OpenStack Compute service <https://docs.openstack.org/nova/latest/admin/quotas.html>`__,
+   `the OpenStack Block Storage service <https://docs.openstack.org/cinder/latest/cli/cli-set-quotas.html>`__,
+   and the OpenStack Networking service (For CLI details,
+   see `OpenStackClient CLI reference
+   <https://docs.openstack.org/python-openstackclient/latest/cli/command-objects/quota.html>`_).
    Additionally, you can update Compute service quotas for
    project users.
 
+.. NOTE: Admin guide contents on the networking service quota
+   has not been migrated to neutron. Update the link once it is recovered.
+
 The following table describes the Compute and Block Storage service quotas:
 
 .. _compute_quotas:
diff --git a/doc/source/admin/view-cloud-resources.rst b/doc/source/admin/view-cloud-resources.rst
deleted file mode 100644
index 223ea5553..000000000
--- a/doc/source/admin/view-cloud-resources.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-===========================
-View cloud usage statistics
-===========================
-
-The Telemetry service provides user-level usage data for
-OpenStack-based clouds, which can be used for customer billing, system
-monitoring, or alerts. Data can be collected by notifications sent by
-existing OpenStack components (for example, usage events emitted from
-Compute) or by polling the infrastructure (for example, libvirt).
-
-.. note::
-
-   You can only view metering statistics on the dashboard (available
-   only to administrators).
-   The Telemetry service must be set up and administered through the
-   :command:`ceilometer` command-line interface (CLI).
-
-   For basic administration information, refer to the `Measure Cloud
-   Resources <https://docs.openstack.org/user-guide/cli-ceilometer.html>`_
-   chapter in the OpenStack End User Guide.
-
-.. _dashboard-view-resource-stats:
-
-View resource statistics
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-#. Log in to the dashboard and select the :guilabel:`admin` project
-   from the drop-down list.
-
-#. On the :guilabel:`Admin` tab, click the :guilabel:`Resource Usage` category.
-
-#. Click the:
-
-   * :guilabel:`Usage Report` tab to view a usage report per project
-     by specifying the time period (or even use a calendar to define
-     a date range).
-
-   * :guilabel:`Stats` tab to view a multi-series line chart with
-     user-defined meters. You group by project, define the value type
-     (min, max, avg, or sum), and specify the time period (or even use
-     a calendar to define a date range).
diff --git a/doc/source/user/create-networks.rst b/doc/source/user/create-networks.rst
index 00006e3eb..cbc2f32b4 100644
--- a/doc/source/user/create-networks.rst
+++ b/doc/source/user/create-networks.rst
@@ -9,9 +9,8 @@ creating and assigning new IP addresses).
 
 Networking in OpenStack is complex. This section provides the basic
 instructions for creating a network and a router. For detailed
-information about managing networks, refer to the `OpenStack
-Administrator
-Guide <https://docs.openstack.org/admin-guide/networking.html>`__.
+information about managing networks, refer to the `OpenStack Networking Guide
+<https://docs.openstack.org/neutron/latest/admin/>`__.
 
 Create a network
 ~~~~~~~~~~~~~~~~
diff --git a/doc/source/user/launch-instances.rst b/doc/source/user/launch-instances.rst
index ed50a905c..834774e1e 100644
--- a/doc/source/user/launch-instances.rst
+++ b/doc/source/user/launch-instances.rst
@@ -231,7 +231,7 @@ file.
 It is also possible to SSH into an instance without an SSH keypair, if the
 administrator has enabled root password injection.  For more information
 about root password injection, see `Injecting the administrator password
-<https://docs.openstack.org/admin-guide/compute-admin-password-injection.html>`_
+<https://docs.openstack.org/nova/latest/admin/admin-password-injection.html>`_
 in the *OpenStack Administrator Guide*.
 
 Track usage for instances
diff --git a/doc/source/user/stacks.rst b/doc/source/user/stacks.rst
index b54d4f26a..7767976b9 100644
--- a/doc/source/user/stacks.rst
+++ b/doc/source/user/stacks.rst
@@ -18,9 +18,7 @@ and users. Once created, the resources are referred to as
 stacks.
 
 The template languages are described in the `Template Guide
-<https://docs.openstack.org/heat/latest/template_guide/index.
-html>`_ in the `Heat developer documentation <https://docs.
-openstack.org/heat/latest/>`_.
+<https://docs.openstack.org/heat/latest/template_guide/>`_.
 
 Launch a stack
 ~~~~~~~~~~~~~~