List:Commits« Previous MessageNext Message »
From:paul Date:March 23 2006 4:08am
Subject:svn commit - mysqldoc@docsrva: r1646 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-03-23 05:08:25 +0100 (Thu, 23 Mar 2006)
New Revision: 1646

Log:
 r8898@frost:  paul | 2006-03-22 22:08:10 -0600
 Fold in proof corrections.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-03-22 21:42:47 UTC (rev 1645)
+++ trunk/refman-4.1/installing.xml	2006-03-23 04:08:25 UTC (rev 1646)
@@ -840,7 +840,7 @@
           distribution. In most cases, you should probably use a binary
           distribution, if one exists for your platform. Binary
           distributions are available in native format for many
-          platforms, such as RPM files for Linux or DMG package
+          platforms, such as RPM files for Linux or PKG package
           installers for Mac OS X. Distributions also are available as
           Zip archives or compressed <command>tar</command> files.
         </para>
@@ -7642,22 +7642,18 @@
 shell&gt; <userinput>./configure --without-server</userinput>
 </programlisting>
 
-          <remark>
-            FIX incorrect..
-          </remark>
-
           <para>
-            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
+            If you have no C++ compiler, some client programs such as
+            <command>mysql</command> cannot be compiled because they
+            require 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
-            should still try to build <command>mysql</command>, but you
-            can ignore any warnings about <filename>mysql.cc</filename>.
-            (If <command>make</command> stops, try <command>make
-            -k</command> to tell it to continue with the rest of the
-            build even if errors occur.)
+            should still try to build all clients, but you can ignore
+            any warnings about files such as
+            <filename>mysql.cc</filename>. (If <command>make</command>
+            stops, try <command>make -k</command> to tell it to continue
+            with the rest of the build even if errors occur.)
           </para>
         </listitem>
 
@@ -8257,7 +8253,7 @@
       </para>
 
       <para>
-        After you have installed the BitKeeper client, you can assess
+        After you have installed the BitKeeper client, you can access
         the MySQL development source tree:
       </para>
 
@@ -9017,7 +9013,8 @@
           <para>
             If you get a compilation error on Linux (for example, SuSE
             Linux 8.1 or Red Hat Linux 7.3) similar to the following
-            one:
+            one, you probably do not have <command>g++</command>
+            installed:
           </para>
 
 <programlisting>
@@ -9032,8 +9029,8 @@
           <para>
             By default, the <command>configure</command> script attempts
             to determine the correct number of arguments by using
-            <command>g++</command> the GNU C++ compiler. This test
-            yields wrong results if <command>g++</command> is not
+            <command>g++</command> (the GNU C++ compiler). This test
+            yields incorrect results if <command>g++</command> is not
             installed. There are two ways to work around this problem:
           </para>
 
@@ -10077,9 +10074,9 @@
             database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
-            <literal>root</literal> accounts and anonymous-user
-            accounts. The accounts have no passwords initially. A
-            description of their initial privileges is given in
+            <literal>root</literal> and anonymous-user accounts. The
+            accounts have no passwords initially. A description of their
+            initial privileges is given in
             <xref linkend="default-privileges"/>. Briefly, these
             privileges allow the MySQL <literal>root</literal> user to
             do anything, and allow anybody to create or use databases
@@ -11211,7 +11208,7 @@
 
         <para>
           You can specify other options such as
-          <option>--datadir</option> as well, but note that
+          <option>--datadir</option> as well, but
           <option>--verbose</option> and <option>--help</option> must be
           the last options. (Prior to MySQL 4.1, omit the
           <option>--verbose</option> option.)
@@ -11593,7 +11590,7 @@
         <listitem>
           <para>
             You should assign a password to each MySQL
-            <literal>root</literal> accounts.
+            <literal>root</literal> account.
           </para>
         </listitem>
 
