List:Commits« Previous MessageNext Message »
From:paul Date:January 21 2006 8:33pm
Subject:svn commit - mysqldoc@docsrva: r975 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-21 21:33:08 +0100 (Sat, 21 Jan 2006)
New Revision: 975

Log:
 r6533@frost:  paul | 2006-01-21 13:33:08 -0600
 Change chapter intro a little.
 Move overview section to beginning.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6532
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6533
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-21 20:31:59 UTC (rev 974)
+++ trunk/refman-4.1/database-administration.xml	2006-01-21 20:33:08 UTC (rev 975)
@@ -15,248 +15,280 @@
 
   <para>
     This chapter covers topics that deal with administering a MySQL
-    installation, such as configuring the server, managing user
-    accounts, and performing backups.
+    installation:
   </para>
 
-  <section id="server-side-scripts">
+  <itemizedlist>
 
-    <title>&title-server-side-scripts;</title>
+    <listitem>
+      <para>
+        Configuring the server
+      </para>
+    </listitem>
 
-    <remark role="todo">
-      describe mysql_secure_installation, make_binary_distribution here
-    </remark>
+    <listitem>
+      <para>
+        Managing user accounts
+      </para>
+    </listitem>
 
+    <listitem>
+      <para>
+        Performing backups
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The server log files
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The query cache
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <section id="server-side-overview">
+
+    <title>&title-server-side-overview;</title>
+
+    <indexterm>
+      <primary>programs</primary>
+      <secondary>list of</secondary>
+    </indexterm>
+
     <para>
-      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.
+      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>.
     </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"/>.
+      You can override default options for all standard programs by
+      specifying options on the command line or in an option file.
+      <xref linkend="program-options"/>.
     </para>
 
-    <section id="server-side-overview">
+    <para>
+      The following list briefly describes the MySQL server and
+      server-related programs:
+    </para>
 
-      <title>&title-server-side-overview;</title>
+    <itemizedlist>
 
-      <indexterm>
-        <primary>programs</primary>
-        <secondary>list of</secondary>
-      </indexterm>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld</command></primary>
+          </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>.
-      </para>
+          <literal>mysqld</literal>
+        </para>
 
-      <para>
-        You can override default options for all standard programs by
-        specifying options on the command line or in an option file.
-        <xref linkend="program-options"/>.
-      </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"/>.
+        </para>
+      </listitem>
 
-      <para>
-        The following list briefly describes the MySQL server and
-        server-related programs:
-      </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld-max</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <literal>mysqld-max</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld</command></primary>
-            </indexterm>
+        <para>
+          A version of the server that includes additional features. See
+          <xref linkend="mysqld-max"/>.
+        </para>
+      </listitem>
 
-            <literal>mysqld</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_safe</command></primary>
+          </indexterm>
 
-          <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"/>.
-          </para>
-        </listitem>
+          <literal>mysqld_safe</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld-max</command></primary>
-            </indexterm>
+        <para>
+          A server startup script. <command>mysqld_safe</command>
+          attempts to start <command>mysqld-max</command> if it exists,
+          and <command>mysqld</command> otherwise. See
+          <xref linkend="mysqld-safe"/>.
+        </para>
+      </listitem>
 
-            <literal>mysqld-max</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql.server</command></primary>
+          </indexterm>
 
-          <para>
-            A version of the server that includes additional features.
-            See <xref linkend="mysqld-max"/>.
-          </para>
-        </listitem>
+          <literal>mysql.server</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_safe</command></primary>
-            </indexterm>
+        <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
+          <command>mysqld_safe</command> to start the MySQL server. See
+          <xref linkend="mysql-server"/>.
+        </para>
+      </listitem>
 
-            <literal>mysqld_safe</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_multi</command></primary>
+          </indexterm>
 
