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

Log:
 r6954@frost:  paul | 2006-01-30 16:58:56 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/installing.xml
   trunk/tools/xmlformat.conf


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:2719
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6954
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-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-4.1/connector-j.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -3199,14 +3199,8 @@
         character encoding per connection, which could either be
         automatically detected from the server configuration, or could
         be configured by the user through the
-
-        <parameter>"useUnicode"</parameter>
-
-        and "
-
-        <parameter>characterEncoding</parameter>
-
-        " properties.
+        <parameter>"useUnicode"</parameter> and
+        "<parameter>characterEncoding</parameter>" properties.
       </para>
 
       <para>
@@ -3219,29 +3213,21 @@
       <para>
         The character encoding between client and server is
         automatically detected upon connection. The encoding used by the
-        driver is specified on the server via the configuration variable
-        '
+        driver is specified on the server via the
+        <literal>character_set</literal> system variable for server
+        versions older than 4.1.0 and
+        <literal>character_set_server</literal> for server versions
+        4.1.0 and newer. For more information, see
 
-        <parameter>character_set</parameter>
+        <xfer linkend="charset-server"/>
 
-        ' for server versions older than 4.1.0 and '
-
-        <parameter>character_set_server</parameter>
-
-        ' for server versions 4.1.0 and newer. See the
-        "<ulink
-      url="http://www.mysql.com/doc/en/Charset-server.html">Server
-        Character Set and Collation</ulink>" section in the MySQL server
-        manual for more information.
+        .
       </para>
 
       <para>
         To override the automatically-detected encoding on the client
-        side, use the
-
-        <parameter>characterEncoding</parameter>
-
-        property in the URL used to connect to the server.
+        side, use the <parameter>characterEncoding</parameter> property
+        in the URL used to connect to the server.
       </para>
 
       <para>
@@ -3433,10 +3419,7 @@
         "UTF-8" encoding should be used, either by configuring "utf8" as
         the default server character set, or by configuring the JDBC
         driver to use "UTF-8" through the
-
-        <parameter>characterEncoding</parameter>
-
-        property.
+        <parameter>characterEncoding</parameter> property.
       </para>
 
     </section>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-4.1/database-administration.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -18758,7 +18758,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset_name</replaceable></command>
+        --set-collation=<replaceable>collation_name</replaceable></command>
         on all tables, or your indexes may not be ordered correctly.
         (Use <option>--set-character-set</option> before MySQL 4.1.1.)
       </para>

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-4.1/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -61,9 +61,9 @@
     <listitem>
       <para>
         <emphasis role="bold">Download the distribution that you want to
-        install.</emphasis> For a list of sites from which you can
-        obtain MySQL, see <xref linkend="getting-mysql"/>. To verify the
-        integrity of the distribution, use the instructions in
+        install.</emphasis> For instructions, see
+        <xref linkend="getting-mysql"/>. To verify the integrity of the
+        distribution, use the instructions in
         <xref linkend="verifying-package-integrity"/>.
       </para>
     </listitem>
@@ -4839,7 +4839,7 @@
       <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
+        invoke <command>mysqladmin</command> with the
         <option>-p</option> option and supply the password when
         prompted.
       </para>
@@ -5436,9 +5436,9 @@
           <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.
+            need to invoke <command>mysqladmin</command> with the
+            <option>-p</option> option and supply the password when
+            prompted.
           </para>
         </listitem>
 
@@ -6272,9 +6272,9 @@
     </para>
 
     <para>
-      If you are running Mac OS X Server, you have a version of MySQL
-      installed. The versions of MySQL that ship with Mac OS X Server
-      versions are shown in the following table:
+      If you are running Mac OS X Server, a version of MySQL should
+      already be installed. The following table shows the versions of
+      MySQL that ship with Mac OS X Server versions.
     </para>
 
     <informaltable>
@@ -6346,11 +6346,11 @@
     </para>
 
     <para>
-      If you would like to automatically start up MySQL during system
-      startup, you also need to install the MySQL Startup Item. Starting
-      with MySQL 4.0.15, it is part of the Mac OS X installation disk
-      images as a separate installation package. Simply double-click the
-      <literal>MySQLStartupItem.pkg</literal> icon and follow the
+      If you want MySQL to start automatically during system startup,
+      you also need to install the MySQL Startup Item. Starting with
+      MySQL 4.0.15, it is part of the Mac OS X installation disk images
+      as a separate installation package. Simply double-click the
+      <guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
       instructions to install it.
     </para>
 
@@ -6361,15 +6361,15 @@
     </para>
 
     <para>
-      The Startup Item is installed into
+      The Startup Item for MySQL is installed into
       <filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
       4.1.2, the location was
       <filename>/Library/StartupItems/MySQL</filename>, but that
       collided with the MySQL Startup Item installed by Mac OS X
       Server.) Startup Item installation adds a variable
       <literal>MYSQLCOM=-YES-</literal> to the system configuration file
-      <filename>/etc/hostconfig</filename>. If you would like to disable
-      the automatic startup of MySQL, simply change this variable to
+      <filename>/etc/hostconfig</filename>. If you want to disable the
+      automatic startup of MySQL, simply change this variable to
       <literal>MYSQLCOM=-NO-</literal>.
     </para>
 
@@ -6391,13 +6391,13 @@
     </para>
 
     <para>
-      If you have installed the Startup Item:
+      If you have installed the Startup Item use this command:
     </para>
 
 <programlisting>
 shell&gt; <userinput>sudo /Library/StartupItems/MySQLCOM/MySQLCOM start</userinput>
-(Enter your password, if necessary)
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6414,10 +6414,10 @@
 <programlisting>
 shell&gt; <userinput>cd /usr/local/mysql</userinput>
 shell&gt; <userinput>sudo ./bin/mysqld_safe</userinput>
-(Enter your password, if necessary)
-(Press Control-Z)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-Z)</replaceable>
 shell&gt; <userinput>bg</userinput>
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6436,41 +6436,51 @@
       You might want to add aliases to your shell's resource file to
       make it easier to access commonly used programs such as
       <command>mysql</command> and <command>mysqladmin</command> from
-      the command line. The syntax for <command>tcsh</command> is:
+      the command line. The syntax for <command>bash</command> is:
     </para>
 
 <programlisting>
-alias mysql /usr/local/mysql/bin/mysql
-alias mysqladmin /usr/local/mysql/bin/mysqladmin
+alias mysql=/usr/local/mysql/bin/mysql
+alias mysqladmin=/usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
-      For <command>bash</command>, use:
+      For <command>tcsh</command>, use:
     </para>
 
 <programlisting>
-alias mysql=/usr/local/mysql/bin/mysql
-alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+alias mysql /usr/local/mysql/bin/mysql
+alias mysqladmin /usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
       Even better, add <literal>/usr/local/mysql/bin</literal> to your
       <literal>PATH</literal> environment variable. For example, add the
-      following line to your <filename>$HOME/.tcshrc</filename> file if
-      your shell is <command>tcsh</command>:
+      following line to your <filename>$HOME/.bashrc</filename> file if
+      your shell is <command>bash</command>:
     </para>
 
 <programlisting>
+PATH=${PATH}:/usr/local/mysql/bin
+</programlisting>
+
+    <para>
+      Add the following line to your <filename>$HOME/.tcshrc</filename>
+      file if your shell is <command>tcsh</command>:
+    </para>
+
+<programlisting>
 setenv PATH ${PATH}:/usr/local/mysql/bin
 </programlisting>
 
     <para>
-      If no <filename>.tcshrc</filename> file exists in your home
-      directory, create it with a text editor.
+      If no <filename>.bashrc<replaceable> or
+      </replaceable></filename><filename>.tcshrc</filename> file exists
+      in your home directory, create it with a text editor.
     </para>
 
     <para>
-      If you are upgrading an existing installation, please note that
+      If you are upgrading an existing installation, note that
       installing a new MySQL PKG does not remove the directory of an
       older installation. Unfortunately, the Mac OS X Installer does not
       yet offer the functionality required to properly upgrade
@@ -6531,9 +6541,9 @@
 
       <listitem>
         <para>
-          Latest Support Pack of
+          The latest Support Pack of
           <ulink url="http://support.novell.com/filefinder/18197/index.html">NetWare
-          6.5</ulink> installed.
+          6.5</ulink> must be installed.
         </para>
       </listitem>
 
@@ -6546,9 +6556,8 @@
 
       <listitem>
         <para>
-          MySQL data, as well as the binaries themselves, must be
-          installed on an NSS volume; traditional volumes are not
-          supported.
+          MySQL data and the program binaries must be installed on an
+          NSS volume; traditional volumes are not supported.
         </para>
       </listitem>
 
@@ -6570,6 +6579,14 @@
 <programlisting>
 SERVER:  mysqladmin -u root shutdown
 </programlisting>
+
+        <para>
+          <emphasis role="bold">Note</emphasis>: If the MySQL
+          <literal>root</literal> user account has a password, you need
+          to invoke <command>mysqladmin</command> with the
+          <option>-p</option> option and supply the password when
+          prompted.
+        </para>
       </listitem>
 
       <listitem>
@@ -6598,7 +6615,7 @@
       <listitem>
         <para>
           You might want to rename the directory to something more
-          consistent and easy to use. The examples iin this manual use
+          consistent and easy to use. The examples in this manual use
           <filename>SYS:MYSQL</filename> to refer to the installation
           directory.
         </para>
@@ -6628,9 +6645,9 @@
 
       <listitem>
         <para>
-          Initialize the data directory and the grant tables, if needed,
-          by executing <command>mysql_install_db</command> at the server
-          console.
+          Initialize the data directory and the grant tables, if
+          necessary, by executing <command>mysql_install_db</command> at
+          the server console.
         </para>
       </listitem>
 
@@ -6644,7 +6661,7 @@
       <listitem>
         <para>
           To finish the installation, you should also add the following
