List:Commits« Previous MessageNext Message »
From:paul.dubois Date:February 8 2011 8:24pm
Subject:svn commit - mysqldoc@docsrva: r25016 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2011-02-08 21:24:48 +0100 (Tue, 08 Feb 2011)
New Revision: 25016

Log:
 r44844@dhcp-adc-twvpn-1-vpnpool-10-154-8-226:  paul | 2011-02-08 14:24:27 -0500
 Multiple-server updates


Modified:
   trunk/refman-5.0/dba-multiple-servers.xml
   trunk/refman-5.1/dba-multiple-servers.xml
   trunk/refman-5.5/dba-multiple-servers.xml
   trunk/refman-5.6/dba-multiple-servers.xml
   trunk/refman-6.0/dba-multiple-servers.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46807
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44839
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46807
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44844


Modified: trunk/refman-5.0/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.0/dba-multiple-servers.xml	2011-02-08 19:16:27 UTC (rev 25015)
+++ trunk/refman-5.0/dba-multiple-servers.xml	2011-02-08 20:24:48 UTC (rev 25016)
Changed blocks: 18, Lines Added: 123, Lines Deleted: 115; 17214 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="multiple-servers">
 
-  <title>Running Multiple MySQL Instances on the Same Machine</title>
+  <title>Running Multiple MySQL Instances on One Machine</title>
 
   <indexterm>
     <primary>postinstall</primary>

@@ -32,7 +32,7 @@
 
   <para>
     In some cases, you might want to run multiple instances of MySQL on
-    the same machine. You might want to test a new MySQL release while
+    a single machine. You might want to test a new MySQL release while
     leaving an existing production setup undisturbed. Or you might want
     to give different users access to different
     <command>mysqld</command> servers that they manage themselves. (For

@@ -46,20 +46,25 @@
     the two approaches. For example, you might run a server from MySQL
     &previous-series; and one from MySQL &current-series;, to see how
     different versions handle a given workload. Or you might run
-    multiple instances of MySQL &current-version;, each managing a
-    different set of databases. However, whether or not you use distinct
-    servers, each instance you run must be configured with unique values
-    for several operating parameters. This eliminates the potential for
-    conflict between running servers. Parameters can be set on the
-    command line or in option files. See
+    multiple instances of the current production version, each managing
+    a different set of databases.
+  </para>
+
+  <para>
+    Whether or not you use distinct server binaries, each instance that
+    you run must be configured with unique values for several operating
+    parameters. This eliminates the potential for conflict between
+    instances. Parameters can be set on the command line, in option
+    files, or by setting environment variables. See
     <xref linkend="program-options"/>. To see the values used by a given
     server, connect to it and execute a <literal role="stmt">SHOW
     VARIABLES</literal> statement.
   </para>
 
   <para>
-    With very limited exceptions, each instance should use a different
-    data directory, which is specified using the
+    The primary resource managed by a MySQL instance is the data
+    directory, and each instance should use a different data directory.
+    The location is specified using the
     <option role="mysqld">--datadir=<replaceable>path</replaceable></option>
     option.
   </para>

@@ -73,44 +78,28 @@
       data directory and they have logging enabled, you must use the
       appropriate options to specify log file names that are unique to
       each server. Otherwise, the servers try to log to the same files.
-      Please note that this kind of setup only works with
-      <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
-      not with any of the other storage engines.
     </para>
 
     <para>
-      Even when the preceding precautions are observed, this warning
-      against sharing a data directory among servers still applies in an
-      NFS environment. Permitting multiple MySQL servers to access a
-      common data directory over NFS is a <emphasis>very bad
-      idea</emphasis>.
+      Even when the preceding precautions are observed, this kind of
+      setup only works with <literal>MyISAM</literal> and
+      <literal>MERGE</literal> tables, and not with any of the other
+      storage engines. Also, this warning against sharing a data
+      directory among servers always applies in an NFS environment.
+      Permitting multiple MySQL servers to access a common data
+      directory over NFS is a <emphasis>very bad idea</emphasis>. The
+      primary problem is that NFS is the speed bottleneck. It is not
+      meant for such use. Another risk with NFS is that you must devise
+      a way to ensure that two or more servers do not interfere with
+      each other. Usually NFS file locking is handled by the
+      <literal>lockd</literal> daemon, but at the moment there is no
+      platform that performs locking 100% reliably in every situation.
     </para>
   </warning>
 
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        The primary problem is that NFS is the speed bottleneck. It is
-        not meant for such use.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Another risk with NFS is that you must devise a way to ensure
-        that two or more servers do not interfere with each other.
-        Usually NFS file locking is handled by the
-        <literal>lockd</literal> daemon, but at the moment there is no
-        platform that performs locking 100% reliably in every situation.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     In addition to using different data directories, several other
-    options must be different for each server instance:
+    options must have different values for each server instance:
   </para>
 
   <itemizedlist>

@@ -124,8 +113,8 @@
         <option role="mysqld">--port</option> controls the port number
         for TCP/IP connections. (Alternatively, if the host has multiple
         network addresses, you can use
-        <option role="mysqld">--bind-address</option> to cause different
-        servers to listen to different interfaces.)
+        <option role="mysqld">--bind-address</option> to cause each
+        server to listen to a different address.)
       </para>
     </listitem>
 

@@ -138,7 +127,7 @@
         <option role="mysqld">--socket</option> controls the Unix socket
         file path on Unix or the named pipe name on Windows. On Windows,
         it is necessary to specify distinct pipe names only for those
-        servers that support named-pipe connections.
+        servers configured to permit named-pipe connections.
       </para>
     </listitem>
 

@@ -151,7 +140,7 @@
         This option is used only on Windows. It designates the
         shared-memory name used by a Windows server to permit clients to
         connect using shared memory. It is necessary to specify distinct
-        shared-memory names only for those servers that support
+        shared-memory names only for those servers configured to permit
         shared-memory connections.
       </para>
     </listitem>

@@ -170,7 +159,7 @@
   </itemizedlist>
 
   <para>
-    If you use the following log file options, they must be different
+    If you use the following log file options, their values must differ
     for each server:
   </para>
 

@@ -258,10 +247,10 @@
 
   <para>
     As discussed in the following sections, it is possible to start
-    additional servers by setting environment variables or by specifying
-    appropriate command-line options. However, if you need to run
-    multiple servers on a more permanent basis, it is more convenient to
-    use option files to specify for each server those option values that
+    additional servers by specifying appropriate command options or by
+    setting environment variables. However, if you need to run multiple
+    servers on a more permanent basis, it is more convenient to use
+    option files to specify for each server those option values that
     must be unique to it. The
     <option role="general">--defaults-file</option> option is useful for
     this purpose.

@@ -273,13 +262,13 @@
 
     <para>
       You can run multiple servers on Windows by starting them manually
-      from the command line, each with appropriate operating parameters.
-      You also have the option of installing several servers as Windows
-      services and running them that way. General instructions for
-      running MySQL servers from the command line or as services are
-      given in <xref linkend="windows-installation"/>. The following
-      sections describe how to start each server with different values
-      for those options that must be unique per server, such as the data
+      from the command line, each with appropriate operating parameters,
+      or by installing several servers as Windows services and running
+      them that way. General instructions for running MySQL from the
+      command line or as a service are given in
+      <xref linkend="windows-installation"/>. The following sections
+      describe how to start each server with different values for those
+      options that must be unique per server, such as the data
       directory. These options are listed in
       <xref linkend="multiple-servers"/>.
     </para>

@@ -289,62 +278,80 @@
       <title>Starting Multiple MySQL Instances at the Windows Command Line</title>
 
       <para>
-        To start multiple servers manually from the command line, you
-        can specify the appropriate options on the command line or in an
-        option file. It is more convenient to place the options in an
-        option file, but it is necessary to make sure that each server
-        gets its own set of options. To do this, create an option file
-        for each server and tell the server the file name with a
-        <option role="general">--defaults-file</option> option when you
-        run it.
+        The procedure for starting a single MySQL server manually from
+        the command line is described in
+        <xref linkend="windows-start-command-line"/>. To start multiple
+        servers this way, you can specify the appropriate options on the
+        command line or in an option file. It is more convenient to
+        place the options in an option file, but it is necessary to make
+        sure that each server gets its own set of options. To do this,
+        create an option file for each server and tell the server the
+        file name with a <option role="general">--defaults-file</option>
+        option when you run it.
       </para>
 
       <para>
         Suppose that you want to run <command>mysqld</command> on port
         3307 with a data directory of <filename>C:\mydata1</filename>,
         and <command>mysqld-debug</command> on port 3308 with a data
