List:Commits« Previous MessageNext Message »
From:paul Date:January 31 2006 12:46am
Subject:svn commit - mysqldoc@docsrva: r1142 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-31 01:46:00 +0100 (Tue, 31 Jan 2006)
New Revision: 1142

Log:
 r6957@frost:  paul | 2006-01-30 18:44:01 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-4.1/connector-j.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -3218,10 +3218,7 @@
         versions older than 4.1.0 and
         <literal>character_set_server</literal> for server versions
         4.1.0 and newer. For more information, see
-
-        <xfer linkend="charset-server"/>
-
-        .
+        <xref linkend="charset-server"/>.
       </para>
 
       <para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-4.1/installing.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -8570,9 +8570,9 @@
 
         <listitem>
           <para>
-            If you have gotten to the <command>make</command> stage and
-            the distribution does not compile, please report it in our
-            bugs database using the instructions given in
+            If you have gotten to the <command>make</command> stage, but
+            the distribution does not compile, please enter the problem
+            into our bugs database using the instructions given in
             <xref linkend="bug-reports"/>. If you have installed the
             latest versions of the required GNU tools, and they crash
             trying to process our configuration files, please report
@@ -8793,10 +8793,10 @@
             and <option>-O0</option> if you are using something else.
             You should try the <option>--with-low-memory</option> option
             even if you have so much memory and swap space that you
-            think you cannot possibly have run out. This problem has
-            been observed to occur even on systems with generous
-            hardware configurations and the
-            <option>--with-low-memory</option> option usually fixes it.
+            think you can't possibly have run out. This problem has been
+            observed to occur even on systems with generous hardware
+            configurations, and the <option>--with-low-memory</option>
+            option usually fixes it.
           </para>
         </listitem>
 
@@ -8861,19 +8861,19 @@
 
           <para>
             This works because <command>gcc</command> compiles C++
-            sources as well as <command>g++</command> does, but does not
-            link in <literal>libg++</literal> or
+            source files as well as <command>g++</command> does, but
+            does not link in <literal>libg++</literal> or
             <literal>libstdc++</literal> by default.
           </para>
 
           <para>
             Another way to fix these problems is to install
             <command>g++</command>, <literal>libg++</literal>, and
-            <literal>libstdc++</literal>. We would, however, like to
-            recommend that you not use <literal>libg++</literal> or
+            <literal>libstdc++</literal>. However, we recommend that you
+            not use <literal>libg++</literal> or
             <literal>libstdc++</literal> with MySQL because this only
             increases the binary size of <command>mysqld</command>
-            without giving you any benefits. Some versions of these
+            without providing any benefits. Some versions of these
             libraries have also caused strange problems for MySQL users
             in the past.
           </para>
@@ -9067,7 +9067,7 @@
           <para>
             Change <literal>XXX</literal> to <literal>size_t</literal>
             or <literal>int</literal>, depending on your operating