-          commands to <literal>autoexec.ncf</literal>. For example, if
+          commands to <filename>autoexec.ncf</filename>. For example, if
           your MySQL installation is in <filename>SYS:MYSQL</filename>
           and you want MySQL to start automatically, you could add these
           lines:
@@ -6680,8 +6697,8 @@
         <para>
           <command>mysqld_safe</command> on NetWare provides a screen
           presence. When you unload (shut down) the
-          <command>mysqld_safe</command> NLM, the screen does not by
-          default go away. Instead, it prompts for user input:
+          <command>mysqld_safe</command> NLM, the screen does not go
+          away by default. Instead, it prompts for user input:
         </para>
 
 <programlisting>
@@ -6703,24 +6720,24 @@
 
       <listitem>
         <para>
-          When installing MySQL version 4.1.x or later either for the
+          When installing MySQL version 4.1.x or later, either for the
           first time or upgrading the 4.0.x version to 4.1.x or later,
           download and install the latest and appropriate Perl module
-          and PHP extension:
+          and PHP extension for NetWare:
         </para>
 
         <itemizedlist>
 
           <listitem>
             <para>
-              Perl for NetWare:
+              Perl:
               <ulink url="http://forge.novell.com/modules/xfcontent/downloads.php/perl/Modules/"/>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              PHP for NetWare:
+              PHP:
               <ulink url="http://forge.novell.com/modules/xfcontent/downloads.php/php/Modules/"/>
             </para>
           </listitem>
@@ -6736,8 +6753,8 @@
     </para>
 
     <para>
-      If there was an existing installation of MySQL on the server, be
-      sure to check for existing MySQL startup commands in
+      If there was an existing installation of MySQL on the NetWare
+      server, be sure to check for existing MySQL startup commands in
       <filename>autoexec.ncf</filename>, and edit or delete them as
       necessary.
     </para>
@@ -6841,8 +6858,8 @@
     </indexterm>
 
     <para>
-      The basic commands you must execute to install and use a MySQL
-      binary distribution are:
+      The basic commands that you must execute to install and use a
+      MySQL binary distribution are:
     </para>
 
 <programlisting>
@@ -6893,8 +6910,8 @@
           These commands add the <literal>mysql</literal> group and the
           <literal>mysql</literal> user. The syntax for
           <command>useradd</command> and <command>groupadd</command> may
-          differ slightly on different versions of Unix. They may also
-          be called <command>adduser</command> and
+          differ slightly on different versions of Unix, or they may
+          have different names such as <command>adduser</command> and
           <command>addgroup</command>.
         </para>
 
@@ -6908,13 +6925,13 @@
       <listitem>
         <para>
           Pick the directory under which you want to unpack the
-          distribution, and change location into it. In the following
+          distribution and change location into it. In the following
           example, we unpack the distribution under
           <filename>/usr/local</filename>. (The instructions, therefore,
           assume that you have permission to create files and
           directories in <filename>/usr/local</filename>. If that
-          directory is protected, you need to perform the installation
-          as <literal>root</literal>.)
+          directory is protected, you must perform the installation as
+          <literal>root</literal>.)
         </para>
 
 <programlisting>
@@ -6924,7 +6941,7 @@
 
       <listitem>
         <para>
-          Obtain a distribution file from one of the sites listed in
+          Obtain a distribution file using the instructions in
           <xref linkend="getting-mysql"/>. For a given release, binary
           distributions for all platforms are built from the same MySQL
           source distribution.
@@ -6973,10 +6990,10 @@
 </programlisting>
 
         <para>
-          You can find several files and subdirectories in the
+          You will find several files and subdirectories in the
           <filename>mysql</filename> directory. The most important for
           installation purposes are the <filename>bin</filename> and
-          <filename>scripts</filename> subdirectories.
+          <filename>scripts</filename> subdirectories:
         </para>
 
         <itemizedlist>
@@ -6992,25 +7009,18 @@
 
           <listitem>
             <para>
-              <filename>bin</filename>
-            </para>
-
-            <para>
-              This directory contains client programs and the server.
-              You should add the full pathname of this directory to your
-              <literal>PATH</literal> environment variable so that your
-              shell finds the MySQL programs properly. See
+              The <filename>bin</filename> directory contains client
+              programs and the server. You should add the full pathname
+              of this directory to your <literal>PATH</literal>
+              environment variable so that your shell finds the MySQL
+              programs properly. See
               <xref linkend="environment-variables"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <filename>scripts</filename>
-            </para>
-
-            <para>
-              This directory contains the
+              The <filename>scripts</filename> directory contains the
               <command>mysql_install_db</command> script used to
               initialize the <literal>mysql</literal> database
               containing the grant tables that store the server access
@@ -7032,7 +7042,7 @@
 </programlisting>
 
         <para>
-          If you run the command as <literal>root</literal>, you should
+          If you run the command as <literal>root</literal>, you must
           use the <option>--user</option> option as shown. The value of
           the option should be the name of the login account that you
           created in the first step to use for running the server. If
@@ -7076,8 +7086,8 @@
 
       <listitem>
         <para>
-          If you would like MySQL to start automatically when you boot
-          your machine, you can copy
+          If you want MySQL to start automatically when you boot your
+          machine, you can copy
           <filename>support-files/mysql.server</filename> to the
           location where your system has its startup files. More
           information can be found in the
@@ -7137,18 +7147,22 @@
 
     <para>
       After everything has been unpacked and installed, you should test
-      your distribution.
+      your distribution. To start the MySQL server, use the following
+      command:
     </para>
 
-    <para>
-      You can start the MySQL server with the following command:
-    </para>
-
 <programlisting>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql &amp;</userinput>
 </programlisting>
 
     <para>
+      If that command fails immediately and prints <literal>mysqld
+      ended</literal>, you can find some information in the
+      <filename><replaceable>host_name</replaceable>.err</filename> file
+      in the data directory.
+    </para>
+
+    <para>
       For versions of MySQL older than 4.0, substitute
       <command>bin/safe_mysqld</command> for
       <command>bin/mysqld_safe</command> in the command.
@@ -7193,7 +7207,7 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, first check
+      Before you proceed with an installation from source, first check
       whether our binary is available for your platform and whether it
       works for you. We put a great deal of effort into ensuring that
       our binaries are built with the best possible options.
@@ -7267,7 +7281,7 @@
         <para>
           A good <command>make</command> program. GNU
           <command>make</command> is always recommended and is sometimes
-          required. If you have problems, we recommend trying GNU
+          required. If you have problems, we recommend GNU
           <command>make</command> 3.75 or newer.
         </para>
       </listitem>
@@ -7305,8 +7319,8 @@
       <title>&title-quick-install;</title>
 
       <para>
-        The basic commands you must execute to install a MySQL source
-        distribution are:
+        The basic commands that you must execute to install a MySQL
+        source distribution are:
       </para>
 
 <programlisting>
@@ -7375,9 +7389,9 @@
             These commands add the <literal>mysql</literal> group and
             the <literal>mysql</literal> user. The syntax for
             <command>useradd</command> and <command>groupadd</command>
-            may differ slightly on different versions of Unix. They may
-            also be called <command>adduser</command> and
-            <command>addgroup</command>.
+            may differ slightly on different versions of Unix, or they
+            may have different names such as <command>adduser</command>
+            and <command>addgroup</command>.
           </para>
 
           <para>
@@ -7390,13 +7404,13 @@
         <listitem>
           <para>
             Pick the directory under which you want to unpack the
-            distribution, and change location into it.
+            distribution and change location into it.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Obtain a distribution file from one of the sites listed in
+            Obtain a distribution file using the instructions in
             <xref linkend="getting-mysql"/>.
           </para>
         </listitem>
@@ -7437,6 +7451,12 @@
 shell&gt; <userinput>cd mysql-<replaceable>VERSION</replaceable></userinput>
 </programlisting>
 
+          <remark role="todo">
+            [pd] It's no longer true that you must be in the top-level
+            directory, but we need information from the build team if
+            we're to describe alternate procedures.
+          </remark>
+
           <para>
             Note that currently you must configure and build MySQL from
             this top-level directory. You cannot build it in a different
@@ -7456,7 +7476,7 @@
 
           <para>
             When you run <command>configure</command>, you might want to
-            specify some options. Run <command>./configure
+            specify other options. Run <command>./configure
             --help</command> for a list of options.
             <xref linkend="configure-options"/>, discusses some of the
             more useful options.
@@ -7469,7 +7489,7 @@
             <filename>config.log</filename> that you think can help
             solve the problem. Also include the last couple of lines of
             output from <command>configure</command>. To file a bug
-            report, please use the instructions at
+            report, please use the instructions in
             <xref linkend="bug-reports"/>.
           </para>
 
@@ -7580,8 +7600,8 @@
 
         <listitem>
           <para>
-            If you would like MySQL to start automatically when you boot
-            your machine, you can copy
+            If you want MySQL to start automatically when you boot your
+            machine, you can copy
             <filename>support-files/mysql.server</filename> to the
             location where your system has its startup files. More
             information can be found in the script itself, and in
@@ -7617,8 +7637,9 @@
       </orderedlist>
 
       <para>
-        After everything has been installed, you should initialize and
-        test your distribution using this command:
+        After everything has been installed, you should test your
+        distribution. To start the MySQL server, use the following
+        command:
       </para>
 
 <programlisting>
@@ -7728,9 +7749,9 @@
           </remark>
 
           <para>
-            If you do not have a C++ compiler, <command>mysql</command>
-            cannot be compiled (it is the one client program that
-            requires C++). In this case, you can remove the code in
+            If you have no C++ compiler, <command>mysql</command> cannot
+            be compiled (it is the one client program that requires
+            C++). In this case, you can remove the code in
             <command>configure</command> that tests for the C++ compiler
             and then run <command>./configure</command> with the
             <option>--without-server</option> option. The compile step
