List:Commits« Previous MessageNext Message »
From:paul Date:February 7 2006 7:51pm
Subject:svn commit - mysqldoc@docsrva: r1229 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-02-07 19:51:11 +0100 (Tue, 07 Feb 2006)
New Revision: 1229

Log:
 r2915@kite-hub:  paul | 2006-02-07 12:50:59 -0600
 Revise introduction to installing-on-Windows discussion.


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


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

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-4.1/installing.xml	2006-02-07 18:51:11 UTC (rev 1229)
@@ -2637,51 +2637,83 @@
     </para>
 
     <para>
-      If you are upgrading MySQL from an existing installation older
-      than MySQL 4.1.5, you must perform the following steps:
+      <emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
+      from an existing installation older than MySQL 4.1.5, you must
+      first perform the the procedure described in
+      <xref linkend="windows-upgrading"/>.
     </para>
 
-    <orderedlist>
+    <para>
+      To run MySQL on Windows, you need the following:
+    </para>
 
+    <itemizedlist>
+
       <listitem>
         <para>
-          Obtain and install the distribution.
+          A 32-bit Windows operating system such as 9x, Me, NT, 2000,
+          XP, or Windows Server 2003.
         </para>
+
+        <para>
+          A Windows NT-based operating system (NT, 2000, XP, 2003)
+          permits you to run the MySQL server as a service. The use of a
+          Windows NT-based operating system is strongly recommended. See
+          <xref linkend="windows-start-service"/>.
+        </para>
+
+        <para>
+          Generally, you should install MySQL on Windows using an
+          account that has administrator rights. Otherwise, you may
+          encounter problems with certain operations such as editing the
+          <literal>PATH</literal> environment variable or accessing the
+          <command>Service Control Manager</command>.
+        </para>
       </listitem>
 
       <listitem>
         <para>
-          Set up an option file if necessary.
+          TCP/IP protocol support.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Select the server that you want to use.
+          Enough space on the hard drive to unpack, install, and create
+          the databases in accordance with your requirements (generally
+          a minimum of 200 megabytes is recommended.)
         </para>
       </listitem>
 
+    </itemizedlist>
+
+    <para>
+      There may also be other requirements, depending on how you plan to
+      use MySQL:
+    </para>
+
+    <itemizedlist>
+
       <listitem>
         <para>
-          Start the server.
+          If you plan to connect to the MySQL server via ODBC, you need
+          a Connector/ODBC driver. See <xref linkend="odbc-connector"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Assign passwords to the initial MySQL accounts.
+          If you need tables with a size larger than 4GB, install MySQL
+          on an NTFS or newer filesystem. Don't forget to use
+          <literal>MAX_ROWS</literal> and
+          <literal>AVG_ROW_LENGTH</literal> when you create tables. See
+          <xref linkend="create-table"/>.
         </para>
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
     <para>
-      This process also must be followed with newer MySQL installations
-      if you use an installation package that does not include an
-      installer.
-    </para>
-
-    <para>
       MySQL for Windows is available in several distribution formats:
     </para>
 
@@ -2699,12 +2731,12 @@
       </listitem>
 
       <listitem>
-        <remark role="todo">
-          This is changing to VS.NET. Determine which versions the
-          change will effect. [js]
-        </remark>
-
         <para>
+          <remark role="todo">
+            This is changing to VS.NET. Determine which versions the
+            change will effect. [js]
+          </remark>
+
           The source distribution contains all the code and support
           files for building the executables using the Visual Studio
           2003 compiler system.
@@ -2714,115 +2746,29 @@
     </itemizedlist>
 
     <para>
-      Generally speaking, you should use the binary distribution. It is
-      simpler to use than the others, and you need no additional tools
-      to get MySQL up and running.
+      Generally speaking, you should use a binary distribution that
+      includes an installer. It is simpler to use than the others, and
+      you need no additional tools to get MySQL up and running. The
+      installer for the Windows version of MySQL, combined with a GUI
+      Configuration Wizard, automatically installs MySQL, creates an
+      option file, starts the server, and secures the default user
+      accounts.
     </para>
 
     <para>
       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"/>.