-          <para>
-            A server startup script. <command>mysqld_safe</command>
-            attempts to start <command>mysqld-max</command> if it
-            exists, and <command>mysqld</command> otherwise. See
-            <xref linkend="mysqld-safe"/>.
-          </para>
-        </listitem>
+          <literal>mysqld_multi</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql.server</command></primary>
-            </indexterm>
+        <para>
+          A server startup script that can start or stop multiple
+          servers installed on the system. See
+          <xref linkend="mysqld-multi"/>.
+        </para>
+      </listitem>
 
-            <literal>mysql.server</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_install_db</command></primary>
+          </indexterm>
 
-          <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
-            <command>mysqld_safe</command> to start the MySQL server.
-            See <xref linkend="mysql-server"/>.
-          </para>
-        </listitem>
+          <literal>mysql_install_db</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_multi</command></primary>
-            </indexterm>
+        <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
+          <xref linkend="unix-post-installation"/>.
+        </para>
+      </listitem>
 
-            <literal>mysqld_multi</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_fix_privilege_tables</command></primary>
+          </indexterm>
 
-          <para>
-            A server startup script that can start or stop multiple
-            servers installed on the system. See
-            <xref linkend="mysqld-multi"/>.
-          </para>
-        </listitem>
+          <literal>mysql_fix_privilege_tables</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_install_db</command></primary>
-            </indexterm>
+        <para>
+          This script is used after an upgrade install operation, to
+          update the grant tables with any changes that have been made
+          in newer versions of MySQL. See
+          <xref linkend="upgrading-grant-tables"/>.
+        </para>
+      </listitem>
 
-            <literal>mysql_install_db</literal>
-          </para>
+    </itemizedlist>
 
-          <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
-            <xref linkend="unix-post-installation"/>.
-          </para>
-        </listitem>
+    <para>
+      There are several other programs that also are run on the server
+      host:
+    </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_fix_privilege_tables</command></primary>
-            </indexterm>
+    <remark role="todo">
+      indicate where these are discussed
+    </remark>
 
-            <literal>mysql_fix_privilege_tables</literal>
-          </para>
+    <itemizedlist>
 
-          <para>
-            This script is used after an upgrade install operation, to
-            update the grant tables with any changes that have been made
-            in newer versions of MySQL. See
-            <xref linkend="upgrading-grant-tables"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>myisamchk</command></primary>
+          </indexterm>
 
-      </itemizedlist>
+          <literal>myisamchk</literal>
+        </para>
 
-      <para>
-        There are several other programs that also are run on the server
-        host:
-      </para>
+        <para>
+          A utility to describe, check, optimize, and repair
+          <literal>MyISAM</literal> tables. <command>myisamchk</command>
+          is described in <xref linkend="myisamchk"/>.
+        </para>
+      </listitem>
 
-      <remark role="todo">
-        indicate where these are discussed
-      </remark>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>make_binary_distribution</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <literal>make_binary_distribution</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>myisamchk</command></primary>
-            </indexterm>
+        <para>
+          This program makes a binary release of a compiled MySQL. This
+          could be sent by FTP to
+          <filename>/pub/mysql/upload/</filename> on
+          <literal>ftp.mysql.com</literal> for the convenience of other
+          MySQL users.
+        </para>
+      </listitem>
 
-            <literal>myisamchk</literal>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqlbug</command></primary>
+          </indexterm>
 
-          <para>
-            A utility to describe, check, optimize, and repair
-            <literal>MyISAM</literal> tables.
-            <command>myisamchk</command> is described in
-            <xref linkend="myisamchk"/>.
-          </para>
-        </listitem>
+          <literal>mysqlbug</literal>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>make_binary_distribution</command></primary>
-            </indexterm>
+        <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>
 
-            <literal>make_binary_distribution</literal>
-          </para>
+    </itemizedlist>
 
-          <para>
-            This program makes a binary release of a compiled MySQL.
-            This could be sent by FTP to
-            <filename>/pub/mysql/upload/</filename> on
-            <literal>ftp.mysql.com</literal> for the convenience of
-            other MySQL users.
-          </para>
-        </listitem>
+  </section>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqlbug</command></primary>
-            </indexterm>
+  <section id="server-side-scripts">
 
