List:Commits« Previous MessageNext Message »
From:paul Date:January 23 2006 9:25pm
Subject:svn commit - mysqldoc@docsrva: r1001 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-23 22:25:50 +0100 (Mon, 23 Jan 2006)
New Revision: 1001

Log:
 r2444@kite-hub:  paul | 2006-01-23 13:17:10 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-common/titles.en.ent


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6574
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2443
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6574
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2444

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-23 21:25:36 UTC (rev 1000)
+++ trunk/refman-4.1/database-administration.xml	2006-01-23 21:25:50 UTC (rev 1001)
@@ -307,22 +307,28 @@
 
           <listitem>
             <para>
-              How to set the server SQL mode
+              Server system variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server system variables
+              Server status variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server status variables
+              How to set the server SQL mode
             </para>
           </listitem>
 
+          <listitem>
+            <para>
+              The server shutdown process
+            </para>
+          </listitem>
+
         </itemizedlist>
 
       </refsection>
@@ -332,13 +338,13 @@
         <title>&title-server-options;</title>
 
         <indexterm type="function">
-          <primary>command-line options</primary>
+          <primary>command options</primary>
           <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
           <primary><command>mysqld</command></primary>
-          <secondary>command-line options</secondary>
+          <secondary>command options</secondary>
         </indexterm>
 
         <para>
@@ -361,8 +367,11 @@
           <literal>[safe_mysqld]</literal> groups.
           <command>mysql.server</command> reads options from the
           <literal>[mysqld]</literal> and
-          <literal>[mysql.server]</literal> groups. An embedded MySQL
-          server usually reads options from the
+          <literal>[mysql.server]</literal> groups.
+        </para>
+
+        <para>
+          An embedded MySQL server usually reads options from the
           <literal>[server]</literal>, <literal>[embedded]</literal>,
           and
           <literal>[<replaceable>xxxxx</replaceable>_SERVER]</literal>
@@ -371,16 +380,16 @@
         </para>
 
         <para>
-          <command>mysqld</command> accepts many command-line options.
-          For a list, execute <command>mysqld --help</command>. Before
-          MySQL 4.1.1, <option>--help</option> prints the full help
-          message. As of 4.1.1, it prints a brief message; to see the
-          full list, use <command>mysqld --verbose --help</command>.
+          <command>mysqld</command> accepts many command options. For a
+          list, execute <command>mysqld --help</command>. Before MySQL
+          4.1.1, <option>--help</option> prints the full help message.
+          As of 4.1.1, it prints a brief message; to see the full list,
+          use <command>mysqld --verbose --help</command>.
         </para>
 
         <para>
           The following list shows some of the most common server
-          options. Additional options are described elsewhere:
+          options. Additional options are described in other sections:
         </para>
 
         <itemizedlist>
@@ -424,9 +433,9 @@
         </itemizedlist>
 
         <para>
-          You can also set the value of a server system variable by
-          using the variable name as an option, as described later in
-          this section.
+          You can also set the values of server system variables by
+          using variable names as options, as described later in this
+          section.
         </para>
 
         <itemizedlist>
@@ -1975,8 +1984,8 @@
         <para>
           The MySQL server can operate in different SQL modes, and (as
           of MySQL 4.1) can apply these modes differentially for
-          different clients. This allows an application to tailor server
-          operation to its own requirements.
+          different clients. This enables each application to tailor the
+          server's operating mode to its own requirements.
         </para>
 
         <para>
@@ -5601,7 +5610,7 @@
             <para>
               On Solaris, <command>mysqld</command> calls
               <literal>thr_setconcurrency()</literal> with this value.
-              This function allows applications to give the threads
+              This function enables applications to give the threads
               system a hint about the desired number of threads that
               should be run at the same time. This variable was added in
               MySQL 3.23.7.
@@ -8789,7 +8798,8 @@
           <para>
             <command>mysql.server</command> can be found in the
             <filename>support-files</filename> directory under your
-            MySQL installation directory or in a MySQL source tree.
+            MySQL installation directory or in a MySQL source
+            distribution.
           </para>
 
           <para>
@@ -8819,12 +8829,12 @@
           <para>
             <command>mysql.server</command> reads options from the
             <literal>[mysql.server]</literal> and
-            <literal>[mysqld]</literal> sections of option files. (For
+            <literal>[mysqld]</literal> sections of option files. For
             backward compatibility, it also reads
             <literal>[mysql_server]</literal> sections, although you
             should rename such sections to
             <literal>[mysql.server]</literal> when you begin using MySQL
-            4.0 or later.)
+            4.0 or later.
           </para>
 
         </refsection>
@@ -8883,7 +8893,7 @@
           <title>Description</title>
 
           <para>
-            <command>mysqld_multi</command> is meant for managing
+            <command>mysqld_multi</command> is designed to manage
             several <command>mysqld</command> processes that listen for
             connections on different Unix socket files and TCP/IP ports.
             It can start or stop servers, or report their current
@@ -8891,7 +8901,7 @@
           </para>
 
           <para>
-            The program searches for groups named
+            <command>mysqld_multi</command> searches for groups named
             <literal>[mysqld<replaceable>N</replaceable>]</literal> in
             <filename>my.cnf</filename> (or in the file named by the
             <option>--config-file</option> option).
@@ -8905,8 +8915,8 @@
             same that you would use in the <literal>[mysqld]</literal>
             group used for starting <command>mysqld</command>. (See, for
             example, <xref linkend="automatic-start"/>.) However, when
-            using multiple servers it is necessary that each one use its
-            own value for options such as the Unix socket file and
+            using multiple servers, it is necessary that each one use
+            its own value for options such as the Unix socket file and
             TCP/IP port number. For more information on which options
             must be unique per server in a multiple-server environment,
             see <xref linkend="multiple-servers"/>.
@@ -8923,8 +8933,8 @@
 
           <para>
             <literal>start</literal>, <literal>stop</literal>, and
-            <literal>report</literal> indicate which operation you want
-            to perform. You can perform the designated operation on a
+            <literal>report</literal> indicate which operation to
+            perform. You can perform the designated operation for a
             single server or multiple servers, depending on the
             <replaceable>GNR</replaceable> list that follows the option
             name. If there is no list, <command>mysqld_multi</command>
@@ -8960,7 +8970,7 @@
 
           <para>
             This command stops several servers, using option groups
-            <literal>[mysql8]</literal> and
+            <literal>[mysqld8]</literal> and
             <literal>[mysqld10]</literal> through
             <literal>[mysqld13]</literal>:
           </para>
@@ -8988,6 +8998,21 @@
             <listitem>
               <para>
                 <indexterm>
