[config-ref] reorganize API configurations to normalize

Change-Id: Iaa3a12ed9e428181f7f1bca56423ff9356a78ea2

doc/config-reference/source/compute.rst

@@ -6,12 +6,12 @@ Compute service
    :maxdepth: 1
 
    compute/nova-conf.rst
+   compute/api.rst
    compute/logging.rst
    compute/authentication-authorization.rst
    compute/resize.rst
    compute/database-connections.rst
    compute/rpc.rst
-   compute/api.rst
    compute/fibre-channel.rst
    compute/iscsi-offload.rst
    compute/hypervisors.rst

doc/config-reference/source/compute/api.rst

@@ -1,5 +1,5 @@
 =========================
-Configure the Compute API
+Compute API configuration
 =========================
 
 The Compute API, run by the ``nova-api`` daemon, is the component of
@@ -132,8 +132,11 @@ The following example shows the default rate-limiting values:
    paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
    limits =(POST, "*", .*, 120, MINUTE);(POST, "*/servers", ^/servers, 120, MINUTE);(PUT, "*", .*, 120, MINUTE);(GET, "*changes-since*", .*changes-since.*, 120, MINUTE);(DELETE, "*", .*, 120, MINUTE);(GET, "*/os-fping", ^/os-fping, 12, MINUTE)
 
-Configuration reference
-~~~~~~~~~~~~~~~~~~~~~~~
+Configuration options
+~~~~~~~~~~~~~~~~~~~~~
 
-The Compute API configuration options are documented in
-the table :ref:`nova-api`.
+The Compute API configuration options are documented in the tables below.
+
+.. include:: ../tables/nova-api.rst
+.. include:: ../tables/nova-apiv21.rst
+.. include:: ../tables/nova-ca.rst

doc/config-reference/source/compute/config-options.rst

@@ -6,14 +6,11 @@ For a complete list of all available configuration options for each
 OpenStack Compute service, run
 :command:`bin/nova-<servicename>` ``--help``.
 
-.. include:: ../tables/nova-api.rst
-.. include:: ../tables/nova-apiv21.rst
 .. include:: ../tables/nova-api_database.rst
 .. include:: ../tables/nova-authentication.rst
 .. include:: ../tables/nova-auth_token.rst
 .. include:: ../tables/nova-availabilityzones.rst
 .. include:: ../tables/nova-barbican.rst
-.. include:: ../tables/nova-ca.rst
 .. include:: ../tables/nova-cells.rst
 .. include:: ../tables/nova-common.rst
 .. include:: ../tables/nova-compute.rst

doc/config-reference/source/image/api.rst

@@ -1,6 +1,6 @@
-=================
-Configure the API
-=================
+=======================
+Image API configuration
+=======================
 
 The Image service has two APIs: the user-facing API, and the registry
 API, which is for internal requests that require access to the database.
@@ -17,6 +17,9 @@ the Glance team has published a statement concerning the status and
 development plans of the APIs: `Using public Image API
 <http://docs.openstack.org/developer/glance/glanceapi.html>`_.
 
+Configuration options
+~~~~~~~~~~~~~~~~~~~~~
+
 Tables of all the options used to configure the APIs, including enabling
 SSL and modifying WSGI settings are found below.
 

doc/config-reference/source/message.rst

@@ -6,7 +6,7 @@ Message service
    :maxdepth: 1
 
    message/zaqar-conf.rst
-   message/zaqar-api.rst
+   message/api.rst
    message/zaqar-logging.rst
    message/zaqar-drivers.rst
    message/zaqar-storage-drivers.rst

doc/config-reference/source/message/api.rst

@@ -1,6 +1,6 @@
-===========
-API options
-===========
+=========================
+Message API configuration
+=========================
 
 The Message service has two APIs: the HTTP REST API for WSGI transport driver,
 and the Websocket API for Websocket transport driver. The Message service can
@@ -26,6 +26,9 @@ Permission control options in each API version:
     special URLs. These are called pre-signed URLs and give temporary
     permissions to outsiders of the system.
 
+Configuration options
+~~~~~~~~~~~~~~~~~~~~~
+
 The Message service can be configured by changing the following options:
 
 .. include:: ../tables/zaqar-api.rst

doc/config-reference/source/orchestration/api.rst

@@ -1,6 +1,9 @@
-==============
-Configure APIs
-==============
+===============================
+Orchestration API configuration
+===============================
+
+Configuration options
+~~~~~~~~~~~~~~~~~~~~~
 
 The following options allow configuration of the APIs that Orchestration
 supports. Currently this includes compatibility APIs for CloudFormation