From 507c190c97d71192678c3a46158b28fcafeb8971 Mon Sep 17 00:00:00 2001 From: chenqiaomin Date: Mon, 23 May 2016 14:48:58 +0000 Subject: [PATCH] [Admin-guide]Correct the wrong title for cleanup There should be 'OpenStack Administrator Guide' for the title, not 'Administrator Guide'. Change-Id: Ia53fe2c159ea697abd50169966cd7a68f4c18f8d Closes-Bug: #1584810 --- doc/admin-guide/source/compute-node-down.rst | 2 +- doc/config-reference/source/identity.rst | 2 +- doc/config-reference/source/networking.rst | 2 +- doc/contributor-guide/source/docs-builds.rst | 2 +- doc/contributor-guide/source/topic-tags.rst | 2 +- doc/ha-guide/source/storage-ha-backend.rst | 2 +- doc/install-guide/source/ceilometer-cinder.rst | 2 +- doc/install-guide/source/environment-security.rst | 2 +- doc/ops-guide/source/ops_user_facing_operations.rst | 12 ++++++------ 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/admin-guide/source/compute-node-down.rst b/doc/admin-guide/source/compute-node-down.rst index f5494f7655..1a441c18aa 100644 --- a/doc/admin-guide/source/compute-node-down.rst +++ b/doc/admin-guide/source/compute-node-down.rst @@ -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 `Administrator Guide `__. +See the `OpenStack Administrator Guide `__. .. _nova-compute-node-down-manual-recovery: diff --git a/doc/config-reference/source/identity.rst b/doc/config-reference/source/identity.rst index 32af7c3322..ebde7bfe6d 100644 --- a/doc/config-reference/source/identity.rst +++ b/doc/config-reference/source/identity.rst @@ -14,5 +14,5 @@ Identity service This chapter details the OpenStack Identity service configuration options. For installation prerequisites and step-by-step walkthroughs, see the OpenStack Installation Guide for your distribution (`docs.openstack.org -`__) and `Administrator Guide +`__) and `OpenStack Administrator Guide `__. diff --git a/doc/config-reference/source/networking.rst b/doc/config-reference/source/networking.rst index a7e273dfb9..d3d23afd2d 100644 --- a/doc/config-reference/source/networking.rst +++ b/doc/config-reference/source/networking.rst @@ -14,4 +14,4 @@ This chapter explains the OpenStack Networking configuration options. For installation prerequisites, steps, and use cases, see the OpenStack Installation Guide for your distribution (`docs.openstack.org `__) and the -`Administrator Guide `__. +`OpenStack Administrator Guide `__. diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst index 5f65639454..897c0a1d65 100644 --- a/doc/contributor-guide/source/docs-builds.rst +++ b/doc/contributor-guide/source/docs-builds.rst @@ -72,7 +72,7 @@ Guides for deployers and administrators - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference - http://docs.openstack.org/mitaka/config-reference/ - * - Administrator Guide + * - OpenStack Administrator Guide - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/admin-guide - http://docs.openstack.org/admin-guide diff --git a/doc/contributor-guide/source/topic-tags.rst b/doc/contributor-guide/source/topic-tags.rst index 5e32685bfd..c7da2de73e 100644 --- a/doc/contributor-guide/source/topic-tags.rst +++ b/doc/contributor-guide/source/topic-tags.rst @@ -9,7 +9,7 @@ message or email subject line to show the topic explicitly. Based on the topic your request refers to, use the following tags: [admin-guide] - Administrator Guide + OpenStack Administrator Guide [api] API Guide, API Complete References diff --git a/doc/ha-guide/source/storage-ha-backend.rst b/doc/ha-guide/source/storage-ha-backend.rst index a6d1deaef1..0f897bbcb1 100644 --- a/doc/ha-guide/source/storage-ha-backend.rst +++ b/doc/ha-guide/source/storage-ha-backend.rst @@ -31,7 +31,7 @@ An OpenStack environment includes multiple data pools for the VMs: or Ceph RBD as the storage back end. For more information about configuring storage back ends for -the different storage options, see the `Administrator Guide +the different storage options, see the `OpenStack Administrator Guide `_. This section discusses ways to protect against diff --git a/doc/install-guide/source/ceilometer-cinder.rst b/doc/install-guide/source/ceilometer-cinder.rst index 2a2005f9da..b2096cf64c 100644 --- a/doc/install-guide/source/ceilometer-cinder.rst +++ b/doc/install-guide/source/ceilometer-cinder.rst @@ -56,6 +56,6 @@ Finalize installation 3. Use the ``cinder-volume-usage-audit`` command on Block Storage nodes to retrieve meters on demand. For more information, see the - `Administrator Guide `__. diff --git a/doc/install-guide/source/environment-security.rst b/doc/install-guide/source/environment-security.rst index f30fc96291..ac3d18f76f 100644 --- a/doc/install-guide/source/environment-security.rst +++ b/doc/install-guide/source/environment-security.rst @@ -74,7 +74,7 @@ during installation and operation. In some cases, services perform modifications to the host that can interfere with deployment automation tools such as Ansible, Chef, and Puppet. For example, some OpenStack services add a root wrapper to ``sudo`` that can interfere with security -policies. See the `Administrator Guide `__ for more information. diff --git a/doc/ops-guide/source/ops_user_facing_operations.rst b/doc/ops-guide/source/ops_user_facing_operations.rst index ea60e5cc55..0d8dd336de 100644 --- a/doc/ops-guide/source/ops_user_facing_operations.rst +++ b/doc/ops-guide/source/ops_user_facing_operations.rst @@ -1198,7 +1198,7 @@ system and use it for your purposes. See `Share Management `__ - of “Shared File Systems” section of Administrator Guide + of “Shared File Systems” section of OpenStack Administrator Guide document for the details on share management operations. Manage Access To Shares @@ -1435,7 +1435,7 @@ permissions to run it: For more details and additional information about other cases, features, API commands etc, see `Share Management `__ - of “Shared File Systems” section of Administrator Guide document. + of “Shared File Systems” section of OpenStack Administrator Guide document. Create Snapshots ---------------- @@ -1494,7 +1494,7 @@ To make sure that the snapshot is available, run: For more details and additional information on snapshots, see `Share Snapshots `__ - of “Shared File Systems” section of “Administrator Guide” document. + of “Shared File Systems” section of “OpenStack Administrator Guide” document. .. _create_a_share_network: @@ -1566,7 +1566,7 @@ Share use case described earlier in this chapter. See `Share Networks `__ - of “Shared File Systems” section of Administrator Guide + of “Shared File Systems” section of OpenStack Administrator Guide document for more details. Manage a Share Network @@ -1641,7 +1641,7 @@ You also can add and remove the security services to the share network. For details, see subsection `Security Services `__ - of “Shared File Systems” section of Administrator Guide document. + of “Shared File Systems” section of OpenStack Administrator Guide document. Instances ~~~~~~~~~ @@ -2285,7 +2285,7 @@ Good Luck! This section was intended as a brief introduction to some of the most useful of many OpenStack commands. For an exhaustive list, please refer -to the `Administrator Guide `__. +to the `OpenStack Administrator Guide `__. We hope your users remain happy and recognize your hard work! (For more hard work, turn the page to the next chapter, where we discuss the system-facing operations: maintenance, failures and debugging.)