-            system. (Note that you have to do this each time you run
+            system. (You must do this each time you run
             <command>configure</command> because
             <command>configure</command> regenerates
             <filename>config.h</filename>.)
@@ -9078,7 +9078,7 @@
           <para>
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
-            does not need to create <filename>sql_yacc.cc</filename>,
+            does not need to create <filename>sql_yacc.cc</filename>
             because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
@@ -9164,8 +9164,8 @@
           </itemizedlist>
 
           <para>
-            Please note that you need to run
-            <command>configure</command> again afterward.
+            You must run <command>configure</command> again after making
+            either of those changes.
           </para>
         </listitem>
 
@@ -9198,8 +9198,8 @@
       </para>
 
       <para>
-        If your system does not provide native thread support, you need
-        to build MySQL using the MIT-pthreads package. This includes
+        If your system does not provide native thread support, you
+        should build MySQL using the MIT-pthreads package. This includes
         older FreeBSD systems, SunOS 4.x, Solaris 2.4 and earlier, and
         some others. See <xref linkend="which-os"/>.
       </para>
@@ -9244,11 +9244,12 @@
             with the server code. If you have configured the
             distribution using <option>--without-server</option> to
             build only the client code, clients do not know whether
-            MIT-pthreads is being used and use Unix socket connections
-            by default. Because Unix socket files do not work under
-            MIT-pthreads on some platforms, this means you need to use
-            <option>-h</option> or <option>--host</option> when you run
-            client programs.
+            MIT-pthreads is being used and use Unix socket file
+            connections by default. Because Unix socket files do not
+            work under MIT-pthreads on some platforms, this means you
+            need to use <option>-h</option> or <option>--host</option>
+            with a value other than <literal>localhost</literal> when
+            you run client programs.
           </para>
         </listitem>
 
@@ -9259,7 +9260,7 @@
             the server to use system locking with the
             <option>--external-locking</option> option. This is needed
             only if you want to be able to run two MySQL servers against
-            the same data files, which is not recommended.
+            the same data files, but that is not recommended, anyway.
           </para>
         </listitem>
 
@@ -9278,7 +9279,7 @@
 </programlisting>
 
           <para>
-            The solution to this is to kill the
+            The solution to this problem is to kill the
             <command>mysqld</command> server and restart it. This has
             happened to us only when we forced the server to shut down
             and then restarted it immediately.
@@ -9288,8 +9289,8 @@
         <listitem>
           <para>
             With MIT-pthreads, the <literal>sleep()</literal> system
-            call is not interruptible with <literal>SIGINT</literal>
-            (break). This is only noticeable when you run
+            call isn't interruptible with <literal>SIGINT</literal>
+            (break). This is noticeable only when you run
             <command>mysqladmin --sleep</command>. You must wait for the
             <literal>sleep()</literal> call to terminate before the
             interrupt is served and the process stops.
@@ -9298,7 +9299,7 @@
 
         <listitem>
           <para>
-            When linking, you may receive warning messages like these
+            When linking, you might receive warning messages like these
             (at least on Solaris); they can be ignored:
           </para>
 
@@ -9342,23 +9343,22 @@
       <title>&title-windows-source-build;</title>
 
       <para>
-        These instructions describe how to build MySQL binaries from
-        source for versions 4.1 and above on Windows. Instructions are
-        provided for building binaries from a standard source
-        distribution or from the BitKeeper tree that contains the latest
-        development source.
+        These instructions describe how to build binaries from source
+        for MySQL 4.1 and up on Windows. Instructions are provided for
+        building binaries from a standard source distribution or from
+        the BitKeeper tree that contains the latest development source.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: The instructions in this
-        document are strictly for users who want to test MySQL on
-        Windows from the latest source distribution or from the
-        BitKeeper tree. For production use, MySQL AB does not advise
-        using a MySQL server built by yourself from source. Normally, it
-        is best to use precompiled binary distributions of MySQL that
-        are built specifically for optimal performance on Windows by
-        MySQL AB. Instructions for installing a binary distributions are
-        available in <xref linkend="windows-installation"/>.
+        <emphasis role="bold">Note</emphasis>: The instructions here are
+        strictly for users who want to test MySQL on Windows from the
+        latest source distribution or from the BitKeeper tree. For
+        production use, MySQL AB does not advise using a MySQL server
+        built by yourself from source. Normally, it is best to use
+        precompiled binary distributions of MySQL that are built
+        specifically for optimal performance on Windows by MySQL AB.
+        Instructions for installing a binary distributions are available
+        in <xref linkend="windows-installation"/>.
       </para>
 
       <para>
@@ -9394,9 +9394,8 @@
       </para>
 
       <para>
-        You will also need a MySQL source distribution for Windows.
-        There are two ways you can get a source distribution for MySQL
-        version 4.1 and above:
+        You also need a MySQL source distribution for Windows. For MySQL
+        4.1 and up, there are two ways to obtain a source distribution:
       </para>
 
       <orderedlist>
@@ -9405,8 +9404,7 @@
           <para>
             Obtain a source distribution packaged by MySQL AB for the
             particular version of MySQL in which you are interested.
-            Prepackaged source distributions are available for released
-            versions of MySQL and can be obtained from
+            These are available from
             <ulink url="&base-url-downloads;"/>.
           </para>
         </listitem>
@@ -9416,10 +9414,9 @@
             You can package a source distribution yourself from the
             latest BitKeeper developer source tree. If you plan to do
             this, you must create the package on a Unix system and then
-            transfer it to your Windows system. (The reason for this is
-            that some of the configuration and build steps require tools
-            that work only on Unix.) The BitKeeper approach thus
-            requires:
+            transfer it to your Windows system. (Some of the
+            configuration and build steps require tools that work only
+            on Unix.) The BitKeeper approach thus requires:
           </para>
 
           <itemizedlist>
@@ -9573,10 +9570,9 @@
               directory, you need to tell the server their pathnames.
               You can either do this on the command line with the
               <option>--basedir</option> and <option>--datadir</option>
-              options, or place appropriate options in an option file
-              (the <filename>my.ini</filename> file in your Windows
-              directory or <filename>C:\my.cnf</filename>). If you have
-              an existing data directory elsewhere that you want to use,
+              options, or by placing appropriate options in an option
+              file. (See <xref linkend="option-files"/>.) If you have an
+              existing data directory elsewhere that you want to use,
               you can specify its pathname instead.
             </para>
           </listitem>
@@ -9588,9 +9584,9 @@
               <filename>client_debug</filename> directory, depending on
               which server you want to use. The general server startup
               instructions are in
-              <xref linkend="windows-installation"/>. You will need to
-              adapt the instructions appropriately if you want to use a
-              different base directory or data directory.
+              <xref linkend="windows-installation"/>. You must adapt the
+              instructions appropriately if you want to use a different
+              base directory or data directory.
             </para>
           </listitem>
 
@@ -9714,19 +9710,19 @@
 
         <para>
           To create a Windows source package from the current BitKeeper
-          source tree, use the following instructions. Please note that
-          this procedure must be performed on a system running a Unix or
-          Unix-like operating system. For example, the procedure is
-          known to work well on Linux.
+          source tree, use the instructions here. This procedure must be
+          performed on a system running a Unix or Unix-like operating
+          system because some of the configuration and build steps
+          require tools that work only on Unix. For example, the
+          following procedure is known to work well on Linux.
         </para>
 
         <orderedlist>
 
           <listitem>
             <para>
-              Copy the BitKeeper source tree for MySQL (version 4.1 or
-              above, as desired). For more information on how to copy
-              the source tree, see the instructions in
+              Copy the BitKeeper source tree for MySQL 4.1 (or above, as
+              desired). For instructions on how to do this, see
               <xref linkend="installing-source-tree"/>.
             </para>
           </listitem>
@@ -9801,7 +9797,7 @@
                 </para>
 
                 <para>
-                  Suffix name for the package.
+                  The suffix name for the package.
                 </para>
               </listitem>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -12297,7 +12297,10 @@
           <command>myisamchk --safe-recover</command>. (<literal>REPAIR
           TABLE</literal> does not yet implement all the options of
           <command>myisamchk</command>. We plan to make it more flexible
-          in the future.)
+          in the future.) With <command>myisamchk
+          --safe-recover</command>, you can also use options that
+          <literal>REPAIR TABLE</literal> does not support, such as
+          <option>--max-record-length</option>.
         </para>
 
         <para>

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.0/connector-j.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -3218,10 +3218,7 @@
         versions older than 4.1.0 and
         <literal>character_set_server</literal> for server versions
         4.1.0 and newer. For more information, see