+                  <primary><literal>help</literal></primary>
+                  <secondary><command>mysqld_multi</command> option</secondary>
+                </indexterm>
+
+                <option>--help</option>
+              </para>
+
+              <para>
+                Display a help message and exit.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <indexterm>
                   <primary><literal>config-file</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -9027,21 +9052,6 @@
             <listitem>
               <para>
                 <indexterm>
-                  <primary><literal>help</literal></primary>
-                  <secondary><command>mysqld_multi</command> option</secondary>
-                </indexterm>
-
-                <option>--help</option>
-              </para>
-
-              <para>
-                Display a help message and exit.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <indexterm>
                   <primary><literal>log</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -9114,8 +9124,9 @@
               </para>
 
               <para>
-                Print log information to stdout rather than to the log
-                file. By default, output goes to the log file.
+                Print log information to <literal>stdout</literal>
+                rather than to the log file. By default, output goes to
+                the log file.
               </para>
             </listitem>
 
@@ -9148,7 +9159,8 @@
               </para>
 
               <para>
-                Disable warnings. This option was added in MySQL 4.1.6.
+                Silent mode; disable warnings. This option was added in
+                MySQL 4.1.6.
               </para>
             </listitem>
 
@@ -9229,22 +9241,54 @@
 
             <listitem>
               <para>
+                <emphasis role="bold">Most important</emphasis>: Before
+                using <command>mysqld_multi</command> be sure that you
+                understand the meanings of the options that are passed
+                to the <command>mysqld</command> servers and
+                <emphasis>why</emphasis> you would want to have separate
+                <command>mysqld</command> processes. Beware of the
+                dangers of using multiple <command>mysqld</command>
+                servers with the same data directory. Use separate data
+                directories, unless you <emphasis>know</emphasis> what
+                you are doing. Starting multiple servers with the same
+                data directory does <emphasis>not</emphasis> give you
+                extra performance in a threaded system. See
+                <xref linkend="multiple-servers"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Important</emphasis>: Make sure
+                that the data directory for each server is fully
+                accessible to the Unix account that the specific
+                <command>mysqld</command> process is started as.
+                <emphasis>Do not</emphasis> use the Unix
+                <replaceable>root</replaceable> account for this, unless
+                you <emphasis>know</emphasis> what you are doing. See
+                <xref linkend="changing-mysql-user"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Make sure that the MySQL account used for stopping the
                 <command>mysqld</command> servers (with the
                 <command>mysqladmin</command> program) has the same
                 username and password for each server. Also, make sure
                 that the account has the <literal>SHUTDOWN</literal>
                 privilege. If the servers that you want to manage have
-                many different usernames or passwords for the
-                administrative accounts, you might want to create an
-                account on each server that has the same username and
-                password. For example, you might set up a common
+                different usernames or passwords for the administrative
+                accounts, you might want to create an account on each
+                server that has the same username and password. For
+                example, you might set up a common
                 <literal>multi_admin</literal> account by executing the
                 following commands for each server:
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p<replaceable>root_password</replaceable></userinput>
+shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p</userinput>
+Enter password:
 mysql&gt; <userinput>GRANT SHUTDOWN ON *.*</userinput>
     -&gt; <userinput>TO 'multi_admin'@'localhost' IDENTIFIED BY 'multipass';</userinput>
 </programlisting>
@@ -9253,8 +9297,8 @@
                 See <xref linkend="privileges"/>. You have to do this
                 for each <command>mysqld</command> server. Change the
                 connection parameters appropriately when connecting to
-                each one. Note that the host part of the account name
-                must allow you to connect as
+                each one. Note that the hostname part of the account
+                name must allow you to connect as
                 <literal>multi_admin</literal> from the host where you
                 want to run <command>mysqld_multi</command>.
               </para>
@@ -9262,6 +9306,13 @@
 
             <listitem>
               <para>