-            <literal>mysqlbug</literal>
-          </para>
+    <title>&title-server-side-scripts;</title>
 
-          <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>
+    <remark role="todo">
+      describe mysql_secure_installation, make_binary_distribution here
+    </remark>
 
-      </itemizedlist>
+    <para>
+      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.
+    </para>
 
-    </section>
+    <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">
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-21 20:31:59 UTC (rev 974)
+++ trunk/refman-5.0/database-administration.xml	2006-01-21 20:33:08 UTC (rev 975)
@@ -15,251 +15,283 @@
 
   <para>
     This chapter covers topics that deal with administering a MySQL
-    installation, such as configuring the server, managing user
-    accounts, and performing backups.
+    installation:
   </para>
 
-  <section id="server-side-scripts">
+  <itemizedlist>
 
-    <title>&title-server-side-scripts;</title>
+    <listitem>
+      <para>
+        Configuring the server
+      </para>
+    </listitem>
 
-    <remark role="todo">
-      describe mysql_secure_installation, make_binary_distribution here
-    </remark>
+    <listitem>
+      <para>
+        Managing user accounts
+      </para>
+    </listitem>
 
+    <listitem>
+      <para>
+        Performing backups
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The server log files
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The query cache
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <section id="server-side-overview">
+
+    <title>&title-server-side-overview;</title>
+
+    <indexterm>
+      <primary>programs</primary>
+      <secondary>list of</secondary>
+    </indexterm>
+
     <para>
-      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.
+      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>.
     </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"/>.
+      You can override default options for all standard programs by
+      specifying options on the command line or in an option file.
+      <xref linkend="program-options"/>.
     </para>
 
-    <section id="server-side-overview">
+    <para>
+      The following list briefly describes the MySQL server and
+      server-related programs:
+    </para>
 
-      <title>&title-server-side-overview;</title>
+    <itemizedlist>
 
-      <indexterm>
-        <primary>programs</primary>
-        <secondary>list of</secondary>
-      </indexterm>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld</command></primary>
+          </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>.
-      </para>
+          <command>mysqld</command>
+        </para>
 
-      <para>
-        You can override default options for all standard programs by
-        specifying options on the command line or in an option file.
-        <xref linkend="program-options"/>.
-      </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"/>.
+        </para>
+      </listitem>
 
-      <para>
-        The following list briefly describes the MySQL server and
-        server-related programs:
-      </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld-max</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <command>mysqld-max</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld</command></primary>
-            </indexterm>
+        <para>
+          A version of the server that includes additional features. See
+          <xref linkend="mysqld-max"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_safe</command></primary>
+          </indexterm>
 
-          <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"/>.
-          </para>
-        </listitem>
+          <command>mysqld_safe</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld-max</command></primary>
-            </indexterm>
+        <para>
+          A server startup script. <command>mysqld_safe</command>
+          attempts to start <command>mysqld-max</command> if it exists,
+          and <command>mysqld</command> otherwise. See
+          <xref linkend="mysqld-safe"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld-max</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql.server</command></primary>
+          </indexterm>
 
-          <para>
-            A version of the server that includes additional features.
-            See <xref linkend="mysqld-max"/>.
-          </para>
-        </listitem>
+          <command>mysql.server</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_safe</command></primary>
-            </indexterm>
+        <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
+          <command>mysqld_safe</command> to start the MySQL server. See
+          <xref linkend="mysql-server"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld_safe</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_multi</command></primary>
+          </indexterm>
 
-          <para>
-            A server startup script. <command>mysqld_safe</command>
-            attempts to start <command>mysqld-max</command> if it
-            exists, and <command>mysqld</command> otherwise. See
-            <xref linkend="mysqld-safe"/>.
-          </para>
-        </listitem>
+          <command>mysqld_multi</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql.server</command></primary>
-            </indexterm>
+        <para>
+          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"/>.
+        </para>
+      </listitem>
 
