List:Commits« Previous MessageNext Message »
From:paul Date:January 22 2006 4:22pm
Subject:svn commit - mysqldoc@docsrva: r987 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-22 17:22:10 +0100 (Sun, 22 Jan 2006)
New Revision: 987

Log:
 r6554@frost:  paul | 2006-01-22 10:18:30 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/using-mysql-programs.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/using-mysql-programs.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/using-mysql-programs.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-4.1/database-administration.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1373,7 +1373,7 @@
             </para>
 
             <para>
-              The path to the process ID file used by
+              The pathname of the process ID file used by
               <command>mysqld_safe</command>.
             </para>
           </listitem>
@@ -1386,7 +1386,9 @@
 
             <para>
               The port number to use when listening for TCP/IP
-              connections.
+              connections. The port number must be 1024 or higher unless
+              the server is started by the <literal>root</literal>
+              system user.
             </para>
           </listitem>
 
@@ -1784,11 +1786,11 @@
 
             <para>
               On Unix, this option specifies the Unix socket file to use
-              for local connections. The default value is
+              when listening for local connections. The default value is
               <filename>/tmp/mysql.sock</filename>. On Windows, the
-              option specifies the pipe name to use for local
-              connections that use a named pipe. The default value is
-              <literal>MySQL</literal>.
+              option specifies the pipe name to use when listening for
+              local connections that use a named pipe. The default value
+              is <literal>MySQL</literal>.
             </para>
           </listitem>
 
@@ -8406,18 +8408,20 @@
 
               <para>
                 The name of an option file to be read in addition to the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--defaults-file=<replaceable>path</replaceable></option>
+                <option>--defaults-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
                 The name of an option file to be read instead of the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
@@ -8438,9 +8442,9 @@
               </para>
 
               <para>
-                The path to the directory containing the
-                <command>mysqld</command> program. Use this option to
-                explicitly indicate the location of the server.
+                If <command>mysqld_safe</command> cannot find the
+                server, use this option to indicate the pathname to the
+                directory where the server is located.
               </para>
             </listitem>
 
@@ -8465,7 +8469,10 @@
                 <literal>ledir</literal> directory) that you want to
                 start. This option is needed if you use the MySQL binary
                 distribution but have the data directory outside of the
-                binary distribution.
+                binary distribution. If <command>mysqld_safe</command>
+                cannot find the server, use the <option>--ledir</option>
+                option to indicate the pathname to the directory where
+                the server is located.
               </para>
             </listitem>
 
@@ -8508,8 +8515,8 @@
               </para>
 
               <para>
-                Do not read any option files. If given, this option must
-                be first.
+                Do not read any option files. This must be the first
+                option on the command line if it is used.
               </para>
             </listitem>
 
@@ -8519,8 +8526,8 @@
               </para>
 
               <para>
-                The number of files <command>mysqld</command> should be
-                able to open. The option value is passed to
+                The number of files that <command>mysqld</command>
+                should be able to open. The option value is passed to
                 <command>ulimit -n</command>. Note that you need to
                 start <command>mysqld_safe</command> as
                 <literal>root</literal> for this to work properly.
@@ -8529,11 +8536,11 @@
 
             <listitem>
               <para>
-                <option>--pid-file=<replaceable>path</replaceable></option>
+                <option>--pid-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
-                The path to the process ID file.
+                The pathname of the process ID file.
               </para>
             </listitem>
 
@@ -8543,10 +8550,10 @@
               </para>
 
               <para>
-                The port number to use when listening for TCP/IP
-                connections. The port number must be
-                <literal>1024</literal> or higher unless MySQL is run as
-                the <literal>root</literal> system user.
+                The port number that the server should use when
+                listening for TCP/IP connections. The port number must
+                be 1024 or higher unless the server is started by the
+                <literal>root</literal> system user.
               </para>
             </listitem>
 
@@ -8556,7 +8563,8 @@
               </para>
 
               <para>
-                The Unix socket file to use for local connections.
+                The Unix socket file that the server should use when
+                listening for local connections.
               </para>
             </listitem>
 
@@ -8592,15 +8600,16 @@
           </itemizedlist>
 
           <para>
-            When executing <command>mysqld_safe</command>, the
+            If you execute <command>mysqld_safe</command> with the
             <option>--defaults-file</option> or
-            <option>--defaults-extra-option</option> must be given
-            first, or the option file will not be used. For example,
-            this command will not use the named option file:
+            <option>--defaults-extra-option</option> option to name an
+            option file, the option must be the first one given on the
+            command line or the option file will not be used. For
+            example, this command will not use the named option file:
           </para>
 
 <programlisting>
-mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable>
+mysql&gt; <userinput>mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -8608,7 +8617,7 @@
           </para>
 
 <programlisting>
-mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable>
+mysql&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -8627,11 +8636,11 @@
             <listitem>
               <para>
                 The server and databases can be found relative to the
-                directory from which <command>mysqld_safe</command> is
-                invoked. For binary distributions,
-                <command>mysqld_safe</command> looks under its working
-                directory for <filename>bin</filename> and
-                <filename>data</filename> directories. For source
+                working directory (the directory from which
+                <command>mysqld_safe</command> is invoked). For binary
+                distributions, <command>mysqld_safe</command> looks
+                under its working directory for <filename>bin</filename>
+                and <filename>data</filename> directories. For source
                 distributions, it looks for <filename>libexec</filename>
                 and <filename>var</filename> directories. This condition
                 should be met if you execute
@@ -8667,7 +8676,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>cd mysql_installation_directory</userinput>
+shell&gt; <userinput>cd <replaceable>mysql_installation_directory</replaceable></userinput>
 shell&gt; <userinput>bin/mysqld_safe &amp;</userinput>
 </programlisting>
 
@@ -8696,7 +8705,7 @@
           <para>
             On NetWare, <command>mysqld_safe</command> is a NetWare
             Loadable Module (NLM) that is ported from the original Unix
-            shell script. It does the following:
+            shell script. It starts the server as follows:
           </para>
 
           <orderedlist>
@@ -21949,12 +21958,12 @@
 
       <listitem>
         <para>
-          <option>--pid-file=<replaceable>path</replaceable></option>
+          <option>--pid-file=<replaceable>file_name</replaceable></option>
         </para>
 
         <para>
-          This option is used only on Unix. It indicates the name of the
-          file in which the server writes its process ID.
+          This option is used only on Unix. It indicates the pathname of
+          the file in which the server writes its process ID.
         </para>
       </listitem>
 
@@ -22632,7 +22641,7 @@
       </para>
 
 <programlisting>
-mysqld_safe --defaults-file=path
+shell&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-4.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-4.1/using-mysql-programs.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-4.1/using-mysql-programs.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1224,25 +1224,25 @@
 
         <listitem>
           <para>
-            <option>--defaults-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Use only the given option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <option>--defaults-extra-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-extra-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Read this option file after the global option file but (on
             Unix) before the user option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-5.0/database-administration.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1379,7 +1379,7 @@
             </para>
 
             <para>
-              The path to the process ID file used by
+              The pathname of the process ID file used by
               <command>mysqld_safe</command>.
             </para>
           </listitem>
@@ -1392,7 +1392,9 @@
 
             <para>
               The port number to use when listening for TCP/IP
-              connections.
+              connections. The port number must be 1024 or higher unless
+              the server is started by the <literal>root</literal>
+              system user.
             </para>
           </listitem>
 
@@ -1746,11 +1748,11 @@
 
             <para>
               On Unix, this option specifies the Unix socket file to use
-              for local connections. The default value is
+              when listening for local connections. The default value is
               <filename>/tmp/mysql.sock</filename>. On Windows, the
-              option specifies the pipe name to use for local
-              connections that use a named pipe. The default value is
-              <literal>MySQL</literal>.
+              option specifies the pipe name to use when listening for
+              local connections that use a named pipe. The default value
+              is <literal>MySQL</literal>.
             </para>
           </listitem>
 
@@ -9597,18 +9599,20 @@
 
               <para>
                 The name of an option file to be read in addition to the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--defaults-file=<replaceable>path</replaceable></option>
+                <option>--defaults-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
                 The name of an option file to be read instead of the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
@@ -9618,9 +9622,9 @@
               </para>
 
               <para>
-                The path to the directory containing the
-                <command>mysqld</command> program. Use this option to
-                explicitly indicate the location of the server.
+                If <command>mysqld_safe</command> cannot find the
+                server, use this option to indicate the pathname to the
+                directory where the server is located.
               </para>
             </listitem>
 
@@ -9645,7 +9649,10 @@
                 <literal>ledir</literal> directory) that you want to
                 start. This option is needed if you use the MySQL binary
                 distribution but have the data directory outside of the
-                binary distribution.
+                binary distribution. If <command>mysqld_safe</command>
+                cannot find the server, use the <option>--ledir</option>
+                option to indicate the pathname to the directory where
+                the server is located.
               </para>
             </listitem>
 
@@ -9687,8 +9694,8 @@
               </para>
 
               <para>
-                Do not read any option files. If given, this option must
-                be first.
+                Do not read any option files. This must be the first
+                option on the command line if it is used.
               </para>
             </listitem>
 