@@ -11617,10 +11614,15 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         To assign passwords to the anonymous accounts, connect to the
-        server as <literal>root</literal> and then either <literal>SET
-        PASSWORD</literal> or <literal>UPDATE</literal>. In either case,
-        be sure to encrypt the password using the
+        server as <literal>root</literal> and then use either
+        <literal>SET PASSWORD</literal> or <literal>UPDATE</literal>. In
+        either case, be sure to encrypt the password using the
         <literal>PASSWORD()</literal> function.
       </para>
 
@@ -11695,6 +11697,10 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Removal</emphasis>
+      </para>
+
+      <para>
         If you prefer to remove the anonymous accounts instead, do so as
         follows:
       </para>
@@ -11724,6 +11730,11 @@
       </para>
 
       <para>
+        <emphasis role="bold"><literal>root</literal> Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         You can assign passwords to the <literal>root</literal> accounts
         in several ways. The following discussion demonstrates three
         methods:
@@ -12034,8 +12045,8 @@
       </para>
 
       <para>
-        In general, you should do the following when upgrading to MySQL
-        4.1 from 4.0:
+        In general, you should do the following when upgrading from
+        MySQL 4.0 to 4.1:
       </para>
 
       <itemizedlist>
@@ -12942,8 +12953,8 @@
       </indexterm>
 
       <para>
-        In general, you should do the following when upgrading to MySQL
-        4.0 from 3.23:
+        In general, you should do the following when upgrading from
+        MySQL 3.23 to 4.0:
       </para>
 
       <itemizedlist>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-03-22 21:42:47 UTC (rev 1645)
+++ trunk/refman-5.0/installing.xml	2006-03-23 04:08:25 UTC (rev 1646)
@@ -841,7 +841,7 @@
           distribution. In most cases, you should probably use a binary
           distribution, if one exists for your platform. Binary
           distributions are available in native format for many
-          platforms, such as RPM files for Linux or DMG package
+          platforms, such as RPM files for Linux or PKG package
           installers for Mac OS X. Distributions also are available as
           Zip archives or compressed <command>tar</command> files.
         </para>
@@ -7500,22 +7500,18 @@
 shell&gt; <userinput>./configure --without-server</userinput>
 </programlisting>
 
-          <remark>
-            FIX incorrect..
-          </remark>
-
           <para>
-            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
+            If you have no C++ compiler, some client programs such as
+            <command>mysql</command> cannot be compiled because they
+            require 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
-            should still try to build <command>mysql</command>, but you
-            can ignore any warnings about <filename>mysql.cc</filename>.
-            (If <command>make</command> stops, try <command>make
-            -k</command> to tell it to continue with the rest of the
-            build even if errors occur.)
+            should still try to build all clients, but you can ignore
+            any warnings about files such as
+            <filename>mysql.cc</filename>. (If <command>make</command>
+            stops, try <command>make -k</command> to tell it to continue
+            with the rest of the build even if errors occur.)
           </para>
         </listitem>
 
@@ -7894,10 +7890,11 @@
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
             --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.
+            <emphasis>on every <literal>MyISAM</literal>
+            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.
           </para>
 
           <para>
@@ -8097,7 +8094,7 @@
       </para>
 
       <para>
-        After you have installed the BitKeeper client, you can assess
+        After you have installed the BitKeeper client, you can access
         the MySQL development source tree:
       </para>
 
@@ -8296,15 +8293,6 @@
 
         <listitem>
           <para>
-            After the initial copying of the repository
-            (<literal>sfioball</literal>) to obtain the source tree, you
-            should update the repository (<literal>update</literal>)
-            periodically to get updates.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             After initially copying the repository with
             <command>sfioball</command> to obtain the source tree, you
             should use <command>update</command> periodically to update
@@ -8798,7 +8786,8 @@
           <para>
             If you get a compilation error on Linux (for example, SuSE
             Linux 8.1 or Red Hat Linux 7.3) similar to the following
-            one:
+            one, you probably do not have <command>g++</command>
+            installed:
           </para>
 
 <programlisting>
