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

Log:
 r2719@kite-hub:  paul | 2006-01-30 15:37:39 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/apis.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/custom-engine-build.xml
   trunk/refman-5.1/installing.xml


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

Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-4.1/apis.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -1250,11 +1250,11 @@
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_STRING</literal></entry>
-                  <entry><literal>CHAR</literal> field</entry>
+                  <entry><literal>CHAR</literal> or <literal>BINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
-                  <entry><literal>VARCHAR</literal> field</entry>
+                  <entry><literal>VARCHAR</literal> or <literal>VARBINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_BLOB</literal></entry>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-4.1/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -597,7 +597,7 @@
           Normally, if you are beginning to use MySQL for the first time
           or trying to port it to some system for which there is no
           binary distribution, we recommend going with the production
-          release series. Currently this is MySQL 5.0. All MySQL
+          release series. Currently, this is MySQL 5.0. All MySQL
           releases, even those from development series, are checked with
           the MySQL benchmarks and an extensive test suite before being
           issued.
@@ -5211,8 +5211,8 @@
       <para>
         Your first resource when troubleshooting server issues is the
         error log. The MySQL server uses the error log to record
-        information relevant to the error that is preventing the server
-        from starting. The error log is located in the data directory
+        information relevant to the error that prevents the server from
+        starting. The error log is located in the data directory
         specified in your <filename>my.ini</filename> file. The default
         data directory location is <filename>C:\mysql\data</filename>.
         See <xref linkend="error-log"/>.
@@ -5229,50 +5229,52 @@
       </para>
 
       <para>
-        The following are examples of some of the more common error
-        messages you may encounter when installing MySQL and starting
-        the server for the first time:
+        The following examples show other common error messages you may
+        encounter when installing MySQL and starting the server for the
+        first time:
       </para>
 
       <itemizedlist>
 
         <listitem>
+          <para>
+            If the MySQL server cannot find the <literal>mysql</literal>
+            privileges database or other critical files, you may see
+            these messsages:
+          </para>
+
 <programlisting>
 System error 1067 has occurred.
 Fatal error: Can't open privilege tables: Table 'mysql.host' does not exist
 </programlisting>
 
           <para>
