From a02f058b5d38dbfa4fb491a2e60247f091b5e1c4 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 14 Apr 2015 19:49:42 +0200 Subject: [PATCH] Replace 'Database Service' and 'Database module' with 'Database service' According to our conventions (https://wiki.openstack.org/wiki/Documentation/Conventions) the correct capitalization is 'Database service'. Change-Id: I49b7a2c3828255dc13f5661a2fd61fc278280100 --- doc/arch-design/hybrid/section_architecture_hybrid.xml | 2 +- doc/common/app_support.xml | 2 +- doc/common/ch_getstart.xml | 2 +- doc/common/section_cli_install.xml | 2 +- doc/common/section_cli_overview.xml | 2 +- doc/common/tables/trove-conf-changes.xml | 2 +- doc/config-reference/bk-config-ref.xml | 4 ++-- doc/config-reference/ch_config-overview.xml | 2 +- doc/config-reference/ch_databaseserviceconfigure.xml | 6 +++--- doc/glossary/glossary-terms.xml | 8 ++++---- doc/install-guide/bk-openstack-install-guide.xml | 2 +- doc/install-guide/ch_trove.xml | 4 ++-- doc/install-guide/section_basics-security.xml | 2 +- doc/install-guide/section_trove-install.xml | 10 +++++----- doc/user-guide/bk-user-guide.xml | 2 +- doc/user-guides/source/common/app_support.rst | 2 +- .../cli_install_openstack_command_line_clients.rst | 2 +- doc/user-guides/source/common/cli_overview.rst | 2 +- .../source/enduser/backup_db_incremental.rst | 4 ++-- doc/user-guides/source/enduser/trove-manage-db.rst | 2 +- 20 files changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/arch-design/hybrid/section_architecture_hybrid.xml b/doc/arch-design/hybrid/section_architecture_hybrid.xml index e88b208a69..6d27644d44 100644 --- a/doc/arch-design/hybrid/section_architecture_hybrid.xml +++ b/doc/arch-design/hybrid/section_architecture_hybrid.xml @@ -85,7 +85,7 @@ platforms that do not support a given service, create a service on top of that platform and apply it to the workloads as they are launched on that cloud. - For example, through the Database Service + For example, through the Database service for OpenStack (trove), OpenStack supports MySQL as a service but not NoSQL databases in production. To either move from or run diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml index 4de2a2d0ab..6d27e89693 100644 --- a/doc/common/app_support.xml +++ b/doc/common/app_support.xml @@ -293,7 +293,7 @@ Bugs: Database Service (trove) + >Bugs: Database service (trove) Database Service + >Database service - trove - Database Service + trove - Database service API diff --git a/doc/common/section_cli_overview.xml b/doc/common/section_cli_overview.xml index 10b4c4c929..440168bac0 100644 --- a/doc/common/section_cli_overview.xml +++ b/doc/common/section_cli_overview.xml @@ -57,7 +57,7 @@ Create and manage images, instances, and flavors. - Database Service + Database service trove python-troveclient Create and manage databases. diff --git a/doc/common/tables/trove-conf-changes.xml b/doc/common/tables/trove-conf-changes.xml index 83f8fdd352..c4d80749c4 100644 --- a/doc/common/tables/trove-conf-changes.xml +++ b/doc/common/tables/trove-conf-changes.xml @@ -1,7 +1,7 @@
- New, updated and deprecated options in Kilo for Database Service + New, updated and deprecated options in Kilo for Database service diff --git a/doc/config-reference/bk-config-ref.xml b/doc/config-reference/bk-config-ref.xml index aec63118c2..bda596b8d4 100644 --- a/doc/config-reference/bk-config-ref.xml +++ b/doc/config-reference/bk-config-ref.xml @@ -69,7 +69,7 @@ Update for Icehouse: Updated all configuration tables, include sample configuration files, add chapters for - Database Service, Orchestration, and + Database service, Orchestration, and Telemetry. @@ -148,7 +148,7 @@ - + diff --git a/doc/config-reference/ch_config-overview.xml b/doc/config-reference/ch_config-overview.xml index 5b5a3b6e3b..ac21c5b7d5 100644 --- a/doc/config-reference/ch_config-overview.xml +++ b/doc/config-reference/ch_config-overview.xml @@ -17,7 +17,7 @@ OpenStack Block Storage OpenStack Compute OpenStack Dashboard - Database Service + Database service OpenStack Identity OpenStack Image Service OpenStack Networking diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml index f27c35c8a9..5c3451b5fb 100644 --- a/doc/config-reference/ch_databaseserviceconfigure.xml +++ b/doc/config-reference/ch_databaseserviceconfigure.xml @@ -4,13 +4,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ch_configuring-trove"> - Database Service - The Database Service provides a scalable and reliable Cloud + Database service + 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. + Database service configuration options. diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml index 3708376daf..5d896dc093 100644 --- a/doc/glossary/glossary-terms.xml +++ b/doc/glossary/glossary-terms.xml @@ -2089,7 +2089,7 @@ (keystone), Dashboard (horizon), Networking (neutron), and Block Storage (cinder). The Telemetry module (ceilometer) and Orchestration module (heat) are integrated projects as of the Havana release. In the - Icehouse release, the Database module (trove) gains integrated project + Icehouse release, the Database service (trove) gains integrated project status. @@ -2278,9 +2278,9 @@ - Database Service + Database service - Database Service + Database service @@ -2288,7 +2288,7 @@ An integrated project that provide scalable and reliable Cloud Database-as-a-Service functionality for both relational and non-relational database engines. The project - name of Database Service is trove. + name of Database service is trove. diff --git a/doc/install-guide/bk-openstack-install-guide.xml b/doc/install-guide/bk-openstack-install-guide.xml index ad55abc6a8..70625e9d27 100644 --- a/doc/install-guide/bk-openstack-install-guide.xml +++ b/doc/install-guide/bk-openstack-install-guide.xml @@ -116,7 +116,7 @@ Update for Icehouse, rework Networking setup to use ML2 as plugin, add - new chapter for Database Service setup, + new chapter for Database service setup, improved basic configuration. diff --git a/doc/install-guide/ch_trove.xml b/doc/install-guide/ch_trove.xml index 3c9bdf53fb..875550c6e2 100644 --- a/doc/install-guide/ch_trove.xml +++ b/doc/install-guide/ch_trove.xml @@ -5,8 +5,8 @@ version="5.0" xml:id="ch_trove"> Add the Database service - Use the Database - module to create cloud database resources. The + Use the Database + service to create cloud database resources. The integrated project name is trove. This chapter is a work in progress. It may contain incorrect information, and will be updated frequently. diff --git a/doc/install-guide/section_basics-security.xml b/doc/install-guide/section_basics-security.xml index 3805de0f08..b7a296a210 100644 --- a/doc/install-guide/section_basics-security.xml +++ b/doc/install-guide/section_basics-security.xml @@ -118,7 +118,7 @@ - +
New options
TROVE_PASSPassword of Database Service user trovePassword of Database service user trove
diff --git a/doc/install-guide/section_trove-install.xml b/doc/install-guide/section_trove-install.xml index 87610058b0..404d84a46b 100644 --- a/doc/install-guide/section_trove-install.xml +++ b/doc/install-guide/section_trove-install.xml @@ -5,7 +5,7 @@ version="5.0" xml:id="trove-install"> Install the Database service - This procedure installs the Database module on the controller + This procedure installs the Database service on the controller node. Prerequisites @@ -21,7 +21,7 @@ If you want to provision datastores on block-storage volumes, you also need Block Storage. - To install the Database module on the controller: + To install the Database service on the controller: Install required packages: @@ -94,7 +94,7 @@ notifier_queue_hostname = controller - Configure the Database module to use the RabbitMQ message broker by + Configure the Database service to use the RabbitMQ message broker by setting the following options in the [DEFAULT] configuration group of each file: [DEFAULT] @@ -208,11 +208,11 @@ log_file = trove-guestagent.log - You must register the Database module with the Identity service so + You must register the Database service with the Identity service so that other OpenStack services can locate it. Register the service and specify the endpoint: $ keystone service-create --name trove --type database \ - --description "OpenStack Database Service" + --description "OpenStack Database service" $ keystone endpoint-create \ --service-id $(keystone service-list | awk '/ trove / {print $2}') \ --publicurl http://controller:8779/v1.0/%\(tenant_id\)s \ diff --git a/doc/user-guide/bk-user-guide.xml b/doc/user-guide/bk-user-guide.xml index ed4042767e..9abcd16b1e 100644 --- a/doc/user-guide/bk-user-guide.xml +++ b/doc/user-guide/bk-user-guide.xml @@ -52,7 +52,7 @@ For the Juno release, this guide has been updated with information about - the Database Service for OpenStack (trove). + the Database service for OpenStack (trove). diff --git a/doc/user-guides/source/common/app_support.rst b/doc/user-guides/source/common/app_support.rst index 071fbb4131..628af0a994 100644 --- a/doc/user-guides/source/common/app_support.rst +++ b/doc/user-guides/source/common/app_support.rst @@ -176,7 +176,7 @@ The following Launchpad Bugs areas are available: - `Bugs: Data Processing Service (sahara) `__ -- `Bugs: Database Service (trove) `__ +- `Bugs: Database service (trove) `__ - `Bugs: Orchestration (heat) `__ diff --git a/doc/user-guides/source/common/cli_install_openstack_command_line_clients.rst b/doc/user-guides/source/common/cli_install_openstack_command_line_clients.rst index 814bfea962..baea9451cc 100644 --- a/doc/user-guides/source/common/cli_install_openstack_command_line_clients.rst +++ b/doc/user-guides/source/common/cli_install_openstack_command_line_clients.rst @@ -161,7 +161,7 @@ for each client. The following values are valid: - ``swift`` - Object Storage API -- ``trove`` - Database Service API +- ``trove`` - Database service API - ``openstack`` - Common OpenStack client supporting multiple services diff --git a/doc/user-guides/source/common/cli_overview.rst b/doc/user-guides/source/common/cli_overview.rst index 5d16334d22..bb1c94ddd1 100644 --- a/doc/user-guides/source/common/cli_overview.rst +++ b/doc/user-guides/source/common/cli_overview.rst @@ -38,7 +38,7 @@ service with its package name and description. | | | |images, instances, and | | | | |flavors. | +----------------+----------+-----------------------+------------------------+ -|Database Service|trove |python-troveclient |Create and manage | +|Database service|trove |python-troveclient |Create and manage | | | | |databases. | +----------------+----------+-----------------------+------------------------+ |Identity |keystone |python-keystoneclient |Create and manage users,| diff --git a/doc/user-guides/source/enduser/backup_db_incremental.rst b/doc/user-guides/source/enduser/backup_db_incremental.rst index 3bf105eb0d..a40810403b 100644 --- a/doc/user-guides/source/enduser/backup_db_incremental.rst +++ b/doc/user-guides/source/enduser/backup_db_incremental.rst @@ -10,7 +10,7 @@ start with a regular backup. Then, when you want to create a subsequent incremental backup, you specify the parent backup. Restoring a database instance from an incremental backup is the same as -creating a database instance from a regular backup—the Database Service +creating a database instance from a regular backup—the Database service handles the complexities of applying the chain of incremental backups. This example shows you how to use incremental backups with a MySQL @@ -100,7 +100,7 @@ Create and use incremental backups To incorporate your incremental backups, you simply use the ``--backup`` parameter to pass in the ``BACKUP_ID`` of your most - recent incremental backup. The Database Service handles the + recent incremental backup. The Database service handles the complexities of applying the chain of all previous incremental backups. diff --git a/doc/user-guides/source/enduser/trove-manage-db.rst b/doc/user-guides/source/enduser/trove-manage-db.rst index 126fb8722e..ab2d2d2cd5 100644 --- a/doc/user-guides/source/enduser/trove-manage-db.rst +++ b/doc/user-guides/source/enduser/trove-manage-db.rst @@ -4,7 +4,7 @@ =========================== Create and manage databases =========================== -The Database Service provides scalable and reliable cloud provisioning +The Database service provides scalable and reliable cloud provisioning functionality for both relational and non-relational database engines. Users can quickly and easily use database features without the burden of handling complex administrative tasks.