@@ -8813,8 +8802,8 @@
           <para>
             By default, the <command>configure</command> script attempts
             to determine the correct number of arguments by using
-            <command>g++</command> the GNU C++ compiler. This test
-            yields wrong results if <command>g++</command> is not
+            <command>g++</command> (the GNU C++ compiler). This test
+            yields incorrect results if <command>g++</command> is not
             installed. There are two ways to work around this problem:
           </para>
 
@@ -9853,9 +9842,9 @@
             database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
-            <literal>root</literal> accounts and anonymous-user
-            accounts. The accounts have no passwords initially. A
-            description of their initial privileges is given in
+            <literal>root</literal> and anonymous-user accounts. The
+            accounts have no passwords initially. A description of their
+            initial privileges is given in
             <xref linkend="default-privileges"/>. Briefly, these
             privileges allow the MySQL <literal>root</literal> user to
             do anything, and allow anybody to create or use databases
@@ -9881,10 +9870,9 @@
             in the <literal>mysql</literal> database, including
             <literal>user</literal>, <literal>db</literal>,
             <literal>host</literal>, <literal>tables_priv</literal>,
-            <literal>columns_priv</literal>, and
-            <literal>func</literal>, as well as others. See
-            <xref linkend="privilege-system"/>, for a complete listing
-            and description of these tables.
+            <literal>columns_priv</literal>, <literal>func</literal>,
+            and others. See <xref linkend="privilege-system"/>, for a
+            complete listing and description of these tables.
           </para>
 
           <para>
@@ -10972,7 +10960,7 @@
 
         <para>
           You can specify other options such as
-          <option>--datadir</option> as well, but note that
+          <option>--datadir</option> as well, but
           <option>--verbose</option> and <option>--help</option> must be
           the last options.
         </para>
@@ -11354,7 +11342,7 @@
         <listitem>
           <para>
             You should assign a password to each MySQL
-            <literal>root</literal> accounts.
+            <literal>root</literal> account.
           </para>
         </listitem>
 
@@ -11378,10 +11366,15 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         To assign passwords to the anonymous accounts, connect to the
-        server as <literal>root</literal> and then either <literal>SET
-        PASSWORD</literal> or <literal>UPDATE</literal>. In either case,
-        be sure to encrypt the password using the
+        server as <literal>root</literal> and then use either
+        <literal>SET PASSWORD</literal> or <literal>UPDATE</literal>. In
+        either case, be sure to encrypt the password using the
         <literal>PASSWORD()</literal> function.
       </para>
 
@@ -11456,6 +11449,10 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Removal</emphasis>
+      </para>
+
+      <para>
         If you prefer to remove the anonymous accounts instead, do so as
         follows:
       </para>
@@ -11485,6 +11482,11 @@
       </para>
 
       <para>
+        <emphasis role="bold"><literal>root</literal> Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         You can assign passwords to the <literal>root</literal> accounts
         in several ways. The following discussion demonstrates three
         methods:
@@ -11816,8 +11818,8 @@
       </para>
 
       <para>
-        In general, you should do the following when upgrading to MySQL
-        &current-series; from &previous-series;:
+        In general, you should do the following when upgrading from
+        MySQL &previous-series; from &current-series;:
       </para>
 
       <itemizedlist>
@@ -11945,7 +11947,7 @@
             the pad value and how it is handled has changed as of MySQL
             5.0.15. The pad value for inserts now is
             <literal>0x00</literal> rather than space, and there is no
-            stripping of the pad value for selects. For details, see
+            stripping of the pad value for retrievals. For details, see
             <xref linkend="binary-varbinary"/>.
           </para>
         </listitem>
@@ -12138,6 +12140,31 @@
         <listitem>
           <para>
             <emphasis role="bold">Incompatible change:</emphasis>