+      using a binary distribution. To use an installation package that
+      does not include an installer, follow the procedure described in
+      <xref linkend="windows-install-archive"/>. To install using a
+      source distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
-    <section id="windows-system-requirements">
+    <para>
+      MySQL distributions for Windows can be downloaded from
+      <ulink url="&base-url-downloads;"/>. See
+      <xref linkend="getting-mysql"/>.
+    </para>
 
-      <title>&title-windows-system-requirements;</title>
-
-      <para>
-        To run MySQL on Windows, you need the following:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            A 32-bit Windows operating system such as 9x, Me, NT, 2000,
-            XP, or Windows Server 2003.
-          </para>
-
-          <para>
-            A Windows NT-based operating system (NT, 2000, XP, 2003)
-            permits you to run the MySQL server as a service. The use of
-            a Windows NT-based operating system is strongly recommended.
-            See <xref linkend="windows-start-service"/>.
-          </para>
-
-          <para>
-            Generally, you should install MySQL on Windows using an
-            account that has administrator rights. Otherwise, you may
-            encounter problems with certain operations such as editing
-            the <literal>PATH</literal> variable or accessing the
-            <command>Service Control Manager</command>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            TCP/IP protocol support.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A copy of the MySQL binary distribution for Windows, which
-            can be downloaded from <ulink url="&base-url-downloads;"/>.
-            See <xref linkend="getting-mysql"/>.
-          </para>
-
-          <para>
-            Note: If you download the distribution via FTP, we recommend
-            the use of an adequate FTP client with a resume feature to
-            avoid corruption of files during the download process.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A tool that can read <filename>.zip</filename> files, to
-            unpack the distribution file.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Enough space on the hard drive to unpack, install, and
-            create the databases in accordance with your requirements
-            (generally a minimum of 200 megabytes is recommended.)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        There may also be other requirements, depending on how you plan
-        to use MySQL:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            If you plan to connect to the MySQL server via ODBC, you
-            need a Connector/ODBC driver. See
-            <xref linkend="odbc-connector"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you need tables with a size larger than 4GB, install
-            MySQL on an NTFS or newer filesystem. Don't forget to use
-            <literal>MAX_ROWS</literal> and
-            <literal>AVG_ROW_LENGTH</literal> when you create tables.
-            See <xref linkend="create-table"/>.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
     <section id="windows-choosing-package">
 
       <title>&title-windows-choosing-package;</title>
@@ -2878,7 +2824,11 @@
       </itemizedlist>
 
       <para>
-        The Essentials package is recommended for most users.
+        The Essentials package is recommended for most users. It is
+        provided as an <filename>.msi</filename> file for use with the
+        Windows Installer. The Complete and Noinstall distributions are
+        packaged as Zip archives. To use them, you must have a tool that
+        can unpack <filename>.zip</filename> files.
       </para>
 
       <para>
@@ -5076,14 +5026,14 @@
         name. As of MySQL 4.1, you can use the
         <option>--protocol=PIPE</option> option instead.
       </para>
-      
+
       <para>
-        Note that if you have set a password for the <literal>root</literal>
account,
-        deleted the anonymous account, or ceated a new user account,
-        then you must use the appropriate <option>-u</option> and
-        <option>-p</option> options with the commands shown above in
-        order to connect with the MySQL Server. See 
-        <xref linkend="connecting"/>.
+        Note that if you have set a password for the
+        <literal>root</literal> account, deleted the anonymous account,
+        or ceated a new user account, then you must use the appropriate
+        <option>-u</option> and <option>-p</option> options with
the
+        commands shown above in order to connect with the MySQL Server.
+        See <xref linkend="connecting"/>.
       </para>
 
       <para>
@@ -5135,9 +5085,9 @@
         check if it needs to be in the *system* directory, or if it can
         be in the Windows directory.
       </remark>
-      
+
       <para>
-        For more information about <command>mysqlshow</command>, see 
+        For more information about <command>mysqlshow</command>, see
         <xref linkend="mysqlshow"/>.
       </para>
 

Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-4.1/renamed-nodes.txt	2006-02-07 18:51:11 UTC (rev 1229)
@@ -113,3 +113,4 @@
 secure-requirements secure-using-openssl
 backing-up innodb-backup
 system-variables server-system-variables
