Use &mysql; entity more. Revert changing &mysql; to 'MariaDB'.

SUSE · Nov 22, 2019 · e3a28ea · e3a28ea
1 parent ae8d29a
commit e3a28ea
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/xml/cap_admin_backup-restore.xml b/xml/cap_admin_backup-restore.xml
@@ -671,7 +671,7 @@
       defined on the source cluster. This value is defined in
       <filename>/var/vcap/jobs/cloud_controller_ng/config/cloud_controller_ng.yml</filename>
       of the <literal>api-group-0</literal> pod and also found in various
-      tables of the MySQL database.
+      tables of the &mysql; database.
      </para>
      <para>
       Begin by examining the configuration file for

diff --git a/xml/cap_admin_service_broker.xml b/xml/cap_admin_service_broker.xml
@@ -85,7 +85,7 @@
   <title>Prerequisites</title>
 
   <para>
-   The following examples demonstrate how to deploy service brokers for MySQL
+   The following examples demonstrate how to deploy service brokers for &mysql;
    and &postgresql; with &helm;, using charts from the &suse; repository. You
    must have the following prerequisites:
   </para>
@@ -107,7 +107,7 @@
    </listitem>
    <listitem>
     <para>
-     An external &mariadb; or &postgresql; installation with account credentials that
+     An external &mysql; or &postgresql; installation with account credentials that
      allow creating and deleting databases and users.
     </para>
    </listitem>
@@ -162,7 +162,7 @@
   </para>
  </sect1>
  <sect1 xml:id="sec-cap-configure-service-broker">
-  <title>Configuring the MySQL Deployment</title>
+  <title>Configuring the &mysql; Deployment</title>
 
   <para>
    Start by extracting the <literal>uaa</literal> namespace secrets name, and
@@ -241,24 +241,24 @@ kube:
     password: ""</screen>
  </sect1>
  <sect1 xml:id="sec-cap-configure-mysql">
-  <title>Deploying the MySQL Chart</title>
+  <title>Deploying the &mysql; Chart</title>
 
   <para>