+            Beginning with MySQL 5.0.12, natural joins and joins with
+            <literal>USING</literal>, including outer join variants, are
+            processed according to the SQL:2003 standard. The changes
+            include elimination of redundant output columns for
+            <literal>NATURAL</literal> joins and joins specified with a
+            <literal>USING</literal> clause and proper ordering of
+            output columns. The precedence of the comma operator also
+            now is lower compared to <literal>JOIN</literal>,
+            <literal>LEFT JOIN</literal>, and so forth.
+          </para>
+
+          <para>
+            These changes make MySQL more compliant with standard SQL.
+            However, they can result in different output columns for
+            some joins. Also, some queries that appeared to work
+            correctly prior to 5.0.12 must be rewritten to comply with
+            the standard. For details about the scope of the changes and
+            examples that show what query rewrites are necessary, see
+            <xref linkend="join"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <emphasis role="bold">Incompatible change:</emphasis>
             Previously, a lock wait timeout caused
             <literal>InnoDB</literal> to roll back the entire current
             transaction. As of MySQL 5.0.13, it rolls back only the most
@@ -12329,31 +12356,6 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Incompatible change:</emphasis>
-            Beginning with MySQL 5.0.12, natural joins and joins with
-            <literal>USING</literal>, including outer join variants, are
-            processed according to the SQL:2003 standard. The changes
-            include elimination of redundant output columns for
-            <literal>NATURAL</literal> joins and joins specified with a
-            <literal>USING</literal> clause and proper ordering of
-            output columns. The precedence of the comma operator also
-            now is lower compared to <literal>JOIN</literal>,
-            <literal>LEFT JOIN</literal>, and so forth.
-          </para>
-
-          <para>
-            These changes make MySQL more compliant with standard SQL.
-            However, they can result in different output columns for
-            some joins. Also, some queries that appeared to work
-            correctly prior to 5.0.12 must be rewritten to comply with
-            the standard. For details about the scope of the changes and
-            examples that show what query rewrites are necessary, see
-            <xref linkend="join"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <emphasis role="bold">Incompatible change:</emphasis> Before
             MySQL 5.0.13,
             <literal>GREATEST(<replaceable>x</replaceable>,NULL)</literal>
@@ -12440,8 +12442,9 @@
             with new <literal>VARCHAR</literal> or
             <literal>VARBINARY</literal> columns in MySQL 5.0.3 or
             later, the table will not be usable if you downgrade to a
-            version older than 5.0.3. Dump the table before downgrading
-            and reload it after downgrading.
+            version older than 5.0.3. Dump the table with
+            <command>mysqldump</command> before downgrading and reload
+            it after downgrading.
           </para>
         </listitem>
 
@@ -12463,7 +12466,7 @@
             for storing incorrect dates such as
             <literal>'2004-02-31'</literal>, you should start the server
             with
-            <option>--sql_mode=TRADITIONAL,ALLOW_INVALID_DATES</option>.
+            <option>--sql_mode="TRADITIONAL,ALLOW_INVALID_DATES"</option>.
           </para>
         </listitem>
 
@@ -12475,7 +12478,7 @@
             <literal>DATABASES</literal>, respectively. (While
             <quote>schemata</quote> is grammatically correct and even
             appears in some MySQL 5.0 system database and table names,
-            it cannot be used as a keyword for input.)
+            it cannot be used as a keyword.)
           </para>
         </listitem>
 
@@ -16859,8 +16862,8 @@
 
 <programlisting>
 shell&gt; <userinput>perl -MCPAN -e shell</userinput>
-cpan&gt; install DBI
-cpan&gt; install DBD::mysql
+cpan&gt; <userinput>install DBI</userinput>
+cpan&gt; <userinput>install DBD::mysql</userinput>
 </programlisting>
 
       <para>
@@ -17039,8 +17042,8 @@
           </para>
 
 <programlisting>
-install \
-ftp://ftp.de.uu.net/pub/CPAN/authors/id/JWIED/DBD-mysql-1.2212.x86.ppd
+ppm&gt; <userinput>install \</userinput>
+  <userinput>ftp://ftp.de.uu.net/pub/CPAN/authors/id/JWIED/DBD-mysql-1.2212.x86.ppd</userinput>
 </programlisting>
         </listitem>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-03-22 21:42:47 UTC (rev 1645)