+windows-system-requirements windows-installation

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-5.0/installing.xml	2006-02-07 18:51:11 UTC (rev 1229)
@@ -2625,58 +2625,83 @@
     </para>
 
     <para>
-      The installer for the Windows version of MySQL, combined with a
-      GUI Configuration Wizard, automatically installs MySQL, creates an
-      option file, starts the server, and secures the default user
-      accounts.
+      <emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
+      from an existing installation older than MySQL 4.1.5, you must
+      first perform the the procedure described in
+      <xref linkend="windows-upgrading"/>.
     </para>
 
     <para>
-      If you are upgrading MySQL from an existing installation older
-      than MySQL 4.1.5, you must perform the following steps:
+      To run MySQL on Windows, you need the following:
     </para>
 
-    <orderedlist>
+    <itemizedlist>
 
       <listitem>
         <para>
-          Obtain and install the distribution.
+          A 32-bit Windows operating system such as 9x, Me, NT, 2000,
+          XP, or Windows Server 2003.
         </para>
+
+        <para>
+          A Windows NT-based operating system (NT, 2000, XP, 2003)
+          permits you to run the MySQL server as a service. The use of a
+          Windows NT-based operating system is strongly recommended. See
+          <xref linkend="windows-start-service"/>.
+        </para>
+
+        <para>
+          Generally, you should install MySQL on Windows using an
+          account that has administrator rights. Otherwise, you may
+          encounter problems with certain operations such as editing the
+          <literal>PATH</literal> environment variable or accessing the
+          <command>Service Control Manager</command>.
+        </para>
       </listitem>
 
       <listitem>
         <para>
-          Set up an option file if necessary.
+          TCP/IP protocol support.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Select the server that you want to use.
+          Enough space on the hard drive to unpack, install, and create
+          the databases in accordance with your requirements (generally
+          a minimum of 200 megabytes is recommended.)
         </para>
       </listitem>
 
+    </itemizedlist>
+
+    <para>
+      There may also be other requirements, depending on how you plan to
+      use MySQL:
+    </para>
+
+    <itemizedlist>
+
       <listitem>
         <para>
-          Start the server.
+          If you plan to connect to the MySQL server via ODBC, you need
+          a Connector/ODBC driver. See <xref linkend="odbc-connector"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Assign passwords to the initial MySQL accounts.
+          If you need tables with a size larger than 4GB, install MySQL
+          on an NTFS or newer filesystem. Don't forget to use
+          <literal>MAX_ROWS</literal> and
+          <literal>AVG_ROW_LENGTH</literal> when you create tables. See
+          <xref linkend="create-table"/>.
         </para>
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
     <para>
-      This process also must be followed with newer MySQL installations
-      if you use an installation package that does not include an
-      installer.
-    </para>
-
-    <para>
       MySQL for Windows is available in several distribution formats:
     </para>
 
@@ -2695,6 +2720,11 @@
 
       <listitem>
         <para>
+          <remark role="todo">
+            This is changing to VS.NET. Determine which versions the
+            change will effect. [js]
+          </remark>
+
           The source distribution contains all the code and support
           files for building the executables using the Visual Studio
           2003 compiler system.
@@ -2704,123 +2734,36 @@
     </itemizedlist>
 
     <para>
-      Generally speaking, you should use the binary distribution. It is
-      simpler to use than the others, and you need no additional tools
-      to get MySQL up and running.
+      Generally speaking, you should use a binary distribution that
+      includes an installer. It is simpler to use than the others, and
+      you need no additional tools to get MySQL up and running. The
+      installer for the Windows version of MySQL, combined with a GUI
+      Configuration Wizard, automatically installs MySQL, creates an
+      option file, starts the server, and secures the default user
+      accounts.
     </para>
 
     <para>
       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"/>.
+      using a binary distribution. To use an installation package that
+      does not include an installer, follow the procedure described in
+      <xref linkend="windows-install-archive"/>. To install using a
+      source distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
-    <section id="windows-system-requirements">
+    <para>
+      MySQL distributions for Windows can be downloaded from
+      <ulink url="&base-url-downloads;"/>. See
+      <xref linkend="getting-mysql"/>.
+    </para>
 
