Author: paul
Date: 2006-03-22 22:42:47 +0100 (Wed, 22 Mar 2006)
New Revision: 1645
Log:
r8893@frost: paul | 2006-03-22 15:38:58 -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
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8880
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4044
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8893
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 18:01:41 UTC (rev 1644)
+++ trunk/refman-4.1/installing.xml 2006-03-22 21:42:47 UTC (rev 1645)
@@ -2738,8 +2738,8 @@
</remark>
The source distribution contains all the code and support
- files for building the executables using the Visual Studio
- 2003 compiler system.
+ files for building the executables using the Visual Studio 7.1
+ compiler system.
</para>
</listitem>
@@ -2958,7 +2958,7 @@
The process for starting the wizard depends on the contents of
the installation package you download. If there is a
<filename>setup.exe</filename> file present, double-click it
- to start the installation process. If there is a
+ to start the installation process. If there is an
<filename>.msi</filename> file present, double-click it to
start the installation process.
</para>
@@ -3131,8 +3131,8 @@
default installation it contains <literal>C:\Program
Files\MySQL\MySQL Server 4.1\</literal>. The
<literal>Version</literal> string contains the release number.
- For example, for an installation of MySQL Server 4.1.5 the key
- contains a value of <literal>4.1.5</literal>.
+ For example, for an installation of MySQL Server 4.1.5, the
+ key contains a value of <literal>4.1.5</literal>.
</para>
<para>
@@ -3328,7 +3328,7 @@
<para>
The MySQL Configuration Wizard is to a large extent the result
- of feedback MySQL AB has received from many users over a
+ of feedback that MySQL AB has received from many users over a
period of several years. However, if you find that it lacks
some feature important to you, please report it in our bugs
database using the instructions given in
@@ -3550,7 +3550,7 @@
option enables both the <literal>InnoDB</literal> and
<literal>MyISAM</literal> storage engines, and divides
resources evenly between the two. This option is
- recommended for users who employ both table handlers on a
+ recommended for users who use both table handlers on a
regular basis.
</para>
</listitem>
@@ -3562,8 +3562,8 @@
<literal>MyISAM</literal> storage engines but dedicates
most server resources to the <literal>InnoDB</literal>
storage engine. This option is recommended for users who
- employ <literal>InnoDB</literal> almost exclusively and
- make only minimal use of <literal>MyISAM</literal>.
+ use <literal>InnoDB</literal> almost exclusively and make
+ only minimal use of <literal>MyISAM</literal>.
</para>
</listitem>
@@ -3574,7 +3574,7 @@
<literal>InnoDB</literal> storage engine completely, and
dedicates all server resources to the
<literal>MyISAM</literal> storage engine. This option is
- recommended for those who do not wish to use
+ recommended for users who do not use
<literal>InnoDB</literal>.
</para>
</listitem>
@@ -3628,12 +3628,12 @@
<para>
To prevent the server from running out of resources, it is
- important to set a limit to the number of concurrent
- connections to the MySQL server that can be established. The
- <guimenu>Concurrent Connections</guimenu> dialog allows you to
- choose the expected usage of your server, and sets the limit
- for concurrent connections accordingly. It is also possible to
- manually set the concurrent connection limit.
+ important to limit the number of concurrent connections to the
+ MySQL server that can be established. The <guimenu>Concurrent
+ Connections</guimenu> dialog allows you to choose the expected
+ usage of your server, and sets the limit for concurrent
+ connections accordingly. It is also possible to manually set
+ the concurrent connection limit.
</para>
<itemizedlist>
@@ -3696,7 +3696,7 @@
Port 3306 is used by default. To change the port used to
access MySQL, choose a new port number from the drop-down box
or type a new port number directly into the drop-down box. If
- the port number you choose is in use you are prompted to
+ the port number you choose is in use, you are prompted to
confirm your choice of port number.
</para>
@@ -3864,8 +3864,8 @@
<para>
After you click the <guibutton>Execute</guibutton> button, the
- MySQL Configuration Wizard performs a series of tasks with the
- progress displayed onscreen as the tasks are performed.
+ MySQL Configuration Wizard performs a series of tasks and
+ displays the progress onscreen as the tasks are performed.
</para>
<para>
@@ -3884,7 +3884,7 @@
</para>
<para>
- If you chose to create a service for the MySQL server the
+ If you chose to create a service for the MySQL server, the
MySQL Configuration Wizard creates and starts the service. If
you are reconfiguring an existing service, the MySQL
Configuration Wizard restarts the service to apply your
@@ -3900,8 +3900,8 @@
<para>
After the MySQL Configuration Wizard has completed its tasks,
- a summary is shown. Click the Finish button to exit the MySQL
- Configuration Wizard.
+ it displays a summary. Click the Finish button to exit the
+ MySQL Configuration Wizard.
</para>
<remark>
@@ -3933,17 +3933,19 @@
To ensure that the MySQL server knows where to look for the
<filename>my.ini</filename> file, an argument similar to this
is passed to the MySQL server as part of the service
- installation: <option>--defaults-file="<replaceable>C:\Program
- Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"</option>.
- Here, <replaceable>C:\Program Files\MySQL\MySQL Server
- 4.1</replaceable> is replaced with the installation path to
- the MySQL Server.
+ installation:
</para>
+<programlisting>
+--defaults-file="<replaceable>C:\Program Files\MySQL\MySQL Server 4.1</replaceable>\my.ini"
+</programlisting>
+
<para>
- The <option>--defaults-file</option> option instructs the
- MySQL server to read the specified file for configuration
- options when it starts.
+ Here, <replaceable>C:\Program Files\MySQL\MySQL Server
+ 4.1</replaceable> is replaced with the installation path to
+ the MySQL Server. The <option>--defaults-file</option> option
+ instructs the MySQL server to read the specified file for
+ configuration options when it starts.
</para>
<remark>
@@ -4007,31 +4009,31 @@
<listitem>
<para>
- Extract the archive to the desired install directory.
+ Extract the archive to the desired install directory
</para>
</listitem>
<listitem>
<para>
- Create an option file.
+ Create an option file
</para>
</listitem>
<listitem>
<para>
- Choose a MySQL server type.
+ Choose a MySQL server type
</para>
</listitem>
<listitem>
<para>
- Start the MySQL server.
+ Start the MySQL server
</para>
</listitem>
<listitem>
<para>
- Secure the default user accounts.
+ Secure the default user accounts
</para>
</listitem>
@@ -4088,7 +4090,7 @@
Extract the install archive to the chosen installation
location using your preferred Zip archive tool. Some tools
may extract the archive to a folder within your chosen
- installation location. If this occurs you can move the
+ installation location. If this occurs, you can move the
contents of the subfolder into the chosen installation
location.
</para>
@@ -4287,8 +4289,8 @@
</row>
<row>
<entry><command>mysqld-max</command></entry>
- <entry>Optimized binary with support for <literal>InnoDB</literal> and
- <literal>BDB</literal> tables.</entry>
+ <entry>Optimized binary with <literal>InnoDB</literal> and
+ <literal>BDB</literal> support.</entry>
</row>
<row>
<entry><command>mysqld-max-nt</command></entry>
@@ -4504,7 +4506,7 @@
<para>
In MySQL versions 4.1 and higher, Windows servers also support
- shared-memory connections if started with the
+ shared-memory connections if the server is started with the
<option>--shared-memory</option> option. Clients can connect
through shared memory by using the
<option>--protocol=memory</option> option.
@@ -4540,8 +4542,9 @@
</programlisting>
<para>
- For servers that include <literal>InnoDB</literal> support, you
- should see the following messages as the server starts:
+ For a server that includes <literal>InnoDB</literal> support,
+ you should see the messages similar to those following as it
+ starts (the pathnames and sizes may differ):
</para>
<programlisting>
@@ -4615,12 +4618,12 @@
</programlisting>
<para>
- The path used in the preceding example may vary depending on the
+ The path to <command>mysqld</command> may vary depending on the
install location of MySQL on your system.
</para>
<para>
- On non-NT versions of Windows, this starts
+ On non-NT versions of Windows, this command starts
<command>mysqld</command> in the background. That is, after the
server starts, you should see another command prompt. If you
start the server this way on Windows NT, 2000, XP, or 2003, the
@@ -4932,8 +4935,8 @@
<para>
To remove a server that is installed as a service, first stop it
- if it is running. Then use the <option>--remove</option> option
- to remove it:
+ if it is running by executing <command>NET STOP MySQL</command>.
+ Then use the <option>--remove</option> option to remove it:
</para>
<programlisting>
@@ -5117,7 +5120,7 @@
<para>
Another source of information regarding possible errors is the
console messages displayed when the MySQL service is starting.
- Use the <command>NET START mysql</command> command from the
+ Use the <command>NET START MySQL</command> command from the
command line after installing <command>mysqld</command> as a
service to see any error messages regarding the starting of the
MySQL server as a service. See
@@ -5377,7 +5380,7 @@
archive. You may either overwrite your existing MySQL
installation (usually located at
<filename>C:\mysql</filename>), or install it into a
- different directory, such as <literal>C:\mysql4</literal>.
+ different directory, such as <literal>C:\mysql5</literal>.
Overwriting the existing installation is recommended.
</para>
</listitem>
@@ -5874,8 +5877,11 @@
<para>
The MySQL server. You need this unless you only want to
- connect to a MySQL server running on another machine. Note:
- Server RPM files were called
+ connect to a MySQL server running on another machine.
+ </para>
+
+ <para>
+ Note: Server RPM files were called
<literal>MySQL-<replaceable>VERSION</replaceable>.i386.rpm</literal>
before MySQL 4.0.10. That is, they did not have
<option>-server</option> in the name.
@@ -5914,7 +5920,8 @@
<para>
Tests and benchmarks. Requires Perl and the
- <literal>DBD::mysql</literal> module.
+ <literal>DBI</literal> and <literal>DBD::mysql</literal>
+ modules.
</para>
</listitem>
@@ -6234,7 +6241,7 @@
</para>
<para>
- If you are upgrading from Marc's 3.23.xx versions or from the Mac
+ If you are upgrading from Marc's 3.23.x versions or from the Mac
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
@@ -6247,16 +6254,12 @@
MySQL 4.0.15, it is part of the Mac OS X installation disk images
as a separate installation package. Simply double-click the
<guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
- instructions to install it.
+ instructions to install it. The Startup Item need be installed
+ only once. There is no need to install it each time you upgrade
+ the MySQL package later.
</para>
<para>
- Note that the Startup Item need be installed only once! There is
- no need to install it each time you upgrade the MySQL package
- later.
- </para>
-
- <para>
The Startup Item for MySQL is installed into
<filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
4.1.2, the location was
@@ -6287,7 +6290,7 @@
</para>
<para>
- If you have installed the Startup Item use this command:
+ If you have installed the Startup Item, use this command:
</para>
<programlisting>
@@ -6370,9 +6373,8 @@
</programlisting>
<para>
- If no <filename>.bashrc<replaceable> or
- </replaceable></filename><filename>.tcshrc</filename> file exists
- in your home directory, create it with a text editor.
+ If no <filename>.bashrc</filename> or <filename>.tcshrc</filename>
+ file exists in your home directory, create it with a text editor.
</para>
<para>
@@ -9267,7 +9269,7 @@
<listitem>
<para>
- Visual Studio 2003 compiler system (VC++ 7.0).
+ Visual Studio 7.1 compiler system
</para>
</listitem>
@@ -9359,8 +9361,7 @@
<para>
<emphasis role="bold">Note</emphasis>: VC++ workspace files
for MySQL 4.1 and above are compatible with Microsoft Visual
- Studio 2003 editions and tested by MySQL AB staff before each
- release.
+ Studio 7.1 and tested by MySQL AB staff before each release.
</para>
<para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-03-22 18:01:41 UTC (rev 1644)
+++ trunk/refman-5.0/installing.xml 2006-03-22 21:42:47 UTC (rev 1645)
@@ -2223,7 +2223,7 @@
</para>
<programlisting>
-shell> gpg --verify mysql-standard-¤t-version;-linux-i686.tar.gz.asc
+shell> <userinput>gpg --verify mysql-standard-¤t-version;-linux-i686.tar.gz.asc</userinput>
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) <build@stripped>"
</programlisting>
@@ -2726,8 +2726,8 @@
</remark>
The source distribution contains all the code and support
- files for building the executables using the Visual Studio
- 2003 compiler system.
+ files for building the executables using the Visual Studio 7.1
+ compiler system.
</para>
</listitem>
@@ -2933,7 +2933,7 @@
The process for starting the wizard depends on the contents of
the installation package you download. If there is a
<filename>setup.exe</filename> file present, double-click it
- to start the installation process. If there is a
+ to start the installation process. If there is an
<filename>.msi</filename> file present, double-click it to
start the installation process.
</para>
@@ -3107,7 +3107,7 @@
Files\MySQL\MySQL Server ¤t-series;\</literal>. The
<literal>Version</literal> string contains the release number.
For example, for an installation of MySQL Server
- ¤t-version; the key contains a value of
+ ¤t-version;, the key contains a value of
<literal>¤t-version;</literal>.
</para>
@@ -3293,7 +3293,7 @@
<para>
The MySQL Configuration Wizard is to a large extent the result
- of feedback MySQL AB has received from many users over a
+ of feedback that MySQL AB has received from many users over a
period of several years. However, if you find that it lacks
some feature important to you, please report it in our bugs
database using the instructions given in
@@ -3516,7 +3516,7 @@
option enables both the <literal>InnoDB</literal> and
<literal>MyISAM</literal> storage engines and divides
resources evenly between the two. This option is
- recommended for users that use both storage engines on a
+ recommended for users who use both storage engines on a
regular basis.
</para>
</listitem>
@@ -3527,7 +3527,7 @@
This option enables both the <literal>InnoDB</literal> and
<literal>MyISAM</literal> storage engines, but dedicates
most server resources to the <literal>InnoDB</literal>
- storage engine. This option is recommended for users that
+ storage engine. This option is recommended for users who
use <literal>InnoDB</literal> almost exclusively and make
only minimal use of <literal>MyISAM</literal>.
</para>
@@ -3594,12 +3594,12 @@
<para>
To prevent the server from running out of resources, it is
- important to set a limit to the number of concurrent
- connections to the MySQL server that can be established. The
- <guimenu>Concurrent Connections</guimenu> dialog allows you to
- choose the expected usage of your server, and sets the limit
- for concurrent connections accordingly. It is also possible to
- set the concurrent connection limit manually.
+ important to limit the number of concurrent connections to the
+ MySQL server that can be established. The <guimenu>Concurrent
+ Connections</guimenu> dialog allows you to choose the expected
+ usage of your server, and sets the limit for concurrent
+ connections accordingly. It is also possible to set the
+ concurrent connection limit manually.
</para>
<itemizedlist>
@@ -3662,7 +3662,7 @@
Port 3306 is used by default. To change the port used to
access MySQL, choose a new port number from the drop-down box
or type a new port number directly into the drop-down box. If
- the port number you choose is in use you are prompted to
+ the port number you choose is in use, you are prompted to
confirm your choice of port number.
</para>
@@ -3830,8 +3830,8 @@
<para>
After you click the <guibutton>Execute</guibutton> button, the
- MySQL Configuration Wizard performs a series of tasks whose
- progress is displayed onscreen as the tasks are performed.
+ MySQL Configuration Wizard performs a series of tasks and
+ displays the progress onscreen as the tasks are performed.
</para>
<para>
@@ -3850,7 +3850,7 @@
</para>
<para>
- If you chose to create a service for the MySQL server the
+ If you chose to create a service for the MySQL server, the
MySQL Configuration Wizard creates and starts the service. If
you are reconfiguring an existing service, the MySQL
Configuration Wizard restarts the service to apply your
@@ -3866,9 +3866,8 @@
<para>
After the MySQL Configuration Wizard has completed its tasks,
- a summary is displayed. Click the
- <guibutton>Finish</guibutton> button to exit the MySQL
- Configuration Wizard.
+ it displays a summary. Click the <guibutton>Finish</guibutton>
+ button to exit the MySQL Configuration Wizard.
</para>
<remark>
@@ -3892,18 +3891,20 @@
To ensure that the MySQL server knows where to look for the
<filename>my.ini</filename> file, an argument similar to this
is passed to the MySQL server as part of the service
- installation: <option>--defaults-file="<replaceable>C:\Program
- Files\MySQL\MySQL Server
- ¤t-series;</replaceable>\my.ini"</option>. Here,
- <replaceable>C:\Program Files\MySQL\MySQL Server
- ¤t-series;</replaceable> is replaced with the
- installation path to the MySQL Server.
+ installation:
</para>
+<programlisting>
+--defaults-file="<replaceable>C:\Program Files\MySQL\MySQL Server ¤t-series;</replaceable>\my.ini"
+</programlisting>
+
<para>
- The <option>--defaults-file</option> option instructs the
- MySQL server to read the specified file for configuration
- options when it starts.
+ Here, <replaceable>C:\Program Files\MySQL\MySQL Server
+ ¤t-series;</replaceable> is replaced with the
+ installation path to the MySQL Server. The
+ <option>--defaults-file</option> option instructs the MySQL
+ server to read the specified file for configuration options
+ when it starts.
</para>
<remark>
@@ -3959,31 +3960,31 @@
<listitem>
<para>
- Extract the archive to the desired install directory.
+ Extract the archive to the desired install directory
</para>
</listitem>
<listitem>
<para>
- Create an option file.
+ Create an option file
</para>
</listitem>
<listitem>
<para>
- Choose a MySQL server type.
+ Choose a MySQL server type
</para>
</listitem>
<listitem>
<para>
- Start the MySQL server.
+ Start the MySQL server
</para>
</listitem>
<listitem>
<para>
- Secure the default user accounts.
+ Secure the default user accounts
</para>
</listitem>
@@ -4040,7 +4041,7 @@
Extract the install archive to the chosen installation
location using your preferred Zip archive tool. Some tools
may extract the archive to a folder within your chosen
- installation location. If this occurs you can move the
+ installation location. If this occurs, you can move the
contents of the subfolder into the chosen installation
location.
</para>
@@ -4213,7 +4214,7 @@
<entry><command>mysqld-debug</command></entry>
<entry>Compiled with full debugging and automatic memory allocation checking,
as well as <literal>InnoDB</literal> and
- <literal>BDB</literal> tables.</entry>
+ <literal>BDB</literal> support.</entry>
</row>
<row>
<entry><command>mysqld</command></entry>
@@ -4226,8 +4227,8 @@
</row>
<row>
<entry><command>mysqld-max</command></entry>
- <entry>Optimized binary with support for <literal>InnoDB</literal> and
- <literal>BDB</literal> tables.</entry>
+ <entry>Optimized binary with <literal>InnoDB</literal> and
+ <literal>BDB</literal> support.</entry>
</row>
<row>
<entry><command>mysqld-max-nt</command></entry>
@@ -4306,7 +4307,7 @@
<listitem>
<para>
- These servers can not be run on Windows 95.
+ These servers cannot be run on Windows 95.
</para>
</listitem>
@@ -4379,9 +4380,9 @@
</para>
<para>
- MySQL for Windows also supports shared-memory connections if
- started with the <option>--shared-memory</option> option.
- Clients can connect through shared memory by using the
+ MySQL for Windows also supports shared-memory connections if the
+ server is started with the <option>--shared-memory</option>
+ option. Clients can connect through shared memory by using the
<option>--protocol=memory</option> option.
</para>
@@ -4408,8 +4409,9 @@
</programlisting>
<para>
- For servers that include <literal>InnoDB</literal> support, you
- should see the following messages as the server starts:
+ For a server that includes <literal>InnoDB</literal> support,
+ you should see the messages similar to those following as it
+ starts (the pathnames and sizes may differ):
</para>
<programlisting>
@@ -4484,12 +4486,12 @@
</programlisting>
<para>
- The path used in the preceding example may vary depending on the
+ The path to <command>mysqld</command> may vary depending on the
install location of MySQL on your system.
</para>
<para>
- On non-NT versions of Windows, this starts
+ On non-NT versions of Windows, this command starts
<command>mysqld</command> in the background. That is, after the
server starts, you should see another command prompt. If you
start the server this way on Windows NT, 2000, XP, or 2003, the
@@ -4865,7 +4867,7 @@
<para>
To remove a server that is installed as a service, first stop it
- if it is running by executing <command>NET STOP MYSQL</command>.
+ if it is running by executing <command>NET STOP MySQL</command>.
Then use the <option>--remove</option> option to remove it:
</para>
@@ -4969,7 +4971,7 @@
<para>
Another source of information regarding possible errors is the
console messages displayed when the MySQL service is starting.
- Use the <command>NET START mysql</command> command from the
+ Use the <command>NET START MySQL</command> command from the
command line after installing <command>mysqld</command> as a
service to see any error messages regarding the starting of the
MySQL server as a service. See
@@ -5171,7 +5173,7 @@
</para>
<programlisting>
-C:\> <userinput>NET STOP MYSQL</userinput>
+C:\> <userinput>NET STOP MySQL</userinput>
</programlisting>
<para>
@@ -5231,7 +5233,7 @@
archive. You may either overwrite your existing MySQL
installation (usually located at
<filename>C:\mysql</filename>), or install it into a
- different directory, such as <literal>C:\mysql4</literal>.
+ different directory, such as <literal>C:\mysql5</literal>.
Overwriting the existing installation is recommended.
</para>
</listitem>
@@ -5754,8 +5756,11 @@
<para>
The MySQL server. You need this unless you only want to
- connect to a MySQL server running on another machine. Note:
- Server RPM files were called
+ connect to a MySQL server running on another machine.
+ </para>
+
+ <para>
+ Note: Server RPM files were called
<literal>MySQL-<replaceable>VERSION</replaceable>.i386.rpm</literal>
before MySQL 4.0.10. That is, they did not have
<literal>-server</literal> in the name.
@@ -5794,7 +5799,8 @@
<para>
Tests and benchmarks. Requires Perl and the
- <literal>DBD::mysql</literal> module.
+ <literal>DBI</literal> and <literal>DBD::mysql</literal>
+ modules.
</para>
</listitem>
@@ -6121,7 +6127,7 @@
</para>
<para>
- If you are upgrading from Marc's 3.23.xx versions or from the Mac
+ If you are upgrading from Marc's 3.23.x versions or from the Mac
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
@@ -6134,16 +6140,12 @@
Mac OS X installation disk images as a separate installation
package. Simply double-click the
<guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
- instructions to install it.
+ instructions to install it. The Startup Item need be installed
+ only once. There is no need to install it each time you upgrade
+ the MySQL package later.
</para>
<para>
- Note that the Startup Item need be installed only once! There is
- no need to install it each time you upgrade the MySQL package
- later.
- </para>
-
- <para>
The Startup Item for MySQL is installed into
<filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
4.1.2, the location was
@@ -6174,7 +6176,7 @@
</para>
<para>
- If you have installed the Startup Item use this command:
+ If you have installed the Startup Item, use this command:
</para>
<programlisting>
@@ -6251,9 +6253,8 @@
</programlisting>
<para>
- If no <filename>.bashrc<replaceable> or
- </replaceable></filename><filename>.tcshrc</filename> file exists
- in your home directory, create it with a text editor.
+ If no <filename>.bashrc</filename> or <filename>.tcshrc</filename>
+ file exists in your home directory, create it with a text editor.
</para>
<para>
@@ -9050,7 +9051,7 @@
<listitem>
<para>
- Visual Studio 2003 compiler system (VC++ 7.0).
+ Visual Studio 7.1 compiler system
</para>
</listitem>
@@ -9140,8 +9141,7 @@
<para>
<emphasis role="bold">Note</emphasis>: VC++ workspace files
for MySQL 4.1 and above are compatible with Microsoft Visual
- Studio 2003 editions and tested by MySQL AB staff before each
- release.
+ Studio 7.1 and tested by MySQL AB staff before each release.
</para>
<para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-03-22 18:01:41 UTC (rev 1644)
+++ trunk/refman-5.1/installing.xml 2006-03-22 21:42:47 UTC (rev 1645)
@@ -2213,7 +2213,7 @@
</para>
<programlisting>
-shell> gpg --verify mysql-standard-¤t-version;-linux-i686.tar.gz.asc
+shell> <userinput>gpg --verify mysql-standard-¤t-version;-linux-i686.tar.gz.asc</userinput>
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) <build@stripped>"
</programlisting>
@@ -2716,8 +2716,8 @@
</remark>
The source distribution contains all the code and support
- files for building the executables using the Visual Studio
- 2003 compiler system.
+ files for building the executables using the Visual Studio 7.1
+ compiler system.
</para>
</listitem>
@@ -2923,7 +2923,7 @@
The process for starting the wizard depends on the contents of
the installation package you download. If there is a
<filename>setup.exe</filename> file present, double-click it
- to start the installation process. If there is a
+ to start the installation process. If there is an
<filename>.msi</filename> file present, double-click it to
start the installation process.
</para>
@@ -3097,7 +3097,7 @@
Files\MySQL\MySQL Server ¤t-series;\</literal>. The
<literal>Version</literal> string contains the release number.
For example, for an installation of MySQL Server
- ¤t-version; the key contains a value of
+ ¤t-version;, the key contains a value of
<literal>¤t-version;</literal>.
</para>
@@ -3283,7 +3283,7 @@
<para>
The MySQL Configuration Wizard is to a large extent the result
- of feedback MySQL AB has received from many users over a
+ of feedback that MySQL AB has received from many users over a
period of several years. However, if you find that it lacks
some feature important to you, please report it in our bugs
database using the instructions given in
@@ -3506,7 +3506,7 @@
option enables both the <literal>InnoDB</literal> and
<literal>MyISAM</literal> storage engines and divides
resources evenly between the two. This option is
- recommended for users that use both storage engines on a
+ recommended for users who use both storage engines on a
regular basis.
</para>
</listitem>
@@ -3517,7 +3517,7 @@
This option enables both the <literal>InnoDB</literal> and
<literal>MyISAM</literal> storage engines, but dedicates
most server resources to the <literal>InnoDB</literal>
- storage engine. This option is recommended for users that
+ storage engine. This option is recommended for users who
use <literal>InnoDB</literal> almost exclusively and make
only minimal use of <literal>MyISAM</literal>.
</para>
@@ -3584,12 +3584,12 @@
<para>
To prevent the server from running out of resources, it is
- important to set a limit to the number of concurrent
- connections to the MySQL server that can be established. The
- <guimenu>Concurrent Connections</guimenu> dialog allows you to
- choose the expected usage of your server, and sets the limit
- for concurrent connections accordingly. It is also possible to
- set the concurrent connection limit manually.
+ important to limit the number of concurrent connections to the
+ MySQL server that can be established. The <guimenu>Concurrent
+ Connections</guimenu> dialog allows you to choose the expected
+ usage of your server, and sets the limit for concurrent
+ connections accordingly. It is also possible to set the
+ concurrent connection limit manually.
</para>
<itemizedlist>
@@ -3652,7 +3652,7 @@
Port 3306 is used by default. To change the port used to
access MySQL, choose a new port number from the drop-down box
or type a new port number directly into the drop-down box. If
- the port number you choose is in use you are prompted to
+ the port number you choose is in use, you are prompted to
confirm your choice of port number.
</para>
@@ -3820,8 +3820,8 @@
<para>
After you click the <guibutton>Execute</guibutton> button, the
- MySQL Configuration Wizard performs a series of tasks whose
- progress is displayed onscreen as the tasks are performed.
+ MySQL Configuration Wizard performs a series of tasks and
+ displays the progress onscreen as the tasks are performed.
</para>
<para>
@@ -3840,7 +3840,7 @@
</para>
<para>
- If you chose to create a service for the MySQL server the
+ If you chose to create a service for the MySQL server, the
MySQL Configuration Wizard creates and starts the service. If
you are reconfiguring an existing service, the MySQL
Configuration Wizard restarts the service to apply your
@@ -3856,9 +3856,8 @@
<para>
After the MySQL Configuration Wizard has completed its tasks,
- a summary is displayed. Click the
- <guibutton>Finish</guibutton> button to exit the MySQL
- Configuration Wizard.
+ it displays a summary. Click the <guibutton>Finish</guibutton>
+ button to exit the MySQL Configuration Wizard.
</para>
<remark>
@@ -3882,18 +3881,20 @@
To ensure that the MySQL server knows where to look for the
<filename>my.ini</filename> file, an argument similar to this
is passed to the MySQL server as part of the service
- installation: <option>--defaults-file="<replaceable>C:\Program
- Files\MySQL\MySQL Server
- ¤t-series;</replaceable>\my.ini"</option>. Here,
- <replaceable>C:\Program Files\MySQL\MySQL Server
- ¤t-series;</replaceable> is replaced with the
- installation path to the MySQL Server.
+ installation:
</para>
+<programlisting>
+--defaults-file="<replaceable>C:\Program Files\MySQL\MySQL Server ¤t-series;</replaceable>\my.ini"
+</programlisting>
+
<para>
- The <option>--defaults-file</option> option instructs the
- MySQL server to read the specified file for configuration
- options when it starts.
+ Here, <replaceable>C:\Program Files\MySQL\MySQL Server
+ ¤t-series;</replaceable> is replaced with the
+ installation path to the MySQL Server. The
+ <option>--defaults-file</option> option instructs the MySQL
+ server to read the specified file for configuration options
+ when it starts.
</para>
<remark>
@@ -3949,31 +3950,31 @@
<listitem>
<para>
- Extract the archive to the desired install directory.
+ Extract the archive to the desired install directory
</para>
</listitem>
<listitem>
<para>
- Create an option file.
+ Create an option file
</para>
</listitem>
<listitem>
<para>
- Choose a MySQL server type.
+ Choose a MySQL server type
</para>
</listitem>
<listitem>
<para>
- Start the MySQL server.
+ Start the MySQL server
</para>
</listitem>
<listitem>
<para>
- Secure the default user accounts.
+ Secure the default user accounts
</para>
</listitem>
@@ -4030,7 +4031,7 @@
Extract the install archive to the chosen installation
location using your preferred Zip archive tool. Some tools
may extract the archive to a folder within your chosen
- installation location. If this occurs you can move the
+ installation location. If this occurs, you can move the
contents of the subfolder into the chosen installation
location.
</para>
@@ -4203,7 +4204,7 @@
<entry><command>mysqld-debug</command></entry>
<entry>Compiled with full debugging and automatic memory allocation checking,
as well as <literal>InnoDB</literal> and
- <literal>BDB</literal> tables.</entry>
+ <literal>BDB</literal> support.</entry>
</row>
<row>
<entry><command>mysqld</command></entry>
@@ -4284,7 +4285,7 @@
<listitem>
<para>
- These servers can not be run on Windows 95.
+ These servers cannot be run on Windows 95.
</para>
</listitem>
@@ -4357,9 +4358,9 @@
</para>
<para>
- MySQL for Windows also supports shared-memory connections if
- started with the <option>--shared-memory</option> option.
- Clients can connect through shared memory by using the
+ MySQL for Windows also supports shared-memory connections if the
+ server is started with the <option>--shared-memory</option>
+ option. Clients can connect through shared memory by using the
<option>--protocol=memory</option> option.
</para>
@@ -4386,8 +4387,9 @@
</programlisting>
<para>
- For servers that include <literal>InnoDB</literal> support, you
- should see the following messages as the server starts:
+ For a server that includes <literal>InnoDB</literal> support,
+ you should see the messages similar to those following as it
+ starts (the pathnames and sizes may differ):
</para>
<programlisting>
@@ -4462,12 +4464,12 @@
</programlisting>
<para>
- The path used in the preceding example may vary depending on the
+ The path to <command>mysqld</command> may vary depending on the
install location of MySQL on your system.
</para>
<para>
- On non-NT versions of Windows, this starts
+ On non-NT versions of Windows, this command starts
<command>mysqld</command> in the background. That is, after the
server starts, you should see another command prompt. If you
start the server this way on Windows NT, 2000, XP, or 2003, the
@@ -4839,7 +4841,7 @@
<para>
To remove a server that is installed as a service, first stop it
- if it is running by executing <command>NET STOP MYSQL</command>.
+ if it is running by executing <command>NET STOP MySQL</command>.
Then use the <option>--remove</option> option to remove it:
</para>
@@ -4943,7 +4945,7 @@
<para>
Another source of information regarding possible errors is the
console messages displayed when the MySQL service is starting.
- Use the <command>NET START mysql</command> command from the
+ Use the <command>NET START MySQL</command> command from the
command line after installing <command>mysqld</command> as a
service to see any error messages regarding the starting of the
MySQL server as a service. See
@@ -5145,7 +5147,7 @@
</para>
<programlisting>
-C:\> <userinput>NET STOP MYSQL</userinput>
+C:\> <userinput>NET STOP MySQL</userinput>
</programlisting>
<para>
@@ -5205,7 +5207,7 @@
archive. You may either overwrite your existing MySQL
installation (usually located at
<filename>C:\mysql</filename>), or install it into a
- different directory, such as <literal>C:\mysql4</literal>.
+ different directory, such as <literal>C:\mysql5</literal>.
Overwriting the existing installation is recommended.
</para>
</listitem>
@@ -5723,8 +5725,11 @@
<para>
The MySQL server. You need this unless you only want to
- connect to a MySQL server running on another machine. Note:
- Server RPM files were called
+ connect to a MySQL server running on another machine.
+ </para>
+
+ <para>
+ Note: Server RPM files were called
<literal>MySQL-<replaceable>VERSION</replaceable>.i386.rpm</literal>
before MySQL 4.0.10. That is, they did not have
<literal>-server</literal> in the name.
@@ -5763,7 +5768,8 @@
<para>
Tests and benchmarks. Requires Perl and the
- <literal>DBD::mysql</literal> module.
+ <literal>DBI</literal> and <literal>DBD::mysql</literal>
+ modules.
</para>
</listitem>
@@ -6079,7 +6085,7 @@
</para>
<para>
- If you are upgrading from Marc's 3.23.xx versions or from the Mac
+ If you are upgrading from Marc's 3.23.x versions or from the Mac
OS X Server version of MySQL to the official MySQL PKG, you also
need to convert the existing MySQL privilege tables to the current
format, because some new security privileges have been added. See
@@ -6092,16 +6098,12 @@
Mac OS X installation disk images as a separate installation
package. Simply double-click the
<guiicon>MySQLStartupItem.pkg</guiicon> icon and follow the
- instructions to install it.
+ instructions to install it. The Startup Item need be installed
+ only once. There is no need to install it each time you upgrade
+ the MySQL package later.
</para>
<para>
- Note that the Startup Item need be installed only once! There is
- no need to install it each time you upgrade the MySQL package
- later.
- </para>
-
- <para>
The Startup Item for MySQL is installed into
<filename>/Library/StartupItems/MySQLCOM</filename>. (Before MySQL
4.1.2, the location was
@@ -6132,7 +6134,7 @@
</para>
<para>
- If you have installed the Startup Item use this command:
+ If you have installed the Startup Item, use this command:
</para>
<programlisting>
@@ -6209,9 +6211,8 @@
</programlisting>
<para>
- If no <filename>.bashrc<replaceable> or
- </replaceable></filename><filename>.tcshrc</filename> file exists
- in your home directory, create it with a text editor.
+ If no <filename>.bashrc</filename> or <filename>.tcshrc</filename>
+ file exists in your home directory, create it with a text editor.
</para>
<para>
@@ -9008,7 +9009,7 @@
<listitem>
<para>
- Visual Studio 2003 compiler system (VC++ 7.0).
+ Visual Studio 7.1 compiler system
</para>
</listitem>
@@ -9098,8 +9099,7 @@
<para>
<emphasis role="bold">Note</emphasis>: VC++ workspace files
for MySQL 4.1 and above are compatible with Microsoft Visual
- Studio 2003 editions and tested by MySQL AB staff before each
- release.
+ Studio 7.1 and tested by MySQL AB staff before each release.
</para>
<para>
@@ -11944,13 +11944,13 @@
accepted as a synonym for the <literal>ENGINE =
<replaceable>engine_name</replaceable></literal> table
option but generates a warning. You should note that this
- option is not available in MySQL 5.1.7, and
+ option is not available in MySQL 5.1.7, and
<emphasis role="bold">is to be removed altogether in MySQL
5.2, where it will produce a syntax error</emphasis>.
</para>
-
+
<para>
- <literal>TYPE</literal> has been deprecated since MySQL 4.0.
+ <literal>TYPE</literal> has been deprecated since MySQL 4.0.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1645 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 22 Mar |
