Author: mcbrown
Date: 2008-12-11 18:46:57 +0100 (Thu, 11 Dec 2008)
New Revision: 12916
Log:
Updating dependencies
Modified:
trunk/refman-5.0/Makefile.depends
trunk/refman-5.0/installing-core.xml
trunk/refman-5.0/programs-using.xml
trunk/refman-5.0/se-innodb-core.xml
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2008-12-11 17:33:31 UTC (rev 12915)
+++ trunk/refman-5.0/Makefile.depends 2008-12-11 17:46:57 UTC (rev 12916)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 0; 1558 bytes
@@ -878,6 +878,9 @@
../dynamic-docs/reserved-words/mysql-5.0.66a \
../dynamic-docs/reserved-words/mysql-5.0.67 \
../dynamic-docs/reserved-words/mysql-5.0.68 \
+ ../dynamic-docs/reserved-words/mysql-5.0.70 \
+ ../dynamic-docs/reserved-words/mysql-5.0.72 \
+ ../dynamic-docs/reserved-words/mysql-5.0.74 \
../dynamic-docs/reserved-words/mysql-5.0.9-beta \
../refman-common/urls.ent \
all-entities.ent \
@@ -1759,6 +1762,9 @@
../dynamic-docs/reserved-words/mysql-5.0.66a \
../dynamic-docs/reserved-words/mysql-5.0.67 \
../dynamic-docs/reserved-words/mysql-5.0.68 \
+ ../dynamic-docs/reserved-words/mysql-5.0.70 \
+ ../dynamic-docs/reserved-words/mysql-5.0.72 \
+ ../dynamic-docs/reserved-words/mysql-5.0.74 \
../dynamic-docs/reserved-words/mysql-5.0.9-beta \
../mysql-monitor-2.0/../common/fixedchars.ent \
../mysql-monitor-2.0/../common/phrases.ent \
@@ -2434,6 +2440,9 @@
../dynamic-docs/reserved-words/mysql-5.0.66a \
../dynamic-docs/reserved-words/mysql-5.0.67 \
../dynamic-docs/reserved-words/mysql-5.0.68 \
+ ../dynamic-docs/reserved-words/mysql-5.0.70 \
+ ../dynamic-docs/reserved-words/mysql-5.0.72 \
+ ../dynamic-docs/reserved-words/mysql-5.0.74 \
../dynamic-docs/reserved-words/mysql-5.0.9-beta \
../mysql-monitor-2.0/../common/fixedchars.ent \
../mysql-monitor-2.0/../common/phrases.ent \
Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml 2008-12-11 17:33:31 UTC (rev 12915)
+++ trunk/refman-5.0/installing-core.xml 2008-12-11 17:46:57 UTC (rev 12916)
Changed blocks: 2, Lines Added: 64, Lines Deleted: 64; 7073 bytes
@@ -1604,7 +1604,8 @@
<para>
The MySQL Server Configuration Wizard is included with the MySQL
- ¤t-series; server. The MySQL Server Configuration Wizard is only available for Windows.
+ ¤t-series; server. The MySQL Server Configuration Wizard
+ is only available for Windows.
</para>
<section id="mysql-config-wizard-starting" role="cses">
@@ -1642,81 +1643,80 @@
</textobject>
</mediaobject>
- <para>
- You can launch the MySQL Configuration Wizard by clicking
- the <guimenuitem>MySQL Server Instance Config
- Wizard</guimenuitem> entry in the
- <guisubmenu>MySQL</guisubmenu> section of the Windows
- <guimenu>Start</guimenu> menu.
- </para>
+ <para>
+ You can launch the MySQL Configuration Wizard by clicking the
+ <guimenuitem>MySQL Server Instance Config Wizard</guimenuitem>
+ entry in the <guisubmenu>MySQL</guisubmenu> section of the
+ Windows <guimenu>Start</guimenu> menu.
+ </para>
- <para>
- Alternatively, you can navigate to the
- <filename>bin</filename> directory of your MySQL
- installation and launch the
- <filename>MySQLInstanceConfig.exe</filename> file directly.
- </para>
+ <para>
+ Alternatively, you can navigate to the
+ <filename>bin</filename> directory of your MySQL installation
+ and launch the <filename>MySQLInstanceConfig.exe</filename>
+ file directly.
+ </para>
- <para>
- The MySQL Server Configuration Wizard places the
- <filename>my.ini</filename> file in the installation
- directory for the MySQL server. This helps associate
- configuration files with particular server instances.
- </para>
+ <para>
+ The MySQL Server Configuration Wizard places the
+ <filename>my.ini</filename> file in the installation directory
+ for the MySQL server. This helps associate configuration files
+ with particular server instances.
+ </para>
- <para>
- 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:
- </para>
+ <para>
+ 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:
+ </para>
<programlisting>
--defaults-file="<replaceable>C:\Program Files\MySQL\MySQL Server ¤t-series;</replaceable>\my.ini"
</programlisting>
- <para>
- 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>
+ <para>
+ 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>
- <para>
- Apart from making changes to the <filename>my.ini</filename>
- file by running the MySQL Server Configuration Wizard again,
- you can modify it by opening it with a text editor and
- making any necessary changes. You can also modify the server
- configuration with the
- <ulink url="http://www.mysql.com/products/administrator/">MySQL
- Administrator</ulink> utility. For more information about
- server configuration, see <xref linkend="server-options"/>.
- </para>
+ <para>
+ Apart from making changes to the <filename>my.ini</filename>
+ file by running the MySQL Server Configuration Wizard again,
+ you can modify it by opening it with a text editor and making
+ any necessary changes. You can also modify the server
+ configuration with the
+ <ulink url="http://www.mysql.com/products/administrator/">MySQL
+ Administrator</ulink> utility. For more information about
+ server configuration, see <xref linkend="server-options"/>.
+ </para>
- <para>
- MySQL clients and utilities such as the
- <command>mysql</command> and <command>mysqldump</command>
- command-line clients are not able to locate the
- <filename>my.ini</filename> file located in the server
- installation directory. To configure the client and utility
- applications, create a new <filename>my.ini</filename> file
- in the Windows installation directory (for example,
- <filename>C:\WINDOWS</filename>).
- </para>
+ <para>
+ MySQL clients and utilities such as the
+ <command>mysql</command> and <command>mysqldump</command>
+ command-line clients are not able to locate the
+ <filename>my.ini</filename> file located in the server
+ installation directory. To configure the client and utility
+ applications, create a new <filename>my.ini</filename> file in
+ the Windows installation directory (for example,
+ <filename>C:\WINDOWS</filename>).
+ </para>
- <para>
- <remark role="update">
- [SH] Amend the list with Windows Vista once it's there
- </remark>
+ <para>
+ <remark role="update">
+ [SH] Amend the list with Windows Vista once it's there
+ </remark>
- Under Windows Server 2003, Windows Server 2000 and Windows
- XP, MySQL Server Configuration Wizard will configure MySQL
- to work as a Windows service. To start and stop MySQL you
- use the <filename>Services</filename> application that is
- supplied as part of the Windows Administrator Tools.
- </para>
+ Under Windows Server 2003, Windows Server 2000 and Windows XP,
+ MySQL Server Configuration Wizard will configure MySQL to work
+ as a Windows service. To start and stop MySQL you use the
+ <filename>Services</filename> application that is supplied as
+ part of the Windows Administrator Tools.
+ </para>
</section>
Modified: trunk/refman-5.0/programs-using.xml
===================================================================
--- trunk/refman-5.0/programs-using.xml 2008-12-11 17:33:31 UTC (rev 12915)
+++ trunk/refman-5.0/programs-using.xml 2008-12-11 17:46:57 UTC (rev 12916)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 595 bytes
@@ -1117,7 +1117,7 @@
English-language versions of Windows), when MySQL
¤t-series; has been installed using the installation and
configuration wizards. See
- <xref linkend="mysql-config-wizard-starting-windows"/>.
+ <xref linkend="mysql-config-wizard-starting"/>.
</para>
<para>
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2008-12-11 17:33:31 UTC (rev 12915)
+++ trunk/refman-5.0/se-innodb-core.xml 2008-12-11 17:46:57 UTC (rev 12916)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 573 bytes
@@ -500,7 +500,7 @@
configuration wizards, the option file will be the
<filename>my.ini</filename> file located in your MySQL
installation directory. See
- <xref linkend="mysql-config-wizard-starting-windows"/>.
+ <xref linkend="mysql-config-wizard-starting"/>.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12916 - trunk/refman-5.0 | martin.brown | 11 Dec |