@@ -7745,7 +7766,7 @@
         <listitem>
           <para>
             If you want to build the embedded MySQL library
-            (<literal>libmysqld.a</literal>) you should use the
+            (<literal>libmysqld.a</literal>), use the
             <option>--with-embedded-server</option> option.
           </para>
         </listitem>
@@ -7772,11 +7793,15 @@
             command preserves the default installation prefix, but
             overrides the default location for database directories
             (normally <filename>/usr/local/var</filename>) and changes
-            it to <literal>/usr/local/mysql/data</literal>. After you
-            have compiled MySQL, you can change these options with
-            option files. See <xref linkend="option-files"/>.
+            it to <literal>/usr/local/mysql/data</literal>.
           </para>
 
+          <para>
+            You can also specify the locations at server startup time by
+            using a MySQL option file. See
+            <xref linkend="option-files"/>.
+          </para>
+
           <indexterm>
             <primary>changing socket location</primary>
           </indexterm>
@@ -7794,9 +7819,9 @@
 
         <listitem>
           <para>
-            If you are using Unix and you want the MySQL socket located
-            somewhere other than the default location (normally in the
-            directory <filename>/tmp</filename> or
+            If you are using Unix and you want the MySQL socket file
+            location to be somewhere other than the default location
+            (normally in the directory <filename>/tmp</filename> or
             <filename>/var/run</filename>), use a
             <command>configure</command> command like this:
           </para>
@@ -7809,7 +7834,7 @@
           <para>
             The socket filename must be an absolute pathname. You can
             also change the location of <filename>mysql.sock</filename>
-            later by using a MySQL option file. See
+            at server startup by using a MySQL option file. See
             <xref linkend="problems-with-mysql-sock"/>.
           </para>
 
@@ -7827,9 +7852,10 @@
         <listitem>
           <para>
             If you want to compile statically linked programs (for
-            example, to make a binary distribution, to get more speed,
-            or to work around problems with some Red Hat Linux
-            distributions), run <command>configure</command> like this:
+            example, to make a binary distribution, to get better
+            performance, or to work around problems with some Red Hat
+            Linux distributions), run <command>configure</command> like
+            this:
           </para>
 
 <programlisting>
@@ -7885,10 +7911,10 @@
           <para>
             When you use <command>gcc</command> as your C++ compiler, it
             does not attempt to link in <literal>libg++</literal> or
-            <literal>libstdc++</literal>. This may be a good idea to do
-            even if you have these libraries installed, because some
-            versions of them have caused strange problems for MySQL
-            users in the past.
+            <literal>libstdc++</literal>. This may be a good thing to do
+            even if you have those libraries installed. Some versions of
+            them have caused strange problems for MySQL users in the
+            past.
           </para>
 
           <para>
@@ -8007,10 +8033,10 @@
 
           <para>
             The binaries we provide on the MySQL Web site at
-            <ulink url="http://www.mysql.com/"/> are all compiled with
+            <ulink url="&base-url-downloads;"/> are all compiled with
             full optimization and should be perfect for most users. See
             <xref linkend="mysql-binaries"/>. There are some
-            configuration settings you can tweak to make an even faster
+            configuration settings you can tweak to build an even faster
             binary, but these are only for advanced users. See
             <xref linkend="compile-and-link-options"/>.
           </para>
@@ -8111,11 +8137,13 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you have to
             run <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset_name</replaceable></command>
-            on every table. Your indexes may be sorted incorrectly
-            otherwise. (This can happen if you install MySQL, create
-            some tables, and then reconfigure MySQL to use a different
-            character set and reinstall it.)
+            --set-collation=<replaceable>collation_name</replaceable></command>
+            on every <literal>MyISAM</literal> table. Your indexes may
+            be sorted incorrectly otherwise. This can happen if you
+            install MySQL, create some tables, and then reconfigure
+            MySQL to use a different character set and reinstall it.
+            (Use <option>--set-character-set</option> before MySQL
+            4.1.1.)
           </para>
 
           <para>
@@ -8123,11 +8151,32 @@
             <option>--with-extra-charsets=<replaceable>LIST</replaceable></option>,
             you can define which additional character sets should be
             compiled into the server. <replaceable>LIST</replaceable> is
-            either a list of character set names separated by spaces,
-            <literal>complex</literal> to include all character sets
-            that cannot be dynamically loaded, or <literal>all</literal>
-            to include all character sets into the binaries.
+            one of the following:
           </para>
+
+          <itemizedlist>
+
+            <listitem>
+              <para>
+                A list of character set names separated by spaces
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal>complex</literal> to include all character sets
+                that can't be dynamically loaded
+              </para>
+            </listitem>
+
+            <listitem>
+              <para>
+                <literal>all</literal> to include all character sets
+                into the binaries
+              </para>
+            </listitem>
+
+          </itemizedlist>
         </listitem>
 
         <listitem>
@@ -8149,13 +8198,12 @@
 
         <listitem>
           <para>
-            If your client programs are using threads, you also must
-            compile a thread-safe version of the MySQL client library
-            with the <option>--enable-thread-safe-client</option>
-            configure option. This creates a
-            <literal>libmysqlclient_r</literal> library with which you
-            should link your threaded applications. See
-            <xref linkend="threaded-clients"/>.
+            If your client programs are using threads, you must compile
+            a thread-safe version of the MySQL client library with the
+            <option>--enable-thread-safe-client</option> configure
+            option. This creates a <literal>libmysqlclient_r</literal>
+            library with which you should link your threaded
+            applications. See <xref linkend="threaded-clients"/>.
           </para>
         </listitem>
 
@@ -8198,8 +8246,8 @@
 
         <listitem>
           <para>
-            Options that pertain to particular systems can be found in
-            the system-specific section of this manual. See
+            Options that pertain to particular operating systems can be
+            found in the system-specific section of this manual. See
             <xref linkend="operating-system-specific-notes"/>.
           </para>
         </listitem>
@@ -11984,13 +12032,14 @@
     <para>
       You can always move the MySQL format files and data files between
       different versions on the same architecture as long as you stay
-      within versions for the same release series of MySQL. The current
-      production release series is 4.1. If you change the character set
-      when running MySQL, you must run <command>myisamchk -r -q
-      --set-character-set=<replaceable>charset_name</replaceable></command>
+      within versions for the same release series of MySQL. If you
+      change the character set when running MySQL, you must run
+      <command>myisamchk -r -q
+      --set-collation=<replaceable>collation_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
-      may also change the sort order.
+      may also change the sort order. (Use
+      <option>--set-character-set</option> before MySQL 4.1.1.)
     </para>
 
     <para>

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.0/connector-j.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -3199,14 +3199,8 @@
         character encoding per connection, which could either be
         automatically detected from the server configuration, or could
         be configured by the user through the
-
-        <parameter>"useUnicode"</parameter>
-
-        and "
-
-        <parameter>characterEncoding</parameter>
-
-        " properties.
+        <parameter>"useUnicode"</parameter> and
+        "<parameter>characterEncoding</parameter>" properties.
       </para>
 
       <para>
@@ -3219,29 +3213,21 @@
       <para>
         The character encoding between client and server is
         automatically detected upon connection. The encoding used by the
-        driver is specified on the server via the configuration variable
-        '
+        driver is specified on the server via the
+        <literal>character_set</literal> system variable for server
+        versions older than 4.1.0 and
+        <literal>character_set_server</literal> for server versions
+        4.1.0 and newer. For more information, see
 
-        <parameter>character_set</parameter>
+        <xfer linkend="charset-server"/>
 
-        ' for server versions older than 4.1.0 and '
-
-        <parameter>character_set_server</parameter>
-
-        ' for server versions 4.1.0 and newer. See the
-        "<ulink
-      url="http://www.mysql.com/doc/en/Charset-server.html">Server
-        Character Set and Collation</ulink>" section in the MySQL server
-        manual for more information.
+        .
       </para>
 
       <para>
         To override the automatically-detected encoding on the client
-        side, use the
-
-        <parameter>characterEncoding</parameter>
-
-        property in the URL used to connect to the server.
+        side, use the <parameter>characterEncoding</parameter> property
+        in the URL used to connect to the server.
       </para>
 
       <para>
@@ -3433,10 +3419,7 @@
         "UTF-8" encoding should be used, either by configuring "utf8" as
         the default server character set, or by configuring the JDBC
         driver to use "UTF-8" through the
-
-        <parameter>characterEncoding</parameter>
-
-        property.
+        <parameter>characterEncoding</parameter> property.
       </para>
 
     </section>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.0/database-administration.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -20949,7 +20949,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset_name</replaceable></command>
+        --set-collation=<replaceable>collation_name</replaceable></command>
         on all tables, or your indexes may not be ordered correctly.
       </para>
 

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.0/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -61,9 +61,9 @@
     <listitem>
       <para>
         <emphasis role="bold">Download the distribution that you want to
-        install.</emphasis> For a list of sites from which you can
-        obtain MySQL, see <xref linkend="getting-mysql"/>. To verify the
-        integrity of the distribution, use the instructions in
+        install.</emphasis> For instructions, see
+        <xref linkend="getting-mysql"/>. To verify the integrity of the
+        distribution, use the instructions in
         <xref linkend="verifying-package-integrity"/>.
       </para>
     </listitem>
@@ -4767,7 +4767,7 @@
       <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
+        invoke <command>mysqladmin</command> with the
         <option>-p</option> option and supply the password when
         prompted.
       </para>
@@ -5349,9 +5349,9 @@
           <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.
+            need to invoke <command>mysqladmin</command> with the
+            <option>-p</option> option and supply the password when
+            prompted.
           </para>
         </listitem>
 
@@ -6218,9 +6218,9 @@
     </remark>
 
     <para>
-      If you are running Mac OS X Server, you have a version of MySQL
-      installed. The versions of MySQL that ship with Mac OS X Server
-      versions are shown in the following table:
+      If you are running Mac OS X Server, a version of MySQL should
+      already be installed. The following table shows the versions of
+      MySQL that ship with Mac OS X Server versions.
     </para>
 
     <informaltable>
