MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul Date:December 7 2007 6:13pm
Subject:svn commit - mysqldoc@docsrva: r9194 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-6.0
View as plain text  
Author: paul
Date: 2007-12-07 19:13:39 +0100 (Fri, 07 Dec 2007)
New Revision: 9194

Log:
 r34020@arctic:  paul | 2007-12-07 11:42:35 -0600
 Revise programs chapter intro.


Modified:
   trunk/refman-4.1/programs.xml
   trunk/refman-4.1/renamed-nodes.txt
   trunk/refman-4.1/using-mysql-programs.xml
   trunk/refman-5.0/programs.xml
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.0/using-mysql-programs.xml
   trunk/refman-5.1/programs.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.1/using-mysql-programs.xml
   trunk/refman-5.2/renamed-nodes.txt
   trunk/refman-6.0/programs.xml
   trunk/refman-6.0/renamed-nodes.txt
   trunk/refman-6.0/using-mysql-programs.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34016
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27855
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34020
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27855
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22582


Modified: trunk/refman-4.1/programs.xml
===================================================================
--- trunk/refman-4.1/programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-4.1/programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 3, Lines Added: 81, Lines Deleted: 17; 5135 bytes

@@ -8,20 +8,47 @@
   <title>MySQL Programs</title>
 
   <para>
+    This chapter provides a brief overview of the command-line programs
+    provided by MySQL AB. It also discusses the general syntax for
+    specifying options when you run these programs. Most programs have
+    options that are specific to their own operation, but the option
+    syntax is similar for all of them. Finally, the chapter provides
+    more detailed descriptions of individual programs, including which
+    options they recognize.
+  </para>
+
+  <section id="programs-overview">
+
+    <title>Overview of MySQL Programs</title>
+
+  <para>
     There are many different programs in a MySQL installation. This
-    chapter provides a brief overview of them and then a more detailed
-    description of each one, with the exception of MySQL Cluster
-    programs. Each program's description indicates its invocation syntax
-    and the options that it understands.
+    section provides a brief overview of them. Later sections provide
+    a more detailed description of each one, with the exception of
+    MySQL Cluster programs. Each program's description indicates its
+    invocation syntax and the options that it understands.
     <xref linkend="mysql-cluster"/>, describes programs specific to
     MySQL Cluster.
   </para>
 
   <para>
+    Most MySQL distributions include all of these programs, except for
+    those programs that are platform-specific. (For example, the
+    server startup scripts are not used on Windows.) The exception is
+    that RPM distributions are more specialized. There is one RPM for
+    the server, another for client programs, and so forth. If you
+    appear to be missing one or more programs, see
+    <xref linkend="installing"/>, for information on types of
+    distributions and what they contain. It may be that you have a
+    distribution that does not include all programs and you need to
+    install an additional package.
+  </para>
+
+  <para>
     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>.
+    <command>mysql --help</command>.
   </para>
 
   <para>

@@ -789,22 +816,59 @@
   </itemizedlist>
 
   <para>
-    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>
-
-  <para>
     Each MySQL program takes many different options. Most programs
     provide a <option>--help</option> option that you can use to get a
     full description of the program's different options. For example,
     try <command>mysql --help</command>.
   </para>
 
+  <para>
+    MySQL AB also provides several GUI tools for administering and
+    otherwise working with MySQL Server:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        MySQL Administrator: This tool is used for administering MySQL
+        servers, databases, tables, and user accounts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Query Browser: This graphical tool is provided by MySQL
+        AB for creating, executing, and optimizing queries on MySQL
+        databases.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Migration Toolkit: This tool helps you migrate schemas
+        and data from other relational database management systems for
+        use with MySQL.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    These GUI programs are available at
+    <ulink url="&base-url-downloads;"/>. Each has its own manual that
+    you can access at <ulink url="&base-url-docs;"/>.
+  </para>
+
   <indexterm>
     <primary>environment variables</primary>
   </indexterm>
 
+  <indexterm>
+    <primary>variables</primary>
+    <secondary>environment</secondary>
+  </indexterm>
+
   <para>
     MySQL client programs that communicate with the server using the
     MySQL client/server library use the following environment variables:

@@ -877,17 +941,17 @@
   </informaltable>
 
   <para>
-    Use of <literal>MYSQL_PWD</literal> is insecure. See
-    <xref linkend="password-security"/>.
+    For a full list of environment variables used by MySQL programs,
+    see <xref linkend="environment-variables"/>.
   </para>
 
   <para>