-            These messages occur when the MySQL server cannot find the
-            <literal>mysql</literal> privileges database or other
-            critical files. This error is often encountered when the
-            MySQL base or data directories are installed in different
-            locations than the default locations
-            (<filename>C:\mysql</filename> and
+            These messages often occur when the MySQL base or data
+            directories are installed in different locations than the
+            default locations (<filename>C:\mysql</filename> and
             <filename>C:\mysql\data</filename>, respectively).
           </para>
 
           <para>
-            One situation when this may occur is when MySQL is upgraded
-            and installed to a new location, but the configuration file
-            is not updated to reflect the new install location. In
-            addition there may be old and new configuration files that
-            conflict, be sure to delete or rename any old configuration
-            files when upgrading MySQL.
+            This situation may occur when MySQL is upgraded and
+            installed to a new location, but the configuration file is
+            not updated to reflect the new location. In addition, there
+            may be old and new configuration files that conflict. Be
+            sure to delete or rename any old configuration files when
+            upgrading MySQL.
           </para>
 
           <para>
             If you have installed MySQL to a directory other than
-            <filename>C:\mysql</filename> you need to ensure that the
+            <filename>C:\mysql</filename>, you need to ensure that the
             MySQL server is aware of this through the use of a
             configuration (<literal>my.ini</literal>) file. The
             <literal>my.ini</literal> file needs to be located in your
-            Windows directory, typically located at
-            <filename>C:\WINNT</filename> or
-            <filename>C:\WINDOWS</filename>. You can determine its exact
-            location from the value of the <literal>WINDIR</literal>
-            environment variable by issuing the following command from
-            the command prompt:
+            Windows directory, typically <filename>C:\WINDOWS</filename>
+            or <filename>C:\WINNT</filename>. You can determine its
+            exact location from the value of the
+            <literal>WINDIR</literal> environment variable by issuing
+            the following command from the command prompt:
           </para>
 
 <programlisting>
@@ -5325,36 +5327,39 @@
         </listitem>
 
         <listitem>
+          <para>
+            If you reinstall or upgrade MySQL without first stopping and
+            removing the existing MySQL service and install MySQL using
+            the MySQL Configuration Wizard, you may see this error:
+          </para>
+
 <programlisting>
 Error: Cannot create Windows service for MySql. Error: 0
 </programlisting>
 
           <para>
-            This error is encountered when you re-install or upgrade
-            MySQL without first stopping and removing the existing MySQL
-            service and install MySQL using the MySQL Configuration
-            Wizard. This happens because when the Configuration Wizard
-            tries to install the service it finds an existing service
-            with the same name.
+            This occurs when the Configuration Wizard tries to install
+            the service and finds an existing service with the same
+            name.
           </para>
 
           <para>
             One solution to this problem is to choose a service name
             other than <literal>mysql</literal> when using the
-            configuration wizard. This will allow the new service to be
+            configuration wizard. This allows the new service to be
             installed correctly, but leaves the outdated service in
             place. Although this is harmless, it is best to remove old
             services that are no longer in use.
           </para>
 
           <para>
-            To permanently remove the old mysql service, execute the
-            following command as a user with administrative privileges,
-            on the command-line:
+            To permanently remove the old <literal>mysql</literal>
+            service, execute the following command as a user with
+            administrative privileges, on the command-line:
           </para>
 
 <programlisting>
-C:\&gt;<userinput>sc delete mysql</userinput>
+C:\&gt; <userinput>sc delete mysql</userinput>
 [SC] DeleteService SUCCESS
 </programlisting>
 
@@ -5389,6 +5394,13 @@
 
         <listitem>
           <para>
+            Review <xref linkend="upgrade"/>, for additional information
+            on upgrading MySQL that is not specific to Windows.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             You should always back up your current MySQL installation
             before performing an upgrade. See <xref linkend="backup"/>.
           </para>
@@ -5403,26 +5415,31 @@
 
         <listitem>
           <para>
-            Before upgrading MySQL, you must stop the server.
+            Before upgrading MySQL, you must stop the server. If the
+            server is installed as a service, stop the service with the
+            following command from the command prompt:
           </para>
 
-          <para>
-            If the server is installed as a service, stop the service
-            with the following command from the command prompt:
-          </para>
-
 <programlisting>
 C:\&gt; <userinput>NET STOP MySQL</userinput>
 </programlisting>
 
           <para>
             If you are not running the MySQL server as a service, use
-            the following command to stop the server:
+            the following command to stop it:
           </para>
 
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\mysqladmin -u root shutdown</userinput>
 </programlisting>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: If the MySQL
+            <literal>root</literal> user account has a password, you
+            need to invoke this command as <command>mysqladmin</command>
+            with the <option>-p</option> option and supply the password
+            when prompted.
+          </para>
         </listitem>
 
         <listitem>
@@ -5471,17 +5488,17 @@
 
         <listitem>
           <para>
-            Restart the server. For example, use <command>NET START
-            MySQL</command> if you run MySQL as a service, or invoke
-            <command>mysqld</command> directly otherwise.
+            If you were running MySQL as a Windows service and you had
+            to remove the service earlier in this procedure, reinstall
+            the service. (See <xref linkend="windows-start-service"/>.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/>, for additional
-            information on upgrading MySQL that is not specific to
-            Windows.
+            Restart the server. For example, use <command>NET START
+            MySQL</command> if you run MySQL as a service, or invoke
+            <command>mysqld</command> directly otherwise.
           </para>
         </listitem>
 
@@ -5528,7 +5545,7 @@
             thread creation. Each connection in MySQL creates a new
             thread, so you should not run <command>mysqld</command> for
             an extended time on Windows 95 if your server handles many
-            connections! Other versions of Windows do not suffer from
+            connections! Newer versions of Windows don't suffer from
             this bug.
           </para>
         </listitem>
@@ -5553,7 +5570,7 @@
           </para>
 
           <para>
-            For more information, see
+            For more information about this problem, see
             <ulink url="http://support.microsoft.com/default.aspx?scid=kb;en-us;196271"/>.
           </para>
         </listitem>
@@ -5567,16 +5584,16 @@
             MySQL depends on the <literal>pread()</literal> and
             <literal>pwrite()</literal> calls to be able to mix
             <literal>INSERT</literal> and <literal>SELECT</literal>.
-            Currently we use mutexes to emulate
+            Currently, we use mutexes to emulate
             <literal>pread()</literal>/<literal>pwrite()</literal>. We
             will, in the long run, replace the file level interface with
             a virtual interface so that we can use the
             <literal>readfile()</literal>/<literal>writefile()</literal>
             interface on NT, 2000, and XP to get more speed. The current
-            implementation limits the number of open files MySQL can use
-            to 2,048 (1,024 before MySQL 4.0.19), which means that you
-            cannot run as many concurrent threads on NT, 2000, XP, and
-            2003 as on Unix.
+            implementation limits the number of open files that MySQL
+            can use to 2,048 (1,024 before MySQL 4.0.19), which means
+            that you cannot run as many concurrent threads on NT, 2000,
+            XP, and 2003 as on Unix.
           </para>
         </listitem>
 
@@ -5586,8 +5603,8 @@
           </para>
 
           <para>
-            MySQL uses a blocking read for each connection, which has
-            the following implications if named-pipe connections are
+            MySQL uses a blocking read for each connection. That has the
+            following implications if named-pipe connections are
             enabled:
           </para>
 
@@ -5698,8 +5715,8 @@
           </para>
 
           <para>
-            You cannot kill MySQL from the Task Manager or with the
-            shutdown utility in Windows 95. You must stop it with
+            On Windows 95, you cannot kill MySQL from the Task Manager
+            or with the shutdown utility. You must stop it with
             <command>mysqladmin shutdown</command> or the <literal>NET
             STOP ...</literal> command.
           </para>
@@ -5753,14 +5770,14 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Problems with pipes.</emphasis>
+            <emphasis role="bold">Problems with pipes</emphasis>
           </para>
 
           <para>
             Pipes do not work reliably from the Windows command-line
             prompt. If the pipe includes the character
             <literal>^Z</literal> / <literal>CHAR(24)</literal>, Windows
-            thinks it has encountered end-of-file and aborts the
+            thinks that it has encountered end-of-file and aborts the
             program.
           </para>
 
@@ -5770,7 +5787,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-name | mysql --user=root</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> | mysql --user=root</userinput>
 </programlisting>
 
           <para>
@@ -5781,7 +5798,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-file --result-file=/tmp/bin.sql</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> --result-file=/tmp/bin.sql</userinput>
 C:\&gt; <userinput>mysql --user=root --execute "source /tmp/bin.sql"</userinput>
 </programlisting>
 
@@ -5798,16 +5815,18 @@
           </para>
 
           <para>
-            If you attempt to run a MySQL client program to connect to a
-            server running on the same machine, but get the error
-            <literal>Access denied for user
-            '<replaceable>some-user</replaceable>'@'unknown' to database
-            'mysql'</literal>, this means that MySQL cannot resolve your
-            hostname properly.
+            If MySQL cannot resolve your hostname properly, you may get
+            the following error when you attempt to run a MySQL client
+            program to connect to a server running on the same machine:
           </para>
 
+<programlisting>
+Access denied for user '<replaceable>some_user</replaceable>'@'unknown'
+to database 'mysql'
+</programlisting>
+
           <para>
-            To fix this, you should create a file named
+            To fix this problem, you should create a file named
             <filename>\windows\hosts</filename> containing the following
             information:
           </para>
@@ -5886,10 +5905,10 @@
 
     <para>
       MySQL AB does provide some platform-specific RPMs; the difference
-      between a platform-specific RPM and a generic RPM is that the
-      platform-specific RPMs are built on the targeted platform and are
-      linked dynamically whereas the generic RPM is linked statically
-      with LinuxThreads.
+      between a platform-specific RPM and a generic RPM is that a
+      platform-specific RPM is built on the targeted platform and is
+      linked dynamically whereas a generic RPM is linked statically with
+      LinuxThreads.
     </para>
 
     <para>
@@ -5903,13 +5922,13 @@
 
     <para>
       If you have problems with an RPM file (for example, if you receive
-      the error <quote><literal>Sorry, the host
+      the error <literal>Sorry, the host
       '<replaceable>xxxx</replaceable>' could not be looked
-      up</literal></quote>), see <xref linkend="binary-notes-linux"/>.
+      up</literal>), see <xref linkend="binary-notes-linux"/>.
     </para>
 
     <para>
-      In most cases, you only need to install the
+      In most cases, you need to install only the
       <literal>MySQL-server</literal> and
       <literal>MySQL-client</literal> packages to get a functional MySQL
       installation. The other packages are not required for a standard
@@ -5923,17 +5942,17 @@
 
     <para>
       If you get a dependency failure when trying to install the MySQL
-      4.0 packages (for example, <quote><literal>error: removing these
-      packages would break dependencies: libmysqlclient.so.10 is needed
-      by ...</literal></quote>), you should also install the package
-      <literal>MySQL-shared-compat</literal>, which includes both the
-      shared libraries for backward compatibility
+      4.0 packages (for example, <literal>error: removing these packages
+      would break dependencies: libmysqlclient.so.10 is needed by
+      ...</literal>), you should also install the
+      <literal>MySQL-shared-compat</literal> package, which includes
+      both the shared libraries for backward compatibility
       (<literal>libmysqlclient.so.12</literal> for MySQL 4.0 and
       <literal>libmysqlclient.so.10</literal> for MySQL 3.23).
     </para>
 
     <para>
-      Many Linux distributions still ship with MySQL 3.23 and they
+      Some Linux distributions still ship with MySQL 3.23 and they
       usually link applications dynamically to save disk space. If these
       shared libraries are in a separate package (for example,
       <literal>MySQL-shared</literal>), it is sufficient to simply leave
@@ -6048,7 +6067,7 @@
         </para>
 
         <para>
-          The embedded MySQL server library (from MySQL 4.0).
+          The embedded MySQL server library (available as of MySQL 4.0).
         </para>
       </listitem>
 
@@ -6068,7 +6087,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run:
+      <literal>MySQL-server</literal> RPM), run a commnd like this:
     </para>
 
 <programlisting>
