Merge "Update the Administrator Guide links"

doc/source/configuration.rst

@@ -215,7 +215,7 @@ as the names of the related extensions in setup.cfg. For a more detailed
 description, please see the `transformers`_ section of the Administrator Guide
 of Ceilometer.
 
-.. _transformers: http://docs.openstack.org/admin-guide-cloud/telemetry-data-collection.html#transformers
+.. _transformers: http://docs.openstack.org/admin-guide/telemetry-data-collection.html#transformers
 
 The *publishers* section contains the list of publishers, where the samples
 data should be sent after the possible transformations. The names of the
@@ -232,4 +232,4 @@ Publishers
 For more information about publishers see the `publishers`_ section of the
 Administrator Guide of Ceilometer.
 
-.. _publishers: http://docs.openstack.org/admin-guide-cloud/telemetry-data-retrieval.html#publishers
+.. _publishers: http://docs.openstack.org/admin-guide/telemetry-data-retrieval.html#publishers

doc/source/measurements.rst

@@ -23,9 +23,9 @@ Existing meters
 ===============
 
 For the list of existing meters see the tables under the
-`Measurements page`_ of Ceilometer in the Cloud Administrator Guide.
+`Measurements page`_ of Ceilometer in the Administrator Guide.
 
-.. _Measurements page: http://docs.openstack.org/admin-guide-cloud/telemetry-measurements.html
+.. _Measurements page: http://docs.openstack.org/admin-guide/telemetry-measurements.html
 
 Adding new meters
 =================

doc/source/new_meters.rst

@@ -99,7 +99,7 @@ specific topics.
 A detailed description of how to use meter definition is illustrated in
 the `admin_guide`_.
 
-.. _admin_guide: http://docs.openstack.org/admin-guide-cloud/telemetry-data-collection.html#meter-definitions
+.. _admin_guide: http://docs.openstack.org/admin-guide/telemetry-data-collection.html#meter-definitions
 
 Non-metric meters and events
 ----------------------------