-    You can override the default option values or values specified in
-    environment variables for all standard programs by specifying
-    options in an option file or on the command line. See
-    <xref linkend="program-options"/>.
+    Use of <literal>MYSQL_PWD</literal> is insecure. See
+    <xref linkend="password-security"/>.
   </para>
 
+  </section>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-server.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-installation.xml"/>


Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-4.1/renamed-nodes.txt	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 451 bytes

@@ -318,3 +318,4 @@
 client-utility-programs programs 2009-01-01
 client-utility-overview programs 2009-01-01
 server-side-overview programs 2009-01-01
+program-overview programs-overview 2009-01-01


Modified: trunk/refman-4.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-4.1/using-mysql-programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-4.1/using-mysql-programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 60; 2518 bytes

@@ -7,53 +7,6 @@
 
   <title>Using MySQL Programs</title>
 
-  <para>
-    This chapter provides a brief overview of the command-line programs
-    provided by MySQL AB and discusses the general syntax for specifying
-    options when you run these programs. Most programs have options that
-    are specific to their own operation, but the option syntax is
-    similar for all of them. Later chapters provide more detailed
-    descriptions of individual programs, including which options they
-    recognize.
-  </para>
-
-  <para>
-    MySQL AB also provides three GUI client programs for use with MySQL
-    Server:
-  </para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        MySQL Administrator: This tool is used for administering MySQL
-        servers, databases, tables, and user accounts.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Query Browser: This graphical tool is provided by MySQL AB
-        for creating, executing, and optimizing queries on MySQL
-        databases.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Migration Toolkit: This tool helps you migrate schemas and
-        data from other relational database management systems for use
-        with MySQL.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>
-    These GUI programs each have their own manuals that you can access
-    at <ulink url="&base-url-docs;"/>.
-  </para>
-
   <section id="program-overview">
 
     <title>Overview of MySQL Programs</title>

@@ -204,19 +157,6 @@
 
     </itemizedlist>
 
-    <para>
-      Most MySQL distributions include all of these programs, except for
-      those programs that are platform-specific. (For example, the
-      server startup scripts are not used on Windows.) The exception is
-      that RPM distributions are more specialized. There is one RPM for
-      the server, another for client programs, and so forth. If you
-      appear to be missing one or more programs, see
-      <xref linkend="installing"/>, for information on types of
-      distributions and what they contain. It may be that you have a
-      distribution that does not include all programs and you need to
-      install something else.
-    </para>
-
   </section>
 
   <section id="invoking-programs">


Modified: trunk/refman-5.0/programs.xml
===================================================================
--- trunk/refman-5.0/programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.0/programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 3, Lines Added: 81, Lines Deleted: 17; 5135 bytes

@@ -8,20 +8,47 @@
   <title>MySQL Programs</title>
 
   <para>
+    This chapter provides a brief overview of the command-line programs
+    provided by MySQL AB. It also discusses the general syntax for
+    specifying options when you run these programs. Most programs have
+    options that are specific to their own operation, but the option
+    syntax is similar for all of them. Finally, the chapter provides
+    more detailed descriptions of individual programs, including which
+    options they recognize.
+  </para>
+
+  <section id="programs-overview">
+
+    <title>Overview of MySQL Programs</title>
+
+  <para>
     There are many different programs in a MySQL installation. This
-    chapter provides a brief overview of them and then a more detailed
-    description of each one, with the exception of MySQL Cluster
-    programs. Each program's description indicates its invocation syntax
-    and the options that it understands.
+    section provides a brief overview of them. Later sections provide
+    a more detailed description of each one, with the exception of
+    MySQL Cluster programs. Each program's description indicates its
+    invocation syntax and the options that it understands.
     <xref linkend="mysql-cluster"/>, describes programs specific to
     MySQL Cluster.
   </para>
 
   <para>
+    Most MySQL distributions include all of these programs, except for
+    those programs that are platform-specific. (For example, the
+    server startup scripts are not used on Windows.) The exception is
+    that RPM distributions are more specialized. There is one RPM for
+    the server, another for client programs, and so forth. If you
+    appear to be missing one or more programs, see
+    <xref linkend="installing"/>, for information on types of
+    distributions and what they contain. It may be that you have a
+    distribution that does not include all programs and you need to
+    install an additional package.
+  </para>
+
+  <para>
     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>.
+    <command>mysql --help</command>.
   </para>
 
   <para>