@@ -6076,7 +6095,8 @@
 </programlisting>
 
     <para>
-      To perform a standard minimal installation, run:
+      To perform a standard minimal installation, install the server and
+      client RPMs:
     </para>
 
 <programlisting>
@@ -6085,7 +6105,7 @@
 </programlisting>
 
     <para>
-      To install just the client package, run:
+      To install only the client programs, install just the client RPM:
     </para>
 
 <programlisting>
@@ -6175,7 +6195,7 @@
 
     <para>
       Beginning with MySQL 4.0.11, you can install MySQL on Mac OS X
-      10.2.x (<quote>Jaguar</quote>) and up using a Mac OS X binary
+      10.2.x (<quote>Jaguar</quote>) or newer using a Mac OS X binary
       package in PKG format instead of the binary tarball distribution.
       Please note that older versions of Mac OS X (for example, 10.1.x)
       are not supported by this package.
@@ -6228,13 +6248,12 @@
       The Mac OS X PKG of MySQL installs itself into
       <filename>/usr/local/mysql-<replaceable>VERSION</replaceable></filename>
       and also installs a symbolic link,
-      <filename>/usr/local/mysql</filename>, pointing to the new
+      <filename>/usr/local/mysql</filename>, that points to the new
       location. If a directory named
       <filename>/usr/local/mysql</filename> exists, it is renamed to
       <filename>/usr/local/mysql.bak</filename> first. In addition, the
       installer creates the grant tables in the <literal>mysql</literal>
-      database by executing <command>mysql_install_db</command> after
-      the installation.
+      database by executing <command>mysql_install_db</command>.
     </para>
 
     <para>

Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-5.0/apis.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -1294,11 +1294,11 @@
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_STRING</literal></entry>
-                  <entry><literal>CHAR</literal> field</entry>
+                  <entry><literal>CHAR</literal> or <literal>BINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
-                  <entry><literal>VARCHAR</literal> field</entry>
+                  <entry><literal>VARCHAR</literal> or <literal>VARBINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_BLOB</literal></entry>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-5.0/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -597,7 +597,7 @@
           Normally, if you are beginning to use MySQL for the first time
           or trying to port it to some system for which there is no
           binary distribution, we recommend going with the production
-          release series. Currently this is MySQL 5.0. All MySQL
+          release series. Currently, this is MySQL 5.0. All MySQL
           releases, even those from development series, are checked with
           the MySQL benchmarks and an extensive test suite before being
           issued.
@@ -5121,8 +5121,8 @@
       <para>
         Your first resource when troubleshooting server issues is the
         error log. The MySQL server uses the error log to record
-        information relevant to the error that is preventing the server
-        from starting. The error log is located in the data directory
+        information relevant to the error that prevents the server from
+        starting. The error log is located in the data directory
         specified in your <filename>my.ini</filename> file. The default
         data directory location is <filename>C:\Program
         Files\MySQL\MySQL Server &current-series;\data</filename>. See
@@ -5140,48 +5140,52 @@
       </para>
 
       <para>
-        The following are examples of some of the more common error
-        messages you may encounter when installing MySQL and starting
-        the server for the first time:
+        The following examples show other common error messages you may
+        encounter when installing MySQL and starting the server for the
+        first time:
       </para>
 
       <itemizedlist>
 
         <listitem>
+          <para>
+            If the MySQL server cannot find the <literal>mysql</literal>
+            privileges database or other critical files, you may see
+            these messsages:
+          </para>
+
 <programlisting>
 System error 1067 has occurred.
 Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't exist
 </programlisting>
 
           <para>