@@ -9698,8 +9705,8 @@
               </para>
 
               <para>
-                The number of files <command>mysqld</command> should be
-                able to open. The option value is passed to
+                The number of files that <command>mysqld</command>
+                should be able to open. The option value is passed to
                 <command>ulimit -n</command>. Note that you need to
                 start <command>mysqld_safe</command> as
                 <literal>root</literal> for this to work properly!
@@ -9708,11 +9715,11 @@
 
             <listitem>
               <para>
-                <option>--pid-file=<replaceable>path</replaceable></option>
+                <option>--pid-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
-                The path to the process ID file.
+                The pathname of the process ID file.
               </para>
             </listitem>
 
@@ -9722,10 +9729,10 @@
               </para>
 
               <para>
-                The port number to use when listening for TCP/IP
-                connections. The port number must be
-                <literal>1024</literal> or higher unless MySQL is run as
-                the <literal>root</literal> system user.
+                The port number that the server should use when
+                listening for TCP/IP connections. The port number must
+                be 1024 or higher unless the server is started by the
+                <literal>root</literal> system user.
               </para>
             </listitem>
 
@@ -9735,7 +9742,8 @@
               </para>
 
               <para>
-                The Unix socket file to use for local connections.
+                The Unix socket file that the server should use when
+                listening for local connections.
               </para>
             </listitem>
 
@@ -9771,15 +9779,16 @@
           </itemizedlist>
 
           <para>
-            When executing <command>mysqld_safe</command>, the
+            If you execute <command>mysqld_safe</command> with the
             <option>--defaults-file</option> or
-            <option>--defaults-extra-option</option> must be given
-            first, or the option file will not be used. For example,
-            this command will not use the named option file:
+            <option>--defaults-extra-option</option> option to name an
+            option file, the option must be the first one given on the
+            command line or the option file will not be used. For
+            example, this command will not use the named option file:
           </para>
 
 <programlisting>
-mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable>
+mysql&gt; <userinput>mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -9787,7 +9796,7 @@
           </para>
 
 <programlisting>
-mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable>
+mysql&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -9806,11 +9815,11 @@
             <listitem>
               <para>
                 The server and databases can be found relative to the
-                directory from which <command>mysqld_safe</command> is
-                invoked. For binary distributions,
-                <command>mysqld_safe</command> looks under its working
-                directory for <filename>bin</filename> and
-                <filename>data</filename> directories. For source
+                working directory (the directory from which
+                <command>mysqld_safe</command> is invoked). For binary
+                distributions, <command>mysqld_safe</command> looks
+                under its working directory for <filename>bin</filename>
+                and <filename>data</filename> directories. For source
                 distributions, it looks for <filename>libexec</filename>
                 and <filename>var</filename> directories. This condition
                 should be met if you execute
@@ -9846,7 +9855,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>cd mysql_installation_directory</userinput>
+shell&gt; <userinput>cd <replaceable>mysql_installation_directory</replaceable></userinput>
 shell&gt; <userinput>bin/mysqld_safe &amp;</userinput>
 </programlisting>
 
@@ -9875,7 +9884,7 @@
           <para>
             On NetWare, <command>mysqld_safe</command> is a NetWare
             Loadable Module (NLM) that is ported from the original Unix
-            shell script. It does the following:
+            shell script. It starts the server as follows:
           </para>
 
           <orderedlist>
@@ -10915,8 +10924,8 @@
             <para>
               Read Instance Manager and MySQL Server settings from the
               given file. All configuration changes by the Instance
-              Manager will be made to this file. This should be used
-              only as the first option to Instance Manager.
+              Manager will be made to this file. This must be the first
+              option on the command line if it is used.
             </para>
           </listitem>
 
@@ -10972,7 +10981,7 @@
 
           <listitem>
             <para>
-              <option>--password-file=<replaceable>name</replaceable></option>
+              <option>--password-file=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -10984,7 +10993,7 @@
 
           <listitem>
             <para>
-              <option>--pid-file=<replaceable>name</replaceable></option>
+              <option>--pid-file=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -11010,8 +11019,8 @@
             </para>
 
             <para>
-              Print the current defaults and exit. This should be used
-              only as the first option to Instance Manager.
+              Print the current defaults and exit. This must be the
+              first option on the command line if it is used.
             </para>
           </listitem>
 
@@ -23968,12 +23977,12 @@
 
       <listitem>
         <para>
-          <option>--pid-file=<replaceable>path</replaceable></option>
+          <option>--pid-file=<replaceable>file_name</replaceable></option>
         </para>
 
         <para>