-
-        <xfer linkend="charset-server"/>
-
-        .
+        <xref linkend="charset-server"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.0/installing.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -8446,9 +8446,9 @@
 
         <listitem>
           <para>
-            If you have gotten to the <command>make</command> stage and
-            the distribution does not compile, please report it in our
-            bugs database using the instructions given in
+            If you have gotten to the <command>make</command> stage, but
+            the distribution does not compile, please enter the problem
+            into our bugs database using the instructions given in
             <xref linkend="bug-reports"/>. If you have installed the
             latest versions of the required GNU tools, and they crash
             trying to process our configuration files, please report
@@ -8680,7 +8680,7 @@
             even if you have so much memory and swap space that you
             think you can't possibly have run out. This problem has been
             observed to occur even on systems with generous hardware
-            configurations and the <option>--with-low-memory</option>
+            configurations, and the <option>--with-low-memory</option>
             option usually fixes it.
           </para>
         </listitem>
@@ -8746,19 +8746,19 @@
 
           <para>
             This works because <command>gcc</command> compiles C++
-            sources as well as <command>g++</command> does, but does not
-            link in <literal>libg++</literal> or
+            source files as well as <command>g++</command> does, but
+            does not link in <literal>libg++</literal> or
             <literal>libstdc++</literal> by default.
           </para>
 
           <para>
             Another way to fix these problems is to install
             <command>g++</command>, <literal>libg++</literal>, and
