Docs gpinitstandby flags 2 (#7409)

* docs - change gpinitsystem -S option to --mirror-mode; change -F to -S

* sentence edit

* Address review comments about mirroring modes

* boldface variable portions of names for readability

* In params list, put short option before the long, consistently.

gpdb-doc/dita/admin_guide/expand/expand-planning.xml

@@ -261,8 +261,7 @@
           <li id="no165386"><b>Grouped Mirroring</b> — Add at least two new hosts so the mirrors for
             the first host can reside on the second host, and the mirrors for the second host can
             reside on the first. This is the default type of mirroring if you enable segment
-            mirroring during system initialization if you enable segment mirroring for an existing
-            system.</li>
+            mirroring during system initialization.</li>
           <li><b>Block Mirroring</b> — Adding one or more blocks of host systems. For example add a
             block of four or eight hosts. Block mirroring is a custom mirroring configuration. For
             more information about block mirroring, see <xref

gpdb-doc/dita/admin_guide/highavail/topics/g-enabling-segment-mirroring.xml

@@ -43,7 +43,7 @@
           starting point,
             run:<codeblock>$ gpaddmirrors -o <i>filename</i>          </codeblock><p>The format of
             the mirror configuration file is:
-            </p><codeblock>mirror<varname>row_id</varname>=<varname>contentID</varname>:<varname>address</varname>:<varname>port</varname>:<varname>data_dir</varname></codeblock><p>Where
+            </p><codeblock>mirror<b><varname>row_id</varname></b>=<b><varname>contentID</varname></b>:<b><varname>address</varname></b>:<b><varname>port</varname></b>:<b><varname>data_dir</varname></b></codeblock><p>Where
               <codeph>row_id</codeph> is the row in the file, <varname>contentID</varname> is the
             segment instance content ID, <varname>address</varname> is the host name or IP address
             of the segment host, <varname>port</varname> is the communication port, and

gpdb-doc/dita/utility_guide/admin_utilities/gpinitsystem.xml

@@ -13,15 +13,16 @@
             [<b>-h</b> <varname>hostfile_gpinitsystem</varname>]
             [<b>-B</b> <varname>parallel_processes</varname>] 
             [<b>-p</b> <varname>postgresql_conf_param_file</varname>]
-            [<b>-s</b> <varname>standby_master_host</varname> 
-                [<b>-P</b> <varname>standby_master_port</varname>] [-F <varname>standby_master_datadir</varname>]]
+            [<b>-s</b> <varname>standby_master_host</varname>
+                [<b>-P</b> <varname>standby_master_port</varname>]
+                [<b>-S</b> <varname>standby_master_datadir</varname> | <b>--standby_datadir</b>=<varname>standby_master_datadir</varname>]]
             [<b>-m</b> <varname>number</varname> | <b>--max_connections</b>=<varname>number</varname>]
             [<b>-b</b> <varname>size</varname> | <b>--shared_buffers</b>=<varname>size</varname>]
             [<b>-n <varname>locale</varname> | --locale</b>=<varname>locale</varname>] [<b>--lc-collate</b>=<varname>locale</varname>] 
             [<b>--lc-ctype</b>=<varname>locale</varname>] [<b>--lc-messages</b>=<varname>locale</varname>] 
             [<b>--lc-monetary</b>=<varname>locale</varname>] [<b>--lc-numeric</b>=<varname>locale</varname>] 
             [<b>--lc-time</b>=<varname>locale</varname>] [<b>-e</b> <varname>password</varname> | <b>--su_password</b>=<varname>password</varname>] 
-            [<b>-S</b>] [<b>-a</b>] [<b>-q</b>] [<b>-l</b> <varname>logfile_directory</varname>] [<b>-D</b>]
+            [<b>--mirror-mode</b>={group|spread}] [<b>-a</b>] [<b>-q</b>] [<b>-l</b> <varname>logfile_directory</varname>] [<b>-D</b>]
             [<b>-I</b> <varname>input_configuration_file</varname>]
             [<b>-O</b> <varname>output_configuration_file</varname>]
 
@@ -132,7 +133,8 @@
                         to <codeph>gpinitsystem</codeph>. </pd>
                 </plentry>
                 <plentry>
-                    <pt>--locale=<varname>locale</varname> | -n <varname>locale</varname></pt>
+                    <pt> -n <varname>locale</varname> | --locale=<varname>locale</varname>
+                    </pt>
                     <pd>Sets the default locale used by Greenplum Database. If not specified, the
                             <codeph>LC_ALL</codeph>, <codeph>LC_COLLATE</codeph>, or
                             <codeph>LANG</codeph> environment variable of the master host determines
@@ -196,7 +198,7 @@
                             <codeph>~/gpAdminLogs</codeph>.</pd>
                 </plentry>
                 <plentry>
-                    <pt>--max_connections=number | -m <varname>number</varname></pt>
+                    <pt> -m <varname>number</varname> | --max_connections=number</pt>
                     <pd>Sets the maximum number of client connections allowed to the master. The
                         default is 250.</pd>
                 </plentry>
@@ -226,7 +228,7 @@
                         still written to the log file.</pd>
                 </plentry>
                 <plentry>
-                    <pt>--shared_buffers=<varname>size</varname> | -b <varname>size</varname></pt>
+                    <pt> -b <varname>size</varname> | --shared_buffers=<varname>size</varname></pt>
                     <pd>Sets the amount of memory a Greenplum server instance uses for shared memory
                         buffers. You can specify sizing in kilobytes (kB), megabytes (MB) or
                         gigabytes (GB). The default is 125MB.</pd>
@@ -247,15 +249,16 @@
                         host.</pd>
                 </plentry>
                 <plentry>
-                    <pt>-F <varname>standby_master_datadir</varname></pt>
+                    <pt>-S <varname>standby_master_datadir</varname> |
+                            --standby_dir=<varname>standby_master_datadir</varname></pt>
                     <pd>If you configure a standby master host with <codeph>-s</codeph>, use this
                         option to specify its data directory. If you configure a standby on the same
                         host as the master instance, the master and standby must have separate data
                         directories.</pd>
                 </plentry>
                 <plentry>
-                    <pt>--su_password=<varname>superuser_password</varname> | -e
-                            <varname>superuser_password</varname></pt>
+                    <pt> -e <varname>superuser_password</varname> |
+                            --su_password=<varname>superuser_password</varname></pt>
                     <pd>Use this option to specify the password to set for the Greenplum Database
                         superuser account (such as <codeph>gpadmin</codeph>). If this option is not
                         specified, the default password <codeph>gparray</codeph> is assigned to the
@@ -269,13 +272,16 @@
                         </ul></pd>
                 </plentry>
                 <plentry>
-                    <pt>-S</pt>
-                    <pd>If mirroring parameters are specified, spreads the mirror segments across
-                        the available hosts. The default is to group the set of mirror segments
-                        together on an alternate host from their primary segment set. Mirror
-                        spreading places each mirror on a different host within the Greenplum
-                        Database array. Spreading is only allowed if the number of hosts is greater
-                        than the number of segment instances.</pd>
+                    <pt>--mirror_mode={group|spread}</pt>
+                    <pd>Use this option to specify the placement of mirror segment instances on the
+                        segment hosts. The default, <codeph>group</codeph>, groups the mirror
+                        segments for all of a host's primary segments on a single alternate host.
+                            <codeph>spread</codeph> spreads mirror segments for the primary segments
+                        on a host across different hosts in the Greenplum Database array. Spreading
+                        is only allowed if the number of hosts is greater than the number of segment
+                        instances per host. See <xref
+                            href="../../admin_guide/highavail/topics/g-overview-of-segment-mirroring.xml#topic3"
+                        /> for information about Greenplum Database mirroring strategies. </pd>
                 </plentry>
                 <plentry>
                     <pt>-v | --version</pt>
@@ -493,24 +499,20 @@ declare -a MIRROR_ARRAY=(
         <section id="section6">
             <title>Examples</title>
             <p>Initialize a Greenplum Database array by supplying a cluster configuration file and a
-                segment host address file, and set up a spread mirroring (<codeph>-S</codeph>)
-                configuration:</p>
-            <codeblock>$ gpinitsystem -c gpinitsystem_config -h 
-hostfile_gpinitsystem -S</codeblock>
+                segment host address file, and set up a spread mirroring
+                    (<codeph>--mirror-mode=spread</codeph>) configuration:</p>
+            <codeblock>$ gpinitsystem -c gpinitsystem_config -h hostfile_gpinitsystem --mirror-mode=spread</codeblock>
             <p>Initialize a Greenplum Database array and set the superuser remote password:</p>
-            <codeblock>$ gpinitsystem -c gpinitsystem_config -h 
-hostfile_gpinitsystem --su-password=mypassword</codeblock>
+            <codeblock>$ gpinitsystem -c gpinitsystem_config -h hostfile_gpinitsystem --su-password=mypassword</codeblock>
             <p>Initialize a Greenplum Database array with an optional standby master host:</p>
-            <codeblock>$ gpinitsystem -c gpinitsystem_config -h 
-hostfile_gpinitsystem -s host09</codeblock>
+            <codeblock>$ gpinitsystem -c gpinitsystem_config -h hostfile_gpinitsystem -s host09</codeblock>
             <p>Instead of initializing a Greenplum Database array, write the provided configuration
                 to an output file. The output file uses the <codeph>QD_PRIMARY_ARRAY</codeph> and
                     <codeph>PRIMARY_ARRAY</codeph> parameters to define master and segment
                 hosts:</p>
-            <codeblock>$ gpinitsystem -c gpinitsystem_config -h 
-hostfile_gpinitsystem -S -O cluster_init.config</codeblock>
+            <codeblock>$ gpinitsystem -c gpinitsystem_config -h hostfile_gpinitsystem --mirror-mode=spread -O cluster_init.config</codeblock>
             <p>Initialize a Greenplum Database using an input configuration file (a file that
-                defines the Greenplum Database array using <codeph>QD_PRIMARY_ARRAY</codeph> and
+                defines the Greenplum Database array) using <codeph>QD_PRIMARY_ARRAY</codeph> and
                     <codeph>PRIMARY_ARRAY</codeph> parameters:</p>
             <codeblock>$ gpinitsystem -I cluster_init.config</codeblock>
         </section>