Merge "docs: fix mistakes in documentation"

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 :doc:`OpenStack End User Guide </user/launch-instances>`.
+user, see the :ref:`launch-and-manage-instances`.
 
 Create instance snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -29,8 +29,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
-   :doc:`OpenStack End User Guide </user/launch-instances>`.
+   instances, see the :ref:`launch-and-manage-instances`.
 
 Control the state of an instance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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
-:doc:`OpenStack End User Guide </user/manage-volumes>`.
+:ref:`create-and-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
@@ -113,7 +113,7 @@ volumes.
    To see further information and CLI instructions, see
    `Create an encrypted volume type
    <https://docs.openstack.org/cinder/latest/configuration/block-storage/volume-encryption.html#create-an-encrypted-volume-type>`__
-   in the OpenStack Block Storage Configuration Guide.
+   in the OpenStack Block Storage (cinder) Configuration Guide.
 
 Delete volume types
 ~~~~~~~~~~~~~~~~~~~

doc/source/admin/sessions.rst

@@ -11,10 +11,7 @@ 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
-:doc:`OpenStack User Documentation </user/index>`
-chapter of the OpenStack End User Guide for
-further instructions on logging in to the Dashboard.
+the OpenStack dashboard. Refer to the :ref:`login-in-dashboard`.
 
 The following sections describe the pros and cons of each option as it
 pertains to deploying the Dashboard.

doc/source/admin/set-quotas.rst

@@ -118,5 +118,5 @@ Update project quotas
 
    The dashboard does not show all possible project quotas.
    To view and update the quotas for a service, use its
-   command-line client. See `OpenStack Administrator Guide
-   <https://docs.openstack.org/admin-guide/cli-set-quotas.html>`_.
+   command-line client. See `Manage quotas
+   <https://docs.openstack.org/cinder/latest/cli/cli-set-quotas.html>`_.

doc/source/user/launch-instances.rst

@@ -1,3 +1,5 @@
+.. _launch-and-manage-instances:
+
 ===========================
 Launch and manage instances
 ===========================

doc/source/user/log-in.rst

@@ -1,3 +1,5 @@
+.. _login-in-dashboard:
+
 =======================
 Log in to the dashboard
 =======================

doc/source/user/manage-volumes.rst

@@ -1,3 +1,5 @@
+.. _create-and-manage-volumes:
+
 =========================
 Create and manage volumes
 =========================