-          This option is used only on Unix. It indicates the name of the
-          file in which the server writes its process ID.
+          This option is used only on Unix. It indicates the pathname of
+          the file in which the server writes its process ID.
         </para>
       </listitem>
 
@@ -24647,7 +24656,7 @@
       </para>
 
 <programlisting>
-mysqld_safe --defaults-file=path
+shell&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-5.0/using-mysql-programs.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1210,25 +1210,25 @@
 
         <listitem>
           <para>
-            <option>--defaults-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Use only the given option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <option>--defaults-extra-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-extra-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Read this option file after the global option file but (on
             Unix) before the user option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-5.1/database-administration.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1374,7 +1374,7 @@
             </para>
 
             <para>
-              The path to the process ID file used by
+              The pathname of the process ID file used by
               <command>mysqld_safe</command>.
             </para>
           </listitem>
@@ -1387,7 +1387,9 @@
 
             <para>
               The port number to use when listening for TCP/IP
-              connections.
+              connections. The port number must be 1024 or higher unless
+              the server is started by the <literal>root</literal>
+              system user.
             </para>
           </listitem>
 
@@ -1742,11 +1744,11 @@
 
             <para>
               On Unix, this option specifies the Unix socket file to use
-              for local connections. The default value is
+              when listening for local connections. The default value is
               <filename>/tmp/mysql.sock</filename>. On Windows, the
-              option specifies the pipe name to use for local
-              connections that use a named pipe. The default value is
-              <literal>MySQL</literal>.
+              option specifies the pipe name to use when listening for
+              local connections that use a named pipe. The default value
+              is <literal>MySQL</literal>.
             </para>
           </listitem>
 
@@ -9650,18 +9652,20 @@
 
               <para>
                 The name of an option file to be read in addition to the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--defaults-file=<replaceable>path</replaceable></option>
+                <option>--defaults-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
                 The name of an option file to be read instead of the
-                usual option files. If given, this option must be first.
+                usual option files. This must be the first option on the
+                command line if it is used.
               </para>
             </listitem>
 
@@ -9671,9 +9675,9 @@
               </para>
 
               <para>
-                The path to the directory containing the
-                <command>mysqld</command> program. Use this option to
-                explicitly indicate the location of the server.
+                If <command>mysqld_safe</command> cannot find the
+                server, use this option to indicate the pathname to the
+                directory where the server is located.
               </para>
             </listitem>
 
@@ -9698,7 +9702,10 @@
                 <literal>ledir</literal> directory) that you want to
                 start. This option is needed if you use the MySQL binary
                 distribution but have the data directory outside of the
-                binary distribution.
+                binary distribution. If <command>mysqld_safe</command>
+                cannot find the server, use the <option>--ledir</option>
+                option to indicate the pathname to the directory where
+                the server is located.
               </para>
             </listitem>
 
@@ -9740,8 +9747,8 @@
               </para>
 
               <para>
-                Do not read any option files. If given, this option must
-                be first.
+                Do not read any option files. This must be the first
+                option on the command line if it is used.
               </para>
             </listitem>
 
@@ -9751,8 +9758,8 @@
               </para>
 
               <para>
-                The number of files <command>mysqld</command> should be
-                able to open. The option value is passed to
+                The number of files that <command>mysqld</command>
+                should be able to open. The option value is passed to
                 <command>ulimit -n</command>. Note that you need to
                 start <command>mysqld_safe</command> as
                 <literal>root</literal> for this to work properly!
@@ -9761,11 +9768,11 @@
 
             <listitem>
               <para>
-                <option>--pid-file=<replaceable>path</replaceable></option>
+                <option>--pid-file=<replaceable>file_name</replaceable></option>
               </para>
 
               <para>
-                The path to the process ID file.
+                The pathname of the process ID file.
               </para>
             </listitem>
 
@@ -9775,10 +9782,10 @@
               </para>
 
               <para>
-                The port number to use when listening for TCP/IP
-                connections. The port number must be
-                <literal>1024</literal> or higher unless MySQL is run as
-                the <literal>root</literal> system user.
+                The port number that the server should use when
+                listening for TCP/IP connections. The port number must
+                be 1024 or higher unless the server is started by the
+                <literal>root</literal> system user.
               </para>
             </listitem>
 
@@ -9788,7 +9795,8 @@
               </para>
 
               <para>
-                The Unix socket file to use for local connections.
+                The Unix socket file that the server should use when
+                listening for local connections.
               </para>
             </listitem>
 
@@ -9824,15 +9832,16 @@
           </itemizedlist>
 
           <para>
-            When executing <command>mysqld_safe</command>, the
+            If you execute <command>mysqld_safe</command> with the
             <option>--defaults-file</option> or
