openstack/openstack-manuals
Code Issues Proposed changes

Merge "Update the user-guide-admin links with administrator guide"

Browse Source
This commit is contained in:
Jenkins 2016-04-06 12:29:41 +00:00 committed by Gerrit Code Review
commit 72ccd8e39a
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/admin-guide/source/compute-networking-nova.rst
View File

@ -719,8 +719,8 @@ to perform floating IP operations:
For more information about how administrators can associate floating IPs
with instances, see `Manage IP
addresses <http://docs.openstack.org/user-guide-admin/cli_admin_manage_ip_addresses.html>`__
in the OpenStack Admin User Guide.
addresses <http://docs.openstack.org/admin-guide/cli_admin_manage_ip_addresses.html>`__
in the OpenStack Administrator Guide.
Automatically add floating IPs
------------------------------

2
doc/admin-guide/source/compute-node-down.rst
View File

@ -13,7 +13,7 @@ Evacuate instances
If a hardware malfunction or other error causes the cloud compute node to
fail, you can use the :command:`nova evacuate` command to evacuate instances.
See the `Admin User Guide <http://docs.openstack.org/user-guide-admin/cli_nova_evacuate.html>`__.
See the `Administrator Guide <http://docs.openstack.org/admin-guide/cli_nova_evacuate.html>`__.
.. _nova-compute-node-down-manual-recovery:

4
doc/admin-guide/source/dashboard_admin_manage_stacks.rst
View File

@ -20,8 +20,8 @@ high availability.
For information about:
* administrative tasks on the command-line, see
the `OpenStack Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_admin_manage_stacks.html>`__.
the `OpenStack Administrator Guide
<http://docs.openstack.org/admin-guide/cli_admin_manage_stacks.html>`__.
.. note::

8
doc/admin-guide/source/dashboard_set_quotas.rst
View File

@ -23,8 +23,8 @@ quotas for new tenants, as well as update quotas for existing tenants.
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 Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_set_quotas.html>`_).
the OpenStack Networking service (see `OpenStack Administrator Guide
<http://docs.openstack.org/admin-guide/cli_set_quotas.html>`_).
Additionally, you can update Compute service quotas for
tenant users.
@ -113,5 +113,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 Admin User Guide
<http://docs.openstack.org/user-guide-admin/cli_set_quotas.html>`_.
command-line client. See `OpenStack Administrator Guide
<http://docs.openstack.org/admin-guide/cli_set_quotas.html>`_.

2
doc/admin-guide/source/identity_concepts.rst
View File

@ -302,7 +302,7 @@ service, such as, a user named ``nova`` for the Compute service, and a
special service tenant called ``service``.
For information about how to create services and endpoints, see the
`OpenStack Admin User Guide <http://docs.openstack.org/user-guide-admin/
`OpenStack Administrator Guide <http://docs.openstack.org/admin-guide/
cli_manage_services.html>`__.
Groups

2
doc/config-reference/source/block-storage/volume-encryption.rst
View File

@ -45,7 +45,7 @@ Update ``nova-compute`` servers:
Follow the instructions in the OpenStack Admin User Guide under the
heading `Create an encrypted volume
type <http://docs.openstack.org/user-guide-admin/dashboard_manage_volumes.html>`__
type <http://docs.openstack.org/admin-guide/dashboard_manage_volumes.html>`__
or alternatively, see ``TODO`` in this manual to do this via the
command line.