-        directory of <filename>C:\mydata2</filename>. First, make sure
-        that each data directory exists and has its own copy of the
-        <literal>mysql</literal> database that contains the grant
-        tables. Then, create two option files. For example, create one
-        file named <filename>C:\my-opts1.cnf</filename> that looks like
-        this:
+        directory of <filename>C:\mydata2</filename>. Use this
+        procedure:
       </para>
 
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Make sure that each data directory exists, including its own
+            copy of the <literal>mysql</literal> database that contains
+            the grant tables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create two option files. For example, create one file named
+            <filename>C:\my-opts1.cnf</filename> that looks like this:
+          </para>
+
 <programlisting>
 [mysqld]
 datadir = C:/mydata1
 port = 3307
 </programlisting>
 
-      <para>
-        Create a second file named <filename>C:\my-opts2.cnf</filename>
-        that looks like this:
-      </para>
+          <para>
+            Create a second file named
+            <filename>C:\my-opts2.cnf</filename> that looks like this:
+          </para>
 
 <programlisting>
 [mysqld]
 datadir = C:/mydata2
 port = 3308
 </programlisting>
+        </listitem>
 
-      <para>
-        Finally, use the
-        <option role="general">--defaults-option</option> option to
-        start each server with its own option file:
-      </para>
+        <listitem>
+          <para>
+            Use the <option role="general">--defaults-option</option>
+            option to start each server with its own option file:
+          </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput>
 C:\&gt; <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput>
 </programlisting>
 
-      <para>
-        Each server starts in the foreground (no new prompt appears
-        until the server exits later), so you will need to issue those
-        two commands in separate console windows.
-      </para>
+          <para>
+            Each server starts in the foreground (no new prompt appears
+            until the server exits later), so you will need to issue
+            those two commands in separate console windows.
+          </para>
+        </listitem>
 
+      </orderedlist>
+
       <para>
         To shut down the servers, connect to each using the appropriate
         port number:

@@ -382,7 +389,7 @@
       </para>
 
       <para>
-        A similar procedure applies for servers that you want to support
+        A similar procedure applies for servers that you want to permit
         shared-memory connections. Enable such connections with the
         <option role="mysqld">--shared-memory</option> option and
         specify a unique shared-memory name for each server with the

@@ -396,9 +403,10 @@
       <title>Starting Multiple MySQL Instances as Windows Services</title>
 
       <para>
-        A MySQL server can run as a Windows service. The procedures for
-        installing, controlling, and removing a single MySQL service are
-        described in <xref linkend="windows-start-service"/>.
+        On Windows, a MySQL server can run as a Windows service. The
+        procedure for installing, controlling, and removing a single
+        MySQL service are described in
+        <xref linkend="windows-start-service"/>.
       </para>
 
       <para>

@@ -408,7 +416,7 @@
       </para>
 
       <para>
-        For the following instructions, assume that you want to run the
+        For the following instructions, suppose that you want to run the
         <command>mysqld-nt</command> server from two different versions
         of MySQL that are installed at
         <filename>C:\mysql-4.1.24</filename> and

@@ -483,8 +491,8 @@
       <para>
         Based on the preceding information, you have several ways to set
         up multiple services. The following instructions describe some
-        examples. Before trying any of them, be sure that you shut down
-        and remove any existing MySQL services first.
+        examples. Before trying any of them, be sure to shut down and
+        remove any existing MySQL services first.
       </para>
 
       <itemizedlist>

@@ -684,10 +692,10 @@
     </para>
 
     <para>
-      Note that if you specify <literal>localhost</literal> as a host
-      name, <command>mysqladmin</command> defaults to using a Unix
-      socket file connection rather than TCP/IP. To explicitly specify
-      the connection protocol, use the
+      If you specify <literal>localhost</literal> as the host name,
+      <command>mysqladmin</command> defaults to using a Unix socket file
+      connection rather than TCP/IP. To explicitly specify the
+      connection protocol, use the
       <option role="general">--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
       option.
     </para>

@@ -714,6 +722,22 @@
     </para>
 
     <para>
+      Alternatively, put the options for each server in a different
+      option file, then start each server using a
+      <option role="general">--defaults-file</option> option that
+      specifies the path to the appropriate option file. For example, if
+      the option files for two server instances are named
+      <filename>/usr/local/mysql/my.cnf</filename> and
+      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
+      like this: command:
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
+</programlisting>
+
+    <para>
       Another way to achieve a similar effect is to use environment
       variables to set the Unix socket file name and TCP/IP port number:
     </para>

@@ -754,31 +778,15 @@
 
     <para>
       <xref linkend="environment-variables"/>, includes a list of other
-      environment variables you can use to affect
-      <command>mysqld</command>.
+      environment variables you can use to affect MySQL programs.
     </para>
 
     <para>
-      Alternatively, put the options for each server in a different
-      option file, then start each server using a
-      <option role="general">--defaults-file</option> option that
-      specifies the path to the appropriate option file. For example, if
-      the option files for two server instances are named
-      <filename>/usr/local/mysql/my.cnf</filename> and
-      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
-      like this: command:
+      On Unix, the <command>mysqld_multi</command> script provides
+      another way to start multiple servers. See
+      <xref linkend="mysqld-multi"/>.
     </para>
 
-<programlisting>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
-</programlisting>
-
-    <para>
-      On Unix, the <command>mysqld_multi</command> script is another way
-      to start multiple servers. See <xref linkend="mysqld-multi"/>.
-    </para>
-
   </section>
 
   <section id="multiple-server-clients">


Modified: trunk/refman-5.1/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.1/dba-multiple-servers.xml	2011-02-08 19:16:27 UTC (rev 25015)
+++ trunk/refman-5.1/dba-multiple-servers.xml	2011-02-08 20:24:48 UTC (rev 25016)
Changed blocks: 20, Lines Added: 122, Lines Deleted: 117; 17680 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="multiple-servers">
 
-  <title>Running Multiple MySQL Instances on the Same Machine</title>
+  <title>Running Multiple MySQL Instances on One Machine</title>
 
   <indexterm>
     <primary>postinstall</primary>

@@ -32,7 +32,7 @@
 
   <para>
     In some cases, you might want to run multiple instances of MySQL on
-    the same machine. You might want to test a new MySQL release while
+    a single machine. You might want to test a new MySQL release while
     leaving an existing production setup undisturbed. Or you might want
     to give different users access to different
     <command>mysqld</command> servers that they manage themselves. (For

@@ -46,20 +46,25 @@
     the two approaches. For example, you might run a server from MySQL
     &previous-series; and one from MySQL &current-series;, to see how
     different versions handle a given workload. Or you might run
-    multiple instances of MySQL &current-version;, each managing a
-    different set of databases. However, whether or not you use distinct
-    servers, each instance you run must be configured with unique values
-    for several operating parameters. This eliminates the potential for
-    conflict between running servers. Parameters can be set on the
-    command line or in option files. See
+    multiple instances of the current production version, each managing
+    a different set of databases.
+  </para>
+
+  <para>
+    Whether or not you use distinct server binaries, each instance that
+    you run must be configured with unique values for several operating
+    parameters. This eliminates the potential for conflict between
+    instances. Parameters can be set on the command line, in option
+    files, or by setting environment variables. See
     <xref linkend="program-options"/>. To see the values used by a given
     server, connect to it and execute a <literal role="stmt">SHOW
     VARIABLES</literal> statement.
   </para>
 
   <para>
-    With very limited exceptions, each instance should use a different
-    data directory, which is specified using the
+    The primary resource managed by a MySQL instance is the data
+    directory, and each instance should use a different data directory.
+    The location is specified using the
     <option role="mysqld">--datadir=<replaceable>path</replaceable></option>
     option.
   </para>

@@ -73,44 +78,28 @@
       data directory and they have logging enabled, you must use the
       appropriate options to specify log file names that are unique to
       each server. Otherwise, the servers try to log to the same files.
-      Please note that this kind of setup only works with
-      <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
-      not with any of the other storage engines.
     </para>
 
     <para>
-      Even when the preceding precautions are observed, this warning
-      against sharing a data directory among servers still applies in an
-      NFS environment. Permitting multiple MySQL servers to access a
-      common data directory over NFS is a <emphasis>very bad
-      idea</emphasis>.
+      Even when the preceding precautions are observed, this kind of
+      setup only works with <literal>MyISAM</literal> and
+      <literal>MERGE</literal> tables, and not with any of the other
+      storage engines. Also, this warning against sharing a data
+      directory among servers always applies in an NFS environment.
+      Permitting multiple MySQL servers to access a common data
+      directory over NFS is a <emphasis>very bad idea</emphasis>. The
+      primary problem is that NFS is the speed bottleneck. It is not
+      meant for such use. Another risk with NFS is that you must devise
+      a way to ensure that two or more servers do not interfere with
+      each other. Usually NFS file locking is handled by the
+      <literal>lockd</literal> daemon, but at the moment there is no
+      platform that performs locking 100% reliably in every situation.
     </para>
   </warning>
 
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        The primary problem is that NFS is the speed bottleneck. It is
-        not meant for such use.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Another risk with NFS is that you must devise a way to ensure
-        that two or more servers do not interfere with each other.
-        Usually NFS file locking is handled by the
-        <literal>lockd</literal> daemon, but at the moment there is no
-        platform that performs locking 100% reliably in every situation.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     In addition to using different data directories, several other
-    options must be different for each server instance:
+    options must have different values for each server instance:
   </para>
 
   <itemizedlist>

@@ -124,8 +113,8 @@
         <option role="mysqld">--port</option> controls the port number
         for TCP/IP connections. (Alternatively, if the host has multiple
         network addresses, you can use
-        <option role="mysqld">--bind-address</option> to cause different
-        servers to listen to different interfaces.)
+        <option role="mysqld">--bind-address</option> to cause each
+        server to listen to a different address.)
       </para>
     </listitem>
 

