Author: paul
Date: 2007-11-21 18:23:42 +0100 (Wed, 21 Nov 2007)
New Revision: 8817
Log:
r27247@frost: paul | 2007-11-21 11:13:07 -0600
Remove some inapplicable version notes from 4.1 manual.
Simplify some wording.
Modified:
trunk/refman-4.1/installing.xml
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.1/installing.xml
trunk/refman-6.0/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33071
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27235
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22282
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33071
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27247
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22282
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2007-11-21 17:14:24 UTC (rev 8816)
+++ trunk/refman-4.1/installing.xml 2007-11-21 17:23:42 UTC (rev 8817)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 22; 1820 bytes
@@ -4749,31 +4749,15 @@
</para>
<para>
- It is possible to use a single option other than
- <option>--defaults-file</option>, but this is discouraged.
- <option>--defaults-file</option> is more flexible because it
- enables you to specify multiple startup options for the
- server by placing them in the named option file. Also, in
- MySQL 5.0, use of an option different from
- <option>--defaults-file</option> is not supported until
- 5.0.3.
+ The use of a single option other than
+ <option>--defaults-file</option> is possible but
+ discouraged. <option>--defaults-file</option> is more
+ flexible because it enables you to specify multiple startup
+ options for the server by placing them in the named option
+ file.
</para>
</listitem>
- <listitem>
- <para>
- As of MySQL 5.0.1, you can also specify a
- <option>--local-service</option> option following the
- service name. This causes the server to run using the
- <literal>LocalService</literal> Windows account that has
- limited system privileges. This account is available only
- for Windows XP or newer. If both
- <option>--defaults-file</option> and
- <option>--local-service</option> are given following the
- service name, they can be in any order.
- </para>
- </listitem>
-
</itemizedlist>
<para>
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2007-11-21 17:14:24 UTC (rev 8816)
+++ trunk/refman-5.0/installing-cs.xml 2007-11-21 17:23:42 UTC (rev 8817)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 22; 3055 bytes
@@ -4629,7 +4629,8 @@
</para>
<programlisting>
-C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin" -u root shutdown</userinput>
+C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin"</userinput>
+ <userinput>-u root shutdown</userinput>
</programlisting>
<note>
@@ -4764,14 +4765,14 @@
</para>
<para>
- It is possible to use a single option other than
- <option>--defaults-file</option>, but this is discouraged.
- <option>--defaults-file</option> is more flexible because it
- enables you to specify multiple startup options for the
- server by placing them in the named option file. Also, in
- MySQL ¤t-series;, use of an option different from
- <option>--defaults-file</option> is not supported until
- 5.0.3.
+ The use of a single option other than
+ <option>--defaults-file</option> is possible but
+ discouraged. <option>--defaults-file</option> is more
+ flexible because it enables you to specify multiple startup
+ options for the server by placing them in the named option
+ file. Also, in MySQL ¤t-series;, use of an option
+ different from <option>--defaults-file</option> is not
+ supported until 5.0.3.
</para>
</listitem>
@@ -4815,20 +4816,14 @@
If the service-installation command specifies a service name
other than <literal>MySQL</literal> following the
<option>--install</option> option, the server uses that
- service name. It reads options from the group that has the
- same name as the service, and reads options from the
- standard option files.
+ service name. It reads options from the
+ <literal>[mysqld]</literal> group and the group that has the
+ same name as the service in the standard option files. This
+ allows you to use the <literal>[mysqld]</literal> group for
+ options that should be used by all MySQL services, and an
+ option group with the service name for use by the server
+ installed with that service name.
</para>
-
- <para>
- The server also reads options from the
- <literal>[mysqld]</literal> group from the standard option
- files. This allows you to use the
- <literal>[mysqld]</literal> group for options that should be
- used by all MySQL services, and an option group with the
- same name as a service for use by the server installed with
- that service name.
- </para>
</listitem>
<listitem>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2007-11-21 17:14:24 UTC (rev 8816)
+++ trunk/refman-5.1/installing.xml 2007-11-21 17:23:42 UTC (rev 8817)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 19; 2730 bytes
@@ -4559,7 +4559,8 @@
</para>
<programlisting>
-C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin" -u root shutdown</userinput>
+C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin"</userinput>
+ <userinput>-u root shutdown</userinput>
</programlisting>
<note>
@@ -4694,11 +4695,12 @@
</para>
<para>
- It is possible to use a single option other than
- <option>--defaults-file</option>, but this is discouraged.
- <option>--defaults-file</option> is more flexible because it
- enables you to specify multiple startup options for the
- server by placing them in the named option file.
+ The use of a single option other than
+ <option>--defaults-file</option> is possible but
+ discouraged. <option>--defaults-file</option> is more
+ flexible because it enables you to specify multiple startup
+ options for the server by placing them in the named option
+ file.
</para>
</listitem>
@@ -4741,20 +4743,14 @@
If the service-installation command specifies a service name
other than <literal>MySQL</literal> following the
<option>--install</option> option, the server uses that
- service name. It reads options from the group that has the
- same name as the service, and reads options from the
- standard option files.
+ service name. It reads options from the
+ <literal>[mysqld]</literal> group and the group that has the
+ same name as the service in the standard option files. This
+ allows you to use the <literal>[mysqld]</literal> group for
+ options that should be used by all MySQL services, and an
+ option group with the service name for use by the server
+ installed with that service name.
</para>
-
- <para>
- The server also reads options from the
- <literal>[mysqld]</literal> group from the standard option
- files. This allows you to use the
- <literal>[mysqld]</literal> group for options that should be
- used by all MySQL services, and an option group with the
- same name as a service for use by the server installed with
- that service name.
- </para>
</listitem>
<listitem>
Modified: trunk/refman-6.0/installing.xml
===================================================================
--- trunk/refman-6.0/installing.xml 2007-11-21 17:14:24 UTC (rev 8816)
+++ trunk/refman-6.0/installing.xml 2007-11-21 17:23:42 UTC (rev 8817)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 19; 2730 bytes
@@ -4507,7 +4507,8 @@
</para>
<programlisting>
-C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin" -u root shutdown</userinput>
+C:\> <userinput>"C:\Program Files\MySQL\MySQL Server ¤t-series;\bin\mysqladmin"</userinput>
+ <userinput>-u root shutdown</userinput>
</programlisting>
<note>
@@ -4642,11 +4643,12 @@
</para>
<para>
- It is possible to use a single option other than
- <option>--defaults-file</option>, but this is discouraged.
- <option>--defaults-file</option> is more flexible because it
- enables you to specify multiple startup options for the
- server by placing them in the named option file.
+ The use of a single option other than
+ <option>--defaults-file</option> is possible but
+ discouraged. <option>--defaults-file</option> is more
+ flexible because it enables you to specify multiple startup
+ options for the server by placing them in the named option
+ file.
</para>
</listitem>
@@ -4689,20 +4691,14 @@
If the service-installation command specifies a service name
other than <literal>MySQL</literal> following the
<option>--install</option> option, the server uses that
- service name. It reads options from the group that has the
- same name as the service, and reads options from the
- standard option files.
+ service name. It reads options from the
+ <literal>[mysqld]</literal> group and the group that has the
+ same name as the service in the standard option files. This
+ allows you to use the <literal>[mysqld]</literal> group for
+ options that should be used by all MySQL services, and an
+ option group with the service name for use by the server
+ installed with that service name.
</para>
-
- <para>
- The server also reads options from the
- <literal>[mysqld]</literal> group from the standard option
- files. This allows you to use the
- <literal>[mysqld]</literal> group for options that should be
- used by all MySQL services, and an option group with the
- same name as a service for use by the server installed with
- that service name.
- </para>
</listitem>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8817 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 21 Nov |
