List:Commits« Previous MessageNext Message »
From:paul Date:January 18 2006 3:32am
Subject:svn commit - mysqldoc@docsrva: r889 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-18 04:32:27 +0100 (Wed, 18 Jan 2006)
New Revision: 889

Log:
 r6339@frost:  paul | 2006-01-17 20:44:14 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-18 01:17:52 UTC (rev 888)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-18 03:32:27 UTC (rev 889)
@@ -423,11 +423,11 @@
 
       <refsynopsisdiv>
         <cmdsynopsis>
-          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
+          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
         </cmdsynopsis>
          
         <cmdsynopsis>
-          <command>isamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
+          <command>isamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
         </cmdsynopsis>
       </refsynopsisdiv>
 
@@ -448,19 +448,21 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
-shell&gt; <userinput>isamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
+shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
+shell&gt; <userinput>isamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
 </programlisting>
 
         <para>
-          The normal operation is update (<option>-u</option>). If a
+          The default operation is update (<option>-u</option>). If a
           recovery is done (<option>-r</option>), all writes and
           possibly updates and deletes are done and errors are only
-          counted. If no logfile name is given,
-          <filename>myisam.log</filename> is used for
+          counted. The default log file name is
+          <filename>myisam.log</filename> for
           <command>myisamlog</command> and <filename>isam.log</filename>
-          for <command>isamlog</command>. If table names are named on
-          the command line, only those tables are updated.
+          for <command>isamlog</command> if no
+          <replaceable>log_file</replaceable> argument is given. If
+          tables are named on the command line, only those tables are
+          updated.
         </para>
 
         <para>
@@ -486,7 +488,7 @@
             </para>
 
             <para>
-              Do only <replaceable>N</replaceable> commands.
+              Execute only <replaceable>N</replaceable> commands.
             </para>
           </listitem>
 
@@ -500,6 +502,10 @@
             </para>
           </listitem>
 
+<!--
+          <remark role="todo">
+            No idea what the -F option does. [pd]
+          </remark>
           <listitem>
             <para>
               <option>-F <replaceable>filepath/</replaceable></option>
@@ -509,6 +515,7 @@
               TODO
             </para>
           </listitem>
+-->
 
           <listitem>
             <para>
@@ -558,14 +565,14 @@
             </para>
 
             <para>
-              Recover.
+              Perform a recovery operation.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <option>-R <replaceable>record-pos-file
-              record-pos</replaceable></option>
+              <option>-R <replaceable>record_pos_file
+              record_pos</replaceable></option>
             </para>
 
             <para>
@@ -579,7 +586,7 @@
             </para>
 
             <para>
-              Update.
+              Perform anupdate operation.
             </para>
           </listitem>
 
@@ -597,12 +604,16 @@
 
           <listitem>
             <para>
-              <option>-w <replaceable>write-file</replaceable></option>
+              <option>-w <replaceable>write_file</replaceable></option>
             </para>
 
             <para>
-              Specify write file.
+              Specify the write file.
             </para>
+
+            <remark role="todo">
+              Which is what?
+            </remark>
           </listitem>
 
           <listitem>