-            <literal>libstdc++</literal>. We would, however, like to
-            recommend that you not use <literal>libg++</literal> or
+            <literal>libstdc++</literal>. However, we recommend that you
+            not use <literal>libg++</literal> or
             <literal>libstdc++</literal> with MySQL because this only
             increases the binary size of <command>mysqld</command>
-            without giving you any benefits. Some versions of these
+            without providing any benefits. Some versions of these
             libraries have also caused strange problems for MySQL users
             in the past.
           </para>
@@ -8913,7 +8913,7 @@
           <para>
             Change <literal>XXX</literal> to <literal>size_t</literal>
             or <literal>int</literal>, depending on your operating
-            system. (Note that you have to do this each time you run
+            system. (You must do this each time you run
             <command>configure</command> because
             <command>configure</command> regenerates
             <filename>config.h</filename>.)
@@ -8924,7 +8924,7 @@
           <para>
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
-            does not need to create <filename>sql_yacc.cc</filename>,
+            does not need to create <filename>sql_yacc.cc</filename>
             because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
@@ -8945,8 +8945,8 @@
           <para>
             On Debian Linux 3.0, you need to install
             <literal>gawk</literal> instead of the default
-            <literal>mawk</literal> if you want to compile MySQL
-            &current-series; with Berkeley DB support.
+            <literal>mawk</literal> if you want to compile MySQL with
+            Berkeley DB support.
           </para>
         </listitem>
 
@@ -9010,8 +9010,8 @@
           </itemizedlist>
 
           <para>
-            Please note that you need to run
-            <command>configure</command> again afterward.
+            You must run <command>configure</command> again after making
+            either of those changes.
           </para>
         </listitem>
 
@@ -9044,8 +9044,8 @@
       </para>
 
       <para>
-        If your system does not provide native thread support, you need
-        to build MySQL using the MIT-pthreads package. This includes
+        If your system does not provide native thread support, you
+        should build MySQL using the MIT-pthreads package. This includes
         older FreeBSD systems, SunOS 4.x, Solaris 2.4 and earlier, and
         some others. See <xref linkend="which-os"/>.
       </para>
@@ -9090,11 +9090,12 @@
             with the server code. If you have configured the
             distribution using <option>--without-server</option> to
             build only the client code, clients do not know whether
-            MIT-pthreads is being used and use Unix socket connections
-            by default. Because Unix socket files do not work under
-            MIT-pthreads on some platforms, this means you need to use
-            <option>-h</option> or <option>--host</option> when you run
-            client programs.
+            MIT-pthreads is being used and use Unix socket file
+            connections by default. Because Unix socket files do not
+            work under MIT-pthreads on some platforms, this means you
+            need to use <option>-h</option> or <option>--host</option>
+            with a value other than <literal>localhost</literal> when
+            you run client programs.
           </para>
         </listitem>
 
@@ -9105,7 +9106,7 @@
             the server to use system locking with the
             <option>--external-locking</option> option. This is needed
             only if you want to be able to run two MySQL servers against
-            the same data files, which is not recommended.
+            the same data files, but that is not recommended, anyway.
           </para>
         </listitem>
 
@@ -9124,7 +9125,7 @@
 </programlisting>
 
           <para>
-            The solution to this is to kill the
+            The solution to this problem is to kill the
             <command>mysqld</command> server and restart it. This has
             happened to us only when we have forcibly stopped the server
             and restarted it immediately.
@@ -9135,7 +9136,7 @@
           <para>
             With MIT-pthreads, the <literal>sleep()</literal> system
             call isn't interruptible with <literal>SIGINT</literal>
-            (break). This is only noticeable when you run
+            (break). This is noticeable only when you run
             <command>mysqladmin --sleep</command>. You must wait for the
             <literal>sleep()</literal> call to terminate before the
             interrupt is served and the process stops.
@@ -9144,7 +9145,7 @@
 
         <listitem>
           <para>
-            When linking, you may receive warning messages like these
+            When linking, you might receive warning messages like these
             (at least on Solaris); they can be ignored:
           </para>
 
@@ -9188,23 +9189,23 @@
       <title>&title-windows-source-build;</title>
 
       <para>
-        These instructions describe how to build MySQL binaries from
-        source for version &current-series; on Windows. Instructions are
-        provided for building binaries from a standard source
-        distribution or from the BitKeeper tree that contains the latest
-        development source.
+        These instructions describe how to build binaries from source
+        for MySQL &current-series; on Windows. Instructions are provided
+        for building binaries from a standard source distribution or
+        from the BitKeeper tree that contains the latest development
+        source.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: The instructions in this
-        document are strictly for users who want to test MySQL on
-        Windows from the latest source distribution or from the
-        BitKeeper tree. For production use, MySQL AB does not advise
-        using a MySQL server built by yourself from source. Normally, it
-        is best to use precompiled binary distributions of MySQL that
-        are built specifically for optimal performance on Windows by
-        MySQL AB. Instructions for installing a binary distributions are
-        available in <xref linkend="windows-installation"/>.
+        <emphasis role="bold">Note</emphasis>: The instructions here are
+        strictly for users who want to test MySQL on Windows from the
+        latest source distribution or from the BitKeeper tree. For
+        production use, MySQL AB does not advise using a MySQL server
+        built by yourself from source. Normally, it is best to use
+        precompiled binary distributions of MySQL that are built
+        specifically for optimal performance on Windows by MySQL AB.
+        Instructions for installing a binary distributions are available
+        in <xref linkend="windows-installation"/>.
       </para>
 
       <para>
@@ -9241,17 +9242,15 @@
 
       <para>
         You also need a MySQL source distribution for Windows. There are
-        two ways you can obtain a source distribution for MySQL
-        &current-series;:
+        two ways to obtain a source distribution:
       </para>
 
       <orderedlist>
 
         <listitem>
           <para>
-            Obtain a source distribution packaged by MySQL AB.
-            Prepackaged source distributions are available from
-            <ulink url="&base-url-downloads;"/>.
+            Obtain a source distribution packaged by MySQL AB. These are
+            available from <ulink url="&base-url-downloads;"/>.
           </para>
         </listitem>
 
@@ -9260,10 +9259,9 @@
             You can package a source distribution yourself from the
             latest BitKeeper developer source tree. If you plan to do
             this, you must create the package on a Unix system and then
-            transfer it to your Windows system. (The reason for this is
-            that some of the configuration and build steps require tools
-            that work only on Unix.) The BitKeeper approach thus
-            requires:
+            transfer it to your Windows system. (Some of the
+            configuration and build steps require tools that work only
+            on Unix.) The BitKeeper approach thus requires:
           </para>
 
           <itemizedlist>
@@ -9413,10 +9411,9 @@
               directory, you need to tell the server their pathnames.
               You can either do this on the command line with the
               <option>--basedir</option> and <option>--datadir</option>
-              options, or place appropriate options in an option file
-              (the <filename>my.ini</filename> file in your Windows
-              directory or <filename>C:\my.cnf</filename>). If you have
-              an existing data directory elsewhere that you want to use,
+              options, or by placing appropriate options in an option
+              file. (See <xref linkend="option-files"/>.) If you have an
+              existing data directory elsewhere that you want to use,
               you can specify its pathname instead.
             </para>
           </listitem>
@@ -9427,10 +9424,10 @@
               <filename>client_release</filename> or
               <filename>client_debug</filename> directory, depending on
               which server you want to use. The general server startup
-              instructions are at
-              <xref linkend="windows-installation"/>. You need to adapt
-              the instructions appropriately if you want to use a
-              different base directory or data directory.
+              instructions are in
+              <xref linkend="windows-installation"/>. You must adapt the
+              instructions appropriately if you want to use a different
+              base directory or data directory.
             </para>
           </listitem>
 
@@ -9554,10 +9551,11 @@
 
         <para>
           To create a Windows source package from the current BitKeeper
-          source tree, use the following instructions. Please note that
-          this procedure must be performed on a system running a Unix or
-          Unix-like operating system. For example, the procedure is
-          known to work well on Linux.
+          source tree, use the instructions here. This procedure must be
+          performed on a system running a Unix or Unix-like operating
+          system because some of the configuration and build steps
+          require tools that work only on Unix. For example, the
+          following procedure is known to work well on Linux.
         </para>
 
         <orderedlist>
@@ -9565,8 +9563,7 @@
           <listitem>
             <para>
               Copy the BitKeeper source tree for MySQL &current-series;.
-              For more information on how to copy the source tree, see
-              the instructions in
+              For instructions on how to do this, see
               <xref linkend="installing-source-tree"/>.
             </para>
           </listitem>
@@ -9641,7 +9638,7 @@
                 </para>
 
                 <para>
-                  Suffix name for the package.
+                  The suffix name for the package.
                 </para>
               </listitem>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -13457,7 +13457,10 @@
           <command>myisamchk --safe-recover</command>. (<literal>REPAIR
           TABLE</literal> does not yet implement all the options of
           <command>myisamchk</command>. We plan to make it more flexible
-          in the future.)
+          in the future.) With <command>myisamchk
+          --safe-recover</command>, you can also use options that
+          <literal>REPAIR TABLE</literal> does not support, such as
+          <option>--max-record-length</option>.
         </para>
 
         <para>

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.1/connector-j.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -3218,10 +3218,7 @@
         versions older than 4.1.0 and
         <literal>character_set_server</literal> for server versions
         4.1.0 and newer. For more information, see