@@ -6292,12 +6292,12 @@
     </para>
 
     <para>
-      If you would like to automatically start up MySQL during system
-      startup, you also need to install the MySQL Startup Item. For
-      MySQL &current-series;, it is part of the Mac OS X installation
-      disk images as a separate installation package. Simply
-      double-click the <guiicon>MySQLStartupItem.pkg</guiicon> icon and
-      follow the instructions to install it.
+      If you want MySQL to start automatically during system startup,
+      you also need to install the MySQL Startup Item. It is part of the
+      Mac OS X installation disk images as a separate installation
+      package. Simply double-click the
+      <guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
+      instructions to install it.
     </para>
 
     <para>
@@ -6307,15 +6307,15 @@
     </para>
 
     <para>
-      The Startup Item for MySQL &current-series; is installed into
+      The Startup Item for MySQL is installed into
       <filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
       4.1.2, the location was
       <filename>/Library/StartupItems/MySQL</filename>, but that
       collided with the MySQL Startup Item installed by Mac OS X
       Server.) Startup Item installation adds a variable
       <literal>MYSQLCOM=-YES-</literal> to the system configuration file
-      <filename>/etc/hostconfig</filename>. If you would like to disable
-      the automatic startup of MySQL, simply change this variable to
+      <filename>/etc/hostconfig</filename>. If you want to disable the
+      automatic startup of MySQL, simply change this variable to
       <literal>MYSQLCOM=-NO-</literal>.
     </para>
 
@@ -6337,13 +6337,13 @@
     </para>
 
     <para>
-      If you have installed the Startup Item:
+      If you have installed the Startup Item use this command:
     </para>
 
 <programlisting>
 shell&gt; <userinput>sudo /Library/StartupItems/MySQLCOM/MySQLCOM start</userinput>
-(Enter your password, if necessary)
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6354,10 +6354,10 @@
 <programlisting>
 shell&gt; <userinput>cd /usr/local/mysql</userinput>
 shell&gt; <userinput>sudo ./bin/mysqld_safe</userinput>
-(Enter your password, if necessary)
-(Press Control-Z)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-Z)</replaceable>
 shell&gt; <userinput>bg</userinput>
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6376,41 +6376,51 @@
       You might want to add aliases to your shell's resource file to
       make it easier to access commonly used programs such as
       <command>mysql</command> and <command>mysqladmin</command> from
-      the command line. The syntax for <command>tcsh</command> is:
+      the command line. The syntax for <command>bash</command> is:
     </para>
 
 <programlisting>
-alias mysql /usr/local/mysql/bin/mysql
-alias mysqladmin /usr/local/mysql/bin/mysqladmin
+alias mysql=/usr/local/mysql/bin/mysql
+alias mysqladmin=/usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
-      For <command>bash</command>, use:
+      For <command>tcsh</command>, use:
     </para>
 
 <programlisting>
-alias mysql=/usr/local/mysql/bin/mysql
-alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+alias mysql /usr/local/mysql/bin/mysql
+alias mysqladmin /usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
       Even better, add <literal>/usr/local/mysql/bin</literal> to your
       <literal>PATH</literal> environment variable. For example, add the
-      following line to your <filename>$HOME/.tcshrc</filename> file if
-      your shell is <command>tcsh</command>:
+      following line to your <filename>$HOME/.bashrc</filename> file if
+      your shell is <command>bash</command>:
     </para>
 
 <programlisting>
+PATH=${PATH}:/usr/local/mysql/bin
+</programlisting>
+
+    <para>
+      Add the following line to your <filename>$HOME/.tcshrc</filename>
+      file if your shell is <command>tcsh</command>:
+    </para>
+
+<programlisting>
 setenv PATH ${PATH}:/usr/local/mysql/bin
 </programlisting>
 
     <para>
-      If no <filename>.tcshrc</filename> file exists in your home
-      directory, create it with a text editor.
+      If no <filename>.bashrc<replaceable> or
+      </replaceable></filename><filename>.tcshrc</filename> file exists
+      in your home directory, create it with a text editor.
     </para>
 
     <para>
-      If you are upgrading an existing installation, please note that
+      If you are upgrading an existing installation, note that
       installing a new MySQL PKG does not remove the directory of an
       older installation. Unfortunately, the Mac OS X Installer does not
       yet offer the functionality required to properly upgrade
@@ -6471,9 +6481,9 @@
 
       <listitem>
         <para>
-          Latest Support Pack of
+          The latest Support Pack of
           <ulink url="http://support.novell.com/filefinder/18197/index.html">NetWare
-          6.5</ulink> installed.
+          6.5</ulink> must be installed.
         </para>
       </listitem>
 
@@ -6486,9 +6496,8 @@
 
       <listitem>
         <para>
-          MySQL data, as well as the binaries themselves, must be
-          installed on an NSS volume; traditional volumes are not
-          supported.
+          MySQL data and the program binaries must be installed on an
+          NSS volume; traditional volumes are not supported.
         </para>
       </listitem>
 
@@ -6510,6 +6519,14 @@
 <programlisting>
 SERVER:  mysqladmin -u root shutdown
 </programlisting>
+
+        <para>
+          <emphasis role="bold">Note</emphasis>: If the MySQL
+          <literal>root</literal> user account has a password, you need
+          to invoke <command>mysqladmin</command> with the
+          <option>-p</option> option and supply the password when
+          prompted.
+        </para>
       </listitem>
 
       <listitem>
@@ -6538,7 +6555,7 @@
       <listitem>
         <para>
           You might want to rename the directory to something more
-          consistent and easy to use. The examples iin this manual use
+          consistent and easy to use. The examples in this manual use
           <filename>SYS:MYSQL</filename> to refer to the installation
           directory.
         </para>
@@ -6568,9 +6585,9 @@
 
       <listitem>
         <para>
-          Initialize the data directory and the grant tables, if needed,
-          by executing <command>mysql_install_db</command> at the server
-          console.
+          Initialize the data directory and the grant tables, if
+          necessary, by executing <command>mysql_install_db</command> at
+          the server console.
         </para>
       </listitem>
 
@@ -6584,7 +6601,7 @@
       <listitem>
         <para>
           To finish the installation, you should also add the following
-          commands to <literal>autoexec.ncf</literal>. For example, if
+          commands to <filename>autoexec.ncf</filename>. For example, if
           your MySQL installation is in <filename>SYS:MYSQL</filename>
           and you want MySQL to start automatically, you could add these
           lines:
@@ -6620,8 +6637,8 @@
         <para>
           <command>mysqld_safe</command> on NetWare provides a screen
           presence. When you unload (shut down) the
-          <command>mysqld_safe</command> NLM, the screen does not by
-          default go away. Instead, it prompts for user input:
+          <command>mysqld_safe</command> NLM, the screen does not go
+          away by default. Instead, it prompts for user input:
         </para>
 
 <programlisting>
@@ -6648,17 +6665,16 @@
         </remark>
 
         <para>
-          When installing MySQL version &current-series; either for the
-          first time or upgrading from a previous version, download and
-          install the latest and appropriate Perl module and PHP
-          extension:
+          When installing MySQL, either for the first time or upgrading
+          from a previous version, download and install the latest and
+          appropriate Perl module and PHP extensions for NetWare:
         </para>
 
         <itemizedlist>
 
           <listitem>
             <para>
-              Perl for NetWare:
+              Perl:
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/perl/Modules/"/>
             </para>
@@ -6666,7 +6682,7 @@
 
           <listitem>
             <para>
-              PHP for NetWare:
+              PHP:
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/php/Modules/"/>
             </para>
@@ -6688,9 +6704,9 @@
     </para>
 
     <para>
-      If there was an existing installation of MySQL on the server, be
-      sure to check for existing MySQL startup commands in
-      <literal>autoexec.ncf</literal>, and edit or delete them as
+      If there was an existing installation of MySQL on the NetWare
+      server, be sure to check for existing MySQL startup commands in
+      <filename>autoexec.ncf</filename>, and edit or delete them as
       necessary.
     </para>
 
@@ -6793,7 +6809,7 @@
     </indexterm>
 
     <para>
-      The basic commands which you must execute to install and use a
+      The basic commands that you must execute to install and use a
       MySQL binary distribution are:
     </para>
 
@@ -6839,8 +6855,8 @@
           These commands add the <literal>mysql</literal> group and the
           <literal>mysql</literal> user. The syntax for
           <command>useradd</command> and <command>groupadd</command> may
-          differ slightly on different versions of Unix. They may also
-          be called <command>adduser</command> and
+          differ slightly on different versions of Unix, or they may
+          have different names such as <command>adduser</command> and
           <command>addgroup</command>.
         </para>
 
@@ -6854,13 +6870,13 @@
       <listitem>
         <para>
           Pick the directory under which you want to unpack the
-          distribution, and change location into it. In the following
+          distribution and change location into it. In the following
           example, we unpack the distribution under
           <filename>/usr/local</filename>. (The instructions, therefore,
           assume that you have permission to create files and
           directories in <filename>/usr/local</filename>. If that
-          directory is protected, you need to perform the installation
-          as <literal>root</literal>.)
+          directory is protected, you must perform the installation as
+          <literal>root</literal>.)
         </para>
 
 <programlisting>
@@ -6870,7 +6886,7 @@
 
       <listitem>
         <para>
-          Obtain a distribution file from one of the sites listed in
+          Obtain a distribution file using the instructions in
           <xref linkend="getting-mysql"/>. For a given release, binary
           distributions for all platforms are built from the same MySQL
           source distribution.
@@ -6919,10 +6935,10 @@
 </programlisting>
 
         <para>
-          You can find several files and subdirectories in the
+          You will find several files and subdirectories in the
           <literal>mysql</literal> directory. The most important for
           installation purposes are the <filename>bin</filename> and