-            These messages occur when the MySQL server cannot find the
-            <literal>mysql</literal> privileges database or other
-            critical files. This error is often encountered when the
-            MySQL base or data directories are installed in different
-            locations than the default locations
-            (<filename>C:\mysql</filename> and <filename>C:\Program
+            These messages often occur when the MySQL base or data
+            directories are installed in different locations than the
+            default locations (<filename>C:\Program Files\MySQL\MySQL
+            Server &current-series;</filename> and <filename>C:\Program
             Files\MySQL\MySQL Server &current-series;\data</filename>,
             respectively).
           </para>
 
           <para>
-            One situation when this may occur is when MySQL is upgraded
-            and installed to a new location, but the configuration file
-            is not updated to reflect the new install location. In
-            addition there may be old and new configuration files that
-            conflict, be sure to delete or rename any old configuration
-            files when upgrading MySQL.
+            This situation may occur when MySQL is upgraded and
+            installed to a new location, but the configuration file is
+            not updated to reflect the new location. In addition, there
+            may be old and new configuration files that conflict. Be
+            sure to delete or rename any old configuration files when
+            upgrading MySQL.
           </para>
 
           <para>
             If you have installed MySQL to a directory other than
             <filename>C:\Program Files\MySQL\MySQL Server
-            &current-series;</filename> you need to ensure that the
+            &current-series;</filename>, you need to ensure that the
             MySQL server is aware of this through the use of a
             configuration (<filename>my.ini</filename>) file. The
             <filename>my.ini</filename> file needs to be located in your
-            Windows directory, typically <filename>C:\WINNT</filename>
-            or <filename>C:\WINDOWS</filename>. You can determine its
+            Windows directory, typically <filename>C:\WINDOWS</filename>
+            or <filename>C:\WINNT</filename>. You can determine its
             exact location from the value of the
             <literal>WINDIR</literal> environment variable by issuing
             the following command from the command prompt:
@@ -5197,7 +5201,8 @@
             in <filename>E:\mysql</filename> and the data directory is
             <filename>D:\MySQLdata</filename>, you can create the option
             file and set up a <literal>[mysqld]</literal> section to
-            specify values for the basedir and datadir parameters:
+            specify values for the <literal>basedir</literal> and
+            <literal>datadir</literal> parameters:
           </para>
 
 <programlisting>
@@ -5235,36 +5240,39 @@
         </listitem>
 
         <listitem>
+          <para>
+            If you reinstall or upgrade MySQL without first stopping and
+            removing the existing MySQL service and install MySQL using
+            the MySQL Configuration Wizard, you may see this error:
+          </para>
+
 <programlisting>
 Error: Cannot create Windows service for MySql. Error: 0
 </programlisting>
 
           <para>
-            This error is encountered when you re-install or upgrade
-            MySQL without first stopping and removing the existing MySQL
-            service and install MySQL using the MySQL Configuration
-            Wizard. This happens because when the Configuration Wizard
-            tries to install the service it finds an existing service
-            with the same name.
+            This occurs when the Configuration Wizard tries to install
+            the service and finds an existing service with the same
+            name.
           </para>
 
           <para>
             One solution to this problem is to choose a service name
             other than <literal>mysql</literal> when using the
-            configuration wizard. This will allow the new service to be
+            configuration wizard. This allows the new service to be
             installed correctly, but leaves the outdated service in
             place. Although this is harmless, it is best to remove old
             services that are no longer in use.
           </para>
 
           <para>
-            To permanently remove the old mysql service, execute the
-            following command as a user with administrative privileges,
-            on the command-line:
+            To permanently remove the old <literal>mysql</literal>
+            service, execute the following command as a user with
+            administrative privileges, on the command-line:
           </para>
 
 <programlisting>
-C:\&gt;<userinput>sc delete mysql</userinput>
+C:\&gt; <userinput>sc delete mysql</userinput>
 [SC] DeleteService SUCCESS
 </programlisting>
 
@@ -5299,6 +5307,13 @@
 
         <listitem>
           <para>
+            Review <xref linkend="upgrade"/>, for additional information
+            on upgrading MySQL that is not specific to Windows.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             You should always back up your current MySQL installation
             before performing an upgrade. See <xref linkend="backup"/>.
           </para>
@@ -5313,26 +5328,31 @@
 
         <listitem>
           <para>
-            Before upgrading MySQL, you must stop the server.
+            Before upgrading MySQL, you must stop the server. If the
+            server is installed as a service, stop the service with the
+            following command from the command prompt:
           </para>
 
-          <para>
-            If the server is installed as a service, stop the service
-            with the following command from the command prompt:
-          </para>
-
 <programlisting>
 C:\&gt; <userinput>NET STOP MYSQL</userinput>
 </programlisting>
 
           <para>
             If you are not running the MySQL server as a service, use
-            the following command to stop the server:
+            the following command to stop it:
           </para>
 
 <programlisting>
 C:\&gt; <userinput>"C:\Program Files\MySQL\MySQL Server &current-series;\bin\mysqladmin" -u root shutdown</userinput>
 </programlisting>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: If the MySQL
+            <literal>root</literal> user account has a password, you
+            need to invoke this command as <command>mysqladmin</command>
+            with the <option>-p</option> option and supply the password
+            when prompted.
+          </para>
         </listitem>
 
         <listitem>
@@ -5381,17 +5401,17 @@
 
         <listitem>
           <para>
-            Restart the server. For example, use <command>NET START
-            MySQL</command> if you run MySQL as a service, or invoke
-            <command>mysqld</command> directly otherwise.
+            If you were running MySQL as a Windows service and you had
+            to remove the service earlier in this procedure, reinstall
+            the service. (See <xref linkend="windows-start-service"/>.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/>, for additional
-            information on upgrading MySQL that is not specific to
-            Windows.
+            Restart the server. For example, use <command>NET START
+            MySQL</command> if you run MySQL as a service, or invoke
+            <command>mysqld</command> directly otherwise.
           </para>
         </listitem>
 
@@ -5442,7 +5462,7 @@
             thread creation. Each connection in MySQL creates a new
             thread, so you shouldn't run <command>mysqld</command> for
             an extended time on Windows 95 if your server handles many
-            connections! Other versions of Windows don't suffer from
+            connections! Newer versions of Windows don't suffer from
             this bug.
           </para>
         </listitem>
@@ -5467,7 +5487,7 @@
           </para>
 
           <para>
-            For more information, see
+            For more information about this problem, see
             <ulink url="http://support.microsoft.com/default.aspx?scid=kb;en-us;196271"/>.
           </para>
         </listitem>
@@ -5481,13 +5501,13 @@
             MySQL depends on the <literal>pread()</literal> and
             <literal>pwrite()</literal> system calls to be able to mix
             <literal>INSERT</literal> and <literal>SELECT</literal>.
-            Currently we use mutexes to emulate
+            Currently, we use mutexes to emulate
             <literal>pread()</literal> and <literal>pwrite()</literal>.
             We intend to replace the file level interface with a virtual
             interface in the future so that we can use the
             <literal>readfile()</literal>/<literal>writefile()</literal>
             interface on NT, 2000, and XP to get more speed. The current
-            implementation limits the number of open files MySQL
+            implementation limits the number of open files that MySQL
             &current-series; can use to 2,048, which means that you
             cannot run as many concurrent threads on Windows NT, 2000,
             XP, and 2003 as on Unix.
@@ -5500,8 +5520,8 @@
           </para>
 
           <para>
-            MySQL uses a blocking read for each connection, which has
-            the following implications if named-pipe connections are
+            MySQL uses a blocking read for each connection. That has the
+            following implications if named-pipe connections are
             enabled:
           </para>
 
@@ -5621,8 +5641,8 @@
           </remark>
 
           <para>
-            You cannot kill MySQL from the Task Manager or with the
-            shutdown utility in Windows 95. You must stop it with
+            On Windows 95, you cannot kill MySQL from the Task Manager
+            or with the shutdown utility. You must stop it with
             <command>mysqladmin shutdown</command>.
           </para>
         </listitem>
@@ -5675,14 +5695,14 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Problems with pipes.</emphasis>
+            <emphasis role="bold">Problems with pipes</emphasis>
           </para>
 
           <para>
             Pipes do not work reliably from the Windows command-line
             prompt. If the pipe includes the character
             <literal>^Z</literal> / <literal>CHAR(24)</literal>, Windows
-            thinks it has encountered end-of-file and aborts the
+            thinks that it has encountered end-of-file and aborts the
             program.
           </para>
 
@@ -5692,7 +5712,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-name | mysql --user=root</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> | mysql --user=root</userinput>
 </programlisting>
 
           <para>
@@ -5703,7 +5723,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-file --result-file=/tmp/bin.sql</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> --result-file=/tmp/bin.sql</userinput>
 C:\&gt; <userinput>mysql --user=root --execute "source /tmp/bin.sql"</userinput>
 </programlisting>
 
@@ -5720,16 +5740,18 @@
           </para>
 
           <para>
-            If you attempt to run a MySQL client program to connect to a
-            server running on the same machine, but get the error
-            <literal>Access denied for user
-            '<replaceable>some-user</replaceable>'@'unknown' to database
-            'mysql'</literal>, this means that MySQL cannot resolve your
-            hostname properly.
+            If MySQL cannot resolve your hostname properly, you may get
+            the following error when you attempt to run a MySQL client
+            program to connect to a server running on the same machine:
           </para>
 
+<programlisting>
+Access denied for user '<replaceable>some_user</replaceable>'@'unknown'
+to database 'mysql'
+</programlisting>
+
           <para>
-            To fix this, you should create a file named
+            To fix this problem, you should create a file named
             <filename>\windows\hosts</filename> containing the following
             information:
           </para>
@@ -5808,10 +5830,10 @@
 
     <para>
       MySQL AB does provide some platform-specific RPMs; the difference
-      between a platform-specific RPM and a generic RPM is that the
-      platform-specific RPMs are built on the targeted platform and are
-      linked dynamically whereas the generic RPM is linked statically
-      with LinuxThreads.
+      between a platform-specific RPM and a generic RPM is that a
+      platform-specific RPM is built on the targeted platform and is
+      linked dynamically whereas a generic RPM is linked statically with
+      LinuxThreads.
     </para>
 
     <para>
@@ -5825,13 +5847,13 @@
 
     <para>
       If you have problems with an RPM file (for example, if you receive
-      the error <quote><literal>Sorry, the host
+      the error <literal>Sorry, the host
       '<replaceable>xxxx</replaceable>' could not be looked
-      up</literal></quote>), see <xref linkend="binary-notes-linux"/>.
+      up</literal>), see <xref linkend="binary-notes-linux"/>.
     </para>
 
     <para>
-      In most cases, you only need to install the
+      In most cases, you need to install only the
       <literal>MySQL-server</literal> and
       <literal>MySQL-client</literal> packages to get a functional MySQL
       installation. The other packages are not required for a standard
@@ -5849,11 +5871,11 @@
 
     <para>
       If you get a dependency failure when trying to install MySQL
-      packages (for example, <quote><literal>error: removing these
-      packages would break dependencies: libmysqlclient.so.10 is needed
-      by ...</literal></quote>), you should also install the package
-      <literal>MySQL-shared-compat</literal>, which includes both the
-      shared libraries for backward compatibility
+      packages (for example, <literal>error: removing these packages
+      would break dependencies: libmysqlclient.so.10 is needed by
+      ...</literal>), you should also install the
+      <literal>MySQL-shared-compat</literal> package, which includes
+      both the shared libraries for backward compatibility
       (<literal>libmysqlclient.so.12</literal> for MySQL 4.0 and
       <literal>libmysqlclient.so.10</literal> for MySQL 3.23).
     </para>
@@ -5864,7 +5886,7 @@
     </remark>
 
     <para>
-      Many Linux distributions still ship with MySQL 3.23 and they
+      Some Linux distributions still ship with MySQL 3.23 and they
       usually link applications dynamically to save disk space. If these
       shared libraries are in a separate package (for example,
       <literal>MySQL-shared</literal>), it is sufficient to simply leave
@@ -5984,7 +6006,7 @@
         </para>
 
         <para>
-          The embedded MySQL server library (from MySQL 4.0).
+          The embedded MySQL server library (available as of MySQL 4.0).
         </para>
       </listitem>
 
@@ -6004,7 +6026,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run:
+      <literal>MySQL-server</literal> RPM), run a commnd like this:
     </para>
 
 <programlisting>