@@ -6274,12 +6285,12 @@
             <para>
               Quote database, table, and column names within
               &lsquo;<literal>`</literal>&rsquo; characters. If the
-              <literal>ANSI_QUOTES</literal> SQL mode is enabled, names are quoted
-              within &lsquo;<literal>"</literal>&rsquo; characters. As
-              of MySQL 4.1.1, <option>--quote-names</option> is on by
-              default. It can be disabled with
-              <option>--skip-quote-names</option>, but this option
-              should be given after any option such as
+              <literal>ANSI_QUOTES</literal> SQL mode is enabled, names
+              are quoted within &lsquo;<literal>"</literal>&rsquo;
+              characters. As of MySQL 4.1.1,
+              <option>--quote-names</option> is on by default. It can be
+              disabled with <option>--skip-quote-names</option>, but
+              this option should be given after any option such as
               <option>--compatible</option> that may enable
               <option>--quote-names</option>.
             </para>
@@ -7752,9 +7763,14 @@
 
         <para>
           <command>mysql_zap</command> kills processes that match a
-          pattern. Invoke it like this:
+          pattern. It uses the <command>ps</command> command and Unix
+          signals, so it runs on Unix and Unix-like systems.
         </para>
 
+        <para>
+          Invoke <command>mysql_zap</command> like this:
+        </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_zap [-<replaceable>signal</replaceable>] [-?Ift] <replaceable>pattern</replaceable></userinput>
 </programlisting>
@@ -7900,8 +7916,8 @@
 </programlisting>
 
         <para>
-          You can find out what the error code means by either examining
-          the documentation for your system or by using the
+          You can find out what the error code means by examining the
+          documentation for your system or by using the
           <command>perror</command> utility.
         </para>
 
@@ -7929,10 +7945,9 @@
 </programlisting>
 
         <para>
-          <emphasis role="bold">Note</emphasis>: To obtain the error
-          message for a MySQL Cluster error code, invoke
-          <command>perror</command> with the <option>--ndb</option>
-          option:
+          To obtain the error message for a MySQL Cluster error code,
+          invoke <command>perror</command> with the
+          <option>--ndb</option> option:
         </para>
 
 <programlisting>
@@ -7945,6 +7960,91 @@
           mean different things on different operating systems.
         </para>
 
+        <para>
+          <command>perror</command> supports the following options:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>help</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--help</option>, <option>--info</option>,
+              <option>-I</option>, <option>-?</option>
+            </para>
+
+            <para>
+              Display a help message and exit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>ndb</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--ndb</option>
+            </para>
+
+            <para>
+              Print the error message for a MySQL Cluster error code.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>silent</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--silent</option>, <option>-s</option>
+            </para>
+
+            <para>
+              Silent mode. Print only the error message.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>verbose</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--verbose</option>, <option>-v</option>
+            </para>
+
+            <para>
+              Verbose mode. Print error code and message. This is the
+              default behavior.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>version</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--version</option>, <option>-V</option>
+            </para>
+
+            <para>
+              Display version information and exit.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
       </refsection>
 
     </refentry>
@@ -7994,37 +8094,54 @@
 
         <para>
           The <command>replace</command> utility program changes strings
-          in place in files or on the standard input. It uses a finite
-          state machine to match longer strings first. It can be used to
-          swap strings. For example, the following command swaps
-          <literal>a</literal> and <literal>b</literal> in the given
-          files, <filename>file1</filename> and
-          <filename>file2</filename>:
+          in place in files or on the standard input.
         </para>
 
+        <para>
+          Invoke <command>replace</command> in one of the following
+          ways:
+        </para>
+
 <programlisting>
-shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... -- file [file] ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... &lt; input</userinput>
 </programlisting>
 
         <para>
-          Use the <option>--</option> option to indicate where the
-          string-replacement list ends and the filenames begin.
+          <replaceable>from</replaceable> represents a string to look
+          for and <replaceable>to</replaceable> represents its
+          replacement. There can be one or more pairs of strings.
         </para>
 
         <para>
-          Any file named on the command line is modified in place, so
-          you may want to make a copy of the original before converting
-          it.
+          Use the <option>--</option> option to indicate where the
+          string-replacement list ends and the filenames begin. In this
+          case, any file named on the command line is modified in place,
+          so you may want to make a copy of the original before
+          converting it. <replaceable>replace</replaceable> prints a
+          message indicating which of the input files it actually
+          modifies.
         </para>
 
         <para>
-          If no files are named on the command line,
+          If the <option>--</option> option is not given
           <command>replace</command> reads the standard input and writes
-          to the standard output. In this case, no <option>--</option>
-          option is needed.
+          to the standard output.
         </para>
 
         <para>
+          <command>replace</command> uses a finite state machine to
+          match longer strings first. It can be used to swap strings.
+          For example, the following command swaps <literal>a</literal>
+          and <literal>b</literal> in the given files,
+          <filename>file1</filename> and <filename>file2</filename>:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+</programlisting>
+
+        <para>
           The <command>replace</command> program is used by
           <command>msql2mysql</command>. See
           <xref linkend="msql2mysql"/>.
@@ -8066,8 +8183,7 @@
             </para>
 
             <para>
-              Silent mode. Print out less information what the program
-              does.
+              Silent mode. Print less information what the program does.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-18 01:17:52 UTC (rev 888)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-18 03:32:27 UTC (rev 889)
@@ -405,7 +405,7 @@
 
       <refsynopsisdiv>
         <cmdsynopsis>
-          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
+          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
         </cmdsynopsis>
       </refsynopsisdiv>
 
@@ -423,16 +423,18 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
+shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
 </programlisting>
 
         <para>
-          The normal operation is update (<option>-u</option>). If a
+          The default operation is update (<option>-u</option>). If a
           recovery is done (<option>-r</option>), all writes and
           possibly updates and deletes are done and errors are only
-          counted. If no logfile name is given,
-          <filename>myisam.log</filename> is used. If table names are
-          named on the command line, only those tables are updated.
+          counted. The default log file name is
+          <filename>myisam.log</filename> if no
+          <replaceable>log_file</replaceable> argument is given, If
+          tables are named on the command line, only those tables are
+          updated.
         </para>
 
         <para>
@@ -458,7 +460,7 @@
             </para>
 
             <para>
-              Do only <replaceable>N</replaceable> commands.
+              Execute only <replaceable>N</replaceable> commands.
             </para>
           </listitem>
 
@@ -472,6 +474,10 @@
             </para>
           </listitem>
 
+<!--
+          <remark role="todo">
+            No idea what the -F option does. [pd]
+          </remark>
           <listitem>
             <para>
               <option>-F <replaceable>filepath/</replaceable></option>
@@ -481,6 +487,7 @@
               TODO
             </para>
           </listitem>
+-->
 
           <listitem>
             <para>
@@ -530,14 +537,14 @@
             </para>
 
             <para>
-              Recover.
+              Perform a recovery operation.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <option>-R <replaceable>record-pos-file
-              record-pos</replaceable></option>
+              <option>-R <replaceable>record_pos_file
+              record_pos</replaceable></option>
             </para>
 
             <para>
@@ -551,7 +558,7 @@
             </para>
 
             <para>
-              Update.
+              Perform anupdate operation.
             </para>
           </listitem>
 
@@ -569,12 +576,16 @@
 
           <listitem>
             <para>
-              <option>-w <replaceable>write-file</replaceable></option>
+              <option>-w <replaceable>write_file</replaceable></option>
             </para>
 
             <para>
-              Specify write file.
+              Specify the write file.
             </para>
+
+            <remark role="todo">
+              Which is what?
+            </remark>
           </listitem>
 
           <listitem>
@@ -7877,9 +7888,14 @@
 
         <para>
           <command>mysql_zap</command> kills processes that match a
-          pattern. Invoke it like this:
+          pattern. It uses the <command>ps</command> command and Unix
+          signals, so it runs on Unix and Unix-like systems.
         </para>
 
+        <para>
+          Invoke <command>mysql_zap</command> like this:
+        </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_zap [-<replaceable>signal</replaceable>] [-?Ift] <replaceable>pattern</replaceable></userinput>
 </programlisting>
@@ -8025,8 +8041,8 @@
 </programlisting>
 
         <para>
-          You can find out what the error code means by either examining
-          the documentation for your system or by using the
+          You can find out what the error code means by examining the
+          documentation for your system or by using the
           <command>perror</command> utility.
         </para>
 
@@ -8054,10 +8070,9 @@
 </programlisting>
 
         <para>
-          <emphasis role="bold">Note</emphasis>: To obtain the error
-          message for a MySQL Cluster error code, invoke
-          <command>perror</command> with the <option>--ndb</option>
-          option:
+          To obtain the error message for a MySQL Cluster error code,
+          invoke <command>perror</command> with the
+          <option>--ndb</option> option:
         </para>
 
 <programlisting>
@@ -8070,6 +8085,91 @@
           mean different things on different operating systems.
         </para>
 
+        <para>
+          <command>perror</command> supports the following options:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>help</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--help</option>, <option>--info</option>,
+              <option>-I</option>, <option>-?</option>
+            </para>
+
+            <para>
+              Display a help message and exit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>ndb</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--ndb</option>
+            </para>
+
+            <para>
+              Print the error message for a MySQL Cluster error code.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>silent</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--silent</option>, <option>-s</option>
+            </para>
+
+            <para>
+              Silent mode. Print only the error message.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>verbose</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--verbose</option>, <option>-v</option>
+            </para>
+
+            <para>
+              Verbose mode. Print error code and message. This is the
+              default behavior.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>version</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--version</option>, <option>-V</option>
+            </para>
+
+            <para>
+              Display version information and exit.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
       </refsection>
 
     </refentry>
@@ -8119,37 +8219,54 @@
 
         <para>
           The <command>replace</command> utility program changes strings
-          in place in files or on the standard input. It uses a finite
-          state machine to match longer strings first. It can be used to
-          swap strings. For example, the following command swaps
-          <literal>a</literal> and <literal>b</literal> in the given
-          files, <filename>file1</filename> and
-          <filename>file2</filename>:
+          in place in files or on the standard input.
         </para>
 
+        <para>
+          Invoke <command>replace</command> in one of the following
+          ways:
+        </para>
+
 <programlisting>
-shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... -- file [file] ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... &lt; input</userinput>
 </programlisting>
 
         <para>
-          Use the <option>--</option> option to indicate where the
-          string-replacement list ends and the filenames begin.
+          <replaceable>from</replaceable> represents a string to look
+          for and <replaceable>to</replaceable> represents its
+          replacement. There can be one or more pairs of strings.
         </para>
 
         <para>
-          Any file named on the command line is modified in place, so
-          you may want to make a copy of the original before converting
-          it.
+          Use the <option>--</option> option to indicate where the
+          string-replacement list ends and the filenames begin. In this
+          case, any file named on the command line is modified in place,
+          so you may want to make a copy of the original before
+          converting it. <replaceable>replace</replaceable> prints a
+          message indicating which of the input files it actually
+          modifies.
         </para>
 
         <para>
-          If no files are named on the command line,
+          If the <option>--</option> option is not given
           <command>replace</command> reads the standard input and writes
-          to the standard output. In this case, no <option>--</option>
-          option is needed.
+          to the standard output.
         </para>
 
         <para>
+          <command>replace</command> uses a finite state machine to
+          match longer strings first. It can be used to swap strings.
+          For example, the following command swaps <literal>a</literal>
+          and <literal>b</literal> in the given files,
+          <filename>file1</filename> and <filename>file2</filename>:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+</programlisting>
+
+        <para>
           The <command>replace</command> program is used by
           <command>msql2mysql</command>. See
           <xref linkend="msql2mysql"/>.
@@ -8191,8 +8308,7 @@
             </para>
 
             <para>
-              Silent mode. Print out less information what the program
-              does.
+              Silent mode. Print less information what the program does.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-18 01:17:52 UTC (rev 888)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-18 03:32:27 UTC (rev 889)
@@ -421,7 +421,7 @@
 
       <refsynopsisdiv>
         <cmdsynopsis>
-          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
+          <command>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</command>
         </cmdsynopsis>
       </refsynopsisdiv>
 
@@ -439,16 +439,18 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>logfile-name</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
+shell&gt; <userinput>myisamlog [<replaceable>options</replaceable>] [<replaceable>log_file</replaceable> [<replaceable>tbl_name</replaceable>] ...]</userinput>
 </programlisting>
 
         <para>
-          The normal operation is update (<option>-u</option>). If a
+          The default operation is update (<option>-u</option>). If a
           recovery is done (<option>-r</option>), all writes and
           possibly updates and deletes are done and errors are only
-          counted. If no logfile name is given,
-          <filename>myisam.log</filename> is used. If table names are
-          named on the command line, only those tables are updated.
+          counted. The default log file name is
+          <filename>myisam.log</filename> if no
+          <replaceable>log_file</replaceable> argument is given, If
+          tables are named on the command line, only those tables are
+          updated.
         </para>
 
         <para>
@@ -474,7 +476,7 @@
             </para>
 
             <para>
-              Do only <replaceable>N</replaceable> commands.
+              Execute only <replaceable>N</replaceable> commands.
             </para>
           </listitem>
 
@@ -488,6 +490,10 @@
             </para>
           </listitem>
 
+<!--
+          <remark role="todo">
+            No idea what the -F option does. [pd]
+          </remark>
           <listitem>
             <para>
               <option>-F <replaceable>filepath/</replaceable></option>
@@ -497,6 +503,7 @@
               TODO
             </para>
           </listitem>
+-->
 
           <listitem>
             <para>
@@ -546,14 +553,14 @@
             </para>
 
             <para>
-              Recover.
+              Perform a recovery operation.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <option>-R <replaceable>record-pos-file
-              record-pos</replaceable></option>
+              <option>-R <replaceable>record_pos_file
+              record_pos</replaceable></option>
             </para>
 
             <para>
@@ -567,7 +574,7 @@
             </para>
 
             <para>
-              Update.
+              Perform anupdate operation.
             </para>
           </listitem>
 
@@ -585,12 +592,16 @@
 
           <listitem>
             <para>
-              <option>-w <replaceable>write-file</replaceable></option>
+              <option>-w <replaceable>write_file</replaceable></option>
             </para>
 
             <para>
-              Specify write file.
+              Specify the write file.
             </para>
+
+            <remark role="todo">
+              Which is what?
+            </remark>
           </listitem>
 
           <listitem>
@@ -8332,9 +8343,14 @@
 
         <para>
           <command>mysql_zap</command> kills processes that match a
-          pattern. Invoke it like this:
+          pattern. It uses the <command>ps</command> command and Unix
+          signals, so it runs on Unix and Unix-like systems.
         </para>
 
+        <para>
+          Invoke <command>mysql_zap</command> like this:
+        </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_zap [-<replaceable>signal</replaceable>] [-?Ift] <replaceable>pattern</replaceable></userinput>
 </programlisting>
@@ -8480,8 +8496,8 @@
 </programlisting>
 
         <para>
-          You can find out what the error code means by either examining
-          the documentation for your system or by using the
+          You can find out what the error code means by examining the
+          documentation for your system or by using the
           <command>perror</command> utility.
         </para>
 
@@ -8509,10 +8525,9 @@
 </programlisting>
 
         <para>
-          <emphasis role="bold">Note</emphasis>: To obtain the error
-          message for a MySQL Cluster error code, invoke
-          <command>perror</command> with the <option>--ndb</option>
-          option:
+          To obtain the error message for a MySQL Cluster error code,
+          invoke <command>perror</command> with the
+          <option>--ndb</option> option:
         </para>
 
 <programlisting>
@@ -8525,6 +8540,91 @@
           mean different things on different operating systems.
         </para>
 
+        <para>
+          <command>perror</command> supports the following options:
+        </para>
+
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>help</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--help</option>, <option>--info</option>,
+              <option>-I</option>, <option>-?</option>
+            </para>
+
+            <para>
+              Display a help message and exit.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>ndb</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--ndb</option>
+            </para>
+
+            <para>
+              Print the error message for a MySQL Cluster error code.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>silent</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--silent</option>, <option>-s</option>
+            </para>
+
+            <para>
+              Silent mode. Print only the error message.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>verbose</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--verbose</option>, <option>-v</option>
+            </para>
+
+            <para>
+              Verbose mode. Print error code and message. This is the
+              default behavior.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <indexterm>
+                <primary><literal>version</literal></primary>
+                <secondary><command>perror</command> option</secondary>
+              </indexterm>
+
+              <option>--version</option>, <option>-V</option>
+            </para>
+
+            <para>
+              Display version information and exit.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+
       </refsection>
 
     </refentry>
@@ -8574,37 +8674,54 @@
 
         <para>
           The <command>replace</command> utility program changes strings
-          in place in files or on the standard input. It uses a finite
-          state machine to match longer strings first. It can be used to
-          swap strings. For example, the following command swaps
-          <literal>a</literal> and <literal>b</literal> in the given
-          files, <filename>file1</filename> and
-          <filename>file2</filename>:
+          in place in files or on the standard input.
         </para>
 
+        <para>
+          Invoke <command>replace</command> in one of the following
+          ways:
+        </para>
+
 <programlisting>
-shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... -- file [file] ...</userinput>
+shell&gt; <userinput>replace from to [from to] ... &lt; input</userinput>
 </programlisting>
 
         <para>
-          Use the <option>--</option> option to indicate where the
-          string-replacement list ends and the filenames begin.
+          <replaceable>from</replaceable> represents a string to look
+          for and <replaceable>to</replaceable> represents its
+          replacement. There can be one or more pairs of strings.
         </para>
 
         <para>
-          Any file named on the command line is modified in place, so
-          you may want to make a copy of the original before converting
-          it.
+          Use the <option>--</option> option to indicate where the
+          string-replacement list ends and the filenames begin. In this
+          case, any file named on the command line is modified in place,
+          so you may want to make a copy of the original before
+          converting it. <replaceable>replace</replaceable> prints a
+          message indicating which of the input files it actually
+          modifies.
         </para>
 
         <para>
-          If no files are named on the command line,
+          If the <option>--</option> option is not given
           <command>replace</command> reads the standard input and writes
-          to the standard output. In this case, no <option>--</option>
-          option is needed.
+          to the standard output.
         </para>
 
         <para>
+          <command>replace</command> uses a finite state machine to
+          match longer strings first. It can be used to swap strings.
+          For example, the following command swaps <literal>a</literal>
+          and <literal>b</literal> in the given files,
+          <filename>file1</filename> and <filename>file2</filename>:
+        </para>
+
+<programlisting>
+shell&gt; <userinput>replace a b b a -- file1 file2 ...</userinput>
+</programlisting>
+
+        <para>
           The <command>replace</command> program is used by
           <command>msql2mysql</command>. See
           <xref linkend="msql2mysql"/>.
@@ -8646,8 +8763,7 @@
             </para>
 
             <para>
-              Silent mode. Print out less information what the program
-              does.
+              Silent mode. Print less information what the program does.
             </para>
           </listitem>
 

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-18 01:17:52 UTC (rev 888)
+++ trunk/refman-common/titles.en.ent	2006-01-18 03:32:27 UTC (rev 889)
@@ -708,8 +708,8 @@
 <!ENTITY title-myisamchk-memory "<command>myisamchk</command> Memory Usage">
 <!ENTITY title-myisamchk-other-options "Other Options for <command>myisamchk</command>">
 <!ENTITY title-myisamchk-repair-options "Repair Options for <command>myisamchk</command>">
-<!ENTITY title-myisamlog-for-manpage "display contents of <literal>MyISAM</literal> log file">
-<!ENTITY title-myisamlog-for-manual "Display Contents of <literal>MyISAM</literal> Log File">
+<!ENTITY title-myisamlog-for-manpage "display <literal>MyISAM</literal> log file contents">
+<!ENTITY title-myisamlog-for-manual "Display <literal>MyISAM</literal> Log File Contents">
 <!ENTITY title-myisampack-for-manpage "generate compressed, read-only <literal>MyISAM</literal> tables">
 <!ENTITY title-myisampack-for-manual "Generate Compressed, Read-Only <literal>MyISAM</literal> Tables">
 <!ENTITY title-myodbc-2-50 "What is MyODBC 2.50?">

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