-          <filename>scripts</filename> subdirectories.
+          <filename>scripts</filename> subdirectories:
         </para>
 
         <itemizedlist>
@@ -6938,25 +6954,18 @@
 
           <listitem>
             <para>
-              <filename>bin</filename>
-            </para>
-
-            <para>
-              This directory contains client programs and the server.
-              You should add the full pathname of this directory to your
-              <literal>PATH</literal> environment variable so that your
-              shell finds the MySQL programs properly. See
+              The <filename>bin</filename> directory contains client
+              programs and the server. You should add the full pathname
+              of this directory to your <literal>PATH</literal>
+              environment variable so that your shell finds the MySQL
+              programs properly. See
               <xref linkend="environment-variables"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <filename>scripts</filename>
-            </para>
-
-            <para>
-              This directory contains the
+              The <filename>scripts</filename> directory contains the
               <command>mysql_install_db</command> script used to
               initialize the <literal>mysql</literal> database
               containing the grant tables that store the server access
@@ -6978,7 +6987,7 @@
 </programlisting>
 
         <para>
-          If you run the command as <literal>root</literal>, you should
+          If you run the command as <literal>root</literal>, you must
           use the <option>--user</option> option as shown. The value of
           the option should be the name of the login account that you
           created in the first step to use for running the server. If
@@ -7019,8 +7028,8 @@
 
       <listitem>
         <para>
-          If you would like MySQL to start automatically when you boot
-          your machine, you can copy
+          If you want MySQL to start automatically when you boot your
+          machine, you can copy
           <literal>support-files/mysql.server</literal> to the location
           where your system has its startup files. More information can
           be found in the <literal>support-files/mysql.server</literal>
@@ -7079,18 +7088,22 @@
 
     <para>
       After everything has been unpacked and installed, you should test
-      your distribution.
+      your distribution. To start the MySQL server, use the following
+      command:
     </para>
 
-    <para>
-      You can start the MySQL server with the following command:
-    </para>
-
 <programlisting>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql &amp;</userinput>
 </programlisting>
 
     <para>
+      If that command fails immediately and prints <literal>mysqld
+      ended</literal>, you can find some information in the
+      <filename><replaceable>host_name</replaceable>.err</filename> file
+      in the data directory.
+    </para>
+
+    <para>
       More information about <command>mysqld_safe</command> is given in
       <xref linkend="mysqld-safe"/>.
     </para>
@@ -7129,7 +7142,7 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, first check
+      Before you proceed with an installation from source, first check
       whether our binary is available for your platform and whether it
       works for you. We put a great deal of effort into ensuring that
       our binaries are built with the best possible options.
@@ -7203,7 +7216,7 @@
         <para>
           A good <command>make</command> program. GNU
           <command>make</command> is always recommended and is sometimes
-          required. If you have problems, we recommend trying GNU
+          required. If you have problems, we recommend GNU
           <command>make</command> 3.75 or newer.
         </para>
       </listitem>
@@ -7241,8 +7254,8 @@
       <title>&title-quick-install;</title>
 
       <para>
-        The basic commands you must execute to install a MySQL source
-        distribution are:
+        The basic commands that you must execute to install a MySQL
+        source distribution are:
       </para>
 
 <programlisting>
@@ -7305,9 +7318,9 @@
             These commands add the <literal>mysql</literal> group and
             the <literal>mysql</literal> user. The syntax for
             <command>useradd</command> and <command>groupadd</command>
-            may differ slightly on different versions of Unix. They may
-            also be called <command>adduser</command> and
-            <command>addgroup</command>.
+            may differ slightly on different versions of Unix, or they
+            may have different names such as <command>adduser</command>
+            and <command>addgroup</command>.
           </para>
 
           <para>
@@ -7320,13 +7333,13 @@
         <listitem>
           <para>
             Pick the directory under which you want to unpack the
-            distribution, and change location into it.
+            distribution and change location into it.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Obtain a distribution file from one of the sites listed in
+            Obtain a distribution file using the instructions in
             <xref linkend="getting-mysql"/>.
           </para>
         </listitem>
@@ -7367,6 +7380,12 @@
 shell&gt; <userinput>cd mysql-<replaceable>VERSION</replaceable></userinput>
 </programlisting>
 
+          <remark role="todo">
+            [pd] It's no longer true that you must be in the top-level
+            directory, but we need information from the build team if
+            we're to describe alternate procedures.
+          </remark>
+
           <para>
             Note that currently you must configure and build MySQL from
             this top-level directory. You cannot build it in a different
@@ -7386,7 +7405,7 @@
 
           <para>
             When you run <command>configure</command>, you might want to
-            specify some options. Run <command>./configure
+            specify other options. Run <command>./configure
             --help</command> for a list of options.
             <xref linkend="configure-options"/>, discusses some of the
             more useful options.
@@ -7399,7 +7418,7 @@
             <filename>config.log</filename> that you think can help
             solve the problem. Also include the last couple of lines of
             output from <command>configure</command>. To file a bug
-            report, please use the instructions at
+            report, please use the instructions in
             <xref linkend="bug-reports"/>.
           </para>
 
@@ -7475,9 +7494,10 @@
           </para>
 
           <para>
-            Note that you must restart the server manually after using
-            <command>mysql_install_db</command> to create the grant
-            tables for MySQL.
+            After using <command>mysql_install_db</command> to create
+            the grant tables for MySQL, you must restart the server
+            manually. The <command>mysqld_safe</command> command to do
+            this is shown in a later step.
           </para>
         </listitem>
 
@@ -7508,8 +7528,8 @@
 
         <listitem>
           <para>
-            If you would like MySQL to start automatically when you boot
-            your machine, you can copy
+            If you want MySQL to start automatically when you boot your
+            machine, you can copy
             <filename>support-files/mysql.server</filename> to the
             location where your system has its startup files. More
             information can be found in the
@@ -7546,8 +7566,9 @@
       </orderedlist>
 
       <para>
-        After everything has been installed, you should initialize and
-        test your distribution using this command:
+        After everything has been installed, you should test your
+        distribution. To start the MySQL server, use the following
+        command:
       </para>
 
 <programlisting>
@@ -7651,9 +7672,9 @@
           </remark>
 
           <para>
-            If you don't have a C++ compiler, <command>mysql</command>
-            cannot be compiled (it is the one client program that
-            requires C++). In this case, you can remove the code in
+            If you have no C++ compiler, <command>mysql</command> cannot
+            be compiled (it is the one client program that requires
+            C++). In this case, you can remove the code in
             <command>configure</command> that tests for the C++ compiler
             and then run <command>./configure</command> with the
             <option>--without-server</option> option. The compile step
@@ -7668,7 +7689,7 @@
         <listitem>
           <para>
             If you want to build the embedded MySQL library
-            (<literal>libmysqld.a</literal>) you should use the
+            (<literal>libmysqld.a</literal>), use the
             <option>--with-embedded-server</option> option.
           </para>
         </listitem>
@@ -7695,11 +7716,15 @@
             command preserves the default installation prefix, but
             overrides the default location for database directories
             (normally <filename>/usr/local/var</filename>) and changes
-            it to <literal>/usr/local/mysql/data</literal>. After you
-            have compiled MySQL, you can change these options with
-            option files. See <xref linkend="option-files"/>.
+            it to <literal>/usr/local/mysql/data</literal>.
           </para>
 
+          <para>
+            You can also specify the locations at server startup time by
+            using a MySQL option file. See
+            <xref linkend="option-files"/>.
+          </para>
+
           <indexterm>
             <primary>changing socket location</primary>
           </indexterm>
@@ -7717,9 +7742,9 @@
 
         <listitem>
           <para>
-            If you are using Unix and you want the MySQL socket located
-            somewhere other than the default location (normally in the
-            directory <filename>/tmp</filename> or
+            If you are using Unix and you want the MySQL socket file
+            location to be somewhere other than the default location
+            (normally in the directory <filename>/tmp</filename> or
             <filename>/var/run</filename>), use a
             <command>configure</command> command like this:
           </para>
@@ -7732,7 +7757,7 @@
           <para>
             The socket filename must be an absolute pathname. You can
             also change the location of <filename>mysql.sock</filename>
-            later by using a MySQL option file. See
+            at server startup by using a MySQL option file. See
             <xref linkend="problems-with-mysql-sock"/>.
           </para>
 
@@ -7750,9 +7775,10 @@
         <listitem>
           <para>
             If you want to compile statically linked programs (for
-            example, to make a binary distribution, to get more speed,
-            or to work around problems with some Red Hat Linux
-            distributions), run <command>configure</command> like this:
+            example, to make a binary distribution, to get better
+            performance, or to work around problems with some Red Hat
+            Linux distributions), run <command>configure</command> like
+            this:
           </para>
 
 <programlisting>
@@ -7808,10 +7834,10 @@
           <para>
             When you use <command>gcc</command> as your C++ compiler, it
             does not attempt to link in <literal>libg++</literal> or
-            <literal>libstdc++</literal>. This may be a good idea to do
-            even if you have these libraries installed, because some
-            versions of them have caused strange problems for MySQL
-            users in the past.
+            <literal>libstdc++</literal>. This may be a good thing to do
+            even if you have those libraries installed. Some versions of
+            them have caused strange problems for MySQL users in the
+            past.
           </para>
 
           <para>
@@ -7930,10 +7956,10 @@
 
           <para>
             The binaries we provide on the MySQL Web site at
-            <ulink url="http://www.mysql.com/"/> are all compiled with
+            <ulink url="&base-url-downloads;"/> are all compiled with
             full optimization and should be perfect for most users. See
             <xref linkend="mysql-binaries"/>. There are some
-            configuration settings you can tweak to make an even faster
+            configuration settings you can tweak to build an even faster
             binary, but these are only for advanced users. See
             <xref linkend="compile-and-link-options"/>.
           </para>