@@ -6012,7 +6034,8 @@
 </programlisting>
 
     <para>
-      To perform a standard minimal installation, run:
+      To perform a standard minimal installation, install the server and
+      client RPMs:
     </para>
 
 <programlisting>
@@ -6021,7 +6044,7 @@
 </programlisting>
 
     <para>
-      To install just the client package, run:
+      To install only the client programs, install just the client RPM:
     </para>
 
 <programlisting>
@@ -6113,7 +6136,7 @@
 
     <para>
       You can install MySQL on Mac OS X 10.2.x (<quote>Jaguar</quote>)
-      and up using a Mac OS X binary package in PKG format instead of
+      or newer using a Mac OS X binary package in PKG format instead of
       the binary tarball distribution. Please note that older versions
       of Mac OS X (for example, 10.1.x) are
       <emphasis role="bold">not</emphasis> supported by this package.
@@ -6166,13 +6189,12 @@
       The Mac OS X PKG of MySQL installs itself into
       <filename>/usr/local/mysql-<replaceable>VERSION</replaceable></filename>
       and also installs a symbolic link,
-      <filename>/usr/local/mysql</filename>, pointing to the new
+      <filename>/usr/local/mysql</filename>, that points to the new
       location. If a directory named
       <filename>/usr/local/mysql</filename> exists, it is renamed to
       <filename>/usr/local/mysql.bak</filename> first. Additionally, the
       installer creates the grant tables in the <literal>mysql</literal>