-      <title>&title-windows-system-requirements;</title>
-
-      <para>
-        To run MySQL on Windows, you need the following:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            A 32-bit Windows operating system such as 9x, Me, NT, 2000,
-            XP, or Windows Server 2003.
-          </para>
-
-          <para>
-            A Windows NT-based operating system (NT, 2000, XP, 2003)
-            permits you to run the MySQL server as a service. The use of
-            a Windows NT-based operating system is strongly recommended.
-            See <xref linkend="windows-start-service"/>.
-          </para>
-
-          <para>
-            Generally, you should install MySQL on Windows using an
-            account that has administrator rights. Otherwise, you may
-            encounter problems with certain operations such as editing
-            the <literal>PATH</literal> variable or accessing the
-            <command>Service Control Manager</command>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            TCP/IP protocol support.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A copy of the MySQL binary distribution for Windows, which
-            can be downloaded from <ulink url="&base-url-downloads;"/>.
-            See <xref linkend="getting-mysql"/>.
-          </para>
-
-          <para>
-            Note: If you download the distribution via FTP, we recommend
-            the use of an adequate FTP client with a resume feature to
-            avoid corruption of files during the download process.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A tool that can read <filename>.zip</filename> files, to
-            unpack the distribution file.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Enough space on the hard drive to unpack, install, and
-            create the databases in accordance with your requirements
-            (generally a minimum of 200 megabytes is recommended.)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        There may also be other requirements, depending on how you plan
-        to use MySQL:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            If you plan to connect to the MySQL server via ODBC, you
-            need a Connector/ODBC driver. See
-            <xref linkend="odbc-connector"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you need tables with a size larger than 4GB, install
-            MySQL on an NTFS or newer filesystem. Don't forget to use
-            <literal>MAX_ROWS</literal> and
-            <literal>AVG_ROW_LENGTH</literal> when you create tables.
-            See <xref linkend="create-table"/>.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
     <section id="windows-choosing-package">
 
       <title>&title-windows-choosing-package;</title>
 
       <para>
         For MySQL &current-series;, there are three installation
-        packages to choose from when installing MySQL on Windows. The
-        packages are as follows:
+        packages to choose from when installing MySQL on Windows:
       </para>
 
       <itemizedlist>
@@ -2864,7 +2807,11 @@
       </itemizedlist>
 
       <para>
-        The Essentials package is recommended for most users.
+        The Essentials package is recommended for most users. It is
+        provided as an <filename>.msi</filename> file for use with the
+        Windows Installer. The Complete and Noinstall distributions are
+        packaged as Zip archives. To use them, you must have a tool that
+        can unpack <filename>.zip</filename> files.
       </para>
 
       <para>
@@ -2964,62 +2911,6 @@
           <xref linkend="bug-reports"/>.
         </para>
 
-        <remark>
-          END INTRODUCTION
-        </remark>
-
-        <remark>
-          @subsubsection Choosing an Install Package There are three
-          different packages available that you can use to install the
-          MySQL server under Windows, each targeted at different user
-          requirements:
-        </remark>
-
-        <remark>
-          [MH] Looks like the GUI team changes these to Minimal and
-          Full, and will eventually drop the Zip archives around the
-          .MSI installers. Let's watch and change this when they do.
-          [JS] Let's hope they do NOT drop the no-install zipfiles.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-win-noinstall.zip}: This package is
-          a simple Zip archive of all the files found in a full
-          installation. It must be manually extracted and configured to
-          be fully operational. If you are using this package, the rest
-          of this document does not apply to you.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-win.zip}: This package contains the
-          MySQL Installation Wizard with all components of MySQL and is
-          intended for a full installation with all optional packages.
-          This is recommended for users who need additional components
-          such as the embedded server, benchmark suite, and additional
-          support scripts.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-essential-win.msi}: This package
-          contains the MySQL Installation Wizard with the minimum
-          components required to install a working MySQL server, without
-          any optional packages. This is recommended for typical users
-          who do not need any optional packages such as the embedded
-          server or the benchmark suite. Omitted packages can be added
-          later.
-        </remark>
-
-        <remark>
-          For most users, the
-          @code{mysql-@var{version}-essential-win.msi} package is
-          recommended because of its smaller size and decreased download
-          time.
-        </remark>
-
-        <remark>
-          END CHOOSE PACKAGES
-        </remark>
-
         <remark role="note">
           - "install" is a verb. - "installation" is a noun. - "install"
           is NOT a noun, it's a verb. Thank you. /JS