@@ -8034,11 +8060,11 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset_name</replaceable></command>
+            --set-collation=<replaceable>collation_name</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
-            sorted incorrectly otherwise. (This can happen if you
-            install MySQL, create some tables, and then reconfigure
-            MySQL to use a different character set and reinstall it.)
+            sorted incorrectly otherwise. This can happen if you install
+            MySQL, create some tables, and then reconfigure MySQL to use
+            a different character set and reinstall it.
           </para>
 
           <para>
@@ -8053,20 +8079,20 @@
 
             <listitem>
               <para>
-                a list of character set names separated by spaces
+                A list of character set names separated by spaces
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <literal>complex</literal> - to include all character
-                sets that can't be dynamically loaded
+                <literal>complex</literal> to include all character sets
+                that can't be dynamically loaded
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <literal>all</literal> - to include all character sets
+                <literal>all</literal> to include all character sets
                 into the binaries
               </para>
             </listitem>
@@ -8093,13 +8119,12 @@
 
         <listitem>
           <para>
-            If your client programs are using threads, you also must
-            compile a thread-safe version of the MySQL client library
-            with the <option>--enable-thread-safe-client</option>
-            configure option. This creates a
-            <literal>libmysqlclient_r</literal> library with which you
-            should link your threaded applications. See
-            <xref linkend="threaded-clients"/>.
+            If your client programs are using threads, you must compile
+            a thread-safe version of the MySQL client library with the
+            <option>--enable-thread-safe-client</option> configure
+            option. This creates a <literal>libmysqlclient_r</literal>
+            library with which you should link your threaded
+            applications. See <xref linkend="threaded-clients"/>.
           </para>
         </listitem>
 
@@ -8126,8 +8151,8 @@
 
         <listitem>
           <para>
-            Options that pertain to particular systems can be found in
-            the system-specific section of this manual. See
+            Options that pertain to particular operating systems can be
+            found in the system-specific section of this manual. See
             <xref linkend="operating-system-specific-notes"/>.
           </para>
         </listitem>
@@ -11839,11 +11864,10 @@
     <para>
       You can always move the MySQL format files and data files between
       different versions on the same architecture as long as you stay
-      within versions for the same release series of MySQL. The current
-      production release series is &current-series;. If you change the
-      character set when running MySQL, you must run <command>myisamchk
-      -r -q
-      --set-character-set=<replaceable>charset_name</replaceable></command>
+      within versions for the same release series of MySQL. If you
+      change the character set when running MySQL, you must run
+      <command>myisamchk -r -q
+      --set-collation=<replaceable>collation_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
       may also change the sort order.

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.1/connector-j.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -3199,14 +3199,8 @@
         character encoding per connection, which could either be
         automatically detected from the server configuration, or could
         be configured by the user through the
-
-        <parameter>"useUnicode"</parameter>
-
-        and "
-
-        <parameter>characterEncoding</parameter>
-
-        " properties.
+        <parameter>"useUnicode"</parameter> and
+        "<parameter>characterEncoding</parameter>" properties.
       </para>
 
       <para>
@@ -3219,29 +3213,21 @@
       <para>
         The character encoding between client and server is
         automatically detected upon connection. The encoding used by the
-        driver is specified on the server via the configuration variable
-        '
+        driver is specified on the server via the
+        <literal>character_set</literal> system variable for server
+        versions older than 4.1.0 and
+        <literal>character_set_server</literal> for server versions
+        4.1.0 and newer. For more information, see
 
-        <parameter>character_set</parameter>
+        <xfer linkend="charset-server"/>
 
-        ' for server versions older than 4.1.0 and '
-
-        <parameter>character_set_server</parameter>
-
-        ' for server versions 4.1.0 and newer. See the
-        "<ulink
-      url="http://www.mysql.com/doc/en/Charset-server.html">Server
-        Character Set and Collation</ulink>" section in the MySQL server
-        manual for more information.
+        .
       </para>
 
       <para>
         To override the automatically-detected encoding on the client
-        side, use the
-
-        <parameter>characterEncoding</parameter>
-
-        property in the URL used to connect to the server.
+        side, use the <parameter>characterEncoding</parameter> property
+        in the URL used to connect to the server.
       </para>
 
       <para>
@@ -3433,10 +3419,7 @@
         "UTF-8" encoding should be used, either by configuring "utf8" as
         the default server character set, or by configuring the JDBC
         driver to use "UTF-8" through the
-
-        <parameter>characterEncoding</parameter>
-
-        property.
+        <parameter>characterEncoding</parameter> property.
       </para>
 
     </section>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.1/database-administration.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -20958,7 +20958,7 @@
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
-        --set-collation=<replaceable>charset_name</replaceable></command>
+        --set-collation=<replaceable>collation_name</replaceable></command>
         on all tables, or your indexes may not be ordered correctly.
       </para>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/refman-5.1/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
@@ -61,9 +61,9 @@
     <listitem>
       <para>
         <emphasis role="bold">Download the distribution that you want to
-        install.</emphasis> For a list of sites from which you can
-        obtain MySQL, see <xref linkend="getting-mysql"/>. To verify the
-        integrity of the distribution, use the instructions in
+        install.</emphasis> For instructions, see
+        <xref linkend="getting-mysql"/>. To verify the integrity of the
+        distribution, use the instructions in
         <xref linkend="verifying-package-integrity"/>.
       </para>
     </listitem>
@@ -4767,7 +4767,7 @@
       <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
+        invoke <command>mysqladmin</command> with the
         <option>-p</option> option and supply the password when
         prompted.
       </para>
@@ -5345,9 +5345,9 @@
           <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.
+            need to invoke <command>mysqladmin</command> with the
+            <option>-p</option> option and supply the password when
+            prompted.
           </para>
         </listitem>
 
@@ -6214,9 +6214,9 @@
     </remark>
 
     <para>
-      If you are running Mac OS X Server, you have a version of MySQL
-      installed. The versions of MySQL that ship with Mac OS X Server
-      versions are shown in the following table:
+      If you are running Mac OS X Server, a version of MySQL should
+      already be installed. The following table shows the versions of
+      MySQL that ship with Mac OS X Server versions.
     </para>
 
     <informaltable>
@@ -6288,12 +6288,12 @@
     </para>
 
     <para>
-      If you would like to automatically start up MySQL during system
-      startup, you also need to install the MySQL Startup Item. For
-      MySQL &current-series;, it is part of the Mac OS X installation
-      disk images as a separate installation package. Simply
-      double-click the <guiicon>MySQLStartupItem.pkg</guiicon> icon and
-      follow the instructions to install it.
+      If you want MySQL to start automatically during system startup,
+      you also need to install the MySQL Startup Item. It is part of the
+      Mac OS X installation disk images as a separate installation
+      package. Simply double-click the
+      <guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
+      instructions to install it.
     </para>
 
     <para>
@@ -6303,15 +6303,15 @@
     </para>
 
     <para>
-      The Startup Item for MySQL &current-series; is installed into
+      The Startup Item for MySQL is installed into
       <filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
       4.1.2, the location was
       <filename>/Library/StartupItems/MySQL</filename>, but that
       collided with the MySQL Startup Item installed by Mac OS X
       Server.) Startup Item installation adds a variable
       <literal>MYSQLCOM=-YES-</literal> to the system configuration file
-      <filename>/etc/hostconfig</filename>. If you would like to disable
-      the automatic startup of MySQL, simply change this variable to
+      <filename>/etc/hostconfig</filename>. If you want to disable the
+      automatic startup of MySQL, simply change this variable to
       <literal>MYSQLCOM=-NO-</literal>.
     </para>
 
@@ -6333,13 +6333,13 @@
     </para>
 
     <para>
-      If you have installed the Startup Item:
+      If you have installed the Startup Item use this command:
     </para>
 
 <programlisting>
 shell&gt; <userinput>sudo /Library/StartupItems/MySQLCOM/MySQLCOM start</userinput>
-(Enter your password, if necessary)
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6350,10 +6350,10 @@
 <programlisting>
 shell&gt; <userinput>cd /usr/local/mysql</userinput>
 shell&gt; <userinput>sudo ./bin/mysqld_safe</userinput>
-(Enter your password, if necessary)
-(Press Control-Z)
+<replaceable>(Enter your password, if necessary)</replaceable>
+<replaceable>(Press Control-Z)</replaceable>
 shell&gt; <userinput>bg</userinput>
-(Press Control-D or enter "exit" to exit the shell)
+<replaceable>(Press Control-D or enter "exit" to exit the shell)</replaceable>
 </programlisting>
 
     <para>
@@ -6372,41 +6372,51 @@
       You might want to add aliases to your shell's resource file to
       make it easier to access commonly used programs such as
       <command>mysql</command> and <command>mysqladmin</command> from
-      the command line. The syntax for <command>tcsh</command> is:
+      the command line. The syntax for <command>bash</command> is:
     </para>
 
 <programlisting>
-alias mysql /usr/local/mysql/bin/mysql
-alias mysqladmin /usr/local/mysql/bin/mysqladmin
+alias mysql=/usr/local/mysql/bin/mysql
+alias mysqladmin=/usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
-      For <command>bash</command>, use:
+      For <command>tcsh</command>, use:
     </para>
 
 <programlisting>
-alias mysql=/usr/local/mysql/bin/mysql
-alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+alias mysql /usr/local/mysql/bin/mysql
+alias mysqladmin /usr/local/mysql/bin/mysqladmin
 </programlisting>
 
     <para>
       Even better, add <literal>/usr/local/mysql/bin</literal> to your
       <literal>PATH</literal> environment variable. For example, add the
-      following line to your <filename>$HOME/.tcshrc</filename> file if
-      your shell is <command>tcsh</command>:
+      following line to your <filename>$HOME/.bashrc</filename> file if
+      your shell is <command>bash</command>:
     </para>
 
 <programlisting>
