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

Log:
 r2698@kite-hub:  paul | 2006-01-30 12:36:31 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/installing.xml


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

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-30 18:36:05 UTC (rev 1133)
+++ trunk/refman-4.1/installing.xml	2006-01-30 18:36:44 UTC (rev 1134)
@@ -1191,7 +1191,7 @@
 
           <listitem>
             <para>
-              The build and test process takes 2-3 days. If we receive a
+              The build and test process takes a week. If we receive a
               report regarding a fatal bug during this process (for
               example, one that causes a core dump), we fix the problem
               and restart the build process.
@@ -1273,7 +1273,7 @@
 
         <para>
           RPM distributions prior to MySQL 3.22 are user-contributed.
-          Beginning with MySQL 3.22, RPM distributions which we make
+          Beginning with MySQL 3.22, RPM distributions that we make
           available through our Web site are generated by MySQL AB.
         </para>
 
@@ -2105,12 +2105,12 @@
           sure that its MD5 checksum matches the one provided on the
           MySQL download pages. Each package has an individual checksum
           that you can verify with the following command, where
-          <literal>package_name</literal> is the name of the package you
-          downloaded:
+          <replaceable>package_name</replaceable> is the name of the
+          package you downloaded:
         </para>
 
 <programlisting>
-shell&gt; <userinput>md5sum package_name</userinput>
+shell&gt; <userinput>md5sum <replaceable>package_name</replaceable></userinput>
 </programlisting>
 
         <para>
@@ -2130,8 +2130,8 @@
 
         <para>
           <emphasis role="bold">Note</emphasis>: Make sure to verify the