-
-        <xfer linkend="charset-server"/>
-
-        .
+        <xref linkend="charset-server"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.1/installing.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -8394,9 +8394,9 @@
 
           <para>
             The command lines that change directory into the
-            <filename>innobase</filename> and
-            <filename>bdb/dist</filename> directories are used to
-            configure the <literal>InnoDB</literal> and Berkeley DB
+            <filename>storage/innobase</filename> and
+            <filename>storage/bdb/dist</filename> directories are used
+            to configure the <literal>InnoDB</literal> and Berkeley DB
             (<literal>BDB</literal>) storage engines. You can omit these
             command lines if you to not require
             <literal>InnoDB</literal> or <literal>BDB</literal> support.
@@ -8451,9 +8451,9 @@
 
         <listitem>
           <para>
-            If you have gotten to the <command>make</command> stage and
-            the distribution does not compile, please report it in our
-            bugs database using the instructions given in
+            If you have gotten to the <command>make</command> stage, but
+            the distribution does not compile, please enter the problem
+            into our bugs database using the instructions given in
             <xref linkend="bug-reports"/>. If you have installed the
             latest versions of the required GNU tools, and they crash
             trying to process our configuration files, please report
@@ -8676,7 +8676,7 @@
             even if you have so much memory and swap space that you
             think you can't possibly have run out. This problem has been
             observed to occur even on systems with generous hardware