+PATH=${PATH}:/usr/local/mysql/bin
+</programlisting>
+
+    <para>
+      Add the following line to your <filename>$HOME/.tcshrc</filename>
+      file if your shell is <command>tcsh</command>:
+    </para>
+
+<programlisting>
 setenv PATH ${PATH}:/usr/local/mysql/bin
 </programlisting>
 
     <para>
-      If no <filename>.tcshrc</filename> file exists in your home
-      directory, create it with a text editor.
+      If no <filename>.bashrc<replaceable> or
+      </replaceable></filename><filename>.tcshrc</filename> file exists
+      in your home directory, create it with a text editor.
     </para>
 
     <para>
-      If you are upgrading an existing installation, please note that
+      If you are upgrading an existing installation, note that
       installing a new MySQL PKG does not remove the directory of an
       older installation. Unfortunately, the Mac OS X Installer does not
       yet offer the functionality required to properly upgrade
@@ -6467,9 +6477,9 @@
 
       <listitem>
         <para>
-          Latest Support Pack of
+          The latest Support Pack of
           <ulink url="http://support.novell.com/filefinder/18197/index.html">NetWare
-          6.5</ulink> installed.
+          6.5</ulink> must be installed.
         </para>
       </listitem>
 
@@ -6482,9 +6492,8 @@
 
       <listitem>
         <para>
-          MySQL data, as well as the binaries themselves, must be
-          installed on an NSS volume; traditional volumes are not
-          supported.
+          MySQL data and the program binaries must be installed on an
+          NSS volume; traditional volumes are not supported.
         </para>
       </listitem>
 
@@ -6506,6 +6515,14 @@
 <programlisting>
 SERVER:  mysqladmin -u root shutdown
 </programlisting>
+
+        <para>
+          <emphasis role="bold">Note</emphasis>: If the MySQL
+          <literal>root</literal> user account has a password, you need
+          to invoke <command>mysqladmin</command> with the
+          <option>-p</option> option and supply the password when
+          prompted.
+        </para>
       </listitem>
 
       <listitem>
@@ -6534,7 +6551,7 @@
       <listitem>
         <para>
           You might want to rename the directory to something more
-          consistent and easy to use. The examples iin this manual use
+          consistent and easy to use. The examples in this manual use
           <filename>SYS:MYSQL</filename> to refer to the installation
           directory.
         </para>
@@ -6564,9 +6581,9 @@
 
       <listitem>
         <para>
-          Initialize the data directory and the grant tables, if needed,
-          by executing <command>mysql_install_db</command> at the server
-          console.
+          Initialize the data directory and the grant tables, if
+          necessary, by executing <command>mysql_install_db</command> at
+          the server console.
         </para>
       </listitem>
 
@@ -6580,7 +6597,7 @@
       <listitem>
         <para>
           To finish the installation, you should also add the following
-          commands to <literal>autoexec.ncf</literal>. For example, if
+          commands to <filename>autoexec.ncf</filename>. For example, if
           your MySQL installation is in <filename>SYS:MYSQL</filename>
           and you want MySQL to start automatically, you could add these
           lines:
@@ -6616,8 +6633,8 @@
         <para>
           <command>mysqld_safe</command> on NetWare provides a screen
           presence. When you unload (shut down) the
-          <command>mysqld_safe</command> NLM, the screen does not by
-          default go away. Instead, it prompts for user input:
+          <command>mysqld_safe</command> NLM, the screen does not go
+          away by default. Instead, it prompts for user input:
         </para>
 
 <programlisting>
@@ -6644,17 +6661,16 @@
         </remark>
 
         <para>
-          When installing MySQL version &current-series; either for the
-          first time or upgrading from a previous version, download and
-          install the latest and appropriate Perl module and PHP
-          extension:
+          When installing MySQL, either for the first time or upgrading
+          from a previous version, download and install the latest and
+          appropriate Perl module and PHP extensions for NetWare:
         </para>
 
         <itemizedlist>
 
           <listitem>
             <para>
-              Perl for NetWare:
+              Perl:
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/perl/Modules/"/>
             </para>
@@ -6662,7 +6678,7 @@
 
           <listitem>
             <para>
-              PHP for NetWare:
+              PHP:
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/php/Modules/"/>
             </para>
@@ -6684,9 +6700,9 @@
     </para>
 
     <para>
-      If there was an existing installation of MySQL on the server, be
-      sure to check for existing MySQL startup commands in
-      <literal>autoexec.ncf</literal>, and edit or delete them as
+      If there was an existing installation of MySQL on the NetWare
+      server, be sure to check for existing MySQL startup commands in
+      <filename>autoexec.ncf</filename>, and edit or delete them as
       necessary.
     </para>
 
@@ -6789,7 +6805,7 @@
     </indexterm>
 
     <para>
-      The basic commands which you must execute to install and use a
+      The basic commands that you must execute to install and use a
       MySQL binary distribution are:
     </para>
 
@@ -6835,8 +6851,8 @@
           These commands add the <literal>mysql</literal> group and the
           <literal>mysql</literal> user. The syntax for
           <command>useradd</command> and <command>groupadd</command> may
-          differ slightly on different versions of Unix. They may also
-          be called <command>adduser</command> and
+          differ slightly on different versions of Unix, or they may
+          have different names such as <command>adduser</command> and
           <command>addgroup</command>.
         </para>
 
@@ -6850,13 +6866,13 @@
       <listitem>
         <para>
           Pick the directory under which you want to unpack the
-          distribution, and change location into it. In the following
+          distribution and change location into it. In the following
           example, we unpack the distribution under
           <filename>/usr/local</filename>. (The instructions, therefore,
           assume that you have permission to create files and
           directories in <filename>/usr/local</filename>. If that
-          directory is protected, you need to perform the installation
-          as <literal>root</literal>.)
+          directory is protected, you must perform the installation as
+          <literal>root</literal>.)
         </para>
 
 <programlisting>
@@ -6866,7 +6882,7 @@
 
       <listitem>
         <para>
-          Obtain a distribution file from one of the sites listed in
+          Obtain a distribution file using the instructions in
           <xref linkend="getting-mysql"/>. For a given release, binary
           distributions for all platforms are built from the same MySQL
           source distribution.
@@ -6915,10 +6931,10 @@
 </programlisting>
 
         <para>
-          You can find several files and subdirectories in the
+          You will find several files and subdirectories in the
           <literal>mysql</literal> directory. The most important for
           installation purposes are the <filename>bin</filename> and
-          <filename>scripts</filename> subdirectories.
+          <filename>scripts</filename> subdirectories:
         </para>
 
         <itemizedlist>
@@ -6934,25 +6950,18 @@
 
           <listitem>
             <para>
-              <filename>bin</filename>
-            </para>
-
-            <para>
-              This directory contains client programs and the server.
-              You should add the full pathname of this directory to your
-              <literal>PATH</literal> environment variable so that your
-              shell finds the MySQL programs properly. See
+              The <filename>bin</filename> directory contains client
+              programs and the server. You should add the full pathname
+              of this directory to your <literal>PATH</literal>
+              environment variable so that your shell finds the MySQL
+              programs properly. See
               <xref linkend="environment-variables"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <filename>scripts</filename>
-            </para>
-
-            <para>
-              This directory contains the
+              The <filename>scripts</filename> directory contains the
               <command>mysql_install_db</command> script used to
               initialize the <literal>mysql</literal> database
               containing the grant tables that store the server access
@@ -6974,7 +6983,7 @@
 </programlisting>
 
         <para>
-          If you run the command as <literal>root</literal>, you should
+          If you run the command as <literal>root</literal>, you must
           use the <option>--user</option> option as shown. The value of
           the option should be the name of the login account that you
           created in the first step to use for running the server. If
@@ -7015,8 +7024,8 @@
 
       <listitem>
         <para>
-          If you would like MySQL to start automatically when you boot
-          your machine, you can copy
+          If you want MySQL to start automatically when you boot your
+          machine, you can copy
           <literal>support-files/mysql.server</literal> to the location
           where your system has its startup files. More information can
           be found in the <literal>support-files/mysql.server</literal>
@@ -7075,18 +7084,22 @@
 
     <para>
       After everything has been unpacked and installed, you should test
-      your distribution.
+      your distribution. To start the MySQL server, use the following
+      command:
     </para>
 
-    <para>
-      You can start the MySQL server with the following command:
-    </para>
-
 <programlisting>
 shell&gt; <userinput>bin/mysqld_safe --user=mysql &amp;</userinput>
 </programlisting>
 
     <para>
+      If that command fails immediately and prints <literal>mysqld
+      ended</literal>, you can find some information in the
+      <filename><replaceable>host_name</replaceable>.err</filename> file
+      in the data directory.
+    </para>
+
+    <para>
       More information about <command>mysqld_safe</command> is given in
       <xref linkend="mysqld-safe"/>.
     </para>
@@ -7125,7 +7138,7 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, first check
+      Before you proceed with an installation from source, first check
       whether our binary is available for your platform and whether it
       works for you. We put a great deal of effort into ensuring that
       our binaries are built with the best possible options.
@@ -7199,7 +7212,7 @@
         <para>
           A good <command>make</command> program. GNU
           <command>make</command> is always recommended and is sometimes
-          required. If you have problems, we recommend trying GNU
+          required. If you have problems, we recommend GNU
           <command>make</command> 3.75 or newer.
         </para>
       </listitem>
@@ -7237,8 +7250,8 @@
       <title>&title-quick-install;</title>
 
       <para>
-        The basic commands you must execute to install a MySQL source
-        distribution are:
+        The basic commands that you must execute to install a MySQL
+        source distribution are:
       </para>
 
 <programlisting>
@@ -7301,9 +7314,9 @@
             These commands add the <literal>mysql</literal> group and
             the <literal>mysql</literal> user. The syntax for
             <command>useradd</command> and <command>groupadd</command>