+                The Unix socket file and the TCP/IP port number must be
+                different for every <command>mysqld</command>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 The <option>--pid-file</option> option is very important
                 if you are using <command>mysqld_safe</command> to start
                 <command>mysqld</command> (for example,
@@ -9270,7 +9321,7 @@
                 file. The advantage of using
                 <command>mysqld_safe</command> instead of
                 <command>mysqld</command> is that
-                <command>mysqld_safe</command> <quote>guards</quote> its
+                <command>mysqld_safe</command> monitors its
                 <command>mysqld</command> process and restarts it if the
                 process terminates due to a signal sent using
                 <literal>kill -9</literal> or for other reasons, such as
@@ -9294,21 +9345,14 @@
 </programlisting>
 
               <para>
-                See <xref linkend="mysqld-safe"/>. The test performed by
-                these lines should be successful, or you might encounter
-                problems.
+                The test performed by these lines should be successful,
+                or you might encounter problems. See
+                <xref linkend="mysqld-safe"/>.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                The Unix socket file and the TCP/IP port number must be
-                different for every <command>mysqld</command>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
                 You might want to use the <option>--user</option> option
                 for <command>mysqld</command>, but in order to do this
                 you need to run the <command>mysqld_multi</command>
@@ -9320,49 +9364,19 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                <emphasis role="bold">Important</emphasis>: Make sure
-                that the data directory is fully accessible to the Unix
-                account that the specific <command>mysqld</command>
-                process is started as. Do <emphasis>not</emphasis> use
-                the Unix root account for this, unless you know
-                <emphasis>exactly</emphasis> what you are doing.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <emphasis role="bold">Most important</emphasis>: Before
-                using <command>mysqld_multi</command> be sure that you
-                understand the meanings of the options that are passed
-                to the <command>mysqld</command> servers and
-                <emphasis>why</emphasis> you would want to have separate
-                <command>mysqld</command> processes. Beware of the
-                dangers of using multiple <command>mysqld</command>
-                servers with the same data directory. Use separate data
-                directories, unless you know
-                <emphasis>exactly</emphasis> what you are doing.
-                Starting multiple servers with the same data directory
-                does <emphasis>not</emphasis> give you extra performance
-                in a threaded system. See
-                <xref linkend="multiple-servers"/>.
-              </para>
-            </listitem>
-
           </itemizedlist>
 
           <para>
             The following example shows how you might set up an option
-            file for use with <command>mysqld_multi</command>. The first
-            and fifth
+            file for use with <command>mysqld_multi</command>. The order
+            in which the <command>mysqld</command> programs are started
+            or stopped depends on the order in which they appear in the
+            option file. Group numbers need not form an unbroken
+            sequence. The first and fifth
             <literal>[mysqld<replaceable>N</replaceable>]</literal>
-            group were intentionally left out from the example to
+            groups were intentionally omitted from the example to
             illustrate that you can have <quote>gaps</quote> in the
-            option file. This gives you more flexibility. The order in
-            which the <command>mysqld</command> programs are started or
-            stopped depends on the order in which they appear in the
-            option file.
+            option file. This gives you more flexibility.
           </para>
 
 <programlisting>
@@ -11445,7 +11459,7 @@
 </programlisting>
 
       <para>
-        The <literal>INDEX</literal> privilege allows you to create or
+        The <literal>INDEX</literal> privilege enables you to create or
         drop (remove) indexes. <literal>INDEX</literal> applies to
         existing tables. If you have the <literal>CREATE</literal>
         privilege for a table, you can include index definitions in the
@@ -11453,13 +11467,13 @@
       </para>
 
       <para>
-        The <literal>ALTER</literal> privilege allows you to use
+        The <literal>ALTER</literal> privilege enables you to use
         <literal>ALTER TABLE</literal> to change the structure of or
         rename tables.
       </para>
 
       <para>
-        The <literal>GRANT</literal> privilege allows you to give to
+        The <literal>GRANT</literal> privilege enables you to give to
         other users those privileges that you yourself possess. It can
         be used for databases, tables, and stored routines.
       </para>
@@ -11473,7 +11487,7 @@
         server host that is either world-readable or readable by the
         MySQL server. (This implies the user can read any file in any
         database directory, because the server can access any of those
-        files.) The <literal>FILE</literal> privilege also allows the
+        files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
         has write access. Existing files cannot be overwritten.
       </para>
@@ -11484,7 +11498,7 @@
         <command>mysqladmin</command> program or by issuing SQL
         statements. The following table shows which
         <command>mysqladmin</command> commands each administrative
-        privilege allows you to execute:
+        privilege enables you to execute:
       </para>
 
       <informaltable>
@@ -11559,13 +11573,13 @@
       </para>
 
       <para>
-        The <literal>CREATE TEMPORARY TABLES</literal> privilege allows
+        The <literal>CREATE TEMPORARY TABLES</literal> privilege enables
         the use of the keyword <literal>TEMPORARY</literal> in
         <literal>CREATE TABLE</literal> statements.
       </para>
 
       <para>
-        The <literal>LOCK TABLES</literal> privilege allows the use of
+        The <literal>LOCK TABLES</literal> privilege enables the use of
         explicit <literal>LOCK TABLES</literal> statements to lock
         tables for which you have the <literal>SELECT</literal>
         privilege. This includes the use of write locks, which prevents
@@ -11573,7 +11587,7 @@
       </para>
 
       <para>
-        The <literal>REPLICATION CLIENT</literal> privilege allows the
+        The <literal>REPLICATION CLIENT</literal> privilege enables the
         use of <literal>SHOW MASTER STATUS</literal> and <literal>SHOW
         SLAVE STATUS</literal>.
       </para>
@@ -11619,7 +11633,7 @@
 
         <listitem>
           <para>
-            The <literal>GRANT</literal> privilege allows users to give
+            The <literal>GRANT</literal> privilege enables users to give
             their privileges to other users. Two users with different
             privileges and with the <literal>GRANT</literal> privilege
             are able to combine privileges.
@@ -13536,8 +13550,8 @@
             flush-privileges</command> to tell the
             <command>mysqld</command> server to start using the new
             grant tables. (Reloading the grant tables overrides the
-            <option>--skip-grant-tables</option> option. This allows you
-            to tell the server to begin using the grant tables again
+            <option>--skip-grant-tables</option> option. This enables
+            you to tell the server to begin using the grant tables again
             without stopping and restarting it.)
           </para>
         </listitem>
@@ -13898,7 +13912,7 @@
 
       <para>
         The purpose of the <option>--old-passwords</option> option is to
-        allow you to maintain backward compatibility with pre-4.1
+        enable you to maintain backward compatibility with pre-4.1
         clients under circumstances where the server would otherwise
         generate long password hashes. The option does not affect
         authentication (4.1 clients can still use accounts that have
@@ -14638,7 +14652,7 @@
             no password. This account can be used only by connecting
             from the local host. No privileges are granted. The
             <literal>USAGE</literal> privilege in the
-            <literal>GRANT</literal> statement allows you to create an
+            <literal>GRANT</literal> statement enables you to create an
             account without giving it any privileges. It has the effect
             of setting all the global privileges to
             <literal>'N'</literal>. It is assumed that you will grant
@@ -16040,7 +16054,7 @@
         <title>&title-ssl-options;</title>
 
         <indexterm>
-          <primary>SSL command-line options</primary>
+          <primary>SSL command options</primary>
         </indexterm>
 
         <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-23 21:25:36 UTC (rev 1000)
+++ trunk/refman-5.0/database-administration.xml	2006-01-23 21:25:50 UTC (rev 1001)
@@ -328,22 +328,28 @@
 
           <listitem>
             <para>
-              How to set the server SQL mode
+              Server system variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server system variables
+              Server status variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server status variables
+              How to set the server SQL mode
             </para>
           </listitem>
 
+          <listitem>
+            <para>
+              The server shutdown process
+            </para>
+          </listitem>
+
         </itemizedlist>
 
       </refsection>
@@ -353,13 +359,13 @@
         <title>&title-server-options;</title>
 
         <indexterm type="function">
-          <primary>command-line options</primary>
+          <primary>command options</primary>
           <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
           <primary><command>mysqld</command></primary>
-          <secondary>command-line options</secondary>
+          <secondary>command options</secondary>
         </indexterm>
 
         <para>
@@ -382,8 +388,11 @@
           <literal>[safe_mysqld]</literal> groups.
           <command>mysql.server</command> reads options from the
           <literal>[mysqld]</literal> and
-          <literal>[mysql.server]</literal> groups. An embedded MySQL
-          server usually reads options from the
+          <literal>[mysql.server]</literal> groups.
+        </para>
+
+        <para>
+          An embedded MySQL server usually reads options from the
           <literal>[server]</literal>, <literal>[embedded]</literal>,
           and
           <literal>[<replaceable>xxxxx</replaceable>_SERVER]</literal>
@@ -392,15 +401,14 @@
         </para>
 
         <para>
-          <command>mysqld</command> accepts many command-line options.
-          For a brief list, execute <command>mysqld --help</command>. To
-          see the full list, use <command>mysqld --verbose
-          --help</command>.
+          <command>mysqld</command> accepts many command options. For a
+          brief list, execute <command>mysqld --help</command>. To see
+          the full list, use <command>mysqld --verbose --help</command>.
         </para>
 
         <para>
           The following list shows some of the most common server
-          options. Additional options are described elsewhere:
+          options. Additional options are described in other sections:
         </para>
 
         <itemizedlist>
@@ -444,9 +452,9 @@
         </itemizedlist>
 
         <para>
-          You can also set the value of a server system variable by
-          using the variable name as an option, as described later in
-          this section.
+          You can also set the values of server system variables by
+          using variable names as options, as described later in this
+          section.
         </para>
 
         <itemizedlist>
@@ -1940,7 +1948,7 @@
         <para>
           The MySQL server can operate in different SQL modes, and can
           apply these modes differently for different clients. This
-          allows each application to tailor the server's operating mode
+          enables each application to tailor the server's operating mode
           to its own requirements.
         </para>
 
@@ -6259,7 +6267,7 @@
             <para>
               On Solaris, <command>mysqld</command> calls
               <literal>thr_setconcurrency()</literal> with this value.
-              This function allows applications to give the threads
+              This function enables applications to give the threads
               system a hint about the desired number of threads that
               should be run at the same time.
             </para>
@@ -9970,7 +9978,8 @@
           <para>
             <command>mysql.server</command> can be found in the
             <filename>support-files</filename> directory under your
-            MySQL installation directory or in a MySQL source tree.
+            MySQL installation directory or in a MySQL source
+            distribution.
           </para>
 
           <para>
@@ -10000,12 +10009,12 @@
           <para>
             <command>mysql.server</command> reads options from the
             <literal>[mysql.server]</literal> and
-            <literal>[mysqld]</literal> sections of option files. (For
+            <literal>[mysqld]</literal> sections of option files. For
             backward compatibility, it also reads
             <literal>[mysql_server]</literal> sections, although you
             should rename such sections to
             <literal>[mysql.server]</literal> when using MySQL
-            &current-series;.)
+            &current-series;.
           </para>
 
         </refsection>
@@ -10064,15 +10073,17 @@
           <title>Description</title>
 
           <para>
-            <command>mysqld_multi</command> is meant for managing
+            <command>mysqld_multi</command> is designed to manage
             several <command>mysqld</command> processes that listen for
             connections on different Unix socket files and TCP/IP ports.
             It can start or stop servers, or report their current
-            status.
+            status. The MySQL Instance Manager is an alternative means
+            of managing multiple servers (see
+            <xref linkend="instance-manager"/>).
           </para>
 
           <para>
-            The program searches for groups named
+            <command>mysqld_multi</command> searches for groups named
             <literal>[mysqld<replaceable>N</replaceable>]</literal> in
             <filename>my.cnf</filename> (or in the file named by the
             <option>--config-file</option> option).
@@ -10086,8 +10097,8 @@
             same that you would use in the <literal>[mysqld]</literal>
             group used for starting <command>mysqld</command>. (See, for
             example, <xref linkend="automatic-start"/>.) However, when
-            using multiple servers it is necessary that each one use its
-            own value for options such as the Unix socket file and
+            using multiple servers, it is necessary that each one use
+            its own value for options such as the Unix socket file and
             TCP/IP port number. For more information on which options
             must be unique per server in a multiple-server environment,
             see <xref linkend="multiple-servers"/>.
@@ -10104,8 +10115,8 @@
 
           <para>
             <literal>start</literal>, <literal>stop</literal>, and
-            <literal>report</literal> indicate which operation you want
-            to perform. You can perform the designated operation on a
+            <literal>report</literal> indicate which operation to
+            perform. You can perform the designated operation for a
             single server or multiple servers, depending on the
             <replaceable>GNR</replaceable> list that follows the option
             name. If there is no list, <command>mysqld_multi</command>
@@ -10141,7 +10152,7 @@
 
           <para>
             This command stops several servers, using option groups
-            <literal>[mysql8]</literal> and
+            <literal>[mysqld8]</literal> and
             <literal>[mysqld10]</literal> through
             <literal>[mysqld13]</literal>:
           </para>
@@ -10169,6 +10180,21 @@
             <listitem>
               <para>
                 <indexterm>
+                  <primary><literal>help</literal></primary>
+                  <secondary><command>mysqld_multi</command> option</secondary>
+                </indexterm>
+
+                <option>--help</option>
+              </para>
+
+              <para>
+                Display a help message and exit.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <indexterm>
                   <primary><literal>config-file</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -10208,21 +10234,6 @@
             <listitem>
               <para>
                 <indexterm>
-                  <primary><literal>help</literal></primary>
-                  <secondary><command>mysqld_multi</command> option</secondary>
-                </indexterm>
-
-                <option>--help</option>
-              </para>
-
-              <para>
-                Display a help message and exit.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <indexterm>
                   <primary><literal>log</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -10295,8 +10306,9 @@
               </para>
 
               <para>
-                Print log information to stdout rather than to the log
-                file. By default, output goes to the log file.
+                Print log information to <literal>stdout</literal>
+                rather than to the log file. By default, output goes to
+                the log file.
               </para>
             </listitem>
 
@@ -10329,7 +10341,7 @@
               </para>
 
               <para>
-                Disable warnings.
+                Silent mode; disable warnings.
               </para>
             </listitem>
 
@@ -10410,22 +10422,54 @@
 
             <listitem>
               <para>
+                <emphasis role="bold">Most important</emphasis>: Before
+                using <command>mysqld_multi</command> be sure that you
+                understand the meanings of the options that are passed
+                to the <command>mysqld</command> servers and
+                <emphasis>why</emphasis> you would want to have separate
+                <command>mysqld</command> processes. Beware of the
+                dangers of using multiple <command>mysqld</command>
+                servers with the same data directory. Use separate data
+                directories, unless you <emphasis>know</emphasis> what
+                you are doing. Starting multiple servers with the same
+                data directory does <emphasis>not</emphasis> give you
+                extra performance in a threaded system. See
+                <xref linkend="multiple-servers"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Important</emphasis>: Make sure
+                that the data directory for each server is fully
+                accessible to the Unix account that the specific
+                <command>mysqld</command> process is started as.
+                <emphasis>Do not</emphasis> use the Unix
+                <replaceable>root</replaceable> account for this, unless
+                you <emphasis>know</emphasis> what you are doing. See
+                <xref linkend="changing-mysql-user"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Make sure that the MySQL account used for stopping the
                 <command>mysqld</command> servers (with the
                 <command>mysqladmin</command> program) has the same
                 username and password for each server. Also, make sure
                 that the account has the <literal>SHUTDOWN</literal>
                 privilege. If the servers that you want to manage have
-                many different usernames or passwords for the
-                administrative accounts, you might want to create an
-                account on each server that has the same username and
-                password. For example, you might set up a common
+                different usernames or passwords for the administrative
+                accounts, you might want to create an account on each
+                server that has the same username and password. For
+                example, you might set up a common
                 <literal>multi_admin</literal> account by executing the
                 following commands for each server:
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p<replaceable>root_password</replaceable></userinput>
+shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p</userinput>
+Enter password:
 mysql&gt; <userinput>GRANT SHUTDOWN ON *.*</userinput>
     -&gt; <userinput>TO 'multi_admin'@'localhost' IDENTIFIED BY 'multipass';</userinput>
 </programlisting>
@@ -10434,8 +10478,8 @@
                 See <xref linkend="privileges"/>. You have to do this
                 for each <command>mysqld</command> server. Change the
                 connection parameters appropriately when connecting to
-                each one. Note that the host part of the account name
-                must allow you to connect as
+                each one. Note that the hostname part of the account
+                name must allow you to connect as
                 <literal>multi_admin</literal> from the host where you
                 want to run <command>mysqld_multi</command>.
               </para>
@@ -10443,6 +10487,13 @@
 
             <listitem>
               <para>
+                The Unix socket file and the TCP/IP port number must be
+                different for every <command>mysqld</command>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 The <option>--pid-file</option> option is very important
                 if you are using <command>mysqld_safe</command> to start
                 <command>mysqld</command> (for example,
@@ -10451,7 +10502,7 @@
                 file. The advantage of using
                 <command>mysqld_safe</command> instead of
                 <command>mysqld</command> is that
-                <command>mysqld_safe</command> <quote>guards</quote> its
+                <command>mysqld_safe</command> monitors its
                 <command>mysqld</command> process and restarts it if the
                 process terminates due to a signal sent using
                 <literal>kill -9</literal> or for other reasons, such as
@@ -10475,21 +10526,14 @@
 </programlisting>
 
               <para>
-                See <xref linkend="mysqld-safe"/>. The test performed by
-                these lines should be successful, or you might encounter
-                problems.
+                The test performed by these lines should be successful,
+                or you might encounter problems. See
+                <xref linkend="mysqld-safe"/>.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                The Unix socket file and the TCP/IP port number must be
-                different for every <command>mysqld</command>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
                 You might want to use the <option>--user</option> option
                 for <command>mysqld</command>, but in order to do this
                 you need to run the <command>mysqld_multi</command>
@@ -10501,48 +10545,19 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                <emphasis role="bold">Important</emphasis>: Make sure
-                that the data directory is fully accessible to the Unix
-                account that the specific <command>mysqld</command>
-                process is started as. <emphasis>Do not</emphasis> use
-                the Unix root account for this, unless you
-                <emphasis>know</emphasis> what you are doing.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <emphasis role="bold">Most important</emphasis>: Before
-                using <command>mysqld_multi</command> be sure that you
-                understand the meanings of the options that are passed
-                to the <command>mysqld</command> servers and
-                <emphasis>why</emphasis> you would want to have separate
-                <command>mysqld</command> processes. Beware of the
-                dangers of using multiple <command>mysqld</command>
-                servers with the same data directory. Use separate data
-                directories, unless you <emphasis>know</emphasis> what
-                you are doing. Starting multiple servers with the same
-                data directory does <emphasis>not</emphasis> give you
-                extra performance in a threaded system. See
-                <xref linkend="multiple-servers"/>.
-              </para>
-            </listitem>
-
           </itemizedlist>
 
           <para>
             The following example shows how you might set up an option
-            file for use with <command>mysqld_multi</command>. The first
-            and fifth
+            file for use with <command>mysqld_multi</command>. The order
+            in which the <command>mysqld</command> programs are started
+            or stopped depends on the order in which they appear in the
+            option file. Group numbers need not form an unbroken
+            sequence. The first and fifth
             <literal>[mysqld<replaceable>N</replaceable>]</literal>
-            group were intentionally left out from the example to
+            groups were intentionally omitted from the example to
             illustrate that you can have <quote>gaps</quote> in the
-            option file. This gives you more flexibility. The order in
-            which the <command>mysqld</command> programs are started or
-            stopped depends on the order in which they appear in the
-            option file.
+            option file. This gives you more flexibility.
           </para>
 
 <programlisting>
@@ -13601,7 +13616,7 @@
 </programlisting>
 
       <para>
-        The <literal>INDEX</literal> privilege allows you to create or
+        The <literal>INDEX</literal> privilege enables you to create or
         drop (remove) indexes. <literal>INDEX</literal> applies to
         existing tables. If you have the <literal>CREATE</literal>
         privilege for a table, you can include index definitions in the
@@ -13609,7 +13624,7 @@
       </para>
 
       <para>
-        The <literal>ALTER</literal> privilege allows you to use
+        The <literal>ALTER</literal> privilege enables you to use
         <literal>ALTER TABLE</literal> to change the structure of or
         rename tables.
       </para>
@@ -13624,7 +13639,7 @@
       </para>
 
       <para>
-        The <literal>GRANT</literal> privilege allows you to give to
+        The <literal>GRANT</literal> privilege enables you to give to
         other users those privileges that you yourself possess. It can
         be used for databases, tables, and stored routines.
       </para>
@@ -13638,7 +13653,7 @@
         server host that is either world-readable or readable by the
         MySQL server. (This implies the user can read any file in any
         database directory, because the server can access any of those
-        files.) The <literal>FILE</literal> privilege also allows the
+        files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
         has write access. Existing files cannot be overwritten.
       </para>
@@ -13649,7 +13664,7 @@
         <command>mysqladmin</command> program or by issuing SQL
         statements. The following table shows which
         <command>mysqladmin</command> commands each administrative
-        privilege allows you to execute:
+        privilege enables you to execute:
       </para>
 
       <informaltable>
@@ -13721,13 +13736,13 @@
       </para>
 
       <para>
-        The <literal>CREATE TEMPORARY TABLES</literal> privilege allows
+        The <literal>CREATE TEMPORARY TABLES</literal> privilege enables
         the use of the keyword <literal>TEMPORARY</literal> in
         <literal>CREATE TABLE</literal> statements.
       </para>
 
       <para>
-        The <literal>LOCK TABLES</literal> privilege allows the use of
+        The <literal>LOCK TABLES</literal> privilege enables the use of
         explicit <literal>LOCK TABLES</literal> statements to lock
         tables for which you have the <literal>SELECT</literal>
         privilege. This includes the use of write locks, which prevents
@@ -13735,7 +13750,7 @@
       </para>
 
       <para>
-        The <literal>REPLICATION CLIENT</literal> privilege allows the
+        The <literal>REPLICATION CLIENT</literal> privilege enables the
         use of <literal>SHOW MASTER STATUS</literal> and <literal>SHOW
         SLAVE STATUS</literal>.
       </para>
@@ -13781,7 +13796,7 @@
 
         <listitem>
           <para>
-            The <literal>GRANT</literal> privilege allows users to give
+            The <literal>GRANT</literal> privilege enables users to give
             their privileges to other users. Two users with different
             privileges and with the <literal>GRANT</literal> privilege
             are able to combine privileges.
@@ -15688,8 +15703,8 @@
             flush-privileges</command> to tell the
             <command>mysqld</command> server to start using the new
             grant tables. (Reloading the grant tables overrides the
-            <option>--skip-grant-tables</option> option. This allows you
-            to tell the server to begin using the grant tables again
+            <option>--skip-grant-tables</option> option. This enables
+            you to tell the server to begin using the grant tables again
             without stopping and restarting it.)
           </para>
         </listitem>
@@ -16059,7 +16074,7 @@
 
       <para>
         The purpose of the <option>--old-passwords</option> option is to
-        allow you to maintain backward compatibility with pre-4.1
+        enable you to maintain backward compatibility with pre-4.1
         clients under circumstances where the server would otherwise
         generate long password hashes. The option doesn't affect
         authentication (4.1 and later clients can still use accounts
@@ -16772,7 +16787,7 @@
             no password. This account can be used only by connecting
             from the local host. No privileges are granted. The
             <literal>USAGE</literal> privilege in the
-            <literal>GRANT</literal> statement allows you to create an
+            <literal>GRANT</literal> statement enables you to create an
             account without giving it any privileges. It has the effect
             of setting all the global privileges to
             <literal>'N'</literal>. It is assumed that you will grant
@@ -18331,7 +18346,7 @@
         <title>&title-ssl-options;</title>
 
         <indexterm>
-          <primary>SSL command-line options</primary>
+          <primary>SSL command options</primary>
         </indexterm>
 
         <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-23 21:25:36 UTC (rev 1000)
+++ trunk/refman-5.1/database-administration.xml	2006-01-23 21:25:50 UTC (rev 1001)
@@ -327,19 +327,25 @@
 
           <listitem>
             <para>
-              How to set the server SQL mode
+              Server system variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server system variables
+              Server status variables
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Server status variables
+              How to set the server SQL mode
+</para>
+</listitem>
+
+<listitem>
+<para>
+The server shutdown process
             </para>
           </listitem>
 
@@ -352,13 +358,13 @@
         <title>&title-server-options;</title>
 
         <indexterm type="function">
-          <primary>command-line options</primary>
+          <primary>command options</primary>
           <secondary><command>mysqld</command></secondary>
         </indexterm>
 
         <indexterm>
           <primary><command>mysqld</command></primary>
-          <secondary>command-line options</secondary>
+          <secondary>command options</secondary>
         </indexterm>
 
         <para>
@@ -381,7 +387,11 @@
           <literal>[safe_mysqld]</literal> groups.
           <command>mysql.server</command> reads options from the
           <literal>[mysqld]</literal> and
-          <literal>[mysql.server]</literal> groups. An embedded MySQL
+          <literal>[mysql.server]</literal> groups.
+</para>
+
+<para>
+ An embedded MySQL
           server usually reads options from the
           <literal>[server]</literal>, <literal>[embedded]</literal>,
           and
@@ -391,7 +401,7 @@
         </para>
 
         <para>
-          <command>mysqld</command> accepts many command-line options.
+          <command>mysqld</command> accepts many command options.
           For a brief list, execute <command>mysqld --help</command>. To
           see the full list, use <command>mysqld --verbose
           --help</command>.
@@ -399,7 +409,7 @@
 
         <para>
           The following list shows some of the most common server
-          options. Additional options are described elsewhere:
+          options. Additional options are described in other sections:
         </para>
 
         <itemizedlist>
@@ -443,8 +453,8 @@
         </itemizedlist>
 
         <para>
-          You can also set the value of a server system variable by
-          using the variable name as an option, as described later in
+          You can also set the values of server system variables by
+          using variable names as options, as described later in
           this section.
         </para>
 
@@ -1932,7 +1942,7 @@
         <para>
           The MySQL server can operate in different SQL modes, and can
           apply these modes differently for different clients. This
-          allows each application to tailor the server's operating mode
+          enables each application to tailor the server's operating mode
           to its own requirements.
         </para>
 
@@ -6310,7 +6320,7 @@
             <para>
               On Solaris, <command>mysqld</command> calls
               <literal>thr_setconcurrency()</literal> with this value.
-              This function allows applications to give the threads
+              This function enables applications to give the threads
               system a hint about the desired number of threads that
               should be run at the same time.
             </para>
@@ -10023,7 +10033,7 @@
           <para>
             <command>mysql.server</command> can be found in the
             <filename>support-files</filename> directory under your
-            MySQL installation directory or in a MySQL source tree.
+            MySQL installation directory or in a MySQL source distribution.
           </para>
 
           <para>
@@ -10053,12 +10063,12 @@
           <para>
             <command>mysql.server</command> reads options from the
             <literal>[mysql.server]</literal> and
-            <literal>[mysqld]</literal> sections of option files. (For
+            <literal>[mysqld]</literal> sections of option files. For
             backward compatibility, it also reads
             <literal>[mysql_server]</literal> sections, although you
             should rename such sections to
             <literal>[mysql.server]</literal> when using MySQL
-            &current-series;.)
+            &current-series;.
           </para>
 
         </refsection>
@@ -10117,15 +10127,18 @@
           <title>Description</title>
 
           <para>
-            <command>mysqld_multi</command> is meant for managing
+            <command>mysqld_multi</command> is designed to manage
             several <command>mysqld</command> processes that listen for
             connections on different Unix socket files and TCP/IP ports.
             It can start or stop servers, or report their current
             status.
+The MySQL Instance Manager is an alternative means of managing multiple servers
+(see <xref linkend="instance-manager"/>).
           </para>
 
           <para>
-            The program searches for groups named
+<command>mysqld_multi</command>
+            searches for groups named
             <literal>[mysqld<replaceable>N</replaceable>]</literal> in
             <filename>my.cnf</filename> (or in the file named by the
             <option>--config-file</option> option).
@@ -10139,7 +10152,7 @@
             same that you would use in the <literal>[mysqld]</literal>
             group used for starting <command>mysqld</command>. (See, for
             example, <xref linkend="automatic-start"/>.) However, when
-            using multiple servers it is necessary that each one use its
+            using multiple servers, it is necessary that each one use its
             own value for options such as the Unix socket file and
             TCP/IP port number. For more information on which options
             must be unique per server in a multiple-server environment,
@@ -10157,8 +10170,8 @@
 
           <para>
             <literal>start</literal>, <literal>stop</literal>, and
-            <literal>report</literal> indicate which operation you want
-            to perform. You can perform the designated operation on a
+            <literal>report</literal> indicate which operation
+            to perform. You can perform the designated operation for a
             single server or multiple servers, depending on the
             <replaceable>GNR</replaceable> list that follows the option
             name. If there is no list, <command>mysqld_multi</command>
@@ -10194,7 +10207,7 @@
 
           <para>
             This command stops several servers, using option groups
-            <literal>[mysql8]</literal> and
+            <literal>[mysqld8]</literal> and
             <literal>[mysqld10]</literal> through
             <literal>[mysqld13]</literal>:
           </para>
@@ -10222,6 +10235,21 @@
             <listitem>
               <para>
                 <indexterm>
+                  <primary><literal>help</literal></primary>
+                  <secondary><command>mysqld_multi</command> option</secondary>
+                </indexterm>
+
+                <option>--help</option>
+              </para>
+
+              <para>
+                Display a help message and exit.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <indexterm>
                   <primary><literal>config-file</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -10261,21 +10289,6 @@
             <listitem>
               <para>
                 <indexterm>
-                  <primary><literal>help</literal></primary>
-                  <secondary><command>mysqld_multi</command> option</secondary>
-                </indexterm>
-
-                <option>--help</option>
-              </para>
-
-              <para>
-                Display a help message and exit.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <indexterm>
                   <primary><literal>log</literal></primary>
                   <secondary><command>mysqld_multi</command> option</secondary>
                 </indexterm>
@@ -10348,7 +10361,7 @@
               </para>
 
               <para>
-                Print log information to stdout rather than to the log
+                Print log information to <literal>stdout</literal> rather than to the log
                 file. By default, output goes to the log file.
               </para>
             </listitem>
@@ -10382,7 +10395,7 @@
               </para>
 
               <para>
-                Disable warnings.
+                Silent mode; disable warnings.
               </para>
             </listitem>
 
@@ -10463,13 +10476,43 @@
 
             <listitem>
               <para>
+                <emphasis role="bold">Most important</emphasis>: Before
+                using <command>mysqld_multi</command> be sure that you
+                understand the meanings of the options that are passed
+                to the <command>mysqld</command> servers and
+                <emphasis>why</emphasis> you would want to have separate
+                <command>mysqld</command> processes. Beware of the
+                dangers of using multiple <command>mysqld</command>
+                servers with the same data directory. Use separate data
+                directories, unless you <emphasis>know</emphasis> what
+                you are doing. Starting multiple servers with the same
+                data directory does <emphasis>not</emphasis> give you
+                extra performance in a threaded system. See
+                <xref linkend="multiple-servers"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <emphasis role="bold">Important</emphasis>: Make sure
+                that the data directory for each server is fully accessible to the Unix
+                account that the specific <command>mysqld</command>
+                process is started as. <emphasis>Do not</emphasis> use
+                the Unix <replaceable>root</replaceable> account for this, unless you
+                <emphasis>know</emphasis> what you are doing.
+            See <xref linkend="changing-mysql-user"/>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 Make sure that the MySQL account used for stopping the
                 <command>mysqld</command> servers (with the
                 <command>mysqladmin</command> program) has the same
                 username and password for each server. Also, make sure
                 that the account has the <literal>SHUTDOWN</literal>
                 privilege. If the servers that you want to manage have
-                many different usernames or passwords for the
+                different usernames or passwords for the
                 administrative accounts, you might want to create an
                 account on each server that has the same username and
                 password. For example, you might set up a common
@@ -10478,7 +10521,8 @@
               </para>
 
 <programlisting>
-shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p<replaceable>root_password</replaceable></userinput>
+shell&gt; <userinput>mysql -u root -S /tmp/mysql.sock -p</userinput>
+Enter password:
 mysql&gt; <userinput>GRANT SHUTDOWN ON *.*</userinput>
     -&gt; <userinput>TO 'multi_admin'@'localhost' IDENTIFIED BY 'multipass';</userinput>
 </programlisting>
@@ -10487,7 +10531,7 @@
                 See <xref linkend="privileges"/>. You have to do this
                 for each <command>mysqld</command> server. Change the
                 connection parameters appropriately when connecting to
-                each one. Note that the host part of the account name
+                each one. Note that the hostname part of the account name
                 must allow you to connect as
                 <literal>multi_admin</literal> from the host where you
                 want to run <command>mysqld_multi</command>.
@@ -10496,6 +10540,13 @@
 
             <listitem>
               <para>
+                The Unix socket file and the TCP/IP port number must be
+                different for every <command>mysqld</command>.
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
                 The <option>--pid-file</option> option is very important
                 if you are using <command>mysqld_safe</command> to start
                 <command>mysqld</command> (for example,
@@ -10504,7 +10555,7 @@
                 file. The advantage of using
                 <command>mysqld_safe</command> instead of
                 <command>mysqld</command> is that
-                <command>mysqld_safe</command> <quote>guards</quote> its
+                <command>mysqld_safe</command> monitors its
                 <command>mysqld</command> process and restarts it if the
                 process terminates due to a signal sent using
                 <literal>kill -9</literal> or for other reasons, such as
@@ -10528,21 +10579,15 @@
 </programlisting>
 
               <para>
-                See <xref linkend="mysqld-safe"/>. The test performed by
+The test performed by
                 these lines should be successful, or you might encounter
                 problems.
+                See <xref linkend="mysqld-safe"/>.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                The Unix socket file and the TCP/IP port number must be
-                different for every <command>mysqld</command>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
                 You might want to use the <option>--user</option> option
                 for <command>mysqld</command>, but in order to do this
                 you need to run the <command>mysqld_multi</command>
@@ -10554,48 +10599,22 @@
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                <emphasis role="bold">Important</emphasis>: Make sure
-                that the data directory is fully accessible to the Unix
-                account that the specific <command>mysqld</command>
-                process is started as. <emphasis>Do not</emphasis> use
-                the Unix root account for this, unless you
-                <emphasis>know</emphasis> what you are doing.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <emphasis role="bold">Most important</emphasis>: Before
-                using <command>mysqld_multi</command> be sure that you
-                understand the meanings of the options that are passed
-                to the <command>mysqld</command> servers and
-                <emphasis>why</emphasis> you would want to have separate
-                <command>mysqld</command> processes. Beware of the
-                dangers of using multiple <command>mysqld</command>
-                servers with the same data directory. Use separate data
-                directories, unless you <emphasis>know</emphasis> what
-                you are doing. Starting multiple servers with the same
-                data directory does <emphasis>not</emphasis> give you
-                extra performance in a threaded system. See
-                <xref linkend="multiple-servers"/>.
-              </para>
-            </listitem>
-
           </itemizedlist>
 
           <para>
             The following example shows how you might set up an option
-            file for use with <command>mysqld_multi</command>. The first
+            file for use with <command>mysqld_multi</command>.
+The order in
+            which the <command>mysqld</command> programs are started or
+            stopped depends on the order in which they appear in the
+            option file.
+Group numbers need not form an unbroken sequence.
+The first
             and fifth
             <literal>[mysqld<replaceable>N</replaceable>]</literal>
-            group were intentionally left out from the example to
+            groups were intentionally omitted from the example to
             illustrate that you can have <quote>gaps</quote> in the
-            option file. This gives you more flexibility. The order in
-            which the <command>mysqld</command> programs are started or
-            stopped depends on the order in which they appear in the
-            option file.
+            option file. This gives you more flexibility.
           </para>
 
 <programlisting>
@@ -13616,7 +13635,7 @@
 </programlisting>
 
       <para>
-        The <literal>INDEX</literal> privilege allows you to create or
+        The <literal>INDEX</literal> privilege enables you to create or
         drop (remove) indexes. <literal>INDEX</literal> applies to
         existing tables. If you have the <literal>CREATE</literal>
         privilege for a table, you can include index definitions in the
@@ -13624,7 +13643,7 @@
       </para>
 
       <para>
-        The <literal>ALTER</literal> privilege allows you to use
+        The <literal>ALTER</literal> privilege enables you to use
         <literal>ALTER TABLE</literal> to change the structure of or
         rename tables.
       </para>
@@ -13639,7 +13658,7 @@
       </para>
 
       <para>
-        The <literal>GRANT</literal> privilege allows you to give to
+        The <literal>GRANT</literal> privilege enables you to give to
         other users those privileges that you yourself possess. It can
         be used for databases, tables, and stored routines.
       </para>
@@ -13653,7 +13672,7 @@
         server host that is either world-readable or readable by the
         MySQL server. (This implies the user can read any file in any
         database directory, because the server can access any of those
-        files.) The <literal>FILE</literal> privilege also allows the
+        files.) The <literal>FILE</literal> privilege also enables the
         user to create new files in any directory where the MySQL server
         has write access. Existing files cannot be overwritten.
       </para>
@@ -13664,7 +13683,7 @@
         <command>mysqladmin</command> program or by issuing SQL
         statements. The following table shows which
         <command>mysqladmin</command> commands each administrative
-        privilege allows you to execute:
+        privilege enables you to execute:
       </para>
 
       <informaltable>
@@ -13736,13 +13755,13 @@
       </para>
 
       <para>
-        The <literal>CREATE TEMPORARY TABLES</literal> privilege allows
+        The <literal>CREATE TEMPORARY TABLES</literal> privilege enables
         the use of the keyword <literal>TEMPORARY</literal> in
         <literal>CREATE TABLE</literal> statements.
       </para>
 
       <para>
-        The <literal>LOCK TABLES</literal> privilege allows the use of
+        The <literal>LOCK TABLES</literal> privilege enables the use of
         explicit <literal>LOCK TABLES</literal> statements to lock
         tables for which you have the <literal>SELECT</literal>
         privilege. This includes the use of write locks, which prevents
@@ -13750,7 +13769,7 @@
       </para>
 
       <para>
-        The <literal>REPLICATION CLIENT</literal> privilege allows the
+        The <literal>REPLICATION CLIENT</literal> privilege enables the
         use of <literal>SHOW MASTER STATUS</literal> and <literal>SHOW
         SLAVE STATUS</literal>.
       </para>
@@ -13796,7 +13815,7 @@
 
         <listitem>
           <para>
-            The <literal>GRANT</literal> privilege allows users to give
+            The <literal>GRANT</literal> privilege enables users to give
             their privileges to other users. Two users with different
             privileges and with the <literal>GRANT</literal> privilege
             are able to combine privileges.
@@ -15703,7 +15722,7 @@
             flush-privileges</command> to tell the
             <command>mysqld</command> server to start using the new
             grant tables. (Reloading the grant tables overrides the
-            <option>--skip-grant-tables</option> option. This allows you
+            <option>--skip-grant-tables</option> option. This enables you
             to tell the server to begin using the grant tables again
             without stopping and restarting it.)
           </para>
@@ -16074,7 +16093,7 @@
 
       <para>
         The purpose of the <option>--old-passwords</option> option is to
-        allow you to maintain backward compatibility with pre-4.1
+        enable you to maintain backward compatibility with pre-4.1
         clients under circumstances where the server would otherwise
         generate long password hashes. The option doesn't affect
         authentication (4.1 and later clients can still use accounts
@@ -16787,7 +16806,7 @@
             no password. This account can be used only by connecting
             from the local host. No privileges are granted. The
             <literal>USAGE</literal> privilege in the
-            <literal>GRANT</literal> statement allows you to create an
+            <literal>GRANT</literal> statement enables you to create an
             account without giving it any privileges. It has the effect
             of setting all the global privileges to
             <literal>'N'</literal>. It is assumed that you will grant
@@ -18341,7 +18360,7 @@
         <title>&title-ssl-options;</title>
 
         <indexterm>
-          <primary>SSL command-line options</primary>
+          <primary>SSL command options</primary>
         </indexterm>
 
         <para>

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-23 21:25:36 UTC (rev 1000)
+++ trunk/refman-common/titles.en.ent	2006-01-23 21:25:50 UTC (rev 1001)
@@ -991,8 +991,8 @@
 <!ENTITY title-mysqld-for-manpage "the MySQL server">
 <!ENTITY title-mysqld-for-manual "The MySQL Server">
 <!ENTITY title-mysqld-max "The <command>mysqld-max</command> Extended MySQL Server">
-<!ENTITY title-mysqld-multi-for-manpage "program for managing multiple MySQL servers">
-<!ENTITY title-mysqld-multi-for-manual "Program for Managing Multiple MySQL Servers">
+<!ENTITY title-mysqld-multi-for-manpage "manage multiple MySQL servers">
+<!ENTITY title-mysqld-multi-for-manual "Manage Multiple MySQL Servers">
 <!ENTITY title-mysqld-process "MySQL Server Process Usage for MySQL Cluster">
 <!ENTITY title-mysqld-safe-for-manpage "MySQL server startup script">
 <!ENTITY title-mysqld-safe-for-manual "MySQL Server Startup Script">
@@ -1371,7 +1371,7 @@
 <!ENTITY title-privilege-changes "When Privilege Changes Take Effect">
 <!ENTITY title-privilege-system "The MySQL Access Privilege System">
 <!ENTITY title-privileges "How the Privilege System Works">
-<!ENTITY title-privileges-options "Startup Options for <command>mysqld</command> Concerning Security">
+<!ENTITY title-privileges-options "Security-Related <command>mysqld</command> Options">
 <!ENTITY title-privileges-provided "Privileges Provided by MySQL">
 <!ENTITY title-problems "Problems and Common Errors">
 <!ENTITY title-problems-with-alias "Problems with Column Aliases">

Thread
svn commit - mysqldoc@docsrva: r1001 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul23 Jan