@@ -5036,18 +4927,18 @@
         <option>--socket</option> option to specify the name of the pipe
         if you do not want to use the default pipe name.
       </para>
-      
+
       <para>
-        Note that if you have set a password for the <literal>root</literal>
account,
-        deleted the anonymous account, or ceated a new user account,
-        then you must use the appropriate <option>-u</option> and
-        <option>-p</option> options with the commands shown above in
-        order to connect with the MySQL Server. See 
-        <xref linkend="connecting"/>.
+        Note that if you have set a password for the
+        <literal>root</literal> account, deleted the anonymous account,
+        or ceated a new user account, then you must use the appropriate
+        <option>-u</option> and <option>-p</option> options with
the
+        commands shown above in order to connect with the MySQL Server.
+        See <xref linkend="connecting"/>.
       </para>
-      
+
       <para>
-        For more information about <command>mysqlshow</command>, see 
+        For more information about <command>mysqlshow</command>, see
         <xref linkend="mysqlshow"/>.
       </para>
 

Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-5.0/renamed-nodes.txt	2006-02-07 18:51:11 UTC (rev 1229)
@@ -413,3 +413,4 @@
 information-schema-tables information-schema
 backing-up innodb-backup
 system-variables server-system-variables
+windows-system-requirements windows-installation

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-5.1/installing.xml	2006-02-07 18:51:11 UTC (rev 1229)
@@ -2625,58 +2625,83 @@
     </para>
 
     <para>
-      The installer for the Windows version of MySQL, combined with a
-      GUI Configuration Wizard, automatically installs MySQL, creates an
-      option file, starts the server, and secures the default user
-      accounts.
+      <emphasis role="bold">Note</emphasis>: If you are upgrading MySQL
+      from an existing installation older than MySQL 4.1.5, you must
+      first perform the the procedure described in
+      <xref linkend="windows-upgrading"/>.
     </para>
 
     <para>
-      If you are upgrading MySQL from an existing installation older
-      than MySQL 4.1.5, you must perform the following steps:
+      To run MySQL on Windows, you need the following:
     </para>
 
-    <orderedlist>
+    <itemizedlist>
 
       <listitem>
         <para>
-          Obtain and install the distribution.
+          A 32-bit Windows operating system such as 9x, Me, NT, 2000,
+          XP, or Windows Server 2003.
         </para>
+
+        <para>
+          A Windows NT-based operating system (NT, 2000, XP, 2003)
+          permits you to run the MySQL server as a service. The use of a
+          Windows NT-based operating system is strongly recommended. See
+          <xref linkend="windows-start-service"/>.
+        </para>
+
+        <para>
+          Generally, you should install MySQL on Windows using an
+          account that has administrator rights. Otherwise, you may
+          encounter problems with certain operations such as editing the
+          <literal>PATH</literal> environment variable or accessing the
+          <command>Service Control Manager</command>.
+        </para>
       </listitem>
 
       <listitem>
         <para>
-          Set up an option file if necessary.
+          TCP/IP protocol support.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Select the server that you want to use.
+          Enough space on the hard drive to unpack, install, and create
+          the databases in accordance with your requirements (generally
+          a minimum of 200 megabytes is recommended.)
         </para>
       </listitem>
 
+    </itemizedlist>
+
+    <para>
+      There may also be other requirements, depending on how you plan to
+      use MySQL:
+    </para>
+
+    <itemizedlist>
+
       <listitem>
         <para>
-          Start the server.
+          If you plan to connect to the MySQL server via ODBC, you need
+          a Connector/ODBC driver. See <xref linkend="odbc-connector"/>.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Assign passwords to the initial MySQL accounts.
+          If you need tables with a size larger than 4GB, install MySQL
+          on an NTFS or newer filesystem. Don't forget to use
+          <literal>MAX_ROWS</literal> and
+          <literal>AVG_ROW_LENGTH</literal> when you create tables. See
+          <xref linkend="create-table"/>.
         </para>
       </listitem>
 