-            may differ slightly on different versions of Unix. They may
-            also be called <command>adduser</command> and
-            <command>addgroup</command>.
+            may differ slightly on different versions of Unix, or they
+            may have different names such as <command>adduser</command>
+            and <command>addgroup</command>.
           </para>
 
           <para>
@@ -7316,13 +7329,13 @@
         <listitem>
           <para>
             Pick the directory under which you want to unpack the
-            distribution, and change location into it.
+            distribution and change location into it.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Obtain a distribution file from one of the sites listed in
+            Obtain a distribution file using the instructions in
             <xref linkend="getting-mysql"/>.
           </para>
         </listitem>
@@ -7363,6 +7376,12 @@
 shell&gt; <userinput>cd mysql-<replaceable>VERSION</replaceable></userinput>
 </programlisting>
 
+          <remark role="todo">
+            [pd] It's no longer true that you must be in the top-level
+            directory, but we need information from the build team if
+            we're to describe alternate procedures.
+          </remark>
+
           <para>
             Note that currently you must configure and build MySQL from
             this top-level directory. You cannot build it in a different
@@ -7382,7 +7401,7 @@
 
           <para>
             When you run <command>configure</command>, you might want to
-            specify some options. Run <command>./configure
+            specify other options. Run <command>./configure
             --help</command> for a list of options.
             <xref linkend="configure-options"/>, discusses some of the
             more useful options.
@@ -7395,7 +7414,7 @@
             <filename>config.log</filename> that you think can help
             solve the problem. Also include the last couple of lines of
             output from <command>configure</command>. To file a bug
-            report, please use the instructions at
+            report, please use the instructions in
             <xref linkend="bug-reports"/>.
           </para>
 
@@ -7471,9 +7490,10 @@
           </para>
 
           <para>
-            Note that you must restart the server manually after using
-            <command>mysql_install_db</command> to create the grant
-            tables for MySQL.
+            After using <command>mysql_install_db</command> to create
+            the grant tables for MySQL, you must restart the server
+            manually. The <command>mysqld_safe</command> command to do
+            this is shown in a later step.
           </para>
         </listitem>
 
@@ -7504,8 +7524,8 @@
 
         <listitem>
           <para>
-            If you would like MySQL to start automatically when you boot
-            your machine, you can copy
+            If you want MySQL to start automatically when you boot your
+            machine, you can copy
             <filename>support-files/mysql.server</filename> to the
             location where your system has its startup files. More
             information can be found in the
@@ -7542,8 +7562,9 @@
       </orderedlist>
 
       <para>
-        After everything has been installed, you should initialize and
-        test your distribution using this command:
+        After everything has been installed, you should test your
+        distribution. To start the MySQL server, use the following
+        command:
       </para>
 
 <programlisting>
@@ -7647,9 +7668,9 @@
           </remark>
 
           <para>
-            If you don't have a C++ compiler, <command>mysql</command>
-            cannot be compiled (it is the one client program that
-            requires C++). In this case, you can remove the code in
+            If you have no C++ compiler, <command>mysql</command> cannot
+            be compiled (it is the one client program that requires
+            C++). In this case, you can remove the code in
             <command>configure</command> that tests for the C++ compiler
             and then run <command>./configure</command> with the
             <option>--without-server</option> option. The compile step
@@ -7664,7 +7685,7 @@
         <listitem>
           <para>
             If you want to build the embedded MySQL library
-            (<literal>libmysqld.a</literal>) you should use the
+            (<literal>libmysqld.a</literal>), use the
             <option>--with-embedded-server</option> option.
           </para>
         </listitem>
@@ -7691,11 +7712,15 @@
             command preserves the default installation prefix, but
             overrides the default location for database directories
             (normally <filename>/usr/local/var</filename>) and changes
-            it to <literal>/usr/local/mysql/data</literal>. After you
-            have compiled MySQL, you can change these options with
-            option files. See <xref linkend="option-files"/>.
+            it to <literal>/usr/local/mysql/data</literal>.
           </para>
 
+          <para>
+            You can also specify the locations at server startup time by
+            using a MySQL option file. See
+            <xref linkend="option-files"/>.
+          </para>
+
           <indexterm>
             <primary>changing socket location</primary>
           </indexterm>
@@ -7713,9 +7738,9 @@
 
         <listitem>
           <para>
-            If you are using Unix and you want the MySQL socket located
-            somewhere other than the default location (normally in the
-            directory <filename>/tmp</filename> or
+            If you are using Unix and you want the MySQL socket file
+            location to be somewhere other than the default location
+            (normally in the directory <filename>/tmp</filename> or
             <filename>/var/run</filename>), use a
             <command>configure</command> command like this:
           </para>
@@ -7728,7 +7753,7 @@
           <para>
             The socket filename must be an absolute pathname. You can
             also change the location of <filename>mysql.sock</filename>
-            later by using a MySQL option file. See
+            at server startup by using a MySQL option file. See
             <xref linkend="problems-with-mysql-sock"/>.
           </para>
 
@@ -7746,9 +7771,10 @@
         <listitem>
           <para>
             If you want to compile statically linked programs (for
-            example, to make a binary distribution, to get more speed,
-            or to work around problems with some Red Hat Linux
-            distributions), run <command>configure</command> like this:
+            example, to make a binary distribution, to get better
+            performance, or to work around problems with some Red Hat
+            Linux distributions), run <command>configure</command> like
+            this:
           </para>
 
 <programlisting>
@@ -7804,10 +7830,10 @@
           <para>
             When you use <command>gcc</command> as your C++ compiler, it
             does not attempt to link in <literal>libg++</literal> or
-            <literal>libstdc++</literal>. This may be a good idea to do
-            even if you have these libraries installed, because some
-            versions of them have caused strange problems for MySQL
-            users in the past.
+            <literal>libstdc++</literal>. This may be a good thing to do
+            even if you have those libraries installed. Some versions of
+            them have caused strange problems for MySQL users in the
+            past.
           </para>
 
           <para>
@@ -7926,10 +7952,10 @@
 
           <para>
             The binaries we provide on the MySQL Web site at
-            <ulink url="http://www.mysql.com/"/> are all compiled with
+            <ulink url="&base-url-downloads;"/> are all compiled with
             full optimization and should be perfect for most users. See
             <xref linkend="mysql-binaries"/>. There are some
-            configuration settings you can tweak to make an even faster
+            configuration settings you can tweak to build an even faster
             binary, but these are only for advanced users. See
             <xref linkend="compile-and-link-options"/>.
           </para>
@@ -8030,11 +8056,11 @@
             <emphasis role="bold">Warning:</emphasis> If you change
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
-            --set-character-set=<replaceable>charset_name</replaceable></command>
+            --set-collation=<replaceable>collation_name</replaceable></command>
             <emphasis>on every table</emphasis>. Your indexes may be
-            sorted incorrectly otherwise. (This can happen if you
-            install MySQL, create some tables, and then reconfigure
-            MySQL to use a different character set and reinstall it.)
+            sorted incorrectly otherwise. This can happen if you install
+            MySQL, create some tables, and then reconfigure MySQL to use
+            a different character set and reinstall it.
           </para>
 
           <para>
@@ -8049,20 +8075,20 @@
 
             <listitem>
               <para>
-                a list of character set names separated by spaces
+                A list of character set names separated by spaces
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <literal>complex</literal> - to include all character
-                sets that can't be dynamically loaded
+                <literal>complex</literal> to include all character sets
+                that can't be dynamically loaded
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <literal>all</literal> - to include all character sets
+                <literal>all</literal> to include all character sets
                 into the binaries
               </para>
             </listitem>
@@ -8089,13 +8115,12 @@
 
         <listitem>
           <para>
-            If your client programs are using threads, you also must
-            compile a thread-safe version of the MySQL client library
-            with the <option>--enable-thread-safe-client</option>
-            configure option. This creates a
-            <literal>libmysqlclient_r</literal> library with which you
-            should link your threaded applications. See
-            <xref linkend="threaded-clients"/>.
+            If your client programs are using threads, you must compile
+            a thread-safe version of the MySQL client library with the
+            <option>--enable-thread-safe-client</option> configure
+            option. This creates a <literal>libmysqlclient_r</literal>
+            library with which you should link your threaded
+            applications. See <xref linkend="threaded-clients"/>.
           </para>
         </listitem>
 
@@ -8121,8 +8146,8 @@
 
         <listitem>
           <para>
-            Options that pertain to particular systems can be found in
-            the system-specific section of this manual. See
+            Options that pertain to particular operating systems can be
+            found in the system-specific section of this manual. See
             <xref linkend="operating-system-specific-notes"/>.
           </para>
         </listitem>
@@ -11845,11 +11870,10 @@
     <para>
       You can always move the MySQL format files and data files between
       different versions on the same architecture as long as you stay
-      within versions for the same release series of MySQL. The current
-      production release series is &current-series;. If you change the
-      character set when running MySQL, you must run <command>myisamchk
-      -r -q
-      --set-character-set=<replaceable>charset_name</replaceable></command>
+      within versions for the same release series of MySQL. If you
+      change the character set when running MySQL, you must run
+      <command>myisamchk -r -q
+      --set-collation=<replaceable>collation_name</replaceable></command>
       on all <literal>MyISAM</literal> tables. Otherwise, your indexes
       may not be ordered correctly, because changing the character set
       may also change the sort order.

Modified: trunk/tools/xmlformat.conf
===================================================================
--- trunk/tools/xmlformat.conf	2006-01-30 21:38:01 UTC (rev 1138)
+++ trunk/tools/xmlformat.conf	2006-01-31 00:45:07 UTC (rev 1139)
@@ -86,7 +86,7 @@
 guibutton guilabel guimenu guisubmenu guimenuitem guiicon \
 quote superscript firstterm \
 methodname classname property function phrase envar foreignphrase errortext \
-classname type varname
+classname type varname parameter
     format          inline
 
 # Begin each element on new line, indenting sub elements two spaces.

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