-            <command>mysql.server</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_install_db</command></primary>
+          </indexterm>
 
-          <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
-            <command>mysqld_safe</command> to start the MySQL server.
-            See <xref linkend="mysql-server"/>.
-          </para>
-        </listitem>
+          <command>mysql_install_db</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_multi</command></primary>
-            </indexterm>
+        <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
+          <xref linkend="unix-post-installation"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld_multi</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_fix_privilege_tables</command></primary>
+          </indexterm>
 
-          <para>
-            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"/>.
-          </para>
-        </listitem>
+          <command>mysql_fix_privilege_tables</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_install_db</command></primary>
-            </indexterm>
+        <para>
+          This script is used after an upgrade install operation, to
+          update the grant tables with any changes that have been made
+          in newer versions of MySQL. See
+          <xref linkend="upgrading-grant-tables"/>.
+        </para>
+      </listitem>
 
-            <command>mysql_install_db</command>
-          </para>
+    </itemizedlist>
 
-          <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
-            <xref linkend="unix-post-installation"/>.
-          </para>
-        </listitem>
+    <para>
+      There are several other programs that also are run on the server
+      host:
+    </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_fix_privilege_tables</command></primary>
-            </indexterm>
+    <remark role="todo">
+      indicate where these are discussed
+    </remark>
 
-            <command>mysql_fix_privilege_tables</command>
-          </para>
+    <itemizedlist>
 
-          <para>
-            This script is used after an upgrade install operation, to
-            update the grant tables with any changes that have been made
-            in newer versions of MySQL. See
-            <xref linkend="upgrading-grant-tables"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>myisamchk</command></primary>
+          </indexterm>
 
-      </itemizedlist>
+          <command>myisamchk</command>
+        </para>
 
-      <para>
-        There are several other programs that also are run on the server
-        host:
-      </para>
+        <para>
+          A utility to describe, check, optimize, and repair
+          <literal>MyISAM</literal> tables. <command>myisamchk</command>
+          is described in <xref linkend="myisamchk"/>.
+        </para>
+      </listitem>
 
-      <remark role="todo">
-        indicate where these are discussed
-      </remark>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>make_binary_distribution</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <command>make_binary_distribution</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>myisamchk</command></primary>
-            </indexterm>
+        <para>
+          This program makes a binary release of a compiled MySQL. This
+          could be sent by FTP to
+          <filename>/pub/mysql/upload/</filename> on
+          <literal>ftp.mysql.com</literal> for the convenience of other
+          MySQL users.
+        </para>
+      </listitem>
 
-            <command>myisamchk</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqlbug</command></primary>
+          </indexterm>
 
-          <para>
-            A utility to describe, check, optimize, and repair
-            <literal>MyISAM</literal> tables.
-            <command>myisamchk</command> is described in
-            <xref linkend="myisamchk"/>.
-          </para>
-        </listitem>
+          <command>mysqlbug</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>make_binary_distribution</command></primary>
-            </indexterm>
+        <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>
 
-            <command>make_binary_distribution</command>
-          </para>
+    </itemizedlist>
 
-          <para>
-            This program makes a binary release of a compiled MySQL.
-            This could be sent by FTP to
-            <filename>/pub/mysql/upload/</filename> on
-            <literal>ftp.mysql.com</literal> for the convenience of
-            other MySQL users.
-          </para>
-        </listitem>
+  </section>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqlbug</command></primary>
-            </indexterm>
+  <section id="server-side-scripts">
 
-            <command>mysqlbug</command>
-          </para>
+    <title>&title-server-side-scripts;</title>
 
-          <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>
+    <remark role="todo">
+      describe mysql_secure_installation, make_binary_distribution here
+    </remark>
 
-      </itemizedlist>
+    <para>
+      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.
+    </para>
 