-            configurations and the <option>--with-low-memory</option>
+            configurations, and the <option>--with-low-memory</option>
             option usually fixes it.
           </para>
         </listitem>
@@ -8742,19 +8742,19 @@
 
           <para>
             This works because <command>gcc</command> compiles C++
-            sources as well as <command>g++</command> does, but does not
-            link in <literal>libg++</literal> or
+            source files as well as <command>g++</command> does, but
+            does not link in <literal>libg++</literal> or
             <literal>libstdc++</literal> by default.
           </para>
 
           <para>
             Another way to fix these problems is to install
             <command>g++</command>, <literal>libg++</literal>, and
-            <literal>libstdc++</literal>. We would, however, like to
-            recommend that you not use <literal>libg++</literal> or
+            <literal>libstdc++</literal>. However, we recommend that you
+            not use <literal>libg++</literal> or
             <literal>libstdc++</literal> with MySQL because this only
             increases the binary size of <command>mysqld</command>
-            without giving you any benefits. Some versions of these
+            without providing any benefits. Some versions of these
             libraries have also caused strange problems for MySQL users
             in the past.
           </para>
@@ -8909,7 +8909,7 @@
           <para>
             Change <literal>XXX</literal> to <literal>size_t</literal>
             or <literal>int</literal>, depending on your operating