@@ -818,22 +845,59 @@
   </itemizedlist>
 
   <para>
-    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>
-
-  <para>
     Each MySQL program takes many different options. Most programs
     provide a <option>--help</option> option that you can use to get a
     full description of the program's different options. For example,
     try <command>mysql --help</command>.
   </para>
 
+  <para>
+    MySQL AB also provides several GUI tools for administering and
+    otherwise working with MySQL Server:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        MySQL Administrator: This tool is used for administering MySQL
+        servers, databases, tables, and user accounts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Query Browser: This graphical tool is provided by MySQL
+        AB for creating, executing, and optimizing queries on MySQL
+        databases.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Migration Toolkit: This tool helps you migrate schemas
+        and data from other relational database management systems for
+        use with MySQL.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    These GUI programs are available at
+    <ulink url="&base-url-downloads;"/>. Each has its own manual that
+    you can access at <ulink url="&base-url-docs;"/>.
+  </para>
+
   <indexterm>
     <primary>environment variables</primary>
   </indexterm>
 
+  <indexterm>
+    <primary>variables</primary>
+    <secondary>environment</secondary>
+  </indexterm>
+
   <para>
     MySQL client programs that communicate with the server using the
     MySQL client/server library use the following environment variables:

@@ -906,17 +970,17 @@
   </informaltable>
 
   <para>
-    Use of <literal>MYSQL_PWD</literal> is insecure. See
-    <xref linkend="password-security"/>.
+    For a full list of environment variables used by MySQL programs,
+    see <xref linkend="environment-variables"/>.
   </para>
 
   <para>
-    You can override the default option values or values specified in
-    environment variables for all standard programs by specifying
-    options in an option file or on the command line. See
-    <xref linkend="program-options"/>.
+    Use of <literal>MYSQL_PWD</literal> is insecure. See
+    <xref linkend="password-security"/>.
   </para>
 
+  </section>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-server.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-installation.xml"/>


Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.0/renamed-nodes.txt	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 451 bytes

@@ -645,3 +645,4 @@
 client-utility-programs programs 2009-01-01
 client-utility-overview programs 2009-01-01
 server-side-overview programs 2009-01-01
+program-overview programs-overview 2009-01-01


Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.0/using-mysql-programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 60; 2518 bytes

@@ -7,53 +7,6 @@
 
   <title>Using MySQL Programs</title>
 
-  <para>
-    This chapter provides a brief overview of the command-line programs
-    provided by MySQL AB and discusses the general syntax for specifying
-    options when you run these programs. Most programs have options that
-    are specific to their own operation, but the option syntax is
-    similar for all of them. Later chapters provide more detailed
-    descriptions of individual programs, including which options they
-    recognize.
-  </para>
-
-  <para>
-    MySQL AB also provides three GUI client programs for use with MySQL
-    Server:
-  </para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        MySQL Administrator: This tool is used for administering MySQL
-        servers, databases, tables, and user accounts.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Query Browser: This graphical tool is provided by MySQL AB
-        for creating, executing, and optimizing queries on MySQL
-        databases.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Migration Toolkit: This tool helps you migrate schemas and
-        data from other relational database management systems for use
-        with MySQL.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>
-    These GUI programs each have their own manuals that you can access
-    at <ulink url="&base-url-docs;"/>.
-  </para>
-
   <section id="program-overview">
 
     <title>Overview of MySQL Programs</title>

@@ -211,19 +164,6 @@
 
     </itemizedlist>
 
-    <para>
-      Most MySQL distributions include all of these programs, except for
-      those programs that are platform-specific. (For example, the
-      server startup scripts are not used on Windows.) The exception is
-      that RPM distributions are more specialized. There is one RPM for
-      the server, another for client programs, and so forth. If you
-      appear to be missing one or more programs, see
-      <xref linkend="installing"/>, for information on types of
-      distributions and what they contain. It may be that you have a
-      distribution that does not include all programs and you need to
-      install something else.
-    </para>
-
   </section>
 
   <section id="invoking-programs">


Modified: trunk/refman-5.1/programs.xml
===================================================================
--- trunk/refman-5.1/programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.1/programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 3, Lines Added: 81, Lines Deleted: 17; 5135 bytes

@@ -8,20 +8,47 @@
   <title>MySQL Programs</title>
 
   <para>