-    </section>
+    <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">
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-21 20:31:59 UTC (rev 974)
+++ trunk/refman-5.1/database-administration.xml	2006-01-21 20:33:08 UTC (rev 975)
@@ -15,251 +15,283 @@
 
   <para>
     This chapter covers topics that deal with administering a MySQL
-    installation, such as configuring the server, managing user
-    accounts, and performing backups.
+    installation:
   </para>
 
-  <section id="server-side-scripts">
+  <itemizedlist>
 
-    <title>&title-server-side-scripts;</title>
+    <listitem>
+      <para>
+        Configuring the server
+      </para>
+    </listitem>
 
-    <remark role="todo">
-      describe mysql_secure_installation, make_binary_distribution here
-    </remark>
+    <listitem>
+      <para>
+        Managing user accounts
+      </para>
+    </listitem>
 
+    <listitem>
+      <para>
+        Performing backups
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The server log files
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        The query cache
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <section id="server-side-overview">
+
+    <title>&title-server-side-overview;</title>
+
+    <indexterm>
+      <primary>programs</primary>
+      <secondary>list of</secondary>
+    </indexterm>
+
     <para>
-      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.
+      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>.
     </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"/>.
+      You can override default options for all standard programs by
+      specifying options on the command line or in an option file.
+      <xref linkend="program-options"/>.
     </para>
 
-    <section id="server-side-overview">
+    <para>
+      The following list briefly describes the MySQL server and
+      server-related programs:
+    </para>
 
-      <title>&title-server-side-overview;</title>
+    <itemizedlist>
 
-      <indexterm>
-        <primary>programs</primary>
-        <secondary>list of</secondary>
-      </indexterm>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld</command></primary>
+          </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>.
-      </para>
+          <command>mysqld</command>
+        </para>
 
-      <para>
-        You can override default options for all standard programs by
-        specifying options on the command line or in an option file.
-        <xref linkend="program-options"/>.
-      </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"/>.
+        </para>
+      </listitem>
 
-      <para>
-        The following list briefly describes the MySQL server and
-        server-related programs:
-      </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld-max</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <command>mysqld-max</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld</command></primary>
-            </indexterm>
+        <para>
+          A version of the server that includes additional features. See
+          <xref linkend="mysqld-max"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_safe</command></primary>
+          </indexterm>
 
-          <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"/>.
-          </para>
-        </listitem>
+          <command>mysqld_safe</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld-max</command></primary>
-            </indexterm>
+        <para>
+          A server startup script. <command>mysqld_safe</command>
+          attempts to start <command>mysqld-max</command> if it exists,
+          and <command>mysqld</command> otherwise. See
+          <xref linkend="mysqld-safe"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld-max</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql.server</command></primary>
+          </indexterm>
 
-          <para>
-            A version of the server that includes additional features.
-            See <xref linkend="mysqld-max"/>.
-          </para>
-        </listitem>
+          <command>mysql.server</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_safe</command></primary>
-            </indexterm>
+        <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
+          <command>mysqld_safe</command> to start the MySQL server. See
+          <xref linkend="mysql-server"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld_safe</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqld_multi</command></primary>
+          </indexterm>
 
-          <para>
-            A server startup script. <command>mysqld_safe</command>
-            attempts to start <command>mysqld-max</command> if it
-            exists, and <command>mysqld</command> otherwise. See
-            <xref linkend="mysqld-safe"/>.
-          </para>
-        </listitem>
+          <command>mysqld_multi</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql.server</command></primary>
-            </indexterm>
+        <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="instance-manager"/>.
+        </para>
+      </listitem>
 
-            <command>mysql.server</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_install_db</command></primary>
+          </indexterm>
 
-          <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
-            <command>mysqld_safe</command> to start the MySQL server.
-            See <xref linkend="mysql-server"/>.
-          </para>
-        </listitem>
+          <command>mysql_install_db</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqld_multi</command></primary>
-            </indexterm>
+        <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
+          <xref linkend="unix-post-installation"/>.
+        </para>
+      </listitem>
 
