From: Date: January 30 2006 9:36pm Subject: svn commit - mysqldoc@docsrva: r1136 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common List-Archive: http://lists.mysql.com/commits/1896 Message-Id: <200601302036.k0UKaPpc001787@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: paul Date: 2006-01-30 21:36:24 +0100 (Mon, 30 Jan 2006) New Revision: 1136 Log: r2715@kite-hub: paul | 2006-01-30 14:35:28 -0600 General revisions. Modified: trunk/ trunk/refman-4.1/installing.xml trunk/refman-5.0/installing.xml trunk/refman-5.1/custom-engine.xml trunk/refman-5.1/installing.xml trunk/refman-common/titles.en.ent Property changes on: trunk ___________________________________________________________________ Name: svk:merge - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2700 + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6940 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2715 Modified: trunk/refman-4.1/installing.xml =================================================================== --- trunk/refman-4.1/installing.xml 2006-01-30 20:35:42 UTC (rev 1135) +++ trunk/refman-4.1/installing.xml 2006-01-30 20:36:24 UTC (rev 1136) @@ -3011,8 +3011,8 @@ The MySQL Installation Wizard is the standard installer for all MySQL server distributions, version 4.1.5 and higher. - Users of previous versions of MySQL need to manually shut down - and remove their existing MySQL installations before + Users of previous versions of MySQL need to shut down and + remove their existing MySQL installations manually before installing MySQL with the MySQL Installation Wizard. See , for more information on upgrading from a previous version. @@ -3074,11 +3074,11 @@ The process for starting the wizard depends on the contents of - the install package you download. If there is a - setup.exe file present, double-click it to - start the install process. If there is a - .msi file present, double-click it to start - the install process. + the installation package you download. If there is a + setup.exe file present, double-click it + to start the installation process. If there is a + .msi file present, double-click it to + start the installation process. @@ -3092,43 +3092,46 @@ &title-mysql-install-wizard-install-type; - There are up three installation types available: - Typical, Complete, and - Custom. + There are three installation types available: + Typical, + Complete, and + Custom. - The Typical installation type installs the - MySQL server, the mysql command-line - client, and the command-line utilities. The command-line - clients and utilities include mysqldump, - myisamchk, and several other tools to help - you manage the MySQL server. + The Typical installation type + installs the MySQL server, the mysql + command-line client, and the command-line utilities. The + command-line clients and utilities include + mysqldump, myisamchk, + and several other tools to help you manage the MySQL server. - The Complete installation type installs all - components included in the installation package. The full - installation package includes components such as the embedded - server library, the benchmark suite, support scripts, and - documentation. + The Complete installation + type installs all components included in the installation + package. The full installation package includes components + such as the embedded server library, the benchmark suite, + support scripts, and documentation. - The Custom installation type gives you - complete control over which packages you wish to install and - the installation path that is used. See + The Custom installation type + gives you complete control over which packages you wish to + install and the installation path that is used. See , for more information on performing a custom install. - If you choose the Typical or - Complete installation types and click the - Next button, you advance to the confirmation screen to confirm - your choices and begin the installation. If you choose the - Custom installation type and click the Next - button, you advance to the custom install dialog, described in + If you choose the Typical or + Complete installation types + and click the Next button, you advance + to the confirmation screen to verify your choices and begin + the installation. If you choose the + Custom installation type and + click the Next button, you advance to + the custom installation dialog, described in . @@ -3152,21 +3155,22 @@ A tree view on the left side of the custom install dialog lists all available components. Components that are not - installed have a red X icon, components + installed have a red X icon; components that are installed have a gray icon. To change whether a - component is installed, click on the component's icon and - choose an new option from the drop-down list that appears. + component is installed, click on that component's icon and + choose a new option from the drop-down list that appears. You can change the default installation path by clicking the - Change... button to the right of the displayed installation - path. + Change... button to the right of the + displayed installation path. - After choosing your install components and installation path, - click the Next button to advance to the confirmation dialog. + After choosing your installation components and installation + path, click the Next button to advance + to the confirmation dialog. @@ -3188,23 +3192,24 @@ To install MySQL if you are satisfied with your settings, - click the Install button. To change your settings, click the - Back button. To exit the MySQL Installation Wizard without - installing MySQL, click the Cancel button. + click the Install button. To change + your settings, click the Back button. + To exit the MySQL Installation Wizard without installing + MySQL, click the Cancel button. - After installation is complete, you are given the option of + After installation is complete, you have the option of registering with the MySQL web site. Registration gives you access to post in the MySQL forums at forums.mysql.com, along with the ability to report bugs at bugs.mysql.com and - to subscribe to the newsletter. The final screen of the + to subscribe to our newsletter. The final screen of the installer provides a summary of the installation and gives you the option to launch the MySQL Configuration Wizard, which you can use to create a configuration file, install the MySQL - service, and configure security. + service, and configure security settings. @@ -3218,10 +3223,10 @@ &title-mysql-install-wizard-changes; - Once you click the Install button, the MySQL Installation - Wizard begins the installation process and makes certain - changes to your system which are described in the sections - that follow. + Once you click the Install button, the + MySQL Installation Wizard begins the installation process and + makes certain changes to your system which are described in + the sections that follow. @@ -3253,9 +3258,9 @@ the installed location of the MySQL server, preventing a complete scan of the hard-disk to determine the installation path of the MySQL server. The registry keys are not required - to run the server and when using the - noinstall Zip archive the registry keys are - not created. + to run the server, and if you install MySQL using the + noinstall Zip archive, the registry keys + are not created. @@ -3268,45 +3273,47 @@ The MySQL Installation Wizard creates a new entry in the - Windows Start menu under a common MySQL menu heading named - after the major version of MySQL that you have installed. For - example, if you install MySQL 4.1, the MySQL Installation - Wizard creates a MySQL Server 4.1 section in the start menu. + Windows Start menu under a common MySQL + menu heading named after the major version of MySQL that you + have installed. For example, if you install MySQL 4.1, the + MySQL Installation Wizard creates a MySQL Server 4.1 section + in the start menu. - The following entries are created within the new Start menu - section: + The following entries are created within the new + Start menu section: - MySQL Command Line Client: This is a - shortcut to the mysql command-line + MySQL Command Line Client: This + is a shortcut to the mysql command-line client and is configured to connect as the root user. The shortcut prompts for a - root user password when connecting. + root user password when you connect. - MySQL Server Instance Config Wizard: - This is a shortcut to the MySQL Configuration Wizard. Use - this shortcut to configure a newly installed server, or to - re-configure an existing server. + MySQL Server Instance Config + Wizard: This is a shortcut to the MySQL + Configuration Wizard. Use this shortcut to configure a + newly installed server, or to reconfigure an existing + server. - MySQL Documentation: This is a link to - the MySQL server documentation that is stored locally in - the MySQL server installation directory. This option is - not available when the MySQL server is installed from the - essential installation package. + MySQL Documentation: This is a + link to the MySQL server documentation that is stored + locally in the MySQL server installation directory. This + option is not available when the MySQL server is installed + from the Essentials installation package. @@ -3326,14 +3333,14 @@ The MySQL Installation Wizard by default installs the MySQL - server to C:\Program + server to C:\Program Files\MySQL\MySQL Server - 4.1, where + 4.1, where Program Files is the default location for applications in your system, and 4.1 is the major version of your - MySQL server. This is the new recommended location for the - MySQL server, replacing the previous default location of + MySQL server. This is the new location for the MySQL server, + replacing the former default location of c:\mysql. @@ -3343,7 +3350,7 @@ Files\MySQL, where Program Files is the default location for applications in your Windows installation. A - typical MySQL installation on a developer machine may look + typical MySQL installation on a developer machine might look like this: @@ -3382,7 +3389,7 @@ - Automatic upgrades are only available when upgrading between + Automatic upgrades are available only when upgrading between installations that have the same major and minor version numbers. For example, you can upgrade automatically from MySQL 4.1.5 to MySQL 4.1.6, but not from MySQL 4.1 to MySQL 5.0. @@ -3460,14 +3467,17 @@ The MySQL Configuration Wizard is typically launched from the MySQL Installation Wizard, as the MySQL Installation Wizard exits. You can also launch the MySQL Configuration Wizard by - clicking the MySQL Server Instance Config Wizard entry in the - MySQL section of the Start menu. + clicking the MySQL Server Instance Config + Wizard entry in the + MySQL section of the Windows + Start menu. - In addition, you can navigate to the bin - directory of your MySQL installation and launch the - MySQLInstanceConfig.exe file directly. + Alternatively, you can navigate to the + bin directory of your MySQL installation + and launch the MySQLInstanceConfig.exe + file directly. @@ -3483,38 +3493,38 @@ If the MySQL Configuration Wizard detects an existing my.ini file, you have the option of - either re-configuring your existing server, or removing the + either reconfiguring your existing server, or removing the server instance by deleting the my.ini file and stopping and removing the MySQL service. To reconfigure an existing server, choose the - Re-configure Instance option and click the - Next button. Your existing my.ini file is - renamed to my - timestamp.ini.bak, where - timestamp is the date and time the - existing my.ini file was created. To - remove the existing server instance, choose the - Remove Instance option and click the Next - button. + Re-configure Instance option and + click the Next button. Your existing + my.ini file is renamed to + mytimestamp.ini.bak, + where timestamp is the date and + time at which the existing my.ini file + was created. To remove the existing server instance, choose + the Remove Instance option and + click the Next button. - If you choose the Remove Instance option, - you advance to a confirmation window. Click the Execute button - and the MySQL Configuration Wizard stops and removes the MySQL - service and deletes the my.ini file. The - server installation and its data folder are - not removed. + If you choose the Remove Instance + option, you advance to a confirmation window. Click the + Execute button. The MySQL Configuration + Wizard stops and removes the MySQL service, and then deletes + the my.ini file. The server installation + and its data folder are not removed. - If you choose the Re-configure Instance - option, you advance to the Configuration - Type dialog where you can choose the type of - installation you wish to configure. + If you choose the Re-configure + Instance option, you advance to the + Configuration Type dialog where you can + choose the type of installation that you wish to configure. @@ -3529,29 +3539,30 @@ When you start the MySQL Configuration Wizard for a new MySQL - installation, or choose the Re-configure - Instance option for an existing installation, you - advance to the Configuration Type dialog. + installation, or choose the Re-configure + Instance option for an existing installation, + you advance to the Configuration Type + dialog. - There are two configuration types available: Detailed - Configuration and Standard - Configuration. The Standard - Configuration option is intended for new users who - want to get started with MySQL quickly without having to make - a lot of decisions in regards to server configuration. The - Detailed Configuration option is intended - for advanced users who want more fine-grained control of - server configuration. + There are two configuration types available: + Detailed Configuration and + Standard Configuration. The + Standard Configuration option is + intended for new users who want to get started with MySQL + quickly without having to make a lot of decisions about server + configuration. The Detailed Configuration + option is intended for advanced users who want more + fine-grained control of server configuration. If you are new to MySQL and need a server configured as a - single-user developer machine the Standard - Configuration should suit your needs. Choosing the - Standard Configuration option causes the - MySQL Configuration Wizard to automatically set all + single-user developer machine, the Standard + Configuration should suit your needs. Choosing + the Standard Configuration option + causes the MySQL Configuration Wizard to automatically set all configuration options with the exception of the Service Options and Security Options. @@ -3591,9 +3602,9 @@ There are three different server types available to choose - from, and the server type you choose affects the decisions the - MySQL Configuration Wizard makes with regards to memory, disk, - and processor usage. + from. The server type that you choose affects the decisions + that the MySQL Configuration Wizard makes with regard to + memory, disk, and processor usage. @@ -3613,7 +3624,7 @@ Server Machine: Choose this option for a server machine where the MySQL server is running alongside other server applications such as FTP, - email, and web servers. The MySQL server is configured to + email, and Web servers. The MySQL server is configured to use a medium portion of the system resources. @@ -3642,11 +3653,11 @@ The Database Usage dialog allows you to - indicate the storage engines you expect to use when creating - MySQL tables. The option you choose determines whether the - InnoDB storage is available and what - percentage of the server resources are available to - InnoDB. + indicate the storage engines that you expect to use when + creating MySQL tables. The option you choose determines + whether the InnoDB storage engine is + available and what percentage of the server resources are + available to InnoDB. @@ -3734,9 +3745,9 @@ &title-mysql-config-wizard-connections; - It is important to set a limit to the number of concurrent - connections to the MySQL server that can be established to - prevent the server from running out of resources. The + 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 Concurrent Connections dialog allows you to choose the expected usage of your server, and sets the limit for concurrent connections accordingly. It is also possible to @@ -3809,12 +3820,12 @@ Set the Server SQL Mode to either enable or - disable strict mode. Enabling strict mode (default) will make + disable strict mode. Enabling strict mode (default) makes MySQL behave more like other database management systems. - If you run applications that rely on - MySQL's old forgiving behavior make sure to - either adapt those applications or to disable strict - mode. For more information about strict mode, see + If you run applications that rely on MySQL's old + forgiving behavior, make sure to either adapt + those applications or to disable strict mode. For + more information about strict mode, see . @@ -3841,9 +3852,9 @@ Standard Character Set: Choose - this option if you want to use Latin1 + this option if you want to use latin1 as the default server character set. - Latin1 is used for English and many + latin1 is used for English and many Western European languages. @@ -3853,9 +3864,8 @@ Best Support For Multilingualism: Choose this option if you want to use utf8 as the default server - character set. utf8 can store - characters from many different languages in a single - character set. + character set. This is a Unicode character set that can + store characters from many different languages. @@ -3883,10 +3893,10 @@ On Windows NT-based platforms, the MySQL server can be - installed as a service. When installed as a service, the MySQL - server can be started automatically during system startup, and - even restarted automatically by Windows in the event of a - service failure. + installed as a Windows service. When installed this way, the + MySQL server can be started automatically during system + startup, and even restarted automatically by Windows in the + event of a service failure. @@ -3922,17 +3932,17 @@ root password for your MySQL server, and the MySQL Configuration Wizard requires by default that you do so. If you do not wish to set a - root password, un-check thebox next to the + root password, uncheck the box next to the Modify Security Settings option. - To set the root password, type the desired + To set the root password, enter the desired password into both the New root password and Confirm - boxes. If you are re-configuring an existing server, you also - need to enter the existing root password - into the Current root password box. + boxes. If you are reconfiguring an existing server, you need + to enter the existing root password into + the Current root password box. @@ -3994,7 +4004,7 @@ If you chose to create a service for the MySQL server the MySQL Configuration Wizard creates and starts the service. If - you are re-configuring an existing service, the MySQL + you are reconfiguring an existing service, the MySQL Configuration Wizard restarts the service to apply your configuration changes. @@ -4042,15 +4052,16 @@ my.ini file, an argument similar to this is passed to the MySQL server as part of the service installation: , - where C:\Program Files\MySQL\MySQL Server + Files\MySQL\MySQL Server 4.1\my.ini". + Here, C:\Program Files\MySQL\MySQL Server 4.1 is replaced with the installation path to the MySQL Server. - The instructs the MySQL - server to read the specified file for configuration options. + The option instructs the + MySQL server to read the specified file for configuration + options when it starts. @@ -4073,12 +4084,14 @@ MySQL clients and utilities such as the - mysql command-line client and - mysqldump are not able to locate the + mysql and mysqldump + command-line clients are not able to locate the my.ini file located in the server installation directory. To configure the client and utility applications, create a new my.ini file in - the c:\Windows directory. + the C:\WINDOWS or + C:\WINNT directory (whichever is + applicable to your Windows version). @@ -4177,9 +4190,9 @@ - Choose an installation location. Traditionally the MySQL - server is installed at C:\mysql, and - the new MySQL Installation Wizard installs MySQL to + Choose an installation location. Traditionally, the MySQL + server has been installed at C:\mysql. + The MySQL Installation Wizard installs MySQL under C:\Program Files\MySQL. If you do not install MySQL in C:\mysql, you must specify the path to the install directory during startup or @@ -4273,9 +4286,10 @@ your MySQL distribution. Look in your installation directory for files such as my-small.cnf, my-medium.cnf, - my-large.cnf, and so on, which you can - rename and copy to the appropriate location for use as a base - configuration file. + my-large.cnf, and + my-huge.cnf, which you can rename and copy + to the appropriate location for use as a base configuration + file. @@ -4316,7 +4330,7 @@ would like to use a data directory in a different location, you should copy the entire contents of the data directory to the new location. For example, by default, the - installer places MySQL in C:\mysql and the + installer places MySQL in C:\mysql, and the data directory in C:\mysql\data. If you want to use E:\mydata as the data directory, you must do two things: @@ -4555,8 +4569,8 @@ Note: Most of the examples in - reference manual use mysqld as the server - name. If you choose to use a different server, such as + this manual use mysqld as the server name. If + you choose to use a different server, such as mysqld-nt, make the appropriate substitutions in the commands that are shown in the examples. Modified: trunk/refman-5.0/installing.xml =================================================================== --- trunk/refman-5.0/installing.xml 2006-01-30 20:35:42 UTC (rev 1135) +++ trunk/refman-5.0/installing.xml 2006-01-30 20:36:24 UTC (rev 1136) @@ -3233,17 +3233,17 @@ - After installation is complete, you are given the option of + After installation is complete, you have the option of registering with the MySQL web site. Registration gives you access to post in the MySQL forums at forums.mysql.com, along with the ability to report bugs at bugs.mysql.com and - to subscribe to the newsletter. The final screen of the + to subscribe to our newsletter. The final screen of the installer provides a summary of the installation and gives you the option to launch the MySQL Configuration Wizard, which you can use to create a configuration file, install the MySQL - service, and configure security. + service, and configure security settings. @@ -3293,9 +3293,9 @@ the installed location of the MySQL server, preventing a complete scan of the hard-disk to determine the installation path of the MySQL server. The registry keys are not required - to run the server and when using the - noinstall Zip archive the registry keys are - not created. + to run the server, and if you install MySQL using the + noinstall Zip archive, the registry keys + are not created. @@ -3329,7 +3329,7 @@ is a shortcut to the mysql command-line client and is configured to connect as the root user. The shortcut prompts for a - root user password when connecting. + root user password when you connect. @@ -3338,7 +3338,7 @@ MySQL Server Instance Config Wizard: This is a shortcut to the MySQL Configuration Wizard. Use this shortcut to configure a - newly installed server, or to re-configure an existing + newly installed server, or to reconfigure an existing server. @@ -3375,9 +3375,9 @@ Program Files is the default location for applications in your system, and ¤t-series; is the major - version of your MySQL server. This is the new recommended - location for the MySQL server, replacing the previous default - location c:\mysql. + version of your MySQL server. This is the recommended location + for the MySQL server, replacing the former default location + C:\mysql. @@ -3386,7 +3386,7 @@ Files\MySQL, where Program Files is the default location for applications in your Windows installation. A - typical MySQL installation on a developer machine may look + typical MySQL installation on a developer machine might look like this: @@ -3498,9 +3498,10 @@ - In addition, you can navigate to the bin - directory of your MySQL installation and launch the - MySQLInstanceConfig.exe file directly. + Alternatively, you can navigate to the + bin directory of your MySQL installation + and launch the MySQLInstanceConfig.exe + file directly. @@ -3516,7 +3517,7 @@ If the MySQL Configuration Wizard detects an existing my.ini file, you have the option of - either re-configuring your existing server, or removing the + either reconfiguring your existing server, or removing the server instance by deleting the my.ini file and stopping and removing the MySQL service. @@ -3528,16 +3529,16 @@ my.ini file is renamed to mytimestamp.ini.bak, where timestamp is the date and - time the existing my.ini file was - created. To remove the existing server instance, choose the - Remove Instance option and click - the Next button. + time at which the existing my.ini file + was created. To remove the existing server instance, choose + the Remove Instance option and + click the Next button. If you choose the Remove Instance option, you advance to a confirmation window. Click the - Execute button: the MySQL Configuration + Execute button. The MySQL Configuration Wizard stops and removes the MySQL service, and then deletes the my.ini file. The server installation and its data folder are not removed. @@ -3547,7 +3548,7 @@ If you choose the Re-configure Instance option, you advance to the Configuration Type dialog where you can - choose the type of installation you wish to configure. + choose the type of installation that you wish to configure. @@ -3574,8 +3575,8 @@ Standard Configuration. The Standard Configuration option is intended for new users who want to get started with MySQL - quickly without having to make many decisions in regards to - server configuration. The Detailed + quickly without having to make many decisions about server + configuration. The Detailed Configuration option is intended for advanced users who want more fine-grained control over server configuration. @@ -3583,7 +3584,7 @@ If you are new to MySQL and need a server configured as a - single-user developer machine the Standard + single-user developer machine, the Standard Configuration should suit your needs. Choosing the Standard Configuration option causes the MySQL Configuration Wizard to set all configuration @@ -3626,9 +3627,9 @@ There are three different server types available to choose - from, and the server type you choose affects the decisions the - MySQL Configuration Wizard makes with regards to memory, disk, - and processor usage. + from. The server type that you choose affects the decisions + that the MySQL Configuration Wizard makes with regard to + memory, disk, and processor usage. @@ -3648,7 +3649,7 @@ Server Machine: Choose this option for a server machine where the MySQL server is running alongside other server applications such as FTP, - email, and web servers. The MySQL server is configured to + email, and Web servers. The MySQL server is configured to use a moderate portion of the system resources. @@ -3677,11 +3678,11 @@ The Database Usage dialog allows you to - indicate the table handlers you expect to use when creating - MySQL tables. The option you choose determines whether the - InnoDB storage engine is available and what - percentage of the server resources are available to - InnoDB. + indicate the storage engines that you expect to use when + creating MySQL tables. The option you choose determines + whether the InnoDB storage engine is + available and what percentage of the server resources are + available to InnoDB. @@ -3769,9 +3770,9 @@ &title-mysql-config-wizard-connections; - It is important to set a limit to the number of concurrent - connections to the MySQL server that can be established to - prevent the server from running out of resources. The + 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 Concurrent Connections dialog allows you to choose the expected usage of your server, and sets the limit for concurrent connections accordingly. It is also possible to @@ -3844,12 +3845,12 @@ Set the Server SQL Mode to either enable or - disable strict mode. Enabling strict mode (default) will make + disable strict mode. Enabling strict mode (default) makes MySQL behave more like other database management systems. - If you run applications that rely on - MySQL's old forgiving behavior make sure to - either adapt those applications or to disable strict - mode. For more information about strict mode, see + If you run applications that rely on MySQL's old + forgiving behavior, make sure to either adapt + those applications or to disable strict mode. For + more information about strict mode, see . @@ -3876,9 +3877,9 @@ Standard Character Set: Choose - this option if you want to use Latin1 + this option if you want to use latin1 as the default server character set. - Latin1 is used for English and many + latin1 is used for English and many Western European languages. @@ -3888,9 +3889,8 @@ Best Support For Multilingualism: Choose this option if you want to use utf8 as the default server - character set. utf8 can store - characters from many different languages in a single - character set. + character set. This is a Unicode character set that can + store characters from many different languages. @@ -3918,10 +3918,10 @@ On Windows NT-based platforms, the MySQL server can be - installed as a service. When installed as a service, the MySQL - server can be started automatically during system startup, and - even restarted automatically by Windows in the event of a - service failure. + installed as a Windows service. When installed this way, the + MySQL server can be started automatically during system + startup, and even restarted automatically by Windows in the + event of a service failure. @@ -3953,22 +3953,21 @@ &title-mysql-config-wizard-security; - It is strongly recommended that you set a - root password for your MySQL server, and - the MySQL Configuration Wizard requires you set a - root password by default. If you do not - wish to set a root password, uncheck the - box next to the Modify Security - Settings option. + It is strongly recommended that you set a + root password for your MySQL + server, and the MySQL Configuration Wizard requires + by default that you do so. If you do not wish to set a + root password, uncheck the box next to the + Modify Security Settings option. To set the root password, enter the desired password into both the New root password and Confirm - boxes. If you are reconfiguring an existing server, you also - need to enter the existing root password - into the Current root password box. + boxes. If you are reconfiguring an existing server, you need + to enter the existing root password into + the Current root password box. @@ -4000,7 +3999,7 @@ The final dialog in the MySQL Configuration Wizard is the Confirmation Dialog. To start the configuration process, click the - Execute. To return to a previous + Execute button. To return to a previous dialog, click the Back button. To exit the MySQL Configuration Wizard without configuring the server, click the Cancel button. @@ -4030,7 +4029,7 @@ If you chose to create a service for the MySQL server the MySQL Configuration Wizard creates and starts the service. If - you are re-configuring an existing service, the MySQL + you are reconfiguring an existing service, the MySQL Configuration Wizard restarts the service to apply your configuration changes. @@ -4072,15 +4071,16 @@ is passed to the MySQL server as part of the service installation: , where + ¤t-series;\my.ini". Here, C:\Program Files\MySQL\MySQL Server ¤t-series; is replaced with the installation path to the MySQL Server. - The instructs the MySQL - server to read the specified file for configuration options. + The option instructs the + MySQL server to read the specified file for configuration + options when it starts. @@ -4103,14 +4103,14 @@ MySQL clients and utilities such as the - mysql command-line client and - mysqldump are not able to locate the + mysql and mysqldump + command-line clients are not able to locate the my.ini file located in the server installation directory. To configure the client and utility applications, create a new my.ini file in the C:\WINDOWS or - C:\WINNT directory as is applicable to - your Windows version. + C:\WINNT directory (whichever is + applicable to your Windows version). @@ -4201,9 +4201,9 @@ - Choose an installation location. Traditionally the MySQL - server is installed in C:\mysql, and - the MySQL Installation Wizard installs MySQL to + Choose an installation location. Traditionally, the MySQL + server is installed in C:\mysql. The + MySQL Installation Wizard installs MySQL under C:\Program Files\MySQL. If you do not install MySQL at C:\mysql, you must specify the path to the install directory during startup or @@ -4215,7 +4215,7 @@ Extract the install archive to the chosen installation - location using your preferred zip archive tool. Some tools + 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 contents of the subfolder into the chosen installation @@ -4293,7 +4293,8 @@ You can also make use of the example option files included with your MySQL distribution. Look in your install directory for files such as my-small.cnf, - my-medium.cnf, my-large.cnf, and + my-medium.cnf, + my-large.cnf, and my-huge.cnf, which you can rename and copy to the appropriate location for use as a base configuration file. @@ -4338,7 +4339,7 @@ should copy the entire contents of the data directory to the new location. For example, if MySQL is installed in C:\Program Files\MySQL\MySQL Server - ¤t-series; the data directory is by default in + ¤t-series;, the data directory is by default in C:\Program Files\MySQL\MySQL Server ¤t-series;\data. If you want to use E:\mydata as the data directory instead, @@ -4372,8 +4373,8 @@ &title-windows-select-server; - The following table shows the available MySQL ¤t-series; - servers for Windows: + The following table shows the available servers for Windows in + MySQL ¤t-series;: @@ -4490,8 +4491,8 @@ Note: Most of the examples in - reference manual use mysqld as the server - name. If you choose to use a different server, such as + this manual use mysqld as the server name. If + you choose to use a different server, such as mysqld-nt, make the appropriate substitutions in the commands that are shown in the examples. Modified: trunk/refman-5.1/custom-engine.xml =================================================================== --- trunk/refman-5.1/custom-engine.xml 2006-01-30 20:35:42 UTC (rev 1135) +++ trunk/refman-5.1/custom-engine.xml 2006-01-30 20:36:24 UTC (rev 1136) @@ -727,7 +727,7 @@ Storage engines are required to provide the MySQL server with a - list of extensions used by the storage engine with regards to a + list of extensions used by the storage engine with regard to a given table, its data and indexes. Modified: trunk/refman-5.1/installing.xml =================================================================== --- trunk/refman-5.1/installing.xml 2006-01-30 20:35:42 UTC (rev 1135) +++ trunk/refman-5.1/installing.xml 2006-01-30 20:36:24 UTC (rev 1136) @@ -3233,17 +3233,17 @@ - After installation is complete, you are given the option of + After installation is complete, you have the option of registering with the MySQL web site. Registration gives you access to post in the MySQL forums at forums.mysql.com, along with the ability to report bugs at bugs.mysql.com and - to subscribe to the newsletter. The final screen of the + to subscribe to our newsletter. The final screen of the installer provides a summary of the installation and gives you the option to launch the MySQL Configuration Wizard, which you can use to create a configuration file, install the MySQL - service, and configure security. + service, and configure security settings. @@ -3293,9 +3293,9 @@ the installed location of the MySQL server, preventing a complete scan of the hard-disk to determine the installation path of the MySQL server. The registry keys are not required - to run the server and when using the - noinstall Zip archive the registry keys are - not created. + to run the server, and if you install MySQL using the + noinstall Zip archive, the registry keys + are not created. @@ -3329,7 +3329,7 @@ is a shortcut to the mysql command-line client and is configured to connect as the root user. The shortcut prompts for a - root user password when connecting. + root user password when you connect. @@ -3338,7 +3338,7 @@ MySQL Server Instance Config Wizard: This is a shortcut to the MySQL Configuration Wizard. Use this shortcut to configure a - newly installed server, or to re-configure an existing + newly installed server, or to reconfigure an existing server. @@ -3375,9 +3375,9 @@ Program Files is the default location for applications in your system, and ¤t-series; is the major - version of your MySQL server. This is the new recommended - location for the MySQL server, replacing the previous default - location c:\mysql. + version of your MySQL server. This is the recommended location + for the MySQL server, replacing the former default location + C:\mysql. @@ -3386,7 +3386,7 @@ Files\MySQL, where Program Files is the default location for applications in your Windows installation. A - typical MySQL installation on a developer machine may look + typical MySQL installation on a developer machine might look like this: @@ -3498,9 +3498,10 @@ - In addition, you can navigate to the bin - directory of your MySQL installation and launch the - MySQLInstanceConfig.exe file directly. + Alternatively, you can navigate to the + bin directory of your MySQL installation + and launch the MySQLInstanceConfig.exe + file directly. @@ -3516,7 +3517,7 @@ If the MySQL Configuration Wizard detects an existing my.ini file, you have the option of - either re-configuring your existing server, or removing the + either reconfiguring your existing server, or removing the server instance by deleting the my.ini file and stopping and removing the MySQL service. @@ -3528,16 +3529,16 @@ my.ini file is renamed to mytimestamp.ini.bak, where timestamp is the date and - time the existing my.ini file was - created. To remove the existing server instance, choose the - Remove Instance option and click - the Next button. + time at which the existing my.ini file + was created. To remove the existing server instance, choose + the Remove Instance option and + click the Next button. If you choose the Remove Instance option, you advance to a confirmation window. Click the - Execute button: the MySQL Configuration + Execute button. The MySQL Configuration Wizard stops and removes the MySQL service, and then deletes the my.ini file. The server installation and its data folder are not removed. @@ -3547,7 +3548,7 @@ If you choose the Re-configure Instance option, you advance to the Configuration Type dialog where you can - choose the type of installation you wish to configure. + choose the type of installation that you wish to configure. @@ -3574,8 +3575,8 @@ Standard Configuration. The Standard Configuration option is intended for new users who want to get started with MySQL - quickly without having to make many decisions in regards to - server configuration. The Detailed + quickly without having to make many decisions about server + configuration. The Detailed Configuration option is intended for advanced users who want more fine-grained control over server configuration. @@ -3583,7 +3584,7 @@ If you are new to MySQL and need a server configured as a - single-user developer machine the Standard + single-user developer machine, the Standard Configuration should suit your needs. Choosing the Standard Configuration option causes the MySQL Configuration Wizard to set all configuration @@ -3626,9 +3627,9 @@ There are three different server types available to choose - from, and the server type you choose affects the decisions the - MySQL Configuration Wizard makes with regards to memory, disk, - and processor usage. + from. The server type that you choose affects the decisions + that the MySQL Configuration Wizard makes with regard to + memory, disk, and processor usage. @@ -3648,7 +3649,7 @@ Server Machine: Choose this option for a server machine where the MySQL server is running alongside other server applications such as FTP, - email, and web servers. The MySQL server is configured to + email, and Web servers. The MySQL server is configured to use a moderate portion of the system resources. @@ -3677,11 +3678,11 @@ The Database Usage dialog allows you to - indicate the table handlers you expect to use when creating - MySQL tables. The option you choose determines whether the - InnoDB storage engine is available and what - percentage of the server resources are available to - InnoDB. + indicate the storage engines that you expect to use when + creating MySQL tables. The option you choose determines + whether the InnoDB storage engine is + available and what percentage of the server resources are + available to InnoDB. @@ -3769,9 +3770,9 @@ &title-mysql-config-wizard-connections; - It is important to set a limit to the number of concurrent - connections to the MySQL server that can be established to - prevent the server from running out of resources. The + 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 Concurrent Connections dialog allows you to choose the expected usage of your server, and sets the limit for concurrent connections accordingly. It is also possible to @@ -3844,12 +3845,12 @@ Set the Server SQL Mode to either enable or - disable strict mode. Enabling strict mode (default) will make + disable strict mode. Enabling strict mode (default) makes MySQL behave more like other database management systems. - If you run applications that rely on - MySQL's old forgiving behavior make sure to - either adapt those applications or to disable strict - mode. For more information about strict mode, see + If you run applications that rely on MySQL's old + forgiving behavior, make sure to either adapt + those applications or to disable strict mode. For + more information about strict mode, see . @@ -3876,9 +3877,9 @@ Standard Character Set: Choose - this option if you want to use Latin1 + this option if you want to use latin1 as the default server character set. - Latin1 is used for English and many + latin1 is used for English and many Western European languages. @@ -3888,9 +3889,8 @@ Best Support For Multilingualism: Choose this option if you want to use utf8 as the default server - character set. utf8 can store - characters from many different languages in a single - character set. + character set. This is a Unicode character set that can + store characters from many different languages. @@ -3918,10 +3918,10 @@ On Windows NT-based platforms, the MySQL server can be - installed as a service. When installed as a service, the MySQL - server can be started automatically during system startup, and - even restarted automatically by Windows in the event of a - service failure. + installed as a Windows service. When installed this way, the + MySQL server can be started automatically during system + startup, and even restarted automatically by Windows in the + event of a service failure. @@ -3953,22 +3953,21 @@ &title-mysql-config-wizard-security; - It is strongly recommended that you set a - root password for your MySQL server, and - the MySQL Configuration Wizard requires you set a - root password by default. If you do not - wish to set a root password, uncheck the - box next to the Modify Security - Settings option. + It is strongly recommended that you set a + root password for your MySQL + server, and the MySQL Configuration Wizard requires + by default that you do so. If you do not wish to set a + root password, uncheck the box next to the + Modify Security Settings option. To set the root password, enter the desired password into both the New root password and Confirm - boxes. If you are reconfiguring an existing server, you also - need to enter the existing root password - into the Current root password box. + boxes. If you are reconfiguring an existing server, you need + to enter the existing root password into + the Current root password box. @@ -4000,7 +3999,7 @@ The final dialog in the MySQL Configuration Wizard is the Confirmation Dialog. To start the configuration process, click the - Execute. To return to a previous + Execute button. To return to a previous dialog, click the Back button. To exit the MySQL Configuration Wizard without configuring the server, click the Cancel button. @@ -4030,7 +4029,7 @@ If you chose to create a service for the MySQL server the MySQL Configuration Wizard creates and starts the service. If - you are re-configuring an existing service, the MySQL + you are reconfiguring an existing service, the MySQL Configuration Wizard restarts the service to apply your configuration changes. @@ -4072,15 +4071,16 @@ is passed to the MySQL server as part of the service installation: , where + ¤t-series;\my.ini". Here, C:\Program Files\MySQL\MySQL Server ¤t-series; is replaced with the installation path to the MySQL Server. - The instructs the MySQL - server to read the specified file for configuration options. + The option instructs the + MySQL server to read the specified file for configuration + options when it starts. @@ -4103,14 +4103,14 @@ MySQL clients and utilities such as the - mysql command-line client and - mysqldump are not able to locate the + mysql and mysqldump + command-line clients are not able to locate the my.ini file located in the server installation directory. To configure the client and utility applications, create a new my.ini file in the C:\WINDOWS or - C:\WINNT directory as is applicable to - your Windows version. + C:\WINNT directory (whichever is + applicable to your Windows version). @@ -4201,9 +4201,9 @@ - Choose an installation location. Traditionally the MySQL - server is installed in C:\mysql, and - the MySQL Installation Wizard installs MySQL to + Choose an installation location. Traditionally, the MySQL + server is installed in C:\mysql. The + MySQL Installation Wizard installs MySQL under C:\Program Files\MySQL. If you do not install MySQL at C:\mysql, you must specify the path to the install directory during startup or @@ -4215,7 +4215,7 @@ Extract the install archive to the chosen installation - location using your preferred zip archive tool. Some tools + 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 contents of the subfolder into the chosen installation @@ -4293,7 +4293,8 @@ You can also make use of the example option files included with your MySQL distribution. Look in your install directory for files such as my-small.cnf, - my-medium.cnf, my-large.cnf, and + my-medium.cnf, + my-large.cnf, and my-huge.cnf, which you can rename and copy to the appropriate location for use as a base configuration file. @@ -4338,7 +4339,7 @@ should copy the entire contents of the data directory to the new location. For example, if MySQL is installed in C:\Program Files\MySQL\MySQL Server - ¤t-series; the data directory is by default in + ¤t-series;, the data directory is by default in C:\Program Files\MySQL\MySQL Server ¤t-series;\data. If you want to use E:\mydata as the data directory instead, @@ -4372,8 +4373,8 @@ &title-windows-select-server; - The following table shows the available MySQL ¤t-series; - servers for Windows: + The following table shows the available servers for Windows in + MySQL ¤t-series;: @@ -4490,8 +4491,8 @@ Note: Most of the examples in - reference manual use mysqld as the server - name. If you choose to use a different server, such as + this manual use mysqld as the server name. If + you choose to use a different server, such as mysqld-nt, make the appropriate substitutions in the commands that are shown in the examples. Modified: trunk/refman-common/titles.en.ent =================================================================== --- trunk/refman-common/titles.en.ent 2006-01-30 20:35:42 UTC (rev 1135) +++ trunk/refman-common/titles.en.ent 2006-01-30 20:36:24 UTC (rev 1136) @@ -905,7 +905,7 @@ - + mysql_kill()"> mysql_library_end()">