+++ trunk/refman-5.1/installing.xml	2006-03-23 04:08:25 UTC (rev 1646)
@@ -841,7 +841,7 @@
           distribution. In most cases, you should probably use a binary
           distribution, if one exists for your platform. Binary
           distributions are available in native format for many
-          platforms, such as RPM files for Linux or DMG package
+          platforms, such as RPM files for Linux or PKG package
           installers for Mac OS X. Distributions also are available as
           Zip archives or compressed <command>tar</command> files.
         </para>
@@ -7458,22 +7458,18 @@
 shell&gt; <userinput>./configure --without-server</userinput>
 </programlisting>
 
-          <remark>
-            FIX incorrect..
-          </remark>
-
           <para>
-            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
+            If you have no C++ compiler, some client programs such as
+            <command>mysql</command> cannot be compiled because they
+            require 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
-            should still try to build <command>mysql</command>, but you
-            can ignore any warnings about <filename>mysql.cc</filename>.
-            (If <command>make</command> stops, try <command>make
-            -k</command> to tell it to continue with the rest of the
-            build even if errors occur.)
+            should still try to build all clients, but you can ignore
+            any warnings about files such as
+            <filename>mysql.cc</filename>. (If <command>make</command>
+            stops, try <command>make -k</command> to tell it to continue
+            with the rest of the build even if errors occur.)
           </para>
         </listitem>
 
@@ -7852,10 +7848,11 @@
             character sets after having created any tables, you must run
             <command>myisamchk -r -q
             --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.
+            <emphasis>on every <literal>MyISAM</literal>
+            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.
           </para>
 
           <para>
@@ -8054,7 +8051,7 @@
       </para>
 
       <para>
-        After you have installed the BitKeeper client, you can assess
+        After you have installed the BitKeeper client, you can access
         the MySQL development source tree:
       </para>
 
@@ -8756,7 +8753,8 @@
           <para>
             If you get a compilation error on Linux (for example, SuSE
             Linux 8.1 or Red Hat Linux 7.3) similar to the following
-            one:
+            one, you probably do not have <command>g++</command>
+            installed:
           </para>
 
 <programlisting>
@@ -8771,8 +8769,8 @@
           <para>
             By default, the <command>configure</command> script attempts
             to determine the correct number of arguments by using
-            <command>g++</command> the GNU C++ compiler. This test
-            yields wrong results if <command>g++</command> is not
+            <command>g++</command> (the GNU C++ compiler). This test
+            yields incorrect results if <command>g++</command> is not
             installed. There are two ways to work around this problem:
           </para>
 
@@ -9811,9 +9809,9 @@
             database that holds all database privileges and the
             <literal>test</literal> database that you can use to test
             MySQL. The script also creates privilege table entries for
-            <literal>root</literal> accounts and anonymous-user
-            accounts. The accounts have no passwords initially. A
-            description of their initial privileges is given in
+            <literal>root</literal> and anonymous-user accounts. The
+            accounts have no passwords initially. A description of their
+            initial privileges is given in
             <xref linkend="default-privileges"/>. Briefly, these
             privileges allow the MySQL <literal>root</literal> user to
             do anything, and allow anybody to create or use databases
@@ -9839,10 +9837,9 @@
             in the <literal>mysql</literal> database, including
             <literal>user</literal>, <literal>db</literal>,
             <literal>host</literal>, <literal>tables_priv</literal>,
-            <literal>columns_priv</literal>, and
-            <literal>func</literal>, as well as others. See
-            <xref linkend="privilege-system"/>, for a complete listing
-            and description of these tables.
+            <literal>columns_priv</literal>, <literal>func</literal>,
+            and others. See <xref linkend="privilege-system"/>, for a
+            complete listing and description of these tables.
           </para>
 
           <para>
