Author: paul
Date: 2006-01-21 21:33:22 +0100 (Sat, 21 Jan 2006)
New Revision: 976
Log:
r6534@frost: paul | 2006-01-21 14:16:11 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6533
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6534
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -37,15 +37,33 @@
<title>&title-client-utility-overview;</title>
+ <remark role="todo">
+ not listed here: mysqldumpslow
+ </remark>
+
<para>
The following list briefly describes the MySQL client programs and
utilities:
</para>
- <remark role="todo">
- not listed here: mysqldumpslow
- </remark>
+ <indexterm>
+ <primary>client programs</primary>
+ </indexterm>
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>client</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>utility programs</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>utility</secondary>
+ </indexterm>
+
<itemizedlist>
<listitem>
@@ -283,7 +301,7 @@
</itemizedlist>
<para>
- MySQL AB also provide a number of GUI tools for administering and
+ MySQL AB also provides a number of GUI tools for administering and
otherwise working with MySQL servers. For basic information about
these, see <xref linkend="using-mysql-programs"/>.
</para>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-4.1/database-administration.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -57,19 +57,23 @@
<title>&title-server-side-overview;</title>
<indexterm>
+ <primary>server-side programs</primary>
+ </indexterm>
+
+ <indexterm>
<primary>programs</primary>
- <secondary>list of</secondary>
+ <secondary>server side</secondary>
</indexterm>
<para>
- All MySQL programs take many different options. However, every
- MySQL program provides a <option>--help</option> option that you
- can use to get a description of the program's options. For
- example, try <command>mysqld --help</command>.
+ Each MySQL program takes many different options. Most programs
+ provide a <option>--help</option> option that you can use to get a
+ description of the program's different options. For example, try
+ <command>mysqld --help</command>.
</para>
<para>
- You can override default options for all standard programs by
+ You can override default option values for MySQL programs by
specifying options on the command line or in an option file.
<xref linkend="program-options"/>.
</para>
@@ -87,14 +91,14 @@
<primary><command>mysqld</command></primary>
</indexterm>
- <literal>mysqld</literal>
+ <command>mysqld</command>
</para>
<para>
The SQL daemon (that is, the MySQL server). To use client
- programs, this program must be running, because clients gain
- access to databases by connecting to the server. See
- <xref linkend="mysqld"/>.
+ programs, <command>mysqld</command> must be running, because
+ clients gain access to databases by connecting to the server.
+ See <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -104,7 +108,7 @@
<primary><command>mysqld-max</command></primary>
</indexterm>
- <literal>mysqld-max</literal>
+ <command>mysqld-max</command>
</para>
<para>
@@ -119,7 +123,7 @@
<primary><command>mysqld_safe</command></primary>
</indexterm>
- <literal>mysqld_safe</literal>
+ <command>mysqld_safe</command>
</para>
<para>
@@ -136,13 +140,13 @@
<primary><command>mysql.server</command></primary>
</indexterm>
- <literal>mysql.server</literal>
+ <command>mysql.server</command>
</para>
<para>
A server startup script. This script is used on systems that
- use run directories containing scripts that start system
- services for particular run levels. It invokes
+ use System V-style run directories containing scripts that
+ start system services for particular run levels. It invokes
<command>mysqld_safe</command> to start the MySQL server. See
<xref linkend="mysql-server"/>.
</para>
@@ -154,7 +158,7 @@
<primary><command>mysqld_multi</command></primary>
</indexterm>
- <literal>mysqld_multi</literal>
+ <command>mysqld_multi</command>
</para>
<para>
@@ -170,13 +174,13 @@
<primary><command>mysql_install_db</command></primary>
</indexterm>
- <literal>mysql_install_db</literal>
+ <command>mysql_install_db</command>
</para>
<para>
- This script creates the MySQL grant tables with default
- privileges. It is usually executed only once, when first
- installing MySQL on a system. See
+ This script creates the MySQL database and initializes the
+ grant tables with default privileges. It is usually executed
+ only once, when first installing MySQL on a system. See
<xref linkend="unix-post-installation"/>.
</para>
</listitem>
@@ -187,22 +191,21 @@
<primary><command>mysql_fix_privilege_tables</command></primary>
</indexterm>
- <literal>mysql_fix_privilege_tables</literal>
+ <command>mysql_fix_privilege_tables</command>
</para>
<para>
- This script is used after an upgrade install operation, to
- update the grant tables with any changes that have been made
+ This script is used after a MySQL upgrade operation. It
+ updates the grant tables with any changes that have been made
in newer versions of MySQL. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
</itemizedlist>
<para>
- There are several other programs that also are run on the server
- host:
+ There are several other programs that are run on the server host:
</para>
<remark role="todo">
@@ -217,13 +220,14 @@
<primary><command>myisamchk</command></primary>
</indexterm>
- <literal>myisamchk</literal>
+ <command>myisamchk</command>
</para>
<para>
A utility to describe, check, optimize, and repair
- <literal>MyISAM</literal> tables. <command>myisamchk</command>
- is described in <xref linkend="myisamchk"/>.
+ <literal>MyISAM</literal> tables. <command>isamchk</command>
+ is a similar program for <literal>ISAM</literal> tables. See
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -233,7 +237,7 @@
<primary><command>make_binary_distribution</command></primary>
</indexterm>
- <literal>make_binary_distribution</literal>
+ <command>make_binary_distribution</command>
</para>
<para>
@@ -245,24 +249,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <indexterm>
- <primary><command>mysqlbug</command></primary>
- </indexterm>
-
- <literal>mysqlbug</literal>
- </para>
-
- <para>
- The MySQL bug reporting script. It can be used to send a bug
- report to the MySQL mailing list. This program is deprecated
- now. To file a bug report, please visit our online bugs
- database at <ulink url="http://bugs.mysql.com/"/> to file a
- bug report online. See <xref linkend="bug-reports"/>.)
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -279,17 +265,12 @@
The MySQL server, <command>mysqld</command>, is the main program
that does most of the work in a MySQL installation. The server is
accompanied by several related scripts that perform setup
- operations when you install MySQL or that are helper programs to
- assist you in starting and stopping the server.
+ operations when you install MySQL or that assist you in starting
+ and stopping the server. This section provides an overview of the
+ server and related programs. The following sections provide more
+ detailed information about each of these programs.
</para>
- <para>
- This section provides an overview of the server and related
- programs, and information about server startup scripts.
- Information about configuring the server itself is given in
- <xref linkend="mysqld"/>.
- </para>
-
<section id="mysqld-max">
<title>&title-mysqld-max;</title>
@@ -352,7 +333,7 @@
<para>
You can find the MySQL-Max binaries on the MySQL AB Web site at
- <ulink url="&base-url-downloads;mysql-4.0.html"/>.
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -9557,6 +9538,11 @@
After running the script, stop the server and restart it.
</para>
+ <para>
+ For additional information, see
+ <xref linkend="upgrading-grant-tables"/>.
+ </para>
+
</refsection>
</refentry>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -37,15 +37,33 @@
<title>&title-client-utility-overview;</title>
+ <remark role="todo">
+ not listed here: mysqldumpslow
+ </remark>
+
<para>
The following list briefly describes the MySQL client programs and
utilities:
</para>
- <remark role="todo">
- not listed here: mysqldumpslow
- </remark>
+ <indexterm>
+ <primary>client programs</primary>
+ </indexterm>
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>client</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>utility programs</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>utility</secondary>
+ </indexterm>
+
<itemizedlist>
<listitem>
@@ -274,7 +292,7 @@
</itemizedlist>
<para>
- MySQL AB also provide a number of GUI tools for administering and
+ MySQL AB also provides a number of GUI tools for administering and
otherwise working with MySQL servers. For basic information about
these, see <xref linkend="using-mysql-programs"/>.
</para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-5.0/database-administration.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -57,19 +57,23 @@
<title>&title-server-side-overview;</title>
<indexterm>
+ <primary>server-side programs</primary>
+ </indexterm>
+
+ <indexterm>
<primary>programs</primary>
- <secondary>list of</secondary>
+ <secondary>server side</secondary>
</indexterm>
<para>
- All MySQL programs take many different options. However, every
- MySQL program provides a <option>--help</option> option that you
- can use to get a description of the program's options. For
- example, try <command>mysqld --help</command>.
+ Each MySQL program takes many different options. Most programs
+ provide a <option>--help</option> option that you can use to get a
+ description of the program's different options. For example, try
+ <command>mysqld --help</command>.
</para>
<para>
- You can override default options for all standard programs by
+ You can override default option values for MySQL programs by
specifying options on the command line or in an option file.
<xref linkend="program-options"/>.
</para>
@@ -92,9 +96,9 @@
<para>
The SQL daemon (that is, the MySQL server). To use client
- programs, this program must be running, because clients gain
- access to databases by connecting to the server. See
- <xref linkend="mysqld"/>.
+ programs, <command>mysqld</command> must be running, because
+ clients gain access to databases by connecting to the server.
+ See <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -141,8 +145,8 @@
<para>
A server startup script. This script is used on systems that
- use run directories containing scripts that start system
- services for particular run levels. It invokes
+ use System V-style run directories containing scripts that
+ start system services for particular run levels. It invokes
<command>mysqld_safe</command> to start the MySQL server. See
<xref linkend="mysql-server"/>.
</para>
@@ -161,9 +165,11 @@
A server startup script that can start or stop multiple
servers installed on the system. See
<xref linkend="mysqld-multi"/>. As of MySQL 5.0.3 (Unix-like
- systems) or 5.0.13 (Windows) you might consider using
- <literal>mysqlmanager</literal>, the MySQL Instance Manager,
- instead. See <xref linkend="instance-manager"/>.
+ systems) or 5.0.13 (Windows), an alternative to
+ <command>mysqld_multi</command> is
+ <literal>mysqlmanager</literal>, the MySQL Instance Manager.
+ instead of <literal>mysqld_multi</literal>. See
+ <xref linkend="instance-manager"/>.
</para>
</listitem>
@@ -177,9 +183,9 @@
</para>
<para>
- This script creates the MySQL grant tables with default
- privileges. It is usually executed only once, when first
- installing MySQL on a system. See
+ This script creates the MySQL database and initializes the
+ grant tables with default privileges. It is usually executed
+ only once, when first installing MySQL on a system. See
<xref linkend="unix-post-installation"/>.
</para>
</listitem>
@@ -194,18 +200,33 @@
</para>
<para>
- This script is used after an upgrade install operation, to
- update the grant tables with any changes that have been made
+ This script is used after a MySQL upgrade operation. It
+ updates the grant tables with any changes that have been made
in newer versions of MySQL. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary><command>mysqlmanager</command></primary>
+ </indexterm>
+
+ <command>mysqlmanager</command>
+ </para>
+
+ <para>
+ The MySQL Instance Manager, a program for monitoring and
+ managing MySQL servers. See
+ <xref linkend="instance-manager"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
- There are several other programs that also are run on the server
- host:
+ There are several other programs that are run on the server host:
</para>
<remark role="todo">
@@ -225,8 +246,8 @@
<para>
A utility to describe, check, optimize, and repair
- <literal>MyISAM</literal> tables. <command>myisamchk</command>
- is described in <xref linkend="myisamchk"/>.
+ <literal>MyISAM</literal> tables. See
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -248,24 +269,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <indexterm>
- <primary><command>mysqlbug</command></primary>
- </indexterm>
-
- <command>mysqlbug</command>
- </para>
-
- <para>
- The MySQL bug reporting script. It can be used to send a bug
- report to the MySQL mailing list. This program is deprecated
- now. To file a bug report, please visit our online bugs
- database at <ulink url="http://bugs.mysql.com/"/> to file a
- bug report online. See <xref linkend="bug-reports"/>.)
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -282,17 +285,12 @@
The MySQL server, <command>mysqld</command>, is the main program
that does most of the work in a MySQL installation. The server is
accompanied by several related scripts that perform setup
- operations when you install MySQL or that are helper programs to
- assist you in starting and stopping the server.
+ operations when you install MySQL or that assist you in starting
+ and stopping the server. This section provides an overview of the
+ server and related programs. The following sections provide more
+ detailed information about each of these programs.
</para>
- <para>
- This section provides an overview of the server and related
- programs, and information about server startup scripts.
- Information about configuring the server itself is given in
- <xref linkend="mysqld"/>.
- </para>
-
<section id="mysqld-max">
<title>&title-mysqld-max;</title>
@@ -355,7 +353,7 @@
<para>
You can find the MySQL-Max binaries on the MySQL AB Web site at
- <ulink url="&base-url-downloads;">&base-url-downloads;</ulink>.
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -11583,6 +11581,11 @@
After running the script, stop the server and restart it.
</para>
+ <para>
+ For additional information, see
+ <xref linkend="upgrading-grant-tables"/>.
+ </para>
+
</refsection>
</refentry>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -37,15 +37,33 @@
<title>&title-client-utility-overview;</title>
+ <remark role="todo">
+ not listed here: mysqldumpslow
+ </remark>
+
<para>
The following list briefly describes the MySQL client programs and
utilities:
</para>
- <remark role="todo">
- not listed here: mysqldumpslow
- </remark>
+ <indexterm>
+ <primary>client programs</primary>
+ </indexterm>
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>client</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>utility programs</primary>
+ </indexterm>
+
+ <indexterm>
+ <primary>programs</primary>
+ <secondary>utility</secondary>
+ </indexterm>
+
<itemizedlist>
<listitem>
@@ -290,7 +308,7 @@
</itemizedlist>
<para>
- MySQL AB also provide a number of GUI tools for administering and
+ MySQL AB also provides a number of GUI tools for administering and
otherwise working with MySQL servers. For basic information about
these, see <xref linkend="using-mysql-programs"/>.
</para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-5.1/database-administration.xml 2006-01-21 20:33:22 UTC (rev 976)
@@ -57,19 +57,23 @@
<title>&title-server-side-overview;</title>
<indexterm>
+ <primary>server-side programs</primary>
+ </indexterm>
+
+ <indexterm>
<primary>programs</primary>
- <secondary>list of</secondary>
+ <secondary>server side</secondary>
</indexterm>
<para>
- All MySQL programs take many different options. However, every
- MySQL program provides a <option>--help</option> option that you
- can use to get a description of the program's options. For
- example, try <command>mysqld --help</command>.
+ Each MySQL program takes many different options. Most programs
+ provide a <option>--help</option> option that you can use to get a
+ description of the program's different options. For example, try
+ <command>mysqld --help</command>.
</para>
<para>
- You can override default options for all standard programs by
+ You can override default option values for MySQL programs by
specifying options on the command line or in an option file.
<xref linkend="program-options"/>.
</para>
@@ -92,9 +96,9 @@
<para>
The SQL daemon (that is, the MySQL server). To use client
- programs, this program must be running, because clients gain
- access to databases by connecting to the server. See
- <xref linkend="mysqld"/>.
+ programs, <command>mysqld</command> must be running, because
+ clients gain access to databases by connecting to the server.
+ See <xref linkend="mysqld"/>.
</para>
</listitem>
@@ -141,8 +145,8 @@
<para>
A server startup script. This script is used on systems that
- use run directories containing scripts that start system
- services for particular run levels. It invokes
+ use System V-style run directories containing scripts that
+ start system services for particular run levels. It invokes
<command>mysqld_safe</command> to start the MySQL server. See
<xref linkend="mysql-server"/>.
</para>
@@ -160,9 +164,10 @@
<para>
A server startup script that can start or stop multiple
servers installed on the system. See
- <xref linkend="mysqld-multi"/>. You might consider using
- <literal>mysqlmanager</literal>, the MySQL Instance Manager,
- instead of that script. See
+ <xref linkend="mysqld-multi"/>. An alternative to
+ <command>mysqld_multi</command> is
+ <literal>mysqlmanager</literal>, the MySQL Instance Manager.
+ instead of <literal>mysqld_multi</literal>. See
<xref linkend="instance-manager"/>.
</para>
</listitem>
@@ -177,9 +182,9 @@
</para>
<para>
- This script creates the MySQL grant tables with default
- privileges. It is usually executed only once, when first
- installing MySQL on a system. See
+ This script creates the MySQL database and initializes the
+ grant tables with default privileges. It is usually executed
+ only once, when first installing MySQL on a system. See
<xref linkend="unix-post-installation"/>.
</para>
</listitem>
@@ -194,18 +199,33 @@
</para>
<para>
- This script is used after an upgrade install operation, to
- update the grant tables with any changes that have been made
+ This script is used after a MySQL upgrade operation. It
+ updates the grant tables with any changes that have been made
in newer versions of MySQL. See
- <xref linkend="upgrading-grant-tables"/>.
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary><command>mysqlmanager</command></primary>
+ </indexterm>
+
+ <command>mysqlmanager</command>
+ </para>
+
+ <para>
+ The MySQL Instance Manager, a program for monitoring and
+ managing MySQL servers. See
+ <xref linkend="instance-manager"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
- There are several other programs that also are run on the server
- host:
+ There are several other programs that are run on the server host:
</para>
<remark role="todo">
@@ -225,8 +245,8 @@
<para>
A utility to describe, check, optimize, and repair
- <literal>MyISAM</literal> tables. <command>myisamchk</command>
- is described in <xref linkend="myisamchk"/>.
+ <literal>MyISAM</literal> tables. See
+ <xref linkend="myisamchk"/>.
</para>
</listitem>
@@ -248,24 +268,6 @@
</para>
</listitem>
- <listitem>
- <para>
- <indexterm>
- <primary><command>mysqlbug</command></primary>
- </indexterm>
-
- <command>mysqlbug</command>
- </para>
-
- <para>
- The MySQL bug reporting script. It can be used to send a bug
- report to the MySQL mailing list. This program is deprecated
- now. To file a bug report, please visit our online bugs
- database at <ulink url="http://bugs.mysql.com/"/> to file a
- bug report online. See <xref linkend="bug-reports"/>.)
- </para>
- </listitem>
-
</itemizedlist>
</section>
@@ -282,17 +284,12 @@
The MySQL server, <command>mysqld</command>, is the main program
that does most of the work in a MySQL installation. The server is
accompanied by several related scripts that perform setup
- operations when you install MySQL or that are helper programs to
- assist you in starting and stopping the server.
+ operations when you install MySQL or that assist you in starting
+ and stopping the server. This section provides an overview of the
+ server and related programs. The following sections provide more
+ detailed information about each of these programs.
</para>
- <para>
- This section provides an overview of the server and related
- programs, and information about server startup scripts.
- Information about configuring the server itself is given in
- <xref linkend="mysqld"/>.
- </para>
-
<section id="mysqld-max">
<title>&title-mysqld-max;</title>
@@ -355,7 +352,7 @@
<para>
You can find the MySQL-Max binaries on the MySQL AB Web site at
- <ulink url="&base-url-downloads;">&base-url-downloads;</ulink>.
+ <ulink url="&base-url-downloads;"/>.
</para>
<para>
@@ -11613,6 +11610,11 @@
After running the script, stop the server and restart it.
</para>
+ <para>
+ For additional information, see
+ <xref linkend="upgrading-grant-tables"/>.
+ </para>
+
</refsection>
</refentry>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-01-21 20:33:08 UTC (rev 975)
+++ trunk/refman-common/titles.en.ent 2006-01-21 20:33:22 UTC (rev 976)
@@ -1488,7 +1488,7 @@
<!ENTITY title-server-options "<command>mysqld</command> Command Options">
<!ENTITY title-server-parameters "Tuning Server Parameters">
<!ENTITY title-server-shutdown "The MySQL Server Shutdown Process">
-<!ENTITY title-server-side-overview "Overview of the Server-Side Scripts and Utilities">
+<!ENTITY title-server-side-overview "Overview of Server-Side Programs">
<!ENTITY title-server-side-scripts "The MySQL Server and Server Startup Scripts">
<!ENTITY title-server-sql-mode "The Server SQL Mode">
<!ENTITY title-server-status-variables "Server Status Variables">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r976 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 21 Jan |