-    </orderedlist>
+    </itemizedlist>
 
     <para>
-      This process also must be followed with newer MySQL installations
-      if you use an installation package that does not include an
-      installer.
-    </para>
-
-    <para>
       MySQL for Windows is available in several distribution formats:
     </para>
 
@@ -2695,6 +2720,11 @@
 
       <listitem>
         <para>
+          <remark role="todo">
+            This is changing to VS.NET. Determine which versions the
+            change will effect. [js]
+          </remark>
+
           The source distribution contains all the code and support
           files for building the executables using the Visual Studio
           2003 compiler system.
@@ -2704,123 +2734,36 @@
     </itemizedlist>
 
     <para>
-      Generally speaking, you should use the binary distribution. It is
-      simpler to use than the others, and you need no additional tools
-      to get MySQL up and running.
+      Generally speaking, you should use a binary distribution that
+      includes an installer. It is simpler to use than the others, and
+      you need no additional tools to get MySQL up and running. The
+      installer for the Windows version of MySQL, combined with a GUI
+      Configuration Wizard, automatically installs MySQL, creates an
+      option file, starts the server, and secures the default user
+      accounts.
     </para>
 
     <para>
       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"/>.
+      using a binary distribution. To use an installation package that
+      does not include an installer, follow the procedure described in
+      <xref linkend="windows-install-archive"/>. To install using a
+      source distribution, see <xref linkend="windows-source-build"/>.
     </para>
 
-    <section id="windows-system-requirements">
+    <para>
+      MySQL distributions for Windows can be downloaded from
+      <ulink url="&base-url-downloads;"/>. See
+      <xref linkend="getting-mysql"/>.
+    </para>
 
-      <title>&title-windows-system-requirements;</title>
-
-      <para>
-        To run MySQL on Windows, you need the following:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            A 32-bit Windows operating system such as 9x, Me, NT, 2000,
-            XP, or Windows Server 2003.
-          </para>
-
-          <para>
-            A Windows NT-based operating system (NT, 2000, XP, 2003)
-            permits you to run the MySQL server as a service. The use of
-            a Windows NT-based operating system is strongly recommended.
-            See <xref linkend="windows-start-service"/>.
-          </para>
-
-          <para>
-            Generally, you should install MySQL on Windows using an
-            account that has administrator rights. Otherwise, you may
-            encounter problems with certain operations such as editing
-            the <literal>PATH</literal> variable or accessing the
-            <command>Service Control Manager</command>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            TCP/IP protocol support.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A copy of the MySQL binary distribution for Windows, which
-            can be downloaded from <ulink url="&base-url-downloads;"/>.
-            See <xref linkend="getting-mysql"/>.
-          </para>
-
-          <para>
-            Note: If you download the distribution via FTP, we recommend
-            the use of an adequate FTP client with a resume feature to
-            avoid corruption of files during the download process.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            A tool that can read <filename>.zip</filename> files, to
-            unpack the distribution file.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            Enough space on the hard drive to unpack, install, and
-            create the databases in accordance with your requirements
-            (generally a minimum of 200 megabytes is recommended.)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      <para>
-        There may also be other requirements, depending on how you plan
-        to use MySQL:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            If you plan to connect to the MySQL server via ODBC, you
-            need a Connector/ODBC driver. See
-            <xref linkend="odbc-connector"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you need tables with a size larger than 4GB, install
-            MySQL on an NTFS or newer filesystem. Don't forget to use
-            <literal>MAX_ROWS</literal> and
-            <literal>AVG_ROW_LENGTH</literal> when you create tables.
-            See <xref linkend="create-table"/>.
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-    </section>
-
     <section id="windows-choosing-package">
 
       <title>&title-windows-choosing-package;</title>
 
       <para>
         For MySQL &current-series;, there are three installation
-        packages to choose from when installing MySQL on Windows. The
-        packages are as follows:
+        packages to choose from when installing MySQL on Windows:
       </para>
 
       <itemizedlist>
@@ -2864,7 +2807,11 @@
       </itemizedlist>
 
       <para>
-        The Essentials package is recommended for most users.
+        The Essentials package is recommended for most users. It is
+        provided as an <filename>.msi</filename> file for use with the
+        Windows Installer. The Complete and Noinstall distributions are
+        packaged as Zip archives. To use them, you must have a tool that
+        can unpack <filename>.zip</filename> files.
       </para>
 
       <para>