+    This chapter provides a brief overview of the command-line programs
+    provided by MySQL AB. It also discusses the general syntax for
+    specifying options when you run these programs. Most programs have
+    options that are specific to their own operation, but the option
+    syntax is similar for all of them. Finally, the chapter provides
+    more detailed descriptions of individual programs, including which
+    options they recognize.
+  </para>
+
+  <section id="programs-overview">
+
+    <title>Overview of MySQL Programs</title>
+
+  <para>
     There are many different programs in a MySQL installation. This
-    chapter provides a brief overview of them and then a more detailed
-    description of each one, with the exception of MySQL Cluster
-    programs. Each program's description indicates its invocation syntax
-    and the options that it understands.
+    section provides a brief overview of them. Later sections provide
+    a more detailed description of each one, with the exception of
+    MySQL Cluster programs. Each program's description indicates its
+    invocation syntax and the options that it understands.
     <xref linkend="mysql-cluster"/>, describes programs specific to
     MySQL Cluster.
   </para>
 
   <para>
+    Most MySQL distributions include all of these programs, except for
+    those programs that are platform-specific. (For example, the
+    server startup scripts are not used on Windows.) The exception is
+    that RPM distributions are more specialized. There is one RPM for
+    the server, another for client programs, and so forth. If you
+    appear to be missing one or more programs, see
+    <xref linkend="installing"/>, for information on types of
+    distributions and what they contain. It may be that you have a
+    distribution that does not include all programs and you need to
+    install an additional package.
+  </para>
+
+  <para>
     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>.
+    <command>mysql --help</command>.
   </para>
 
   <para>

@@ -801,22 +828,59 @@
   </itemizedlist>
 
   <para>
-    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>
-
-  <para>
     Each MySQL program takes many different options. Most programs
     provide a <option>--help</option> option that you can use to get a
     full description of the program's different options. For example,
     try <command>mysql --help</command>.
   </para>
 
+  <para>
+    MySQL AB also provides several GUI tools for administering and
+    otherwise working with MySQL Server:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        MySQL Administrator: This tool is used for administering MySQL
+        servers, databases, tables, and user accounts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Query Browser: This graphical tool is provided by MySQL
+        AB for creating, executing, and optimizing queries on MySQL
+        databases.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Migration Toolkit: This tool helps you migrate schemas
+        and data from other relational database management systems for
+        use with MySQL.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    These GUI programs are available at
+    <ulink url="&base-url-downloads;"/>. Each has its own manual that
+    you can access at <ulink url="&base-url-docs;"/>.
+  </para>
+
   <indexterm>
     <primary>environment variables</primary>
   </indexterm>
 
+  <indexterm>
+    <primary>variables</primary>
+    <secondary>environment</secondary>
+  </indexterm>
+
   <para>
     MySQL client programs that communicate with the server using the
     MySQL client/server library use the following environment variables:

@@ -889,17 +953,17 @@
   </informaltable>
 
   <para>
-    Use of <literal>MYSQL_PWD</literal> is insecure. See
-    <xref linkend="password-security"/>.
+    For a full list of environment variables used by MySQL programs,
+    see <xref linkend="environment-variables"/>.
   </para>
 
   <para>
-    You can override the default option values or values specified in
-    environment variables for all standard programs by specifying
-    options in an option file or on the command line. See
-    <xref linkend="program-options"/>.
+    Use of <literal>MYSQL_PWD</literal> is insecure. See
+    <xref linkend="password-security"/>.
   </para>
 
+  </section>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-server.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-installation.xml"/>


Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.1/renamed-nodes.txt	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 451 bytes

@@ -405,3 +405,4 @@
 client-utility-programs programs 2009-01-01
 client-utility-overview programs 2009-01-01
 server-side-overview programs 2009-01-01
+program-overview programs-overview 2009-01-01


Modified: trunk/refman-5.1/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.1/using-mysql-programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.1/using-mysql-programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 60; 2518 bytes

@@ -7,53 +7,6 @@
 
   <title>Using MySQL Programs</title>
 
-  <para>
-    This chapter provides a brief overview of the command-line programs
-    provided by MySQL AB and discusses the general syntax for specifying
-    options when you run these programs. Most programs have options that
-    are specific to their own operation, but the option syntax is
-    similar for all of them. Later chapters provide more detailed
-    descriptions of individual programs, including which options they
-    recognize.
-  </para>
-
-  <para>
-    MySQL AB also provides three GUI client programs for use with MySQL
-    Server:
-  </para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        MySQL Administrator: This tool is used for administering MySQL
-        servers, databases, tables, and user accounts.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Query Browser: This graphical tool is provided by MySQL AB
-        for creating, executing, and optimizing queries on MySQL
-        databases.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Migration Toolkit: This tool helps you migrate schemas and
-        data from other relational database management systems for use
-        with MySQL.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>
-    These GUI programs each have their own manuals that you can access
-    at <ulink url="&base-url-docs;"/>.
-  </para>
-
   <section id="program-overview">
 
     <title>Overview of MySQL Programs</title>