-            system. (Note that you have to do this each time you run
+            system. (You must do this each time you run
             <command>configure</command> because
             <command>configure</command> regenerates
             <filename>config.h</filename>.)
@@ -8920,7 +8920,7 @@
           <para>
             The <filename>sql_yacc.cc</filename> file is generated from
             <filename>sql_yacc.yy</filename>. Normally the build process
-            does not need to create <filename>sql_yacc.cc</filename>,
+            does not need to create <filename>sql_yacc.cc</filename>
             because MySQL comes with a pre-generated copy. However, if
             you do need to re-create it, you might encounter this error:
           </para>
@@ -8941,8 +8941,8 @@
           <para>
             On Debian Linux 3.0, you need to install
             <literal>gawk</literal> instead of the default
-            <literal>mawk</literal> if you want to compile MySQL
-            &current-series; with Berkeley DB support.
+            <literal>mawk</literal> if you want to compile MySQL with
+            Berkeley DB support.
           </para>
         </listitem>
 
@@ -9006,8 +9006,8 @@
           </itemizedlist>
 
           <para>
-            Please note that you need to run
-            <command>configure</command> again afterward.
+            You must run <command>configure</command> again after making
+            either of those changes.
           </para>
         </listitem>
 
@@ -9040,8 +9040,8 @@
       </para>
 
       <para>
-        If your system does not provide native thread support, you need
-        to build MySQL using the MIT-pthreads package. This includes
+        If your system does not provide native thread support, you
+        should build MySQL using the MIT-pthreads package. This includes
         older FreeBSD systems, SunOS 4.x, Solaris 2.4 and earlier, and
         some others. See <xref linkend="which-os"/>.
       </para>
@@ -9086,11 +9086,12 @@
             with the server code. If you have configured the
             distribution using <option>--without-server</option> to
             build only the client code, clients do not know whether
-            MIT-pthreads is being used and use Unix socket connections
-            by default. Because Unix socket files do not work under
-            MIT-pthreads on some platforms, this means you need to use
-            <option>-h</option> or <option>--host</option> when you run
-            client programs.
+            MIT-pthreads is being used and use Unix socket file
+            connections by default. Because Unix socket files do not
+            work under MIT-pthreads on some platforms, this means you
+            need to use <option>-h</option> or <option>--host</option>
+            with a value other than <literal>localhost</literal> when
+            you run client programs.
           </para>
         </listitem>
 
@@ -9101,7 +9102,7 @@
             the server to use system locking with the
             <option>--external-locking</option> option. This is needed
             only if you want to be able to run two MySQL servers against
-            the same data files, which is not recommended.
+            the same data files, but that is not recommended, anyway.
           </para>
         </listitem>
 
@@ -9120,7 +9121,7 @@
 </programlisting>
 
           <para>
-            The solution to this is to kill the
+            The solution to this problem is to kill the
             <command>mysqld</command> server and restart it. This has
             happened to us only when we have forcibly stopped the server
             and restarted it immediately.
@@ -9131,7 +9132,7 @@
           <para>
             With MIT-pthreads, the <literal>sleep()</literal> system
             call isn't interruptible with <literal>SIGINT</literal>
-            (break). This is only noticeable when you run
+            (break). This is noticeable only when you run
             <command>mysqladmin --sleep</command>. You must wait for the
             <literal>sleep()</literal> call to terminate before the
             interrupt is served and the process stops.
@@ -9140,7 +9141,7 @@
 
         <listitem>
           <para>
-            When linking, you may receive warning messages like these
+            When linking, you might receive warning messages like these
             (at least on Solaris); they can be ignored:
           </para>
 
@@ -9184,23 +9185,23 @@
       <title>&title-windows-source-build;</title>
 
       <para>
-        These instructions describe how to build MySQL binaries from
-        source for version &current-series; on Windows. Instructions are
-        provided for building binaries from a standard source
-        distribution or from the BitKeeper tree that contains the latest
-        development source.
+        These instructions describe how to build binaries from source
+        for MySQL &current-series; on Windows. Instructions are provided
+        for building binaries from a standard source distribution or
+        from the BitKeeper tree that contains the latest development
+        source.
       </para>
 
       <para>
-        <emphasis role="bold">Note</emphasis>: The instructions in this
-        document are strictly for users who want to test MySQL on
-        Windows from the latest source distribution or from the
-        BitKeeper tree. For production use, MySQL AB does not advise
-        using a MySQL server built by yourself from source. Normally, it
-        is best to use precompiled binary distributions of MySQL that
-        are built specifically for optimal performance on Windows by
-        MySQL AB. Instructions for installing a binary distributions are
-        available in <xref linkend="windows-installation"/>.
+        <emphasis role="bold">Note</emphasis>: The instructions here are
+        strictly for users who want to test MySQL on Windows from the
+        latest source distribution or from the BitKeeper tree. For
+        production use, MySQL AB does not advise using a MySQL server
+        built by yourself from source. Normally, it is best to use
+        precompiled binary distributions of MySQL that are built
+        specifically for optimal performance on Windows by MySQL AB.
+        Instructions for installing a binary distributions are available
+        in <xref linkend="windows-installation"/>.
       </para>
 
       <para>
@@ -9237,17 +9238,15 @@
 
       <para>
         You also need a MySQL source distribution for Windows. There are
-        two ways you can obtain a source distribution for MySQL
-        &current-series;:
+        two ways to obtain a source distribution:
       </para>
 
       <orderedlist>
 
         <listitem>
           <para>
-            Obtain a source distribution packaged by MySQL AB.
-            Prepackaged source distributions are available from
-            <ulink url="&base-url-downloads;"/>.
+            Obtain a source distribution packaged by MySQL AB. These are
+            available from <ulink url="&base-url-downloads;"/>.
           </para>
         </listitem>
 
@@ -9256,10 +9255,9 @@
             You can package a source distribution yourself from the
             latest BitKeeper developer source tree. If you plan to do
             this, you must create the package on a Unix system and then
-            transfer it to your Windows system. (The reason for this is
-            that some of the configuration and build steps require tools
-            that work only on Unix.) The BitKeeper approach thus
-            requires:
+            transfer it to your Windows system. (Some of the
+            configuration and build steps require tools that work only
+            on Unix.) The BitKeeper approach thus requires:
           </para>
 
           <itemizedlist>
@@ -9409,10 +9407,9 @@
               directory, you need to tell the server their pathnames.
               You can either do this on the command line with the
               <option>--basedir</option> and <option>--datadir</option>
-              options, or place appropriate options in an option file
-              (the <filename>my.ini</filename> file in your Windows
-              directory or <filename>C:\my.cnf</filename>). If you have
-              an existing data directory elsewhere that you want to use,
+              options, or by placing appropriate options in an option
+              file. (See <xref linkend="option-files"/>.) If you have an
+              existing data directory elsewhere that you want to use,
               you can specify its pathname instead.
             </para>
           </listitem>
@@ -9423,10 +9420,10 @@
               <filename>client_release</filename> or
               <filename>client_debug</filename> directory, depending on
               which server you want to use. The general server startup
-              instructions are at
-              <xref linkend="windows-installation"/>. You need to adapt
-              the instructions appropriately if you want to use a
-              different base directory or data directory.
+              instructions are in
+              <xref linkend="windows-installation"/>. You must adapt the
+              instructions appropriately if you want to use a different
+              base directory or data directory.
             </para>
           </listitem>
 
@@ -9550,10 +9547,11 @@
 
         <para>
           To create a Windows source package from the current BitKeeper
-          source tree, use the following instructions. Please note that
-          this procedure must be performed on a system running a Unix or
-          Unix-like operating system. For example, the procedure is
-          known to work well on Linux.
+          source tree, use the instructions here. This procedure must be
+          performed on a system running a Unix or Unix-like operating
+          system because some of the configuration and build steps
+          require tools that work only on Unix. For example, the
+          following procedure is known to work well on Linux.
         </para>
 
         <orderedlist>
@@ -9561,8 +9559,7 @@
           <listitem>
             <para>
               Copy the BitKeeper source tree for MySQL &current-series;.
-              For more information on how to copy the source tree, see
-              the instructions in
+              For instructions on how to do this, see
               <xref linkend="installing-source-tree"/>.
             </para>
           </listitem>
@@ -9637,7 +9634,7 @@
                 </para>
 
                 <para>
-                  Suffix name for the package.
+                  The suffix name for the package.
                 </para>
               </listitem>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-31 00:45:44 UTC (rev 1141)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-31 00:46:00 UTC (rev 1142)
@@ -13926,7 +13926,10 @@
           <command>myisamchk --safe-recover</command>. (<literal>REPAIR
           TABLE</literal> does not yet implement all the options of
           <command>myisamchk</command>. We plan to make it more flexible
-          in the future.)
+          in the future.) With <command>myisamchk
+          --safe-recover</command>, you can also use options that
+          <literal>REPAIR TABLE</literal> does not support, such as
+          <option>--max-record-length</option>.
         </para>
 
         <para>

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