-      database by executing <command>mysql_install_db</command> after
-      the installation.
+      database by executing <command>mysql_install_db</command>.
     </para>
 
     <para>

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-5.1/apis.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -1293,11 +1293,11 @@
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_STRING</literal></entry>
-                  <entry><literal>CHAR</literal> field</entry>
+                  <entry><literal>CHAR</literal> or <literal>BINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_VAR_STRING</literal></entry>
-                  <entry><literal>VARCHAR</literal> field</entry>
+                  <entry><literal>VARCHAR</literal> or <literal>VARBINARY</literal> field</entry>
                 </row>
                 <row>
                   <entry><literal>MYSQL_TYPE_BLOB</literal></entry>

Modified: trunk/refman-5.1/custom-engine-build.xml
===================================================================
--- trunk/refman-5.1/custom-engine-build.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-5.1/custom-engine-build.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -229,7 +229,7 @@
       tables, those tables will not be accessible, but will still be
       present on disk (where applicable). Ensure that there are no
       tables using a given storage engine before uninstalling it
-      otherwise the table will be inaccessible unless you re-install the
+      otherwise the table will be inaccessible unless you reinstall the
       storage engine.
     </para>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-30 21:37:47 UTC (rev 1137)
+++ trunk/refman-5.1/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
@@ -597,7 +597,7 @@
           Normally, if you are beginning to use MySQL for the first time
           or trying to port it to some system for which there is no
           binary distribution, we recommend going with the production
-          release series. Currently this is MySQL 5.0. All MySQL
+          release series. Currently, this is MySQL 5.0. All MySQL
           releases, even those from development series, are checked with
           the MySQL benchmarks and an extensive test suite before being
           issued.
@@ -5117,8 +5117,8 @@
       <para>
         Your first resource when troubleshooting server issues is the
         error log. The MySQL server uses the error log to record
-        information relevant to the error that is preventing the server
-        from starting. The error log is located in the data directory
+        information relevant to the error that prevents the server from
+        starting. The error log is located in the data directory
         specified in your <filename>my.ini</filename> file. The default
         data directory location is <filename>C:\Program
         Files\MySQL\MySQL Server &current-series;\data</filename>. See
@@ -5136,48 +5136,52 @@
       </para>
 
       <para>
-        The following are examples of some of the more common error
-        messages you may encounter when installing MySQL and starting
-        the server for the first time:
+        The following examples show other common error messages you may
+        encounter when installing MySQL and starting the server for the
+        first time:
       </para>
 
       <itemizedlist>
 
         <listitem>
+          <para>
+            If the MySQL server cannot find the <literal>mysql</literal>
+            privileges database or other critical files, you may see
+            these messsages:
+          </para>
+
 <programlisting>
 System error 1067 has occurred.
 Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't exist
 </programlisting>
 
           <para>