-            <option>--defaults-extra-option</option> must be given
-            first, or the option file will not be used. For example,
-            this command will not use the named option file:
+            <option>--defaults-extra-option</option> option to name an
+            option file, the option must be the first one given on the
+            command line or the option file will not be used. For
+            example, this command will not use the named option file:
           </para>
 
 <programlisting>
-mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable>
+mysql&gt; <userinput>mysqld_safe --port=<replaceable>port_num</replaceable> --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -9840,7 +9849,7 @@
           </para>
 
 <programlisting>
-mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable>
+mysql&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable> --port=<replaceable>port_num</replaceable></userinput>
 </programlisting>
 
           <para>
@@ -9859,11 +9868,11 @@
             <listitem>
               <para>
                 The server and databases can be found relative to the
-                directory from which <command>mysqld_safe</command> is
-                invoked. For binary distributions,
-                <command>mysqld_safe</command> looks under its working
-                directory for <filename>bin</filename> and
-                <filename>data</filename> directories. For source
+                working directory (the directory from which
+                <command>mysqld_safe</command> is invoked). For binary
+                distributions, <command>mysqld_safe</command> looks
+                under its working directory for <filename>bin</filename>
+                and <filename>data</filename> directories. For source
                 distributions, it looks for <filename>libexec</filename>
                 and <filename>var</filename> directories. This condition
                 should be met if you execute
@@ -9899,7 +9908,7 @@
           </para>
 
 <programlisting>
-shell&gt; <userinput>cd mysql_installation_directory</userinput>
+shell&gt; <userinput>cd <replaceable>mysql_installation_directory</replaceable></userinput>
 shell&gt; <userinput>bin/mysqld_safe &amp;</userinput>
 </programlisting>
 
@@ -9928,7 +9937,7 @@
           <para>
             On NetWare, <command>mysqld_safe</command> is a NetWare
             Loadable Module (NLM) that is ported from the original Unix
-            shell script. It does the following:
+            shell script. It starts the server as follows:
           </para>
 
           <orderedlist>
@@ -10959,8 +10968,8 @@
             <para>
               Read Instance Manager and MySQL Server settings from the
               given file. All configuration changes by the Instance
-              Manager will be made to this file. This should be used
-              only as the first option to Instance Manager.
+              Manager will be made to this file. This must be the first
+              option on the command line if it is used.
             </para>
           </listitem>
 
@@ -11015,7 +11024,7 @@
 
           <listitem>
             <para>
-              <option>--password-file=<replaceable>name</replaceable></option>
+              <option>--password-file=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -11027,7 +11036,7 @@
 
           <listitem>
             <para>
-              <option>--pid-file=<replaceable>name</replaceable></option>
+              <option>--pid-file=<replaceable>file_name</replaceable></option>
             </para>
 
             <para>
@@ -11053,8 +11062,8 @@
             </para>
 
             <para>
-              Print the current defaults and exit. This should be used
-              only as the first option to Instance Manager.
+              Print the current defaults and exit. This must be the
+              first option on the command line if it is used.
             </para>
           </listitem>
 
@@ -23974,12 +23983,12 @@
 
       <listitem>
         <para>
-          <option>--pid-file=<replaceable>path</replaceable></option>
+          <option>--pid-file=<replaceable>file_name</replaceable></option>
         </para>
 
         <para>
-          This option is used only on Unix. It indicates the name of the
-          file in which the server writes its process ID.
+          This option is used only on Unix. It indicates the pathname of
+          the file in which the server writes its process ID.
         </para>
       </listitem>
 
@@ -24653,7 +24662,7 @@
       </para>
 
 <programlisting>
-mysqld_safe --defaults-file=path
+shell&gt; <userinput>mysqld_safe --defaults-file=<replaceable>file_name</replaceable></userinput>
 </programlisting>
 
       <para>

Modified: trunk/refman-5.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.1/using-mysql-programs.xml	2006-01-22 16:21:17 UTC (rev 986)
+++ trunk/refman-5.1/using-mysql-programs.xml	2006-01-22 16:22:10 UTC (rev 987)
@@ -1208,25 +1208,25 @@
 
         <listitem>
           <para>
-            <option>--defaults-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Use only the given option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <option>--defaults-extra-file=<replaceable>path_name</replaceable></option>
+            <option>--defaults-extra-file=<replaceable>file_name</replaceable></option>
           </para>
 
           <para>
             Read this option file after the global option file but (on
             Unix) before the user option file.
-            <replaceable>path_name</replaceable> is the full pathname to
+            <replaceable>file_name</replaceable> is the full pathname to
             the file.
           </para>
         </listitem>

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