-   &productname; includes charts for &mariadb; and &postgresql; (see
+   &productname; includes charts for &mysql; and &postgresql; (see
    <xref linkend="sec-cap-addrepo-prod"/> for information on managing your
    &helm; repository):
   </para>
 
 &helm-search-suse;
 
   <para>
-   Create a namespace for your MySQL sidecar:
+   Create a namespace for your &mysql; sidecar:
   </para>
 
 <screen>&prompt.user;kubectl create namespace <replaceable>mysql-sidecar</replaceable></screen>
 
   <para>
-   Install the MySQL Helm chart:
+   Install the &mysql; Helm chart:
   </para>
 
 <screen>&prompt.user;helm install suse/cf-usb-sidecar-mysql \
@@ -283,11 +283,11 @@ kube:
 <screen>&prompt.user;cf marketplace</screen>
 
   <warning>
-   <title>MySQL Requires <literal>mysql_native_password</literal></title>
+   <title>&mysql; Requires <literal>mysql_native_password</literal></title>
    <para>
-    The MySQL sidecar works only with deployments that use
+    The &mysql; sidecar works only with deployments that use
     <literal>mysql_native_password</literal> as their authentication plugin.
-    This is the default for MySQL versions 8.0.3 and earlier, but later
+    This is the default for &mysql; versions 8.0.3 and earlier, but later
     versions must be started with
     <literal>--default-auth=mysql_native_password</literal> before any user
     creation. (See
@@ -296,7 +296,7 @@ kube:
   </warning>
  </sect1>
  <sect1 xml:id="sec-cap-deploy-mysql">
-  <title>Create and Bind a MySQL Service</title>
+  <title>Create and Bind a &mysql; Service</title>
 
   <para>
    To create a new service instance, use the &cf; command line client:
@@ -319,7 +319,7 @@ kube:
   <title>Deploying the &postgresql; Chart</title>
 
   <para>
-   The &postgresql; configuration is slightly different from the MySQL
+   The &postgresql; configuration is slightly different from the &mysql;
    configuration. The database-specific keys are named differently, and it
    requires the <varname>SERVICE_POSTGRESQL_SSLMODE</varname> key.
   </para>
@@ -384,7 +384,7 @@ kube:
   --wait</screen>
 
   <para>
-   Then follow the same steps as for the MySQL chart.
+   Then follow the same steps as for the &mysql; chart.
   </para>
  </sect1>
  <sect1 xml:id="sec-cap-remove-sidecars">

diff --git a/xml/cap_depl_eks.xml b/xml/cap_depl_eks.xml
@@ -740,7 +740,7 @@ suse            https://kubernetes-charts.suse.com/</screen>
     </step>
     <step>
      <para>
-      Create a service instance. As an example, a custom MySQL instance can be
+      Create a service instance. As an example, a custom &mysql; instance can be
       created as:
      </para>
 <screen>&prompt.user;cf create-service rdsmysql custom mysql-instance-name -c '{

diff --git a/xml/cap_depl_gke.xml b/xml/cap_depl_gke.xml
@@ -783,7 +783,7 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
 
    <para>
     The GCP Service Broker requires a database to store information about the
-    resources it provisions. Any database that adheres to the MySQL protocol
+    resources it provisions. Any database that adheres to the &mysql; protocol
     may be used, but it is recommended to use a GCP Cloud SQL instance, as
     outlined in the following steps.
    </para>
@@ -806,13 +806,13 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
     </step>
     <step>
      <para>
-      Click <guimenu>Choose MySQL</guimenu> to select MySQL as the database
+      Click <guimenu>Choose &mysql;</guimenu> to select &mysql; as the database
       engine.
      </para>
     </step>
     <step>
      <para>
-      In the <guimenu>Instance ID</guimenu> field, enter an identifier for MySQL
+      In the <guimenu>Instance ID</guimenu> field, enter an identifier for &mysql;
       instance.
      </para>
     </step>
@@ -848,13 +848,13 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
     </step>
     <step>
      <para>
-      Click <guimenu>Create</guimenu> and wait for the MySQL instance to finish
+      Click <guimenu>Create</guimenu> and wait for the &mysql; instance to finish
       creating.
      </para>
     </step>
     <step>
      <para>
-      After the MySQL instance is finished creating, connect to it using either
+      After the &mysql; instance is finished creating, connect to it using either
       the Cloud Shell or the <command>mysql</command> command line client.
      </para>
      <itemizedlist>
@@ -865,7 +865,7 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
        <procedure>
         <step>
          <para>
-          Click on the instance ID of the MySQL instance.
+          Click on the instance ID of the &mysql; instance.
          </para>
         </step>
         <step>
@@ -879,7 +879,7 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
          <para>
           After the shell is opened, the <command>gcloud sql connect</command>
           command is displayed. Press <keycap>Enter</keycap> to connect to the
-          MySQL instance as the root user.
+          &mysql; instance as the root user.
          </para>
         </step>
         <step>
@@ -897,7 +897,7 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
        <procedure>
         <step>
          <para>
-          Click on the instance ID of the MySQL instance.
+          Click on the instance ID of the &mysql; instance.
          </para>
         </step>
         <step>
@@ -926,7 +926,7 @@ tcp-router-tcp-router-public                LoadBalancer   10.23.241.17   35.197
     </step>
     <step>
      <para>
-      After connecting to the MySQL instance, run the following commands to
+      After connecting to the &mysql; instance, run the following commands to
       create an initial user. The service broker will use this user to connect
       to the service broker database.
      </para>
@@ -1126,14 +1126,14 @@ applications:
     <step>
      <para>
       Enable access to a service. This example enables access to the Google
-      CloudSQL MySQL service (see
+      CloudSQL &mysql; service (see
       <link xlink:href="https://cloud.google.com/sql/"/>).
      </para>
 <screen>&prompt.user;cf enable-service-access <replaceable>google-cloudsql-mysql</replaceable></screen>
     </step>
     <step>
      <para>
-      Create an instance of the Google CloudSQL MySQL service. This example uses
+      Create an instance of the Google CloudSQL &mysql; service. This example uses
       the <literal>mysql-db-f1-micro</literal> plan. Use the
       <command>-c</command> flag to pass optional parameters when provisioning a
       service. See <link xlink:href="https://github.com/GoogleCloudPlatform/gcp-service-broker/blob/master/docs/use.md"/> for the parameters that can be set for each service.