@@ -2964,62 +2911,6 @@
           <xref linkend="bug-reports"/>.
         </para>
 
-        <remark>
-          END INTRODUCTION
-        </remark>
-
-        <remark>
-          @subsubsection Choosing an Install Package There are three
-          different packages available that you can use to install the
-          MySQL server under Windows, each targeted at different user
-          requirements:
-        </remark>
-
-        <remark>
-          [MH] Looks like the GUI team changes these to Minimal and
-          Full, and will eventually drop the Zip archives around the
-          .MSI installers. Let's watch and change this when they do.
-          [JS] Let's hope they do NOT drop the no-install zipfiles.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-win-noinstall.zip}: This package is
-          a simple Zip archive of all the files found in a full
-          installation. It must be manually extracted and configured to
-          be fully operational. If you are using this package, the rest
-          of this document does not apply to you.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-win.zip}: This package contains the
-          MySQL Installation Wizard with all components of MySQL and is
-          intended for a full installation with all optional packages.
-          This is recommended for users who need additional components
-          such as the embedded server, benchmark suite, and additional
-          support scripts.
-        </remark>
-
-        <remark>
-          @code{mysql-@var{version}-essential-win.msi}: This package
-          contains the MySQL Installation Wizard with the minimum
-          components required to install a working MySQL server, without
-          any optional packages. This is recommended for typical users
-          who do not need any optional packages such as the embedded
-          server or the benchmark suite. Omitted packages can be added
-          later.
-        </remark>
-
-        <remark>
-          For most users, the
-          @code{mysql-@var{version}-essential-win.msi} package is
-          recommended because of its smaller size and decreased download
-          time.
-        </remark>
-
-        <remark>
-          END CHOOSE PACKAGES
-        </remark>
-
         <remark role="note">
           - "install" is a verb. - "installation" is a noun. - "install"
           is NOT a noun, it's a verb. Thank you. /JS
@@ -5032,18 +4923,18 @@
         <option>--socket</option> option to specify the name of the pipe
         if you do not want to use the default pipe name.
       </para>
-      
+
       <para>
-        Note that if you have set a password for the <literal>root</literal>
account,
-        deleted the anonymous account, or ceated a new user account,
-        then you must use the appropriate <option>-u</option> and
-        <option>-p</option> options with the commands shown above in
-        order to connect with the MySQL Server. See 
-        <xref linkend="connecting"/>.
+        Note that if you have set a password for the
+        <literal>root</literal> account, deleted the anonymous account,
+        or ceated a new user account, then you must use the appropriate
+        <option>-u</option> and <option>-p</option> options with
the
+        commands shown above in order to connect with the MySQL Server.
+        See <xref linkend="connecting"/>.
       </para>
-      
+
       <para>
-        For more information about <command>mysqlshow</command>, see 
+        For more information about <command>mysqlshow</command>, see
         <xref linkend="mysqlshow"/>.
       </para>
 

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-02-07 18:51:11 UTC (rev 1229)
@@ -117,3 +117,4 @@
 information-schema-tables information-schema
 backing-up innodb-backup
 system-variables server-system-variables
+windows-system-requirements windows-installation

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-02-07 17:50:58 UTC (rev 1228)
+++ trunk/refman-common/titles.en.ent	2006-02-07 18:51:11 UTC (rev 1229)
@@ -1708,7 +1708,6 @@
 <!ENTITY title-windows-start-command-line "Starting MySQL from the Windows Command
Line">
 <!ENTITY title-windows-start-service "Starting MySQL as a Windows Service">
 <!ENTITY title-windows-symbolic-links "Using Symbolic Links for Databases on
Windows">
-<!ENTITY title-windows-system-requirements "Windows System Requirements">
 <!ENTITY title-windows-testing "Testing The MySQL Installation">
 <!ENTITY title-windows-troubleshooting "Troubleshooting a MySQL Installation Under
Windows">
 <!ENTITY title-windows-upgrading "Upgrading MySQL on Windows">

Thread
svn commit - mysqldoc@docsrva: r1229 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul7 Feb