@@ -211,19 +164,6 @@
 
     </itemizedlist>
 
-    <para>
-      Most MySQL distributions include all of these programs, except for
-      those programs that are platform-specific. (For example, the
-      server startup scripts are not used on Windows.) The exception is
-      that RPM distributions are more specialized. There is one RPM for
-      the server, another for client programs, and so forth. If you
-      appear to be missing one or more programs, see
-      <xref linkend="installing"/>, for information on types of
-      distributions and what they contain. It may be that you have a
-      distribution that does not include all programs and you need to
-      install something else.
-    </para>
-
   </section>
 
   <section id="invoking-programs">


Modified: trunk/refman-5.2/renamed-nodes.txt
===================================================================
--- trunk/refman-5.2/renamed-nodes.txt	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-5.2/renamed-nodes.txt	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1006 bytes

@@ -3197,7 +3197,7 @@
 procedure-analyse	http://dev.mysql.com/doc/refman/6.0/en/procedure-analyse.html 2008-03-31
 processlist-table	http://dev.mysql.com/doc/refman/6.0/en/processlist-table.html 2008-03-31
 program-options	http://dev.mysql.com/doc/refman/6.0/en/program-options.html 2008-03-31
-program-overview	http://dev.mysql.com/doc/refman/6.0/en/program-overview.html 2008-03-31
+program-overview	http://dev.mysql.com/doc/refman/6.0/en/programs-overview.html 2008-03-31
 program-variables	http://dev.mysql.com/doc/refman/6.0/en/program-variables.html 2008-03-31
 programming-utilities	http://dev.mysql.com/doc/refman/6.0/en/programs-development.html 2008-03-31
 purge-master-logs	http://dev.mysql.com/doc/refman/6.0/en/purge-master-logs.html 2008-03-31


Modified: trunk/refman-6.0/programs.xml
===================================================================
--- trunk/refman-6.0/programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-6.0/programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 3, Lines Added: 81, Lines Deleted: 17; 5135 bytes

@@ -8,20 +8,47 @@
   <title>MySQL Programs</title>
 
   <para>
+    This chapter provides a brief overview of the command-line programs
+    provided by MySQL AB. It also discusses the general syntax for
+    specifying options when you run these programs. Most programs have
+    options that are specific to their own operation, but the option
+    syntax is similar for all of them. Finally, the chapter provides
+    more detailed descriptions of individual programs, including which
+    options they recognize.
+  </para>
+
+  <section id="programs-overview">
+
+    <title>Overview of MySQL Programs</title>
+
+  <para>
     There are many different programs in a MySQL installation. This
-    chapter provides a brief overview of them and then a more detailed
-    description of each one, with the exception of MySQL Cluster
-    programs. Each program's description indicates its invocation syntax
-    and the options that it understands.
+    section provides a brief overview of them. Later sections provide
+    a more detailed description of each one, with the exception of
+    MySQL Cluster programs. Each program's description indicates its
+    invocation syntax and the options that it understands.
     <xref linkend="mysql-cluster"/>, describes programs specific to
     MySQL Cluster.
   </para>
 
   <para>
+    Most MySQL distributions include all of these programs, except for
+    those programs that are platform-specific. (For example, the
+    server startup scripts are not used on Windows.) The exception is
+    that RPM distributions are more specialized. There is one RPM for
+    the server, another for client programs, and so forth. If you
+    appear to be missing one or more programs, see
+    <xref linkend="installing"/>, for information on types of
+    distributions and what they contain. It may be that you have a
+    distribution that does not include all programs and you need to
+    install an additional package.
+  </para>
+
+  <para>
     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>.
+    <command>mysql --help</command>.
   </para>
 
   <para>

@@ -779,22 +806,59 @@
   </itemizedlist>
 
   <para>
-    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>
-
-  <para>
     Each MySQL program takes many different options. Most programs
     provide a <option>--help</option> option that you can use to get a
     full description of the program's different options. For example,
     try <command>mysql --help</command>.
   </para>
 