@@ -10930,7 +10927,7 @@
 
         <para>
           You can specify other options such as
-          <option>--datadir</option> as well, but note that
+          <option>--datadir</option> as well, but
           <option>--verbose</option> and <option>--help</option> must be
           the last options.
         </para>
@@ -11312,7 +11309,7 @@
         <listitem>
           <para>
             You should assign a password to each MySQL
-            <literal>root</literal> accounts.
+            <literal>root</literal> account.
           </para>
         </listitem>
 
@@ -11336,10 +11333,15 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         To assign passwords to the anonymous accounts, connect to the
-        server as <literal>root</literal> and then either <literal>SET
-        PASSWORD</literal> or <literal>UPDATE</literal>. In either case,
-        be sure to encrypt the password using the
+        server as <literal>root</literal> and then use either
+        <literal>SET PASSWORD</literal> or <literal>UPDATE</literal>. In
+        either case, be sure to encrypt the password using the
         <literal>PASSWORD()</literal> function.
       </para>
 
@@ -11414,6 +11416,10 @@
       </para>
 
       <para>
+        <emphasis role="bold">Anonymous Account Removal</emphasis>
+      </para>
+
+      <para>
         If you prefer to remove the anonymous accounts instead, do so as
         follows:
       </para>
@@ -11443,6 +11449,11 @@
       </para>
 
       <para>
+        <emphasis role="bold"><literal>root</literal> Account Password
+        Assignment</emphasis>
+      </para>
+
+      <para>
         You can assign passwords to the <literal>root</literal> accounts
         in several ways. The following discussion demonstrates three
         methods:
@@ -11764,8 +11775,8 @@
       </para>
 
       <para>
-        In general, you should do the following when upgrading to MySQL
-        &current-series; from &previous-series;:
+        In general, you should do the following when upgrading from
+        MySQL &previous-series; from &current-series;:
       </para>
 
       <itemizedlist>

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-03-22 21:42:47 UTC (rev 1645)
+++ trunk/refman-common/titles.en.ent	2006-03-23 04:08:25 UTC (rev 1646)
@@ -395,8 +395,8 @@
 <!ENTITY title-doctoexcel "How to Retrieve Data from MySQL into MS-Word/Excel Documents?">
 <!ENTITY title-documenters-translators "Documenters and translators">
 <!ENTITY title-downgrading "Downgrading MySQL">
-<!ENTITY title-downgrading-to-4-0 "Downgrading to 4.0">
-<!ENTITY title-downgrading-to-4-1 "Downgrading to 4.1">
+<!ENTITY title-downgrading-to-4-0 "Downgrading to MySQL 4.0">
+<!ENTITY title-downgrading-to-4-1 "Downgrading to MySQL 4.1">
 <!ENTITY title-driver-manager "ODBC Driver Managers">
 <!ENTITY title-drop-database "<literal>DROP DATABASE</literal> Syntax">
 <!ENTITY title-drop-event "<literal>DROP EVENT</literal> Syntax">
@@ -1758,7 +1758,7 @@
 <!ENTITY title-upgrading-from-3-23 "Upgrading from MySQL 3.23 to 4.0">
 <!ENTITY title-upgrading-from-4-0 "Upgrading from MySQL 4.0 to 4.1">
 <!ENTITY title-upgrading-from-4-1 "Upgrading from MySQL 4.1 to 5.0">
-<!ENTITY title-upgrading-from-5-0 "Upgrading from MySQL 5.0">
+<!ENTITY title-upgrading-from-5-0 "Upgrading from MySQL 5.0 to 5.1">
 <!ENTITY title-upgrading-to-arch "Copying MySQL Databases to Another Machine">
 <!ENTITY title-use "<literal>USE</literal> Syntax">
 <!ENTITY title-used-libraries "Libraries used by and included with MySQL">

Thread
svn commit - mysqldoc@docsrva: r1646 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul23 Mar