-            These messages occur when the MySQL server cannot find the
-            <literal>mysql</literal> privileges database or other
-            critical files. This error is often encountered when the
-            MySQL base or data directories are installed in different
-            locations than the default locations
-            (<filename>C:\mysql</filename> and <filename>C:\Program
+            These messages often occur when the MySQL base or data
+            directories are installed in different locations than the
+            default locations (<filename>C:\Program Files\MySQL\MySQL
+            Server &current-series;</filename> and <filename>C:\Program
             Files\MySQL\MySQL Server &current-series;\data</filename>,
             respectively).
           </para>
 
           <para>
-            One situation when this may occur is when MySQL is upgraded
-            and installed to a new location, but the configuration file
-            is not updated to reflect the new install location. In
-            addition there may be old and new configuration files that
-            conflict, be sure to delete or rename any old configuration
-            files when upgrading MySQL.
+            This situation may occur when MySQL is upgraded and
+            installed to a new location, but the configuration file is
+            not updated to reflect the new location. In addition, there
+            may be old and new configuration files that conflict. Be
+            sure to delete or rename any old configuration files when
+            upgrading MySQL.
           </para>
 
           <para>
             If you have installed MySQL to a directory other than
             <filename>C:\Program Files\MySQL\MySQL Server
-            &current-series;</filename> you need to ensure that the
+            &current-series;</filename>, you need to ensure that the
             MySQL server is aware of this through the use of a
             configuration (<filename>my.ini</filename>) file. The
             <filename>my.ini</filename> file needs to be located in your
-            Windows directory, typically <filename>C:\WINNT</filename>
-            or <filename>C:\WINDOWS</filename>. You can determine its
+            Windows directory, typically <filename>C:\WINDOWS</filename>
+            or <filename>C:\WINNT</filename>. You can determine its
             exact location from the value of the
             <literal>WINDIR</literal> environment variable by issuing
             the following command from the command prompt:
@@ -5193,7 +5197,8 @@
             in <filename>E:\mysql</filename> and the data directory is
             <filename>D:\MySQLdata</filename>, you can create the option
             file and set up a <literal>[mysqld]</literal> section to
-            specify values for the basedir and datadir parameters:
+            specify values for the <literal>basedir</literal> and
+            <literal>datadir</literal> parameters:
           </para>
 
 <programlisting>
@@ -5231,36 +5236,39 @@
         </listitem>
 
         <listitem>
+          <para>
+            If you reinstall or upgrade MySQL without first stopping and
+            removing the existing MySQL service and install MySQL using
+            the MySQL Configuration Wizard, you may see this error:
+          </para>
+
 <programlisting>
 Error: Cannot create Windows service for MySql. Error: 0
 </programlisting>
 
           <para>
-            This error is encountered when you re-install or upgrade
-            MySQL without first stopping and removing the existing MySQL
-            service and install MySQL using the MySQL Configuration
-            Wizard. This happens because when the Configuration Wizard
-            tries to install the service it finds an existing service
-            with the same name.
+            This occurs when the Configuration Wizard tries to install
+            the service and finds an existing service with the same
+            name.
           </para>
 
           <para>
             One solution to this problem is to choose a service name
             other than <literal>mysql</literal> when using the
-            configuration wizard. This will allow the new service to be
+            configuration wizard. This allows the new service to be
             installed correctly, but leaves the outdated service in
             place. Although this is harmless, it is best to remove old
             services that are no longer in use.
           </para>
 
           <para>
-            To permanently remove the old mysql service, execute the
-            following command as a user with administrative privileges,
-            on the command-line:
+            To permanently remove the old <literal>mysql</literal>
+            service, execute the following command as a user with
+            administrative privileges, on the command-line:
           </para>
 
 <programlisting>
-C:\&gt;<userinput>sc delete mysql</userinput>
+C:\&gt; <userinput>sc delete mysql</userinput>
 [SC] DeleteService SUCCESS
 </programlisting>
 
@@ -5295,6 +5303,13 @@
 
         <listitem>
           <para>
+            Review <xref linkend="upgrade"/>, for additional information
+            on upgrading MySQL that is not specific to Windows.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             You should always back up your current MySQL installation
             before performing an upgrade. See <xref linkend="backup"/>.
           </para>
@@ -5309,26 +5324,31 @@
 
         <listitem>
           <para>
-            Before upgrading MySQL, you must stop the server.
+            Before upgrading MySQL, you must stop the server. If the
+            server is installed as a service, stop the service with the
+            following command from the command prompt:
           </para>
 
-          <para>
-            If the server is installed as a service, stop the service
-            with the following command from the command prompt:
-          </para>
-
 <programlisting>
 C:\&gt; <userinput>NET STOP MYSQL</userinput>
 </programlisting>
 
           <para>
             If you are not running the MySQL server as a service, use
-            the following command to stop the server:
+            the following command to stop it:
           </para>
 
 <programlisting>
 C:\&gt; <userinput>"C:\Program Files\MySQL\MySQL Server &current-series;\bin\mysqladmin" -u root shutdown</userinput>
 </programlisting>
+
+          <para>
+            <emphasis role="bold">Note</emphasis>: If the MySQL
+            <literal>root</literal> user account has a password, you
+            need to invoke this command as <command>mysqladmin</command>
+            with the <option>-p</option> option and supply the password
+            when prompted.
+          </para>
         </listitem>
 
         <listitem>
@@ -5377,17 +5397,17 @@
 
         <listitem>
           <para>
-            Restart the server. For example, use <command>NET START
-            MySQL</command> if you run MySQL as a service, or invoke
-            <command>mysqld</command> directly otherwise.
+            If you were running MySQL as a Windows service and you had
+            to remove the service earlier in this procedure, reinstall
+            the service. (See <xref linkend="windows-start-service"/>.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Refer to <xref linkend="upgrade"/>, for additional
-            information on upgrading MySQL that is not specific to
-            Windows.
+            Restart the server. For example, use <command>NET START
+            MySQL</command> if you run MySQL as a service, or invoke
+            <command>mysqld</command> directly otherwise.
           </para>
         </listitem>
 
@@ -5438,7 +5458,7 @@
             thread creation. Each connection in MySQL creates a new
             thread, so you shouldn't run <command>mysqld</command> for
             an extended time on Windows 95 if your server handles many
-            connections! Other versions of Windows don't suffer from
+            connections! Newer versions of Windows don't suffer from
             this bug.
           </para>
         </listitem>
@@ -5463,7 +5483,7 @@
           </para>
 
           <para>
-            For more information, see
+            For more information about this problem, see
             <ulink url="http://support.microsoft.com/default.aspx?scid=kb;en-us;196271"/>.
           </para>
         </listitem>
@@ -5477,13 +5497,13 @@
             MySQL depends on the <literal>pread()</literal> and
             <literal>pwrite()</literal> system calls to be able to mix
             <literal>INSERT</literal> and <literal>SELECT</literal>.
-            Currently we use mutexes to emulate
+            Currently, we use mutexes to emulate
             <literal>pread()</literal> and <literal>pwrite()</literal>.
             We intend to replace the file level interface with a virtual
             interface in the future so that we can use the
             <literal>readfile()</literal>/<literal>writefile()</literal>
             interface on NT, 2000, and XP to get more speed. The current
-            implementation limits the number of open files MySQL
+            implementation limits the number of open files that MySQL
             &current-series; can use to 2,048, which means that you
             cannot run as many concurrent threads on Windows NT, 2000,
             XP, and 2003 as on Unix.
@@ -5496,8 +5516,8 @@
           </para>
 
           <para>
-            MySQL uses a blocking read for each connection, which has
-            the following implications if named-pipe connections are
+            MySQL uses a blocking read for each connection. That has the
+            following implications if named-pipe connections are
             enabled:
           </para>
 
@@ -5617,8 +5637,8 @@
           </remark>
 
           <para>
-            You cannot kill MySQL from the Task Manager or with the
-            shutdown utility in Windows 95. You must stop it with
+            On Windows 95, you cannot kill MySQL from the Task Manager
+            or with the shutdown utility. You must stop it with
             <command>mysqladmin shutdown</command>.
           </para>
         </listitem>
@@ -5671,14 +5691,14 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Problems with pipes.</emphasis>
+            <emphasis role="bold">Problems with pipes</emphasis>
           </para>
 
           <para>
             Pipes do not work reliably from the Windows command-line
             prompt. If the pipe includes the character
             <literal>^Z</literal> / <literal>CHAR(24)</literal>, Windows
-            thinks it has encountered end-of-file and aborts the
+            thinks that it has encountered end-of-file and aborts the
             program.
           </para>
 
@@ -5688,7 +5708,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-name | mysql --user=root</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> | mysql --user=root</userinput>
 </programlisting>
 
           <para>
@@ -5699,7 +5719,7 @@
           </para>
 
 <programlisting>
-C:\&gt; <userinput>mysqlbinlog binary-log-file --result-file=/tmp/bin.sql</userinput>
+C:\&gt; <userinput>mysqlbinlog <replaceable>binary_log_file</replaceable> --result-file=/tmp/bin.sql</userinput>
 C:\&gt; <userinput>mysql --user=root --execute "source /tmp/bin.sql"</userinput>
 </programlisting>
 
@@ -5716,16 +5736,18 @@
           </para>
 
           <para>
-            If you attempt to run a MySQL client program to connect to a
-            server running on the same machine, but get the error
-            <literal>Access denied for user
-            '<replaceable>some-user</replaceable>'@'unknown' to database
-            'mysql'</literal>, this means that MySQL cannot resolve your
-            hostname properly.
+            If MySQL cannot resolve your hostname properly, you may get
+            the following error when you attempt to run a MySQL client
+            program to connect to a server running on the same machine:
           </para>
 
+<programlisting>
+Access denied for user '<replaceable>some_user</replaceable>'@'unknown'
+to database 'mysql'
+</programlisting>
+
           <para>
-            To fix this, you should create a file named
+            To fix this problem, you should create a file named
             <filename>\windows\hosts</filename> containing the following
             information:
           </para>
@@ -5804,10 +5826,10 @@
 
     <para>
       MySQL AB does provide some platform-specific RPMs; the difference
-      between a platform-specific RPM and a generic RPM is that the
-      platform-specific RPMs are built on the targeted platform and are
-      linked dynamically whereas the generic RPM is linked statically
-      with LinuxThreads.
+      between a platform-specific RPM and a generic RPM is that a
+      platform-specific RPM is built on the targeted platform and is
+      linked dynamically whereas a generic RPM is linked statically with
+      LinuxThreads.
     </para>
 
     <para>
@@ -5821,13 +5843,13 @@
 
     <para>
       If you have problems with an RPM file (for example, if you receive
-      the error <quote><literal>Sorry, the host
+      the error <literal>Sorry, the host
       '<replaceable>xxxx</replaceable>' could not be looked
-      up</literal></quote>), see <xref linkend="binary-notes-linux"/>.
+      up</literal>), see <xref linkend="binary-notes-linux"/>.
     </para>
 
     <para>
-      In most cases, you only need to install the
+      In most cases, you need to install only the
       <literal>MySQL-server</literal> and
       <literal>MySQL-client</literal> packages to get a functional MySQL
       installation. The other packages are not required for a standard
@@ -5845,11 +5867,11 @@
 
     <para>
       If you get a dependency failure when trying to install MySQL
-      packages (for example, <quote><literal>error: removing these
-      packages would break dependencies: libmysqlclient.so.10 is needed
-      by ...</literal></quote>), you should also install the package
-      <literal>MySQL-shared-compat</literal>, which includes both the
-      shared libraries for backward compatibility
+      packages (for example, <literal>error: removing these packages
+      would break dependencies: libmysqlclient.so.10 is needed by
+      ...</literal>), you should also install the
+      <literal>MySQL-shared-compat</literal> package, which includes
+      both the shared libraries for backward compatibility
       (<literal>libmysqlclient.so.12</literal> for MySQL 4.0 and
       <literal>libmysqlclient.so.10</literal> for MySQL 3.23).
     </para>
@@ -5860,7 +5882,7 @@
     </remark>
 
     <para>
-      Many Linux distributions still ship with MySQL 3.23 and they
+      Some Linux distributions still ship with MySQL 3.23 and they
       usually link applications dynamically to save disk space. If these
       shared libraries are in a separate package (for example,
       <literal>MySQL-shared</literal>), it is sufficient to simply leave
@@ -5980,7 +6002,7 @@
         </para>
 
         <para>
-          The embedded MySQL server library (from MySQL 4.0).
+          The embedded MySQL server library (available as of MySQL 4.0).
         </para>
       </listitem>
 
@@ -6000,7 +6022,7 @@
 
     <para>
       To see all files in an RPM package (for example, a
-      <literal>MySQL-server</literal> RPM), run:
+      <literal>MySQL-server</literal> RPM), run a commnd like this:
     </para>
 
 <programlisting>