-            <command>mysqld_multi</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysql_fix_privilege_tables</command></primary>
+          </indexterm>
 
-          <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="instance-manager"/>.
-          </para>
-        </listitem>
+          <command>mysql_fix_privilege_tables</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_install_db</command></primary>
-            </indexterm>
+        <para>
+          This script is used after an upgrade install operation, to
+          update the grant tables with any changes that have been made
+          in newer versions of MySQL. See
+          <xref linkend="upgrading-grant-tables"/>.
+        </para>
+      </listitem>
 
-            <command>mysql_install_db</command>
-          </para>
+    </itemizedlist>
 
-          <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
-            <xref linkend="unix-post-installation"/>.
-          </para>
-        </listitem>
+    <para>
+      There are several other programs that also are run on the server
+      host:
+    </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysql_fix_privilege_tables</command></primary>
-            </indexterm>
+    <remark role="todo">
+      indicate where these are discussed
+    </remark>
 
-            <command>mysql_fix_privilege_tables</command>
-          </para>
+    <itemizedlist>
 
-          <para>
-            This script is used after an upgrade install operation, to
-            update the grant tables with any changes that have been made
-            in newer versions of MySQL. See
-            <xref linkend="upgrading-grant-tables"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>myisamchk</command></primary>
+          </indexterm>
 
-      </itemizedlist>
+          <command>myisamchk</command>
+        </para>
 
-      <para>
-        There are several other programs that also are run on the server
-        host:
-      </para>
+        <para>
+          A utility to describe, check, optimize, and repair
+          <literal>MyISAM</literal> tables. <command>myisamchk</command>
+          is described in <xref linkend="myisamchk"/>.
+        </para>
+      </listitem>
 
-      <remark role="todo">
-        indicate where these are discussed
-      </remark>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>make_binary_distribution</command></primary>
+          </indexterm>
 
-      <itemizedlist>
+          <command>make_binary_distribution</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>myisamchk</command></primary>
-            </indexterm>
+        <para>
+          This program makes a binary release of a compiled MySQL. This
+          could be sent by FTP to
+          <filename>/pub/mysql/upload/</filename> on
+          <literal>ftp.mysql.com</literal> for the convenience of other
+          MySQL users.
+        </para>
+      </listitem>
 
-            <command>myisamchk</command>
-          </para>
+      <listitem>
+        <para>
+          <indexterm>
+            <primary><command>mysqlbug</command></primary>
+          </indexterm>
 
-          <para>
-            A utility to describe, check, optimize, and repair
-            <literal>MyISAM</literal> tables.
-            <command>myisamchk</command> is described in
-            <xref linkend="myisamchk"/>.
-          </para>
-        </listitem>
+          <command>mysqlbug</command>
+        </para>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>make_binary_distribution</command></primary>
-            </indexterm>
+        <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>
 
-            <command>make_binary_distribution</command>
-          </para>
+    </itemizedlist>
 
-          <para>
-            This program makes a binary release of a compiled MySQL.
-            This could be sent by FTP to
-            <filename>/pub/mysql/upload/</filename> on
-            <literal>ftp.mysql.com</literal> for the convenience of
-            other MySQL users.
-          </para>
-        </listitem>
+  </section>
 
-        <listitem>
-          <para>
-            <indexterm>
-              <primary><command>mysqlbug</command></primary>
-            </indexterm>
+  <section id="server-side-scripts">
 
-            <command>mysqlbug</command>
-          </para>
+    <title>&title-server-side-scripts;</title>
 
-          <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>
+    <remark role="todo">
+      describe mysql_secure_installation, make_binary_distribution here
+    </remark>
 
-      </itemizedlist>
+    <para>
+      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.
+    </para>
 
-    </section>
+    <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">
 

Thread
svn commit - mysqldoc@docsrva: r975 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul21 Jan