From cff835d97a4c1b19438c52644a93624b2993ed65 Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Mon, 7 Dec 2015 11:06:38 +0100
Subject: [PATCH] [config-ref] Convert the trove chapter to RST

Change-Id: I92036b668b9b6df900f3fae43b19d5e0876f2629
Implements: blueprint config-ref-rst
---
 .../source/database-service.rst               | 28 +++++++++++++++++++
 .../source/tables/trove-swift.rst             |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/doc/config-ref-rst/source/database-service.rst b/doc/config-ref-rst/source/database-service.rst
index dd546515d0..a0e8453091 100644
--- a/doc/config-ref-rst/source/database-service.rst
+++ b/doc/config-ref-rst/source/database-service.rst
@@ -7,3 +7,31 @@ Database service
    database-service/databaseservice_db.rst
    database-service/databaseservice_rpc.rst
    tables/conf-changes/trove.rst
+
+The Database service provides a scalable and reliable Cloud
+Database-as-a-Service functionality for both relational and non-relational
+database engines.
+
+The following tables provide a comprehensive list of the Database service
+configuration options.
+
+.. include:: tables/trove-api.rst
+.. include:: tables/trove-auth_token.rst
+.. include:: tables/trove-backup.rst
+.. include:: tables/trove-clients.rst
+.. include:: tables/trove-cluster.rst
+.. include:: tables/trove-common.rst
+.. include:: tables/trove-compute.rst
+.. include:: tables/trove-debug.rst
+.. include:: tables/trove-dns.rst
+.. include:: tables/trove-guestagent.rst
+.. include:: tables/trove-heat.rst
+.. include:: tables/trove-logging.rst
+.. include:: tables/trove-network.rst
+.. include:: tables/trove-nova.rst
+.. include:: tables/trove-quota.rst
+.. include:: tables/trove-redis.rst
+.. include:: tables/trove-swift.rst
+.. include:: tables/trove-taskmanager.rst
+.. include:: tables/trove-upgrades.rst
+.. include:: tables/trove-volume.rst
diff --git a/doc/config-ref-rst/source/tables/trove-swift.rst b/doc/config-ref-rst/source/tables/trove-swift.rst
index 1d9a6e65c6..9809f9f6b8 100644
--- a/doc/config-ref-rst/source/tables/trove-swift.rst
+++ b/doc/config-ref-rst/source/tables/trove-swift.rst
@@ -23,4 +23,4 @@
    * - ``swift_service_type`` = ``object-store``
      - (StrOpt) Service type to use when searching catalog.
    * - ``swift_url`` = ``None``
-     - (StrOpt) URL ending in AUTH_.
+     - (StrOpt) URL ending in AUTH\_.