@@ -6008,7 +6030,8 @@
 </programlisting>
 
     <para>
-      To perform a standard minimal installation, run:
+      To perform a standard minimal installation, install the server and
+      client RPMs:
     </para>
 
 <programlisting>
@@ -6017,7 +6040,7 @@
 </programlisting>
 
     <para>
-      To install just the client package, run:
+      To install only the client programs, install just the client RPM:
     </para>
 
 <programlisting>
@@ -6109,7 +6132,7 @@
 
     <para>
       You can install MySQL on Mac OS X 10.2.x (<quote>Jaguar</quote>)
-      and up using a Mac OS X binary package in PKG format instead of
+      or newer using a Mac OS X binary package in PKG format instead of
       the binary tarball distribution. Please note that older versions
       of Mac OS X (for example, 10.1.x) are
       <emphasis role="bold">not</emphasis> supported by this package.
@@ -6162,13 +6185,12 @@
       The Mac OS X PKG of MySQL installs itself into
       <filename>/usr/local/mysql-<replaceable>VERSION</replaceable></filename>
       and also installs a symbolic link,
-      <filename>/usr/local/mysql</filename>, pointing to the new
+      <filename>/usr/local/mysql</filename>, that points to the new
       location. If a directory named
       <filename>/usr/local/mysql</filename> exists, it is renamed to
       <filename>/usr/local/mysql.bak</filename> first. Additionally, the
       installer creates the grant tables in the <literal>mysql</literal>
-      database by executing <command>mysql_install_db</command> after
-      the installation.
+      database by executing <command>mysql_install_db</command>.
     </para>
 
     <para>

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