-          checksum of the <emphasis role="bold">archive file</emphasis>
-          (for example, the <literal>.zip</literal> or
+          checksum of the <emphasis>archive file</emphasis> (for
+          example, the <literal>.zip</literal> or
           <literal>.tar.gz</literal> file) and not of the files that are
           contained inside of the archive.
         </para>
@@ -2139,18 +2139,19 @@
         <para>
           Note that not all operating systems support the
           <command>md5sum</command> command. On some, it is simply
-          called <command>md5</command> and others do not ship it at
+          called <command>md5</command>, and others do not ship it at
           all. On Linux, it is part of the <emphasis role="bold">GNU
           Text Utilities</emphasis> package, which is available for a
           wide range of platforms. You can download the source code from
           <ulink url="http://www.gnu.org/software/textutils/"/> as well.
-          If you have OpenSSL installed, you can also use the command
-          <command>openssl md5 package_name</command> instead. A
-          DOS/Windows implementation of the <command>md5</command>
-          command line utility is available from
+          If you have OpenSSL installed, you can use the command
+          <command>openssl md5
+          <replaceable>package_name</replaceable></command> instead. A
+          Windows implementation of the <command>md5</command> command
+          line utility is available from
           <ulink url="http://www.fourmilab.ch/md5/"/>.
-          <literal>winMd5Sum</literal> is a graphical MD5 checking tool
-          which can be obtained from
+          <command>winMd5Sum</command> is a graphical MD5 checking tool
+          that can be obtained from
           <ulink url="http://www.nullriver.com/index/products/winmd5sum"/>.
         </para>
 
@@ -2189,12 +2190,11 @@
 
         <para>
           To verify the signature for a specific package, you first need
-          to obtain a copy of MySQL AB's public GPG build key. You can
-          download the key from
-          <ulink url="http://www.keyserver.net/"/>. The key that you
-          want to obtain is named <literal>build@stripped</literal>.
-          Alternatively, you can cut and paste the key directly from the
-          following text:
+          to obtain a copy of MySQL AB's public GPG build key, which you
+          can download from <ulink url="http://www.keyserver.net/"/>.
+          The key that you want to obtain is named
+          <literal>build@stripped</literal>. Alternatively, you can cut
+          and paste the key directly from the following text:
         </para>
 
 <programlisting>
@@ -2242,9 +2242,9 @@
 </programlisting>
 
         <para>
-          You can import the build key into your personal public GPG
-          keyring by using <command>gpg --import</command>. For example,
-          if you save the key in a file named
+          To import the build key into your personal public GPG keyring,
+          use <command>gpg --import</command>. For example, if you have
+          saved the key in a file named
           <filename>mysql_pubkey.asc</filename>, the import command
           looks like this:
         </para>
@@ -2254,11 +2254,6 @@
 </programlisting>
 
         <para>
-          See the GPG documentation for more information on how to work
-          with public keys.
-        </para>
-
-        <para>
           After you have downloaded and imported the public build key,
           download your desired MySQL package and the corresponding
           signature, which also is available from the download page. The
@@ -2268,8 +2263,8 @@
 
         <informaltable>
           <tgroup cols="2">
-            <colspec colwidth="30*"/>
-            <colspec colwidth="60*"/>
+            <colspec colwidth="20*"/>
+            <colspec colwidth="70*"/>
             <tbody>
               <row>
                 <entry>Distribution file</entry>
@@ -2290,7 +2285,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>gpg --verify package_name.asc</userinput>
+shell&gt; <userinput>gpg --verify <replaceable>package_name</replaceable>.asc</userinput>
 </programlisting>
 
         <para>
@@ -2312,6 +2307,11 @@
           memory</literal> warning you might obtain.
         </para>
 
+        <para>
+          See the GPG documentation for more information on how to work
+          with public keys.
+        </para>
+
       </section>
 
       <section id="checking-rpm-signature">
@@ -2325,7 +2325,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>rpm --checksig package_name.rpm</userinput>
+shell&gt; <userinput>rpm --checksig <replaceable>package_name</replaceable>.rpm</userinput>
 </programlisting>
 
         <para>
@@ -2347,9 +2347,10 @@
           it maintains its own keyring because it is a system-wide
           application and a user's GPG public keyring is a user-specific
           file. To import the MySQL public key into the RPM keyring,
-          first obtain the key as described in the previous section.
-          Then use <command>rpm --import</command> to import the key.
-          For example, if you have the public key stored in a file named
+          first obtain the key as described in
+          <xref linkend="checking-gpg-signature"/>. Then use
+          <command>rpm --import</command> to import the key. For
+          example, if you have saved the public key in a file named
           <filename>mysql_pubkey.asc</filename>, import it using this
           command:
         </para>
@@ -2391,8 +2392,8 @@
       <para>
         This section describes the default layout of the directories
         created by installing binary or source distributions provided by
-        MySQL AB. If you install a distribution provided by another
-        vendor, some other layout might be used.
+        MySQL AB. A distribution provided by another vendor might use a
+        layout different from those shown here.
       </para>
 
       <para>
@@ -2689,10 +2690,10 @@
     </remark>
 
     <para>
-      A native Windows version of MySQL has been available from MySQL AB
-      since version 3.21 and represents a sizable percentage of the
-      daily downloads of MySQL. This section describes the process for
-      installing MySQL on Windows.
+      A native Windows distribution of MySQL has been available from
+      MySQL AB since version 3.21 and represents a sizable percentage of
+      the daily downloads of MySQL. This section describes the process
+      for installing MySQL on Windows.
     </para>
 
     <para>
@@ -2704,8 +2705,8 @@
     </para>
 
     <para>
-      If you are upgrading an existing installation of MySQL prior to
-      version 4.1.5, you must perform the following steps:
+      If you are upgrading MySQL from an existing installation older
+      than MySQL 4.1.5, you must perform the following steps:
     </para>
 
     <orderedlist>
@@ -2744,20 +2745,24 @@
 
     <para>
       This process also must be followed with newer MySQL installations
-      where the installation package does not include an installer.
+      if you use an installation package that does not include an
+      installer.
     </para>
 
     <para>
-      MySQL for Windows is available in two distribution formats:
+      MySQL for Windows is available in several distribution formats:
     </para>
 
     <itemizedlist>
 
       <listitem>
         <para>
-          The binary distribution contains a setup program that installs
-          everything you need so that you can start the server
-          immediately.
+          Binary distributions are available that contain a setup
+          program that installs everything you need so that you can
+          start the server immediately. Another binary distribution
+          format contains an archive that you simply unpack in the
+          installation location and then configure yourself. For
+          details, see <xref linkend="windows-choosing-package"/>.
         </para>
       </listitem>
 
@@ -2783,9 +2788,9 @@
     </para>
 
     <para>
-      This section describes how to install MySQL on Windows using a
-      binary distribution. To install using a source distribution, see
-      <xref linkend="windows-source-build"/>.
+      The following section describes how to install MySQL on Windows
+      using a binary distribution. To install using a source
+      distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
     <section id="windows-system-requirements">

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-30 18:36:05 UTC (rev 1133)
+++ trunk/refman-5.0/installing.xml	2006-01-30 18:36:44 UTC (rev 1134)
@@ -1186,7 +1186,7 @@
 
           <listitem>
             <para>
-              The build and test process takes 2-3 days. If we receive a
+              The build and test process takes a week. If we receive a
               report regarding a fatal bug during this process (for
               example, one that causes a core dump), we fix the problem
               and restart the build process.
@@ -1267,9 +1267,9 @@
         </para>
 
         <para>
-          The RPM distributions for MySQL &current-series; releases
-          which we make available through our Web site are generated by
-          MySQL AB.
+          The RPM distributions for MySQL &current-series; releases that
+          we make available through our Web site are generated by MySQL
+          AB.
         </para>
 
         <para>
@@ -2105,12 +2105,12 @@
           sure that its MD5 checksum matches the one provided on the
           MySQL download pages. Each package has an individual checksum
           that you can verify with the following command, where
-          <literal>package_name</literal> is the name of the package you
-          downloaded:
+          <replaceable>package_name</replaceable> is the name of the
+          package you downloaded:
         </para>
 
 <programlisting>
-shell&gt; <userinput>md5sum package_name</userinput>
+shell&gt; <userinput>md5sum <replaceable>package_name</replaceable></userinput>
 </programlisting>
 
         <para>
@@ -2118,8 +2118,8 @@
         </para>
 
 <programlisting>
-  shell&gt; md5sum mysql-standard-&current-version;-linux-i686.tar.gz
-  aaab65abbec64d5e907dcd41b8699945  mysql-standard-&current-version;-linux-i686.tar.gz
+shell&gt; <userinput>md5sum mysql-standard-&current-version;-linux-i686.tar.gz</userinput>
+aaab65abbec64d5e907dcd41b8699945  mysql-standard-&current-version;-linux-i686.tar.gz
 </programlisting>
 
         <para>
@@ -2130,8 +2130,8 @@
 
         <para>
           <emphasis role="bold">Note</emphasis>: Make sure to verify the
-          checksum of the <emphasis role="bold">archive file</emphasis>
-          (for example, the <literal>.zip</literal> or
+          checksum of the <emphasis>archive file</emphasis> (for
+          example, the <literal>.zip</literal> or
           <literal>.tar.gz</literal> file) and not of the files that are
           contained inside of the archive.
         </para>
@@ -2139,18 +2139,19 @@
         <para>
           Note that not all operating systems support the
           <command>md5sum</command> command. On some, it is simply
-          called <command>md5</command> and others do not ship it at
+          called <command>md5</command>, and others do not ship it at
           all. On Linux, it is part of the <emphasis role="bold">GNU
           Text Utilities</emphasis> package, which is available for a
           wide range of platforms. You can download the source code from
           <ulink url="http://www.gnu.org/software/textutils/"/> as well.
-          If you have OpenSSL installed, you can also use the command
-          <command>openssl md5 package_name</command> instead. A
-          DOS/Windows implementation of the <command>md5</command>
-          command line utility is available from
+          If you have OpenSSL installed, you can use the command
+          <command>openssl md5
+          <replaceable>package_name</replaceable></command> instead. A
+          Windows implementation of the <command>md5</command> command
+          line utility is available from
           <ulink url="http://www.fourmilab.ch/md5/"/>.
           <command>winMd5Sum</command> is a graphical MD5 checking tool
-          which can be obtained from
+          that can be obtained from
           <ulink url="http://www.nullriver.com/index/products/winmd5sum"/>.
         </para>
 
@@ -2167,7 +2168,7 @@
         </para>
 
         <para>
-          MySQL AB sign MySQL downloadable packages with
+          At MySQL AB, we sign MySQL downloadable packages with
           <command>GnuPG</command> (GNU Privacy Guard).
           <command>GnuPG</command> is an Open Source alternative to the
           well-known Pretty Good Privacy (<command>PGP</command>) by
@@ -2187,12 +2188,11 @@
 
         <para>
           To verify the signature for a specific package, you first need
-          to obtain a copy of MySQL AB's public GPG build key. You can
-          download the key from
-          <ulink url="http://www.keyserver.net/"/>. The key that you
-          want to obtain is named <literal>build@stripped</literal>.
-          Alternatively, you can cut and paste the key directly from the
-          following text:
+          to obtain a copy of MySQL AB's public GPG build key, which you
+          can download from <ulink url="http://www.keyserver.net/"/>.
+          The key that you want to obtain is named
+          <literal>build@stripped</literal>. Alternatively, you can cut
+          and paste the key directly from the following text:
         </para>
 
 <programlisting>
@@ -2240,9 +2240,9 @@
 </programlisting>
 
         <para>
-          You can import the build key into your personal public GPG
-          keyring by using <command>gpg --import</command>. For example,
-          if you save the key in a file named
+          To import the build key into your personal public GPG keyring,
+          use <command>gpg --import</command>. For example, if you have
+          saved the key in a file named
           <filename>mysql_pubkey.asc</filename>, the import command
           looks like this:
         </para>
@@ -2252,11 +2252,6 @@
 </programlisting>
 
         <para>
-          See the GPG documentation for more information on how to work
-          with public keys.
-        </para>
-
-        <para>
           After you have downloaded and imported the public build key,
           download your desired MySQL package and the corresponding
           signature, which also is available from the download page. The
@@ -2266,8 +2261,8 @@
 
         <informaltable>
           <tgroup cols="2">
-            <colspec colwidth="30*"/>
-            <colspec colwidth="60*"/>
+            <colspec colwidth="20*"/>
+            <colspec colwidth="70*"/>
             <tbody>
               <row>
                 <entry>Distribution file</entry>
@@ -2288,7 +2283,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>gpg --verify package_name.asc</userinput>
+shell&gt; <userinput>gpg --verify <replaceable>package_name</replaceable>.asc</userinput>
 </programlisting>
 
         <para>
@@ -2296,9 +2291,9 @@
         </para>
 
 <programlisting>
-  shell&gt; gpg --verify mysql-standard-&current-version;-linux-i686.tar.gz.asc
-  gpg: Signature made Tue 12 Jul 2005 23:35:41 EST using DSA key ID 5072E1F5
-  gpg: Good signature from "MySQL Package signing key (www.mysql.com) &lt;build@stripped&gt;"
+shell&gt; gpg --verify mysql-standard-&current-version;-linux-i686.tar.gz.asc
+gpg: Signature made Tue 12 Jul 2005 23:35:41 EST using DSA key ID 5072E1F5
+gpg: Good signature from "MySQL Package signing key (www.mysql.com) &lt;build@stripped&gt;"
 </programlisting>
 
         <para>
@@ -2307,6 +2302,11 @@
           memory</literal> warning you might obtain.
         </para>
 
+        <para>
+          See the GPG documentation for more information on how to work
+          with public keys.
+        </para>
+
       </section>
 
       <section id="checking-rpm-signature">
@@ -2320,7 +2320,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>rpm --checksig package_name.rpm</userinput>
+shell&gt; <userinput>rpm --checksig <replaceable>package_name</replaceable>.rpm</userinput>
 </programlisting>
 
         <para>
@@ -2342,9 +2342,10 @@
           it maintains its own keyring because it is a system-wide
           application and a user's GPG public keyring is a user-specific
           file. To import the MySQL public key into the RPM keyring,
-          first obtain the key as described in the previous section.
-          Then use <command>rpm --import</command> to import the key.
-          For example, if you have the public key stored in a file named
+          first obtain the key as described in
+          <xref linkend="checking-gpg-signature"/>. Then use
+          <command>rpm --import</command> to import the key. For
+          example, if you have saved the public key in a file named
           <filename>mysql_pubkey.asc</filename>, import it using this
           command:
         </para>
@@ -2386,16 +2387,16 @@
       <para>
         This section describes the default layout of the directories
         created by installing binary or source distributions provided by
-        MySQL AB. If you install a distribution provided by another
-        vendor, some other layout might be used.
+        MySQL AB. A distribution provided by another vendor might use a
+        layout different from those shown here.
       </para>
 
       <para>
         For MySQL &current-series; on Windows, the default installation
         directory is <filename>C:\Program Files\MySQL\MySQL Server
         &current-series;</filename>. (Some Windows users prefer to
-        install to the older default installation directory
-        <filename>C:\mysql</filename>. However, the layout of the
+        install in <filename>C:\mysql</filename>, the directory that
+        formerly was used as the default. However, the layout of the
         subdirectories remains the same.) The installation directory has
         the following subdirectories:
       </para>
@@ -2685,10 +2686,10 @@
     </remark>
 
     <para>
-      A native Windows version of MySQL has been available from MySQL AB
-      since version 3.21 and represents a sizable percentage of the
-      daily downloads of MySQL. This section describes the process for
-      installing MySQL on Windows.
+      A native Windows distribution of MySQL has been available from
+      MySQL AB since version 3.21 and represents a sizable percentage of
+      the daily downloads of MySQL. This section describes the process
+      for installing MySQL on Windows.
     </para>
 
     <para>
@@ -2699,8 +2700,8 @@
     </para>
 
     <para>
-      If you are upgrading an existing installation of MySQL prior to
-      version 4.1.5, you must perform the following steps:
+      If you are upgrading MySQL from an existing installation older
+      than MySQL 4.1.5, you must perform the following steps:
     </para>
 
     <orderedlist>
@@ -2739,21 +2740,24 @@
 
     <para>
       This process also must be followed with newer MySQL installations
-      where the installation package does not include an installer.
+      if you use an installation package that does not include an
+      installer.
     </para>
 
     <para>
-      MySQL &current-series; for Windows is available in three
-      distribution formats:
+      MySQL for Windows is available in several distribution formats:
     </para>
 
     <itemizedlist>
 
       <listitem>
         <para>
-          The binary distribution contains a setup program that installs
-          everything you need so that you can start the server
-          immediately.
+          Binary distributions are available that contain a setup
+          program that installs everything you need so that you can
+          start the server immediately. Another binary distribution
+          format contains an archive that you simply unpack in the
+          installation location and then configure yourself. For
+          details, see <xref linkend="windows-choosing-package"/>.
         </para>
       </listitem>
 
@@ -2774,9 +2778,9 @@
     </para>
 
     <para>
-      This section describes how to install MySQL on Windows using a
-      binary distribution. To install using a source distribution, see
-      <xref linkend="windows-source-build"/>.
+      The following section describes how to install MySQL on Windows
+      using a binary distribution. To install using a source
+      distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
     <section id="windows-system-requirements">
@@ -11666,8 +11670,8 @@
       </para>
 
 <programlisting>
-  shell&gt; mysqladmin -u root password "<replaceable>newpwd</replaceable>"
-  shell&gt; mysqladmin -u root -h <replaceable>host_name</replaceable> password "<replaceable>newpwd</replaceable>"
+shell&gt; mysqladmin -u root password "<replaceable>newpwd</replaceable>"
+shell&gt; mysqladmin -u root -h <replaceable>host_name</replaceable> password "<replaceable>newpwd</replaceable>"
 </programlisting>
 
       <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-30 18:36:05 UTC (rev 1133)
+++ trunk/refman-5.1/database-administration.xml	2006-01-30 18:36:44 UTC (rev 1134)
@@ -2655,7 +2655,7 @@
             </para>
 
             <para>
-              The replication logging format, either
+              The binary logging format, either
               <literal>STATEMENT</literal> or <literal>ROW</literal>.
               This variable is set by the
               <option>--binlog-format</option> option. See

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-30 18:36:05 UTC (rev 1133)
+++ trunk/refman-5.1/installing.xml	2006-01-30 18:36:44 UTC (rev 1134)
@@ -1186,7 +1186,7 @@
 
           <listitem>
             <para>
-              The build and test process takes 2-3 days. If we receive a
+              The build and test process takes a week. If we receive a
               report regarding a fatal bug during this process (for
               example, one that causes a core dump), we fix the problem
               and restart the build process.
@@ -1267,9 +1267,9 @@
         </para>
 
         <para>
-          The RPM distributions for MySQL &current-series; releases
-          which we make available through our Web site are generated by
-          MySQL AB.
+          The RPM distributions for MySQL &current-series; releases that
+          we make available through our Web site are generated by MySQL
+          AB.
         </para>
 
         <para>
@@ -2105,12 +2105,12 @@
           sure that its MD5 checksum matches the one provided on the
           MySQL download pages. Each package has an individual checksum
           that you can verify with the following command, where
-          <literal>package_name</literal> is the name of the package you
-          downloaded:
+          <replaceable>package_name</replaceable> is the name of the
+          package you downloaded:
         </para>
 
 <programlisting>
-shell&gt; <userinput>md5sum package_name</userinput>
+shell&gt; <userinput>md5sum <replaceable>package_name</replaceable></userinput>
 </programlisting>
 
         <para>
@@ -2118,8 +2118,8 @@
         </para>
 
 <programlisting>
-  shell&gt; md5sum mysql-standard-&current-version;-linux-i686.tar.gz
-  aaab65abbec64d5e907dcd41b8699945  mysql-standard-&current-version;-linux-i686.tar.gz
+shell&gt; <userinput>md5sum mysql-standard-&current-version;-linux-i686.tar.gz</userinput>
+aaab65abbec64d5e907dcd41b8699945  mysql-standard-&current-version;-linux-i686.tar.gz
 </programlisting>
 
         <para>
@@ -2130,8 +2130,8 @@
 
         <para>
           <emphasis role="bold">Note</emphasis>: Make sure to verify the
-          checksum of the <emphasis role="bold">archive file</emphasis>
-          (for example, the <literal>.zip</literal> or
+          checksum of the <emphasis>archive file</emphasis> (for
+          example, the <literal>.zip</literal> or
           <literal>.tar.gz</literal> file) and not of the files that are
           contained inside of the archive.
         </para>
@@ -2139,18 +2139,19 @@
         <para>
           Note that not all operating systems support the
           <command>md5sum</command> command. On some, it is simply
-          called <command>md5</command> and others do not ship it at
+          called <command>md5</command>, and others do not ship it at
           all. On Linux, it is part of the <emphasis role="bold">GNU
           Text Utilities</emphasis> package, which is available for a
           wide range of platforms. You can download the source code from
           <ulink url="http://www.gnu.org/software/textutils/"/> as well.
-          If you have OpenSSL installed, you can also use the command
-          <command>openssl md5 package_name</command> instead. A
-          DOS/Windows implementation of the <command>md5</command>
-          command line utility is available from
+          If you have OpenSSL installed, you can use the command
+          <command>openssl md5
+          <replaceable>package_name</replaceable></command> instead. A
+          Windows implementation of the <command>md5</command> command
+          line utility is available from
           <ulink url="http://www.fourmilab.ch/md5/"/>.
           <command>winMd5Sum</command> is a graphical MD5 checking tool
-          which can be obtained from
+          that can be obtained from
           <ulink url="http://www.nullriver.com/index/products/winmd5sum"/>.
         </para>
 
@@ -2167,7 +2168,7 @@
         </para>
 
         <para>
-          MySQL AB sign MySQL downloadable packages with
+          At MySQL AB, we sign MySQL downloadable packages with
           <command>GnuPG</command> (GNU Privacy Guard).
           <command>GnuPG</command> is an Open Source alternative to the
           well-known Pretty Good Privacy (<command>PGP</command>) by
@@ -2187,12 +2188,11 @@
 
         <para>
           To verify the signature for a specific package, you first need
-          to obtain a copy of MySQL AB's public GPG build key. You can
-          download the key from
-          <ulink url="http://www.keyserver.net/"/>. The key that you
-          want to obtain is named <literal>build@stripped</literal>.
-          Alternatively, you can cut and paste the key directly from the
-          following text:
+          to obtain a copy of MySQL AB's public GPG build key, which you
+          can download from <ulink url="http://www.keyserver.net/"/>.
+          The key that you want to obtain is named
+          <literal>build@stripped</literal>. Alternatively, you can cut
+          and paste the key directly from the following text:
         </para>
 
 <programlisting>
@@ -2240,9 +2240,9 @@
 </programlisting>
 
         <para>
-          You can import the build key into your personal public GPG
-          keyring by using <command>gpg --import</command>. For example,
-          if you save the key in a file named
+          To import the build key into your personal public GPG keyring,
+          use <command>gpg --import</command>. For example, if you have
+          saved the key in a file named
           <filename>mysql_pubkey.asc</filename>, the import command
           looks like this:
         </para>
@@ -2252,11 +2252,6 @@
 </programlisting>
 
         <para>
-          See the GPG documentation for more information on how to work
-          with public keys.
-        </para>
-
-        <para>
           After you have downloaded and imported the public build key,
           download your desired MySQL package and the corresponding
           signature, which also is available from the download page. The
@@ -2266,8 +2261,8 @@
 
         <informaltable>
           <tgroup cols="2">
-            <colspec colwidth="30*"/>
-            <colspec colwidth="60*"/>
+            <colspec colwidth="20*"/>
+            <colspec colwidth="70*"/>
             <tbody>
               <row>
                 <entry>Distribution file</entry>
@@ -2288,7 +2283,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>gpg --verify package_name.asc</userinput>
+shell&gt; <userinput>gpg --verify <replaceable>package_name</replaceable>.asc</userinput>
 </programlisting>
 
         <para>
@@ -2296,9 +2291,9 @@
         </para>
 
 <programlisting>
-  shell&gt; gpg --verify mysql-standard-&current-version;-linux-i686.tar.gz.asc
-  gpg: Signature made Tue 12 Jul 2005 23:35:41 EST using DSA key ID 5072E1F5
-  gpg: Good signature from "MySQL Package signing key (www.mysql.com) &lt;build@stripped&gt;"
+shell&gt; gpg --verify mysql-standard-&current-version;-linux-i686.tar.gz.asc
+gpg: Signature made Tue 12 Jul 2005 23:35:41 EST using DSA key ID 5072E1F5
+gpg: Good signature from "MySQL Package signing key (www.mysql.com) &lt;build@stripped&gt;"
 </programlisting>
 
         <para>
@@ -2307,6 +2302,11 @@
           memory</literal> warning you might obtain.
         </para>
 
+        <para>
+          See the GPG documentation for more information on how to work
+          with public keys.
+        </para>
+
       </section>
 
       <section id="checking-rpm-signature">
@@ -2320,7 +2320,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>rpm --checksig package_name.rpm</userinput>
+shell&gt; <userinput>rpm --checksig <replaceable>package_name</replaceable>.rpm</userinput>
 </programlisting>
 
         <para>
@@ -2342,9 +2342,10 @@
           it maintains its own keyring because it is a system-wide
           application and a user's GPG public keyring is a user-specific
           file. To import the MySQL public key into the RPM keyring,
-          first obtain the key as described in the previous section.
-          Then use <command>rpm --import</command> to import the key.
-          For example, if you have the public key stored in a file named
+          first obtain the key as described in
+          <xref linkend="checking-gpg-signature"/>. Then use
+          <command>rpm --import</command> to import the key. For
+          example, if you have saved the public key in a file named
           <filename>mysql_pubkey.asc</filename>, import it using this
           command:
         </para>
@@ -2386,16 +2387,16 @@
       <para>
         This section describes the default layout of the directories
         created by installing binary or source distributions provided by
-        MySQL AB. If you install a distribution provided by another
-        vendor, some other layout might be used.
+        MySQL AB. A distribution provided by another vendor might use a
+        layout different from those shown here.
       </para>
 
       <para>
         For MySQL &current-series; on Windows, the default installation
         directory is <filename>C:\Program Files\MySQL\MySQL Server
         &current-series;</filename>. (Some Windows users prefer to
-        install to the older default installation directory
-        <filename>C:\mysql</filename>. However, the layout of the
+        install in <filename>C:\mysql</filename>, the directory that
+        formerly was used as the default. However, the layout of the
         subdirectories remains the same.) The installation directory has
         the following subdirectories:
       </para>
@@ -2685,10 +2686,10 @@
     </remark>
 
     <para>
-      A native Windows version of MySQL has been available from MySQL AB
-      since version 3.21 and represents a sizable percentage of the
-      daily downloads of MySQL. This section describes the process for
-      installing MySQL on Windows.
+      A native Windows distribution of MySQL has been available from
+      MySQL AB since version 3.21 and represents a sizable percentage of
+      the daily downloads of MySQL. This section describes the process
+      for installing MySQL on Windows.
     </para>
 
     <para>
@@ -2699,8 +2700,8 @@
     </para>
 
     <para>
-      If you are upgrading an existing installation of MySQL prior to
-      version 4.1.5, you must perform the following steps:
+      If you are upgrading MySQL from an existing installation older
+      than MySQL 4.1.5, you must perform the following steps:
     </para>
 
     <orderedlist>
@@ -2739,21 +2740,24 @@
 
     <para>
       This process also must be followed with newer MySQL installations
-      where the installation package does not include an installer.
+      if you use an installation package that does not include an
+      installer.
     </para>
 
     <para>
-      MySQL &current-series; for Windows is available in three
-      distribution formats:
+      MySQL for Windows is available in several distribution formats:
     </para>
 
     <itemizedlist>
 
       <listitem>
         <para>
-          The binary distribution contains a setup program that installs
-          everything you need so that you can start the server
-          immediately.
+          Binary distributions are available that contain a setup
+          program that installs everything you need so that you can
+          start the server immediately. Another binary distribution
+          format contains an archive that you simply unpack in the
+          installation location and then configure yourself. For
+          details, see <xref linkend="windows-choosing-package"/>.
         </para>
       </listitem>
 
@@ -2774,9 +2778,9 @@
     </para>
 
     <para>
-      This section describes how to install MySQL on Windows using a
-      binary distribution. To install using a source distribution, see
-      <xref linkend="windows-source-build"/>.
+      The following section describes how to install MySQL on Windows
+      using a binary distribution. To install using a source
+      distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
     <section id="windows-system-requirements">
@@ -11671,8 +11675,8 @@
       </para>
 
 <programlisting>
-  shell&gt; mysqladmin -u root password "<replaceable>newpwd</replaceable>"
-  shell&gt; mysqladmin -u root -h <replaceable>host_name</replaceable> password "<replaceable>newpwd</replaceable>"
+shell&gt; mysqladmin -u root password "<replaceable>newpwd</replaceable>"
+shell&gt; mysqladmin -u root -h <replaceable>host_name</replaceable> password "<replaceable>newpwd</replaceable>"
 </programlisting>
 
       <para>

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