+  <para>
+    MySQL AB also provides several GUI tools for administering and
+    otherwise working with MySQL Server:
+  </para>
+
+  <itemizedlist>
+
+    <listitem>
+      <para>
+        MySQL Administrator: This tool is used for administering MySQL
+        servers, databases, tables, and user accounts.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Query Browser: This graphical tool is provided by MySQL
+        AB for creating, executing, and optimizing queries on MySQL
+        databases.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        MySQL Migration Toolkit: This tool helps you migrate schemas
+        and data from other relational database management systems for
+        use with MySQL.
+      </para>
+    </listitem>
+
+  </itemizedlist>
+
+  <para>
+    These GUI programs are available at
+    <ulink url="&base-url-downloads;"/>. Each has its own manual that
+    you can access at <ulink url="&base-url-docs;"/>.
+  </para>
+
   <indexterm>
     <primary>environment variables</primary>
   </indexterm>
 
+  <indexterm>
+    <primary>variables</primary>
+    <secondary>environment</secondary>
+  </indexterm>
+
   <para>
     MySQL client programs that communicate with the server using the
     MySQL client/server library use the following environment variables:

@@ -867,17 +931,17 @@
   </informaltable>
 
   <para>
-    Use of <literal>MYSQL_PWD</literal> is insecure. See
-    <xref linkend="password-security"/>.
+    For a full list of environment variables used by MySQL programs,
+    see <xref linkend="environment-variables"/>.
   </para>
 
   <para>
-    You can override the default option values or values specified in
-    environment variables for all standard programs by specifying
-    options in an option file or on the command line. See
-    <xref linkend="program-options"/>.
+    Use of <literal>MYSQL_PWD</literal> is insecure. See
+    <xref linkend="password-security"/>.
   </para>
 
+  </section>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-server.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="programs-installation.xml"/>


Modified: trunk/refman-6.0/renamed-nodes.txt
===================================================================
--- trunk/refman-6.0/renamed-nodes.txt	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-6.0/renamed-nodes.txt	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 449 bytes

@@ -30,3 +30,4 @@
 client-utility-programs programs 2009-01-01
 client-utility-overview programs 2009-01-01
 server-side-overview programs 2009-01-01
+program-overview programs-overview 2009-01-01


Modified: trunk/refman-6.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-6.0/using-mysql-programs.xml	2007-12-07 17:58:45 UTC (rev 9193)
+++ trunk/refman-6.0/using-mysql-programs.xml	2007-12-07 18:13:39 UTC (rev 9194)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 60; 2518 bytes

@@ -7,53 +7,6 @@
 
   <title>Using MySQL Programs</title>
 
-  <para>
-    This chapter provides a brief overview of the command-line programs
-    provided by MySQL AB and discusses the general syntax for specifying
-    options when you run these programs. Most programs have options that
-    are specific to their own operation, but the option syntax is
-    similar for all of them. Later chapters provide more detailed
-    descriptions of individual programs, including which options they
-    recognize.
-  </para>
-
-  <para>
-    MySQL AB also provides three GUI client programs for use with MySQL
-    Server:
-  </para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>
-        MySQL Administrator: This tool is used for administering MySQL
-        servers, databases, tables, and user accounts.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Query Browser: This graphical tool is provided by MySQL AB
-        for creating, executing, and optimizing queries on MySQL
-        databases.
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL Migration Toolkit: This tool helps you migrate schemas and
-        data from other relational database management systems for use
-        with MySQL.
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>
-    These GUI programs each have their own manuals that you can access
-    at <ulink url="&base-url-docs;"/>.
-  </para>
-
   <section id="program-overview">
 
     <title>Overview of MySQL Programs</title>

@@ -211,19 +164,6 @@
 
     </itemizedlist>
 
-    <para>
-      Most MySQL distributions include all of these programs, except for
-      those programs that are platform-specific. (For example, the
-      server startup scripts are not used on Windows.) The exception is
-      that RPM distributions are more specialized. There is one RPM for
-      the server, another for client programs, and so forth. If you
-      appear to be missing one or more programs, see
-      <xref linkend="installing"/>, for information on types of
-      distributions and what they contain. It may be that you have a
-      distribution that does not include all programs and you need to
-      install something else.
-    </para>
-
   </section>
 
   <section id="invoking-programs">


Thread
svn commit - mysqldoc@docsrva: r9194 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-6.0paul7 Dec