@@ -138,7 +127,7 @@
         <option role="mysqld">--socket</option> controls the Unix socket
         file path on Unix or the named pipe name on Windows. On Windows,
         it is necessary to specify distinct pipe names only for those
-        servers that support named-pipe connections.
+        servers configured to permit named-pipe connections.
       </para>
     </listitem>
 

@@ -151,7 +140,7 @@
         This option is used only on Windows. It designates the
         shared-memory name used by a Windows server to permit clients to
         connect using shared memory. It is necessary to specify distinct
-        shared-memory names only for those servers that support
+        shared-memory names only for those servers configured to permit
         shared-memory connections.
       </para>
     </listitem>

@@ -170,7 +159,7 @@
   </itemizedlist>
 
   <para>
-    If you use the following log file options, they must be different
+    If you use the following log file options, their values must differ
     for each server:
   </para>
 

@@ -178,8 +167,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--general_log</option> or
-        <option role="mysqld">--log[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--general_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -191,8 +179,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--slow_query_log</option> or
-        <option role="mysqld">--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--slow_query_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -254,10 +241,10 @@
 
   <para>
     As discussed in the following sections, it is possible to start
-    additional servers by setting environment variables or by specifying
-    appropriate command-line options. However, if you need to run
-    multiple servers on a more permanent basis, it is more convenient to
-    use option files to specify for each server those option values that
+    additional servers by specifying appropriate command options or by
+    setting environment variables. However, if you need to run multiple
+    servers on a more permanent basis, it is more convenient to use
+    option files to specify for each server those option values that
     must be unique to it. The
     <option role="general">--defaults-file</option> option is useful for
     this purpose.

@@ -269,13 +256,13 @@
 
     <para>
       You can run multiple servers on Windows by starting them manually
-      from the command line, each with appropriate operating parameters.
-      You also have the option of installing several servers as Windows
-      services and running them that way. General instructions for
-      running MySQL servers from the command line or as services are
-      given in <xref linkend="windows-installation"/>. The following
-      sections describe how to start each server with different values
-      for those options that must be unique per server, such as the data
+      from the command line, each with appropriate operating parameters,
+      or by installing several servers as Windows services and running
+      them that way. General instructions for running MySQL from the
+      command line or as a service are given in
+      <xref linkend="windows-installation"/>. The following sections
+      describe how to start each server with different values for those
+      options that must be unique per server, such as the data
       directory. These options are listed in
       <xref linkend="multiple-servers"/>.
     </para>

@@ -285,62 +272,80 @@
       <title>Starting Multiple MySQL Instances at the Windows Command Line</title>
 
       <para>
-        To start multiple servers manually from the command line, you
-        can specify the appropriate options on the command line or in an
-        option file. It is more convenient to place the options in an
-        option file, but it is necessary to make sure that each server
-        gets its own set of options. To do this, create an option file
-        for each server and tell the server the file name with a
-        <option role="general">--defaults-file</option> option when you
-        run it.
+        The procedure for starting a single MySQL server manually from
+        the command line is described in
+        <xref linkend="windows-start-command-line"/>. To start multiple
+        servers this way, you can specify the appropriate options on the
+        command line or in an option file. It is more convenient to
+        place the options in an option file, but it is necessary to make
+        sure that each server gets its own set of options. To do this,
+        create an option file for each server and tell the server the
+        file name with a <option role="general">--defaults-file</option>
+        option when you run it.
       </para>
 
       <para>
         Suppose that you want to run <command>mysqld</command> on port
         3307 with a data directory of <filename>C:\mydata1</filename>,
         and <command>mysqld-debug</command> on port 3308 with a data
-        directory of <filename>C:\mydata2</filename>. First, make sure
-        that each data directory exists and has its own copy of the
-        <literal>mysql</literal> database that contains the grant
-        tables. Then, create two option files. For example, create one
-        file named <filename>C:\my-opts1.cnf</filename> that looks like
-        this:
+        directory of <filename>C:\mydata2</filename>. Use this
+        procedure:
       </para>
 
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Make sure that each data directory exists, including its own
+            copy of the <literal>mysql</literal> database that contains
+            the grant tables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create two option files. For example, create one file named
+            <filename>C:\my-opts1.cnf</filename> that looks like this:
+          </para>
+
 <programlisting>
 [mysqld]
 datadir = C:/mydata1
 port = 3307
 </programlisting>
 
-      <para>
-        Create a second file named <filename>C:\my-opts2.cnf</filename>
-        that looks like this:
-      </para>
+          <para>
+            Create a second file named
+            <filename>C:\my-opts2.cnf</filename> that looks like this:
+          </para>
 
 <programlisting>
 [mysqld]
 datadir = C:/mydata2
 port = 3308
 </programlisting>
+        </listitem>
 
-      <para>
-        Finally, use the
-        <option role="general">--defaults-option</option> option to
-        start each server with its own option file:
-      </para>
+        <listitem>
+          <para>
+            Use the <option role="general">--defaults-option</option>
+            option to start each server with its own option file:
+          </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput>
 C:\&gt; <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput>
 </programlisting>
 
-      <para>
-        Each server starts in the foreground (no new prompt appears
-        until the server exits later), so you will need to issue those
-        two commands in separate console windows.
-      </para>
+          <para>
+            Each server starts in the foreground (no new prompt appears
+            until the server exits later), so you will need to issue
+            those two commands in separate console windows.
+          </para>
+        </listitem>
 
+      </orderedlist>
+
       <para>
         To shut down the servers, connect to each using the appropriate
         port number:

@@ -379,7 +384,7 @@
       </para>
 
       <para>
-        A similar procedure applies for servers that you want to support
+        A similar procedure applies for servers that you want to permit
         shared-memory connections. Enable such connections with the
         <option role="mysqld">--shared-memory</option> option and
         specify a unique shared-memory name for each server with the

@@ -394,7 +399,7 @@
 
       <para>
         On Windows, a MySQL server can run as a Windows service. The
-        procedures for installing, controlling, and removing a single
+        procedure for installing, controlling, and removing a single
         MySQL service are described in
         <xref linkend="windows-start-service"/>.
       </para>

@@ -406,7 +411,7 @@
       </para>
 
       <para>
-        For the following instructions, assume that you want to run the
+        For the following instructions, suppose that you want to run the
         <command>mysqld</command> server from two different versions of
         MySQL that are installed at <filename>C:\mysql-5.0.92</filename>
         and <filename>C:\mysql-&current-version;</filename>,

@@ -480,8 +485,8 @@
       <para>
         Based on the preceding information, you have several ways to set
         up multiple services. The following instructions describe some
-        examples. Before trying any of them, be sure that you shut down
-        and remove any existing MySQL services first.
+        examples. Before trying any of them, be sure to shut down and
+        remove any existing MySQL services first.
       </para>
 
       <itemizedlist>

@@ -681,10 +686,10 @@
     </para>
 
     <para>
-      Note that if you specify <literal>localhost</literal> as a host
-      name, <command>mysqladmin</command> defaults to using a Unix
-      socket file connection rather than TCP/IP. To explicitly specify
-      the connection protocol, use the
+      If you specify <literal>localhost</literal> as the host name,
+      <command>mysqladmin</command> defaults to using a Unix socket file
+      connection rather than TCP/IP. To explicitly specify the
+      connection protocol, use the
       <option role="general">--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
       option.
     </para>

@@ -711,6 +716,22 @@
     </para>
 
     <para>
+      Alternatively, put the options for each server in a different
+      option file, then start each server using a
+      <option role="general">--defaults-file</option> option that
+      specifies the path to the appropriate option file. For example, if
+      the option files for two server instances are named
+      <filename>/usr/local/mysql/my.cnf</filename> and
+      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
+      like this: command:
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
+</programlisting>
+
+    <para>
       Another way to achieve a similar effect is to use environment
       variables to set the Unix socket file name and TCP/IP port number:
     </para>

@@ -751,31 +772,15 @@
 
     <para>
       <xref linkend="environment-variables"/>, includes a list of other
-      environment variables you can use to affect
-      <command>mysqld</command>.
+      environment variables you can use to affect MySQL programs.
     </para>
 
     <para>
-      Alternatively, put the options for each server in a different
-      option file, then start each server using a
-      <option role="general">--defaults-file</option> option that
-      specifies the path to the appropriate option file. For example, if
-      the option files for two server instances are named
-      <filename>/usr/local/mysql/my.cnf</filename> and
-      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
-      like this: command:
+      On Unix, the <command>mysqld_multi</command> script provides
+      another way to start multiple servers. See
+      <xref linkend="mysqld-multi"/>.
     </para>
 
-<programlisting>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
-</programlisting>
-
-    <para>
-      On Unix, the <command>mysqld_multi</command> script is another way
-      to start multiple servers. See <xref linkend="mysqld-multi"/>.
-    </para>
-
   </section>
 
   <section id="multiple-server-clients">


Modified: trunk/refman-5.5/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.5/dba-multiple-servers.xml	2011-02-08 19:16:27 UTC (rev 25015)
+++ trunk/refman-5.5/dba-multiple-servers.xml	2011-02-08 20:24:48 UTC (rev 25016)
Changed blocks: 20, Lines Added: 122, Lines Deleted: 117; 17680 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="multiple-servers">
 
-  <title>Running Multiple MySQL Instances on the Same Machine</title>
+  <title>Running Multiple MySQL Instances on One Machine</title>
 
   <indexterm>
     <primary>postinstall</primary>

@@ -32,7 +32,7 @@
 
   <para>
     In some cases, you might want to run multiple instances of MySQL on
-    the same machine. You might want to test a new MySQL release while
+    a single machine. You might want to test a new MySQL release while
     leaving an existing production setup undisturbed. Or you might want
     to give different users access to different
     <command>mysqld</command> servers that they manage themselves. (For

@@ -46,20 +46,25 @@
     the two approaches. For example, you might run a server from MySQL
     &previous-series; and one from MySQL &current-series;, to see how
     different versions handle a given workload. Or you might run
-    multiple instances of MySQL &current-version;, each managing a
-    different set of databases. However, whether or not you use distinct
-    servers, each instance you run must be configured with unique values
-    for several operating parameters. This eliminates the potential for
-    conflict between running servers. Parameters can be set on the
-    command line or in option files. See
+    multiple instances of the current production version, each managing
+    a different set of databases.
+  </para>
+
+  <para>
+    Whether or not you use distinct server binaries, each instance that
+    you run must be configured with unique values for several operating
+    parameters. This eliminates the potential for conflict between
+    instances. Parameters can be set on the command line, in option
+    files, or by setting environment variables. See
     <xref linkend="program-options"/>. To see the values used by a given
     server, connect to it and execute a <literal role="stmt">SHOW
     VARIABLES</literal> statement.
   </para>
 
   <para>
-    With very limited exceptions, each instance should use a different
-    data directory, which is specified using the
+    The primary resource managed by a MySQL instance is the data
+    directory, and each instance should use a different data directory.
+    The location is specified using the
     <option role="mysqld">--datadir=<replaceable>path</replaceable></option>
     option.
   </para>

@@ -73,44 +78,28 @@
       data directory and they have logging enabled, you must use the
       appropriate options to specify log file names that are unique to
       each server. Otherwise, the servers try to log to the same files.
-      Please note that this kind of setup only works with
-      <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
-      not with any of the other storage engines.
     </para>
 
     <para>
-      Even when the preceding precautions are observed, this warning
-      against sharing a data directory among servers still applies in an
-      NFS environment. Permitting multiple MySQL servers to access a
-      common data directory over NFS is a <emphasis>very bad
-      idea</emphasis>.
+      Even when the preceding precautions are observed, this kind of
+      setup only works with <literal>MyISAM</literal> and
+      <literal>MERGE</literal> tables, and not with any of the other
+      storage engines. Also, this warning against sharing a data
+      directory among servers always applies in an NFS environment.
+      Permitting multiple MySQL servers to access a common data
+      directory over NFS is a <emphasis>very bad idea</emphasis>. The
+      primary problem is that NFS is the speed bottleneck. It is not
+      meant for such use. Another risk with NFS is that you must devise
+      a way to ensure that two or more servers do not interfere with
+      each other. Usually NFS file locking is handled by the
+      <literal>lockd</literal> daemon, but at the moment there is no
+      platform that performs locking 100% reliably in every situation.
     </para>
   </warning>
 
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        The primary problem is that NFS is the speed bottleneck. It is
-        not meant for such use.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Another risk with NFS is that you must devise a way to ensure
-        that two or more servers do not interfere with each other.
-        Usually NFS file locking is handled by the
-        <literal>lockd</literal> daemon, but at the moment there is no
-        platform that performs locking 100% reliably in every situation.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     In addition to using different data directories, several other
-    options must be different for each server instance:
+    options must have different values for each server instance:
   </para>
 
   <itemizedlist>

@@ -124,8 +113,8 @@
         <option role="mysqld">--port</option> controls the port number
         for TCP/IP connections. (Alternatively, if the host has multiple
         network addresses, you can use
-        <option role="mysqld">--bind-address</option> to cause different
-        servers to listen to different interfaces.)
+        <option role="mysqld">--bind-address</option> to cause each
+        server to listen to a different address.)
       </para>
     </listitem>
 

@@ -138,7 +127,7 @@
         <option role="mysqld">--socket</option> controls the Unix socket
         file path on Unix or the named pipe name on Windows. On Windows,
         it is necessary to specify distinct pipe names only for those
-        servers that support named-pipe connections.
+        servers configured to permit named-pipe connections.
       </para>
     </listitem>
 

@@ -151,7 +140,7 @@
         This option is used only on Windows. It designates the
         shared-memory name used by a Windows server to permit clients to
         connect using shared memory. It is necessary to specify distinct
-        shared-memory names only for those servers that support
+        shared-memory names only for those servers configured to permit
         shared-memory connections.
       </para>
     </listitem>

@@ -170,7 +159,7 @@
   </itemizedlist>
 
   <para>
-    If you use the following log file options, they must be different
+    If you use the following log file options, their values must differ
     for each server:
   </para>
 

@@ -178,8 +167,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--general_log</option> or
-        <option role="mysqld">--log[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--general_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -191,8 +179,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--slow_query_log</option> or
-        <option role="mysqld">--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--slow_query_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -254,10 +241,10 @@
 
   <para>
     As discussed in the following sections, it is possible to start
-    additional servers by setting environment variables or by specifying
-    appropriate command-line options. However, if you need to run
-    multiple servers on a more permanent basis, it is more convenient to
-    use option files to specify for each server those option values that
+    additional servers by specifying appropriate command options or by
+    setting environment variables. However, if you need to run multiple
+    servers on a more permanent basis, it is more convenient to use
+    option files to specify for each server those option values that
     must be unique to it. The
     <option role="general">--defaults-file</option> option is useful for
     this purpose.

@@ -269,13 +256,13 @@
 
     <para>
       You can run multiple servers on Windows by starting them manually
-      from the command line, each with appropriate operating parameters.
-      You also have the option of installing several servers as Windows
-      services and running them that way. General instructions for
-      running MySQL servers from the command line or as services are
-      given in <xref linkend="windows-installation"/>. The following
-      sections describe how to start each server with different values
-      for those options that must be unique per server, such as the data
+      from the command line, each with appropriate operating parameters,
+      or by installing several servers as Windows services and running
+      them that way. General instructions for running MySQL from the
+      command line or as a service are given in
+      <xref linkend="windows-installation"/>. The following sections
+      describe how to start each server with different values for those
+      options that must be unique per server, such as the data
       directory. These options are listed in
       <xref linkend="multiple-servers"/>.
     </para>

@@ -285,62 +272,80 @@
       <title>Starting Multiple MySQL Instances at the Windows Command Line</title>
 
       <para>
-        To start multiple servers manually from the command line, you
-        can specify the appropriate options on the command line or in an
-        option file. It is more convenient to place the options in an
-        option file, but it is necessary to make sure that each server
-        gets its own set of options. To do this, create an option file
-        for each server and tell the server the file name with a
-        <option role="general">--defaults-file</option> option when you
-        run it.
+        The procedure for starting a single MySQL server manually from
+        the command line is described in
+        <xref linkend="windows-start-command-line"/>. To start multiple
+        servers this way, you can specify the appropriate options on the
+        command line or in an option file. It is more convenient to
+        place the options in an option file, but it is necessary to make
+        sure that each server gets its own set of options. To do this,
+        create an option file for each server and tell the server the
+        file name with a <option role="general">--defaults-file</option>
+        option when you run it.
       </para>
 
       <para>
         Suppose that you want to run <command>mysqld</command> on port
         3307 with a data directory of <filename>C:\mydata1</filename>,
         and <command>mysqld-debug</command> on port 3308 with a data
-        directory of <filename>C:\mydata2</filename>. First, make sure
-        that each data directory exists and has its own copy of the
-        <literal>mysql</literal> database that contains the grant
-        tables. Then, create two option files. For example, create one
-        file named <filename>C:\my-opts1.cnf</filename> that looks like
-        this:
+        directory of <filename>C:\mydata2</filename>. Use this
+        procedure:
       </para>
 
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Make sure that each data directory exists, including its own
+            copy of the <literal>mysql</literal> database that contains
+            the grant tables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create two option files. For example, create one file named
+            <filename>C:\my-opts1.cnf</filename> that looks like this:
+          </para>
+
 <programlisting>
 [mysqld]
 datadir = C:/mydata1
 port = 3307
 </programlisting>
 
-      <para>
-        Create a second file named <filename>C:\my-opts2.cnf</filename>
-        that looks like this:
-      </para>
+          <para>
+            Create a second file named
+            <filename>C:\my-opts2.cnf</filename> that looks like this:
+          </para>
 
 <programlisting>
 [mysqld]
 datadir = C:/mydata2
 port = 3308
 </programlisting>
+        </listitem>
 
-      <para>
-        Finally, use the
-        <option role="general">--defaults-option</option> option to
-        start each server with its own option file:
-      </para>
+        <listitem>
+          <para>
+            Use the <option role="general">--defaults-option</option>
+            option to start each server with its own option file:
+          </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput>
 C:\&gt; <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput>
 </programlisting>
 
-      <para>
-        Each server starts in the foreground (no new prompt appears
-        until the server exits later), so you will need to issue those
-        two commands in separate console windows.
-      </para>
+          <para>
+            Each server starts in the foreground (no new prompt appears
+            until the server exits later), so you will need to issue
+            those two commands in separate console windows.
+          </para>
+        </listitem>
 
+      </orderedlist>
+
       <para>
         To shut down the servers, connect to each using the appropriate
         port number:

@@ -378,7 +383,7 @@
       </para>
 
       <para>
-        A similar procedure applies for servers that you want to support
+        A similar procedure applies for servers that you want to permit
         shared-memory connections. Enable such connections with the
         <option role="mysqld">--shared-memory</option> option and
         specify a unique shared-memory name for each server with the

@@ -393,7 +398,7 @@
 
       <para>
         On Windows, a MySQL server can run as a Windows service. The
-        procedures for installing, controlling, and removing a single
+        procedure for installing, controlling, and removing a single
         MySQL service are described in
         <xref linkend="windows-start-service"/>.
       </para>

@@ -405,7 +410,7 @@
       </para>
 
       <para>
-        For the following instructions, assume that you want to run the
+        For the following instructions, suppose that you want to run the
         <command>mysqld</command> server from two different versions of
         MySQL that are installed at <filename>C:\mysql-5.1.55</filename>
         and <filename>C:\mysql-&current-version;</filename>,

@@ -479,8 +484,8 @@
       <para>
         Based on the preceding information, you have several ways to set
         up multiple services. The following instructions describe some
-        examples. Before trying any of them, be sure that you shut down
-        and remove any existing MySQL services first.
+        examples. Before trying any of them, be sure to shut down and
+        remove any existing MySQL services first.
       </para>
 
       <itemizedlist>

@@ -680,10 +685,10 @@
     </para>
 
     <para>
-      Note that if you specify <literal>localhost</literal> as a host
-      name, <command>mysqladmin</command> defaults to using a Unix
-      socket file connection rather than TCP/IP. To explicitly specify
-      the connection protocol, use the
+      If you specify <literal>localhost</literal> as the host name,
+      <command>mysqladmin</command> defaults to using a Unix socket file
+      connection rather than TCP/IP. To explicitly specify the
+      connection protocol, use the
       <option role="general">--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
       option.
     </para>

@@ -710,6 +715,22 @@
     </para>
 
     <para>
+      Alternatively, put the options for each server in a different
+      option file, then start each server using a
+      <option role="general">--defaults-file</option> option that
+      specifies the path to the appropriate option file. For example, if
+      the option files for two server instances are named
+      <filename>/usr/local/mysql/my.cnf</filename> and
+      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
+      like this: command:
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
+</programlisting>
+
+    <para>
       Another way to achieve a similar effect is to use environment
       variables to set the Unix socket file name and TCP/IP port number:
     </para>

@@ -750,31 +771,15 @@
 
     <para>
       <xref linkend="environment-variables"/>, includes a list of other
-      environment variables you can use to affect
-      <command>mysqld</command>.
+      environment variables you can use to affect MySQL programs.
     </para>
 
     <para>
-      Alternatively, put the options for each server in a different
-      option file, then start each server using a
-      <option role="general">--defaults-file</option> option that
-      specifies the path to the appropriate option file. For example, if
-      the option files for two server instances are named
-      <filename>/usr/local/mysql/my.cnf</filename> and
-      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
-      like this: command:
+      On Unix, the <command>mysqld_multi</command> script provides
+      another way to start multiple servers. See
+      <xref linkend="mysqld-multi"/>.
     </para>
 
-<programlisting>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
-</programlisting>
-
-    <para>
-      On Unix, the <command>mysqld_multi</command> script is another way
-      to start multiple servers. See <xref linkend="mysqld-multi"/>.
-    </para>
-
   </section>
 
   <section id="multiple-server-clients">


Modified: trunk/refman-5.6/dba-multiple-servers.xml
===================================================================
--- trunk/refman-5.6/dba-multiple-servers.xml	2011-02-08 19:16:27 UTC (rev 25015)
+++ trunk/refman-5.6/dba-multiple-servers.xml	2011-02-08 20:24:48 UTC (rev 25016)
Changed blocks: 20, Lines Added: 122, Lines Deleted: 117; 17679 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="multiple-servers">
 
-  <title>Running Multiple MySQL Instances on the Same Machine</title>
+  <title>Running Multiple MySQL Instances on One Machine</title>
 
   <indexterm>
     <primary>postinstall</primary>

@@ -32,7 +32,7 @@
 
   <para>
     In some cases, you might want to run multiple instances of MySQL on
-    the same machine. You might want to test a new MySQL release while
+    a single machine. You might want to test a new MySQL release while
     leaving an existing production setup undisturbed. Or you might want
     to give different users access to different
     <command>mysqld</command> servers that they manage themselves. (For

@@ -46,20 +46,25 @@
     the two approaches. For example, you might run a server from MySQL
     &previous-series; and one from MySQL &current-series;, to see how
     different versions handle a given workload. Or you might run
-    multiple instances of MySQL &current-version;, each managing a
-    different set of databases. However, whether or not you use distinct
-    servers, each instance you run must be configured with unique values
-    for several operating parameters. This eliminates the potential for
-    conflict between running servers. Parameters can be set on the
-    command line or in option files. See
+    multiple instances of the current production version, each managing
+    a different set of databases.
+  </para>
+
+  <para>
+    Whether or not you use distinct server binaries, each instance that
+    you run must be configured with unique values for several operating
+    parameters. This eliminates the potential for conflict between
+    instances. Parameters can be set on the command line, in option
+    files, or by setting environment variables. See
     <xref linkend="program-options"/>. To see the values used by a given
     server, connect to it and execute a <literal role="stmt">SHOW
     VARIABLES</literal> statement.
   </para>
 
   <para>
-    With very limited exceptions, each instance should use a different
-    data directory, which is specified using the
+    The primary resource managed by a MySQL instance is the data
+    directory, and each instance should use a different data directory.
+    The location is specified using the
     <option role="mysqld">--datadir=<replaceable>path</replaceable></option>
     option.
   </para>

@@ -73,44 +78,28 @@
       data directory and they have logging enabled, you must use the
       appropriate options to specify log file names that are unique to
       each server. Otherwise, the servers try to log to the same files.
-      Please note that this kind of setup only works with
-      <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
-      not with any of the other storage engines.
     </para>
 
     <para>
-      Even when the preceding precautions are observed, this warning
-      against sharing a data directory among servers still applies in an
-      NFS environment. Permitting multiple MySQL servers to access a
-      common data directory over NFS is a <emphasis>very bad
-      idea</emphasis>.
+      Even when the preceding precautions are observed, this kind of
+      setup only works with <literal>MyISAM</literal> and
+      <literal>MERGE</literal> tables, and not with any of the other
+      storage engines. Also, this warning against sharing a data
+      directory among servers always applies in an NFS environment.
+      Permitting multiple MySQL servers to access a common data
+      directory over NFS is a <emphasis>very bad idea</emphasis>. The
+      primary problem is that NFS is the speed bottleneck. It is not
+      meant for such use. Another risk with NFS is that you must devise
+      a way to ensure that two or more servers do not interfere with
+      each other. Usually NFS file locking is handled by the
+      <literal>lockd</literal> daemon, but at the moment there is no
+      platform that performs locking 100% reliably in every situation.
     </para>
   </warning>
 
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        The primary problem is that NFS is the speed bottleneck. It is
-        not meant for such use.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Another risk with NFS is that you must devise a way to ensure
-        that two or more servers do not interfere with each other.
-        Usually NFS file locking is handled by the
-        <literal>lockd</literal> daemon, but at the moment there is no
-        platform that performs locking 100% reliably in every situation.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     In addition to using different data directories, several other
-    options must be different for each server instance:
+    options must have different values for each server instance:
   </para>
 
   <itemizedlist>

@@ -124,8 +113,8 @@
         <option role="mysqld">--port</option> controls the port number
         for TCP/IP connections. (Alternatively, if the host has multiple
         network addresses, you can use
-        <option role="mysqld">--bind-address</option> to cause different
-        servers to listen to different interfaces.)
+        <option role="mysqld">--bind-address</option> to cause each
+        server to listen to a different address.)
       </para>
     </listitem>
 

@@ -138,7 +127,7 @@
         <option role="mysqld">--socket</option> controls the Unix socket
         file path on Unix or the named pipe name on Windows. On Windows,
         it is necessary to specify distinct pipe names only for those
-        servers that support named-pipe connections.
+        servers configured to permit named-pipe connections.
       </para>
     </listitem>
 

@@ -151,7 +140,7 @@
         This option is used only on Windows. It designates the
         shared-memory name used by a Windows server to permit clients to
         connect using shared memory. It is necessary to specify distinct
-        shared-memory names only for those servers that support
+        shared-memory names only for those servers configured to permit
         shared-memory connections.
       </para>
     </listitem>

@@ -170,7 +159,7 @@
   </itemizedlist>
 
   <para>
-    If you use the following log file options, they must be different
+    If you use the following log file options, their values must differ
     for each server:
   </para>
 

@@ -178,8 +167,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--general_log</option> or
-        <option role="mysqld">--log[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--general_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -191,8 +179,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--slow_query_log</option> or
-        <option role="mysqld">--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--slow_query_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -254,10 +241,10 @@
 
   <para>
     As discussed in the following sections, it is possible to start
-    additional servers by setting environment variables or by specifying
-    appropriate command-line options. However, if you need to run
-    multiple servers on a more permanent basis, it is more convenient to
-    use option files to specify for each server those option values that
+    additional servers by specifying appropriate command options or by
+    setting environment variables. However, if you need to run multiple
+    servers on a more permanent basis, it is more convenient to use
+    option files to specify for each server those option values that
     must be unique to it. The
     <option role="general">--defaults-file</option> option is useful for
     this purpose.

@@ -269,13 +256,13 @@
 
     <para>
       You can run multiple servers on Windows by starting them manually
-      from the command line, each with appropriate operating parameters.
-      You also have the option of installing several servers as Windows
-      services and running them that way. General instructions for
-      running MySQL servers from the command line or as services are
-      given in <xref linkend="windows-installation"/>. The following
-      sections describe how to start each server with different values
-      for those options that must be unique per server, such as the data
+      from the command line, each with appropriate operating parameters,
+      or by installing several servers as Windows services and running
+      them that way. General instructions for running MySQL from the
+      command line or as a service are given in
+      <xref linkend="windows-installation"/>. The following sections
+      describe how to start each server with different values for those
+      options that must be unique per server, such as the data
       directory. These options are listed in
       <xref linkend="multiple-servers"/>.
     </para>

@@ -285,62 +272,80 @@
       <title>Starting Multiple MySQL Instances at the Windows Command Line</title>
 
       <para>
-        To start multiple servers manually from the command line, you
-        can specify the appropriate options on the command line or in an
-        option file. It is more convenient to place the options in an
-        option file, but it is necessary to make sure that each server
-        gets its own set of options. To do this, create an option file
-        for each server and tell the server the file name with a
-        <option role="general">--defaults-file</option> option when you
-        run it.
+        The procedure for starting a single MySQL server manually from
+        the command line is described in
+        <xref linkend="windows-start-command-line"/>. To start multiple
+        servers this way, you can specify the appropriate options on the
+        command line or in an option file. It is more convenient to
+        place the options in an option file, but it is necessary to make
+        sure that each server gets its own set of options. To do this,
+        create an option file for each server and tell the server the
+        file name with a <option role="general">--defaults-file</option>
+        option when you run it.
       </para>
 
       <para>
         Suppose that you want to run <command>mysqld</command> on port
         3307 with a data directory of <filename>C:\mydata1</filename>,
         and <command>mysqld-debug</command> on port 3308 with a data
-        directory of <filename>C:\mydata2</filename>. First, make sure
-        that each data directory exists and has its own copy of the
-        <literal>mysql</literal> database that contains the grant
-        tables. Then, create two option files. For example, create one
-        file named <filename>C:\my-opts1.cnf</filename> that looks like
-        this:
+        directory of <filename>C:\mydata2</filename>. Use this
+        procedure:
       </para>
 
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Make sure that each data directory exists, including its own
+            copy of the <literal>mysql</literal> database that contains
+            the grant tables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create two option files. For example, create one file named
+            <filename>C:\my-opts1.cnf</filename> that looks like this:
+          </para>
+
 <programlisting>
 [mysqld]
 datadir = C:/mydata1
 port = 3307
 </programlisting>
 
-      <para>
-        Create a second file named <filename>C:\my-opts2.cnf</filename>
-        that looks like this:
-      </para>
+          <para>
+            Create a second file named
+            <filename>C:\my-opts2.cnf</filename> that looks like this:
+          </para>
 
 <programlisting>
 [mysqld]
 datadir = C:/mydata2
 port = 3308
 </programlisting>
+        </listitem>
 
-      <para>
-        Finally, use the
-        <option role="general">--defaults-option</option> option to
-        start each server with its own option file:
-      </para>
+        <listitem>
+          <para>
+            Use the <option role="general">--defaults-option</option>
+            option to start each server with its own option file:
+          </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput>
 C:\&gt; <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput>
 </programlisting>
 
-      <para>
-        Each server starts in the foreground (no new prompt appears
-        until the server exits later), so you will need to issue those
-        two commands in separate console windows.
-      </para>
+          <para>
+            Each server starts in the foreground (no new prompt appears
+            until the server exits later), so you will need to issue
+            those two commands in separate console windows.
+          </para>
+        </listitem>
 
+      </orderedlist>
+
       <para>
         To shut down the servers, connect to each using the appropriate
         port number:

@@ -378,7 +383,7 @@
       </para>
 
       <para>
-        A similar procedure applies for servers that you want to support
+        A similar procedure applies for servers that you want to permit
         shared-memory connections. Enable such connections with the
         <option role="mysqld">--shared-memory</option> option and
         specify a unique shared-memory name for each server with the

@@ -393,7 +398,7 @@
 
       <para>
         On Windows, a MySQL server can run as a Windows service. The
-        procedures for installing, controlling, and removing a single
+        procedure for installing, controlling, and removing a single
         MySQL service are described in
         <xref linkend="windows-start-service"/>.
       </para>

@@ -405,7 +410,7 @@
       </para>
 
       <para>
-        For the following instructions, assume that you want to run the
+        For the following instructions, suppose that you want to run the
         <command>mysqld</command> server from two different versions of
         MySQL that are installed at <filename>C:\mysql-5.5.9</filename>
         and <filename>C:\mysql-&current-version;</filename>,

@@ -479,8 +484,8 @@
       <para>
         Based on the preceding information, you have several ways to set
         up multiple services. The following instructions describe some
-        examples. Before trying any of them, be sure that you shut down
-        and remove any existing MySQL services first.
+        examples. Before trying any of them, be sure to shut down and
+        remove any existing MySQL services first.
       </para>
 
       <itemizedlist>

@@ -680,10 +685,10 @@
     </para>
 
     <para>
-      Note that if you specify <literal>localhost</literal> as a host
-      name, <command>mysqladmin</command> defaults to using a Unix
-      socket file connection rather than TCP/IP. To explicitly specify
-      the connection protocol, use the
+      If you specify <literal>localhost</literal> as the host name,
+      <command>mysqladmin</command> defaults to using a Unix socket file
+      connection rather than TCP/IP. To explicitly specify the
+      connection protocol, use the
       <option role="general">--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
       option.
     </para>

@@ -710,6 +715,22 @@
     </para>
 
     <para>
+      Alternatively, put the options for each server in a different
+      option file, then start each server using a
+      <option role="general">--defaults-file</option> option that
+      specifies the path to the appropriate option file. For example, if
+      the option files for two server instances are named
+      <filename>/usr/local/mysql/my.cnf</filename> and
+      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
+      like this: command:
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
+</programlisting>
+
+    <para>
       Another way to achieve a similar effect is to use environment
       variables to set the Unix socket file name and TCP/IP port number:
     </para>

@@ -750,31 +771,15 @@
 
     <para>
       <xref linkend="environment-variables"/>, includes a list of other
-      environment variables you can use to affect
-      <command>mysqld</command>.
+      environment variables you can use to affect MySQL programs.
     </para>
 
     <para>
-      Alternatively, put the options for each server in a different
-      option file, then start each server using a
-      <option role="general">--defaults-file</option> option that
-      specifies the path to the appropriate option file. For example, if
-      the option files for two server instances are named
-      <filename>/usr/local/mysql/my.cnf</filename> and
-      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
-      like this: command:
+      On Unix, the <command>mysqld_multi</command> script provides
+      another way to start multiple servers. See
+      <xref linkend="mysqld-multi"/>.
     </para>
 
-<programlisting>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
-</programlisting>
-
-    <para>
-      On Unix, the <command>mysqld_multi</command> script is another way
-      to start multiple servers. See <xref linkend="mysqld-multi"/>.
-    </para>
-
   </section>
 
   <section id="multiple-server-clients">


Modified: trunk/refman-6.0/dba-multiple-servers.xml
===================================================================
--- trunk/refman-6.0/dba-multiple-servers.xml	2011-02-08 19:16:27 UTC (rev 25015)
+++ trunk/refman-6.0/dba-multiple-servers.xml	2011-02-08 20:24:48 UTC (rev 25016)
Changed blocks: 20, Lines Added: 122, Lines Deleted: 117; 17680 bytes

@@ -5,7 +5,7 @@
 ]>
 <section id="multiple-servers">
 
-  <title>Running Multiple MySQL Instances on the Same Machine</title>
+  <title>Running Multiple MySQL Instances on One Machine</title>
 
   <indexterm>
     <primary>postinstall</primary>

@@ -32,7 +32,7 @@
 
   <para>
     In some cases, you might want to run multiple instances of MySQL on
-    the same machine. You might want to test a new MySQL release while
+    a single machine. You might want to test a new MySQL release while
     leaving an existing production setup undisturbed. Or you might want
     to give different users access to different
     <command>mysqld</command> servers that they manage themselves. (For

@@ -46,20 +46,25 @@
     the two approaches. For example, you might run a server from MySQL
     &previous-series; and one from MySQL &current-series;, to see how
     different versions handle a given workload. Or you might run
-    multiple instances of MySQL &current-version;, each managing a
-    different set of databases. However, whether or not you use distinct
-    servers, each instance you run must be configured with unique values
-    for several operating parameters. This eliminates the potential for
-    conflict between running servers. Parameters can be set on the
-    command line or in option files. See
+    multiple instances of the current production version, each managing
+    a different set of databases.
+  </para>
+
+  <para>
+    Whether or not you use distinct server binaries, each instance that
+    you run must be configured with unique values for several operating
+    parameters. This eliminates the potential for conflict between
+    instances. Parameters can be set on the command line, in option
+    files, or by setting environment variables. See
     <xref linkend="program-options"/>. To see the values used by a given
     server, connect to it and execute a <literal role="stmt">SHOW
     VARIABLES</literal> statement.
   </para>
 
   <para>
-    With very limited exceptions, each instance should use a different
-    data directory, which is specified using the
+    The primary resource managed by a MySQL instance is the data
+    directory, and each instance should use a different data directory.
+    The location is specified using the
     <option role="mysqld">--datadir=<replaceable>path</replaceable></option>
     option.
   </para>

@@ -73,44 +78,28 @@
       data directory and they have logging enabled, you must use the
       appropriate options to specify log file names that are unique to
       each server. Otherwise, the servers try to log to the same files.
-      Please note that this kind of setup only works with
-      <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
-      not with any of the other storage engines.
     </para>
 
     <para>
-      Even when the preceding precautions are observed, this warning
-      against sharing a data directory among servers still applies in an
-      NFS environment. Permitting multiple MySQL servers to access a
-      common data directory over NFS is a <emphasis>very bad
-      idea</emphasis>.
+      Even when the preceding precautions are observed, this kind of
+      setup only works with <literal>MyISAM</literal> and
+      <literal>MERGE</literal> tables, and not with any of the other
+      storage engines. Also, this warning against sharing a data
+      directory among servers always applies in an NFS environment.
+      Permitting multiple MySQL servers to access a common data
+      directory over NFS is a <emphasis>very bad idea</emphasis>. The
+      primary problem is that NFS is the speed bottleneck. It is not
+      meant for such use. Another risk with NFS is that you must devise
+      a way to ensure that two or more servers do not interfere with
+      each other. Usually NFS file locking is handled by the
+      <literal>lockd</literal> daemon, but at the moment there is no
+      platform that performs locking 100% reliably in every situation.
     </para>
   </warning>
 
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        The primary problem is that NFS is the speed bottleneck. It is
-        not meant for such use.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Another risk with NFS is that you must devise a way to ensure
-        that two or more servers do not interfere with each other.
-        Usually NFS file locking is handled by the
-        <literal>lockd</literal> daemon, but at the moment there is no
-        platform that performs locking 100% reliably in every situation.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
   <para>
     In addition to using different data directories, several other
-    options must be different for each server instance:
+    options must have different values for each server instance:
   </para>
 
   <itemizedlist>

@@ -124,8 +113,8 @@
         <option role="mysqld">--port</option> controls the port number
         for TCP/IP connections. (Alternatively, if the host has multiple
         network addresses, you can use
-        <option role="mysqld">--bind-address</option> to cause different
-        servers to listen to different interfaces.)
+        <option role="mysqld">--bind-address</option> to cause each
+        server to listen to a different address.)
       </para>
     </listitem>
 

@@ -138,7 +127,7 @@
         <option role="mysqld">--socket</option> controls the Unix socket
         file path on Unix or the named pipe name on Windows. On Windows,
         it is necessary to specify distinct pipe names only for those
-        servers that support named-pipe connections.
+        servers configured to permit named-pipe connections.
       </para>
     </listitem>
 

@@ -151,7 +140,7 @@
         This option is used only on Windows. It designates the
         shared-memory name used by a Windows server to permit clients to
         connect using shared memory. It is necessary to specify distinct
-        shared-memory names only for those servers that support
+        shared-memory names only for those servers configured to permit
         shared-memory connections.
       </para>
     </listitem>

@@ -170,7 +159,7 @@
   </itemizedlist>
 
   <para>
-    If you use the following log file options, they must be different
+    If you use the following log file options, their values must differ
     for each server:
   </para>
 

@@ -178,8 +167,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--general_log</option> or
-        <option role="mysqld">--log[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--general_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -191,8 +179,7 @@
 
     <listitem>
       <para>
-        <option role="sysvar">--slow_query_log</option> or
-        <option role="mysqld">--log-slow-queries[=<replaceable>file_name</replaceable>]</option>
+        <option role="sysvar">--slow_query_log_file=<replaceable>file_name</replaceable></option>
       </para>
     </listitem>
 

@@ -254,10 +241,10 @@
 
   <para>
     As discussed in the following sections, it is possible to start
-    additional servers by setting environment variables or by specifying
-    appropriate command-line options. However, if you need to run
-    multiple servers on a more permanent basis, it is more convenient to
-    use option files to specify for each server those option values that
+    additional servers by specifying appropriate command options or by
+    setting environment variables. However, if you need to run multiple
+    servers on a more permanent basis, it is more convenient to use
+    option files to specify for each server those option values that
     must be unique to it. The
     <option role="general">--defaults-file</option> option is useful for
     this purpose.

@@ -269,13 +256,13 @@
 
     <para>
       You can run multiple servers on Windows by starting them manually
-      from the command line, each with appropriate operating parameters.
-      You also have the option of installing several servers as Windows
-      services and running them that way. General instructions for
-      running MySQL servers from the command line or as services are
-      given in <xref linkend="windows-installation"/>. The following
-      sections describe how to start each server with different values
-      for those options that must be unique per server, such as the data
+      from the command line, each with appropriate operating parameters,
+      or by installing several servers as Windows services and running
+      them that way. General instructions for running MySQL from the
+      command line or as a service are given in
+      <xref linkend="windows-installation"/>. The following sections
+      describe how to start each server with different values for those
+      options that must be unique per server, such as the data
       directory. These options are listed in
       <xref linkend="multiple-servers"/>.
     </para>

@@ -285,62 +272,80 @@
       <title>Starting Multiple MySQL Instances at the Windows Command Line</title>
 
       <para>
-        To start multiple servers manually from the command line, you
-        can specify the appropriate options on the command line or in an
-        option file. It is more convenient to place the options in an
-        option file, but it is necessary to make sure that each server
-        gets its own set of options. To do this, create an option file
-        for each server and tell the server the file name with a
-        <option role="general">--defaults-file</option> option when you
-        run it.
+        The procedure for starting a single MySQL server manually from
+        the command line is described in
+        <xref linkend="windows-start-command-line"/>. To start multiple
+        servers this way, you can specify the appropriate options on the
+        command line or in an option file. It is more convenient to
+        place the options in an option file, but it is necessary to make
+        sure that each server gets its own set of options. To do this,
+        create an option file for each server and tell the server the
+        file name with a <option role="general">--defaults-file</option>
+        option when you run it.
       </para>
 
       <para>
         Suppose that you want to run <command>mysqld</command> on port
         3307 with a data directory of <filename>C:\mydata1</filename>,
         and <command>mysqld-debug</command> on port 3308 with a data
-        directory of <filename>C:\mydata2</filename>. First, make sure
-        that each data directory exists and has its own copy of the
-        <literal>mysql</literal> database that contains the grant
-        tables. Then, create two option files. For example, create one
-        file named <filename>C:\my-opts1.cnf</filename> that looks like
-        this:
+        directory of <filename>C:\mydata2</filename>. Use this
+        procedure:
       </para>
 
+      <orderedlist>
+
+        <listitem>
+          <para>
+            Make sure that each data directory exists, including its own
+            copy of the <literal>mysql</literal> database that contains
+            the grant tables.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Create two option files. For example, create one file named
+            <filename>C:\my-opts1.cnf</filename> that looks like this:
+          </para>
+
 <programlisting>
 [mysqld]
 datadir = C:/mydata1
 port = 3307
 </programlisting>
 
-      <para>
-        Create a second file named <filename>C:\my-opts2.cnf</filename>
-        that looks like this:
-      </para>
+          <para>
+            Create a second file named
+            <filename>C:\my-opts2.cnf</filename> that looks like this:
+          </para>
 
 <programlisting>
 [mysqld]
 datadir = C:/mydata2
 port = 3308
 </programlisting>
+        </listitem>
 
-      <para>
-        Finally, use the
-        <option role="general">--defaults-option</option> option to
-        start each server with its own option file:
-      </para>
+        <listitem>
+          <para>
+            Use the <option role="general">--defaults-option</option>
+            option to start each server with its own option file:
+          </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqld --defaults-file=C:\my-opts1.cnf</userinput>
 C:\&gt; <userinput>C:\mysql\bin\mysqld-debug --defaults-file=C:\my-opts2.cnf</userinput>
 </programlisting>
 
-      <para>
-        Each server starts in the foreground (no new prompt appears
-        until the server exits later), so you will need to issue those
-        two commands in separate console windows.
-      </para>
+          <para>
+            Each server starts in the foreground (no new prompt appears
+            until the server exits later), so you will need to issue
+            those two commands in separate console windows.
+          </para>
+        </listitem>
 
+      </orderedlist>
+
       <para>
         To shut down the servers, connect to each using the appropriate
         port number:

@@ -378,7 +383,7 @@
       </para>
 
       <para>
-        A similar procedure applies for servers that you want to support
+        A similar procedure applies for servers that you want to permit
         shared-memory connections. Enable such connections with the
         <option role="mysqld">--shared-memory</option> option and
         specify a unique shared-memory name for each server with the

@@ -393,7 +398,7 @@
 
       <para>
         On Windows, a MySQL server can run as a Windows service. The
-        procedures for installing, controlling, and removing a single
+        procedure for installing, controlling, and removing a single
         MySQL service are described in
         <xref linkend="windows-start-service"/>.
       </para>

@@ -405,7 +410,7 @@
       </para>
 
       <para>
-        For the following instructions, assume that you want to run the
+        For the following instructions, suppose that you want to run the
         <command>mysqld</command> server from two different versions of
         MySQL that are installed at <filename>C:\mysql-5.1.55</filename>
         and <filename>C:\mysql-&current-version;</filename>,

@@ -479,8 +484,8 @@
       <para>
         Based on the preceding information, you have several ways to set
         up multiple services. The following instructions describe some
-        examples. Before trying any of them, be sure that you shut down
-        and remove any existing MySQL services first.
+        examples. Before trying any of them, be sure to shut down and
+        remove any existing MySQL services first.
       </para>
 
       <itemizedlist>

@@ -680,10 +685,10 @@
     </para>
 
     <para>
-      Note that if you specify <literal>localhost</literal> as a host
-      name, <command>mysqladmin</command> defaults to using a Unix
-      socket file connection rather than TCP/IP. To explicitly specify
-      the connection protocol, use the
+      If you specify <literal>localhost</literal> as the host name,
+      <command>mysqladmin</command> defaults to using a Unix socket file
+      connection rather than TCP/IP. To explicitly specify the
+      connection protocol, use the
       <option role="general">--protocol={TCP|SOCKET|PIPE|MEMORY}</option>
       option.
     </para>

@@ -710,6 +715,22 @@
     </para>
 
     <para>
+      Alternatively, put the options for each server in a different
+      option file, then start each server using a
+      <option role="general">--defaults-file</option> option that
+      specifies the path to the appropriate option file. For example, if
+      the option files for two server instances are named
+      <filename>/usr/local/mysql/my.cnf</filename> and
+      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
+      like this: command:
+    </para>
+
+<programlisting>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
+shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
+</programlisting>
+
+    <para>
       Another way to achieve a similar effect is to use environment
       variables to set the Unix socket file name and TCP/IP port number:
     </para>

@@ -750,31 +771,15 @@
 
     <para>
       <xref linkend="environment-variables"/>, includes a list of other
-      environment variables you can use to affect
-      <command>mysqld</command>.
+      environment variables you can use to affect MySQL programs.
     </para>
 
     <para>
-      Alternatively, put the options for each server in a different
-      option file, then start each server using a
-      <option role="general">--defaults-file</option> option that
-      specifies the path to the appropriate option file. For example, if
-      the option files for two server instances are named
-      <filename>/usr/local/mysql/my.cnf</filename> and
-      <filename>/usr/local/mysql/my.cnf2</filename>, start the servers
-      like this: command:
+      On Unix, the <command>mysqld_multi</command> script provides
+      another way to start multiple servers. See
+      <xref linkend="mysqld-multi"/>.
     </para>
 
-<programlisting>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf</userinput>
-shell&gt; <userinput>mysqld_safe --defaults-file=/usr/local/mysql/my.cnf2</userinput>
-</programlisting>
-
-    <para>
-      On Unix, the <command>mysqld_multi</command> script is another way
-      to start multiple servers. See <xref linkend="mysqld-multi"/>.
-    </para>
-
   </section>
 
   <section id="multiple-server-clients">


Thread
svn commit - mysqldoc@docsrva: r25016 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois8 Feb