List:Commits« Previous MessageNext Message »
From:mcbrown Date:November 28 2007 12:09pm
Subject:svn commit - mysqldoc@docsrva: r8937 - trunk/userguide
View as plain text  
Author: mcbrown
Date: 2007-11-28 12:09:41 +0100 (Wed, 28 Nov 2007)
New Revision: 8937

Log:
Reformat



Modified:
   trunk/userguide/about.xml
   trunk/userguide/access-mysql.xml
   trunk/userguide/backups.xml
   trunk/userguide/data-types.xml
   trunk/userguide/functions.xml
   trunk/userguide/introduction-using.xml
   trunk/userguide/introduction.xml
   trunk/userguide/mysql-client-programs.xml
   trunk/userguide/mysql-server-programs.xml
   trunk/userguide/operators.xml
   trunk/userguide/optimizing.xml
   trunk/userguide/other-utilities.xml
   trunk/userguide/phpmyadmin.xml
   trunk/userguide/schemas-tables.xml
   trunk/userguide/security.xml
   trunk/userguide/storage-engines.xml
   trunk/userguide/triggers.xml
   trunk/userguide/upgrading.xml
   trunk/userguide/userguide.xml
   trunk/userguide/using-mysqlnd.xml
   trunk/userguide/using-pdo.xml
   trunk/userguide/using-ruby.xml


Modified: trunk/userguide/about.xml
===================================================================
--- trunk/userguide/about.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/about.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 935 bytes

@@ -178,11 +178,11 @@
 
       <para>
         Additionally, make sure that you have read and understood
-        &lt;xref to legal status of submissions&gt;.
-        Email <email>docs@stripped</email> specifying
-        <quote>&userguide; Contribution</quote> as the subject line.
-        This email should contain a short biography and briefly describe
-        what you wish to write about.
+        &lt;xref to legal status of submissions&gt;. Email
+        <email>docs@stripped</email> specifying <quote>&userguide;
+        Contribution</quote> as the subject line. This email should
+        contain a short biography and briefly describe what you wish to
+        write about.
       </para>
 
       <note>


Modified: trunk/userguide/access-mysql.xml
===================================================================
--- trunk/userguide/access-mysql.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/access-mysql.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 454 bytes

@@ -6,9 +6,9 @@
 %all.entities;
 ]>
 <chapter id="userguide-access-mysql">
-  
+
   <title>Migrating an Access Database to MySQL</title>
-  
+
   <para></para>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/backups.xml
===================================================================
--- trunk/userguide/backups.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/backups.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 2, Lines Added: 498, Lines Deleted: 516; 50111 bytes

@@ -19,684 +19,668 @@
 
   </section>
 
-    <section id="userguide-mysqldump-intro">
+  <section id="userguide-mysqldump-intro">
 
-      <title>Using <command>mysqldump</command></title>
-      
-      <formalpara role="contributor">
-        
-        <title>MySQL Contributor</title>
-        
-        <para>
-          This section was contributed by MySQL staff. For more
-          information see <ulink url="http://mysql.com"/>.
-        </para>
-        
-      </formalpara>
+    <title>Using <command>mysqldump</command></title>
 
+    <formalpara role="contributor">
+
+      <title>MySQL Contributor</title>
+
       <para>
-        The <command>mysqldump</command> utility is a database back-up
-        program capable of copying everything on a specific MySQL server
-        &mdash; both the database objects and the data. It can also be
-        used to copy a number of databases, one particular database, one
-        or more tables from a specific database, or just specific
-        records from one table. Any kind of data can be saved using this
-        utility &mdash; even images stored as binary data.
+        This section was contributed by MySQL staff. For more
+        information see <ulink url="http://mysql.com"/>.
       </para>
 
+    </formalpara>
+
+    <para>
+      The <command>mysqldump</command> utility is a database back-up
+      program capable of copying everything on a specific MySQL server
+      &mdash; both the database objects and the data. It can also be
+      used to copy a number of databases, one particular database, one
+      or more tables from a specific database, or just specific records
+      from one table. Any kind of data can be saved using this utility
+      &mdash; even images stored as binary data.
+    </para>
+
+    <para>
+      The <command>mysqldump</command> utility creates a script file of
+      SQL statements that recreate the database objects selected and it
+      also creates <literal>INSERT</literal> statements to restore data.
+      There are various other ways to back up MySQL databases or tables;
+      using the <command>mysql</command> client program and SQL
+      statements, copying the MySQL data directory, using binary logs,
+      using MySQL Administrator, and also the Unix-specific utility,
+      <command>mysqlhotcopy</command>. However,
+      <command>mysqldump</command> is the most versatile and accessible
+      tool for backing up tables and databases and it is available for
+      all operating systems.
+    </para>
+
+    <para>
+      The reasons for creating back-up files vary:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            As replacements for existing files in the event of database
+            corruption
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To transfer files from a development server to a production
+            server
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            To migrate to another file format
+          </para>
+        </listitem>
+
+      </itemizedlist>
+    </para>
+
+    <para>
+      This chapter shows how to use <command>mysqldump</command> for
+      each of these tasks. This is not meant as a definite treatment of
+      <literal>mysqldump</literal>; for complete coverage of this
+      utility see <ulink url="&base-url-refman;5.0/en/mysqldump.html"/>.
+    </para>
+
+<!-- start options -->
+
+    <section id="mysqldump-options">
+
+      <title>Options</title>
+
       <para>
-        The <command>mysqldump</command> utility creates a script file
-        of SQL statements that recreate the database objects selected
-        and it also creates <literal>INSERT</literal> statements to
-        restore data. There are various other ways to back up MySQL
-        databases or tables; using the <command>mysql</command> client
-        program and SQL statements, copying the MySQL data directory,
-        using binary logs, using MySQL Administrator, and also the
-        Unix-specific utility, <command>mysqlhotcopy</command>. However,
-        <command>mysqldump</command> is the most versatile and
-        accessible tool for backing up tables and databases and it is
-        available for all operating systems.
+        This section identifies the most commonly used options and
+        briefly describes each one. Examples of using these options are
+        given in subsequent sections.
       </para>
 
       <para>
-        The reasons for creating back-up files vary:
+        Since the <command>mysqldump</command> utility gives access to a
+        specific MySQL server, you must have credentials on that server;
+        you must explicitly or implicitly provide a
+        <option>--user</option> and <option>--password</option>.
+        Likewise you must provide <option>--host</option> and
+        <option>--port</option> options. In this respect,
+        <command>mysqldump</command> does not differ from the MySQL
+        client program, <command>mysql</command>, or from other
+        utilities such as <command>mysqladmin</command>.
+      </para>
 
+      <para>
+        Other common options are:
+
         <itemizedlist>
 
           <listitem>
             <para>
-              As replacements for existing files in the event of
-              database corruption
+              <option>--all-databases, -A </option> &ndash; Dump all
+              tables in all databases.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              To transfer files from a development server to a
-              production server
+              <option>--databases, -B </option> &ndash; Specify this
+              option and <command>mysqldump</command> regards all name
+              arguments as database names
             </para>
           </listitem>
 
           <listitem>
             <para>
-              To migrate to another file format
+              <option>--fields-terminated-by </option> &ndash; Used in
+              conjunction with the <option>--tab</option> option to
+              specify a field terminator.
             </para>
           </listitem>
 
+          <listitem>
+            <para>
+              <option>--no-create-db</option> &ndash; Used in
+              conjunction with the <option>--all-databases</option> or
+              the <option>--databases</option> option to suppress the
+              <literal>CREATE DATABASE</literal> statement
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--no-data</option> &ndash; Save database objects
+              but not data.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--opt </option> &ndash; This option is shorthand
+              for a group of options. See
+              <xref linkend="opt-group-options"/>.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--skip-opt </option> &ndash; Turn off the
+              <option>--opt</option> group of options.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--tab=<replaceable>path</replaceable>, -T
+              <replaceable>path</replaceable> </option> &ndash; Create
+              tab-separated data files in the named directory.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--tables </option> &ndash; Override the
+              <option>--databases</option> option.
+              <command>mysqldump</command> regards all name arguments
+              following this option as table names.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--where=<replaceable>'where_condition'</replaceable>,
+              -w <replaceable>'where_condition'</replaceable> </option>
+              &ndash; Only dump rows selected by the where condition.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <option>--xml </option> &ndash; Dump output as XML.
+            </para>
+          </listitem>
+
         </itemizedlist>
       </para>
 
       <para>
-        This chapter shows how to use <command>mysqldump</command> for
-        each of these tasks. This is not meant as a definite treatment
-        of <literal>mysqldump</literal>; for complete coverage of this
-        utility see
-        <ulink url="&base-url-refman;5.0/en/mysqldump.html"/>.
+        The <option>--all-databases</option> option is used when you
+        want to dump the entire contents of a server. On the other hand,
+        the <option>--databases</option> option lets you specify
+        particular databases to copy. Both of these options add a
+        <literal>CREATE DATABASE</literal> statement to the dump file.
+        To turn off this feature use the <option>--no-create-db</option>
+        option. You can also choose not to save any data by using the
+        <option>--no-data</option> option.
       </para>
 
-<!-- start options -->
+      <para>
+        The <option>--tables</option> option makes it possible to use
+        the <option>--databases</option> option and also specify which
+        tables you would like to dump.
+      </para>
 
-      <section id="mysqldump-options">
+      <para>
+        Use the <option>--tab</option> and
+        <option>--fields-terminated-by</option> options, to dump a
+        database in a variety of text formats. For XML format, use the
+        <option>--xml</option> option. To select only specific rows from
+        a table use the <option>--where</option> option.
+      </para>
 
-        <title>Options</title>
+      <para>
+        For a complete list of all the available options see
+        <ulink url="&base-url-refman;5.0/en/mysqldump.html"/>.
+      </para>
 
-        <para>
-          This section identifies the most commonly used options and
-          briefly describes each one. Examples of using these options
-          are given in subsequent sections.
-        </para>
+      <section id="opt-group-options">
 
-        <para>
-          Since the <command>mysqldump</command> utility gives access to
-          a specific MySQL server, you must have credentials on that
-          server; you must explicitly or implicitly provide a
-          <option>--user</option> and <option>--password</option>.
-          Likewise you must provide <option>--host</option> and
-          <option>--port</option> options. In this respect,
-          <command>mysqldump</command> does not differ from the MySQL
-          client program, <command>mysql</command>, or from other
-          utilities such as <command>mysqladmin</command>.
-        </para>
+        <title>The <option>--opt</option> Group of Options</title>
 
         <para>
-          Other common options are:
+          The <option>--opt</option> option is on by default so you
+          don't have to specify it. However, you do need to know what it
+          does. Using <option>--opt</option> is shorthand for specifying
+          <option> --add-locks, --add-drop-table, --create-options,
+          --disable-keys, --extended-insert, --lock-tables,
+          --quick,</option> and <option>--set-charset</option>. Find a
+          brief description of these options in what follows.
 
           <itemizedlist>
 
             <listitem>
               <para>
-                <option>--all-databases, -A </option> &ndash; Dump all
-                tables in all databases.
+                <option>--add-locks </option> &ndash; Lock tables before
+                inserting data.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--databases, -B </option> &ndash; Specify this
-                option and <command>mysqldump</command> regards all name
-                arguments as database names
+                <option>--add-drop-table </option> &ndash; Remove tables
+                before recreating them.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--fields-terminated-by </option> &ndash; Used in
-                conjunction with the <option>--tab</option> option to
-                specify a field terminator.
+                <option>--create-options </option> &ndash; Include all
+                MySQL-specific table options in the <literal>CREATE
+                TABLE</literal> statements.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--no-create-db</option> &ndash; Used in
-                conjunction with the <option>--all-databases</option> or
-                the <option>--databases</option> option to suppress the
-                <literal>CREATE DATABASE</literal> statement
+                <option>--disable-keys </option> &ndash; Improve speed
+                by disabling indexes before inserting data. (Applies
+                only to MyISAM tables and only to non-unique indexes.)
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--no-data</option> &ndash; Save database objects
-                but not data.
+                <option>--extended-insert </option> &ndash; Use
+                multiple-row <literal>INSERT</literal> syntax that
+                includes a <literal>VALUES</literal> list for each row.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--opt </option> &ndash; This option is shorthand
-                for a group of options. See
-                <xref linkend="opt-group-options"/>.
+                <option>--lock-tables </option> &ndash; Lock tables
+                before dumping them.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--skip-opt </option> &ndash; Turn off the
-                <option>--opt</option> group of options.
+                <option>--quick </option> &ndash; Retrieve rows from a
+                table one row at a time, reducing demands on memory.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                <option>--tab=<replaceable>path</replaceable>, -T
-                <replaceable>path</replaceable> </option> &ndash; Create
-                tab-separated data files in the named directory.
+                <option>--set-charset</option> &ndash; Add <literal>SET
+                NAMES</literal>
+                <replaceable>default_character_set</replaceable> to the
+                output.
               </para>
             </listitem>
 
-            <listitem>
-              <para>
-                <option>--tables </option> &ndash; Override the
-                <option>--databases</option> option.
-                <command>mysqldump</command> regards all name arguments
-                following this option as table names.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <option>--where=<replaceable>'where_condition'</replaceable>,
-                -w <replaceable>'where_condition'</replaceable>
-                </option> &ndash; Only dump rows selected by the where
-                condition.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <option>--xml </option> &ndash; Dump output as XML.
-              </para>
-            </listitem>
-
           </itemizedlist>
         </para>
 
         <para>
-          The <option>--all-databases</option> option is used when you
-          want to dump the entire contents of a server. On the other
-          hand, the <option>--databases</option> option lets you specify
-          particular databases to copy. Both of these options add a
-          <literal>CREATE DATABASE</literal> statement to the dump file.
-          To turn off this feature use the
-          <option>--no-create-db</option> option. You can also choose
-          not to save any data by using the <option>--no-data</option>
-          option.
+          Each of these options can be turned off individually by using
+          the
+          <option>--skip-<replaceable>option-name</replaceable></option>
+          syntax. For example, if you want to ensure that you recreate
+          tables as the server default table type, you can turn off
+          <option>--create-options</option> by specifying
+          <option>--skip-create-options</option>. No engine or character
+          set will be specified in the <literal>CREATE TABLE</literal>
+          statement. Turn off <option>--extended-insert</option> by
+          specifying the <option>--skip-extended-inserts</option>
+          option. Doing this creates a separate
+          <literal>INSERT</literal> statement for each row, making it
+          much easier to remove individual <literal>INSERT</literal>
+          statements.
         </para>
 
-        <para>
-          The <option>--tables</option> option makes it possible to use
-          the <option>--databases</option> option and also specify which
-          tables you would like to dump.
-        </para>
+      </section>
 
-        <para>
-          Use the <option>--tab</option> and
-          <option>--fields-terminated-by</option> options, to dump a
-          database in a variety of text formats. For XML format, use the
-          <option>--xml</option> option. To select only specific rows
-          from a table use the <option>--where</option> option.
-        </para>
+    </section>
 
-        <para>
-          For a complete list of all the available options see
-          <ulink url="&base-url-refman;5.0/en/mysqldump.html"/>.
-        </para>
+<!-- back-up -->
 
-        <section id="opt-group-options">
+    <section id="backing-up">
 
-          <title>The <option>--opt</option> Group of Options</title>
+      <title>Backing Up Data and Database Objects</title>
 
-          <para>
-            The <option>--opt</option> option is on by default so you
-            don't have to specify it. However, you do need to know what
-            it does. Using <option>--opt</option> is shorthand for
-            specifying <option> --add-locks, --add-drop-table,
-            --create-options, --disable-keys, --extended-insert,
-            --lock-tables, --quick,</option> and
-            <option>--set-charset</option>. Find a brief description of
-            these options in what follows.
+      <para>
+        To back up the contents of a server and create replacements for
+        all existing databases invoke the <command>mysqldump</command>
+        utility specifying your credentials and the
+        <option>--all-databases</option> option. Using the option short
+        forms, you can back up a server and redirect output to a file in
+        the following way:
+      </para>
 
-            <itemizedlist>
+<programlisting>
+shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p -A &gt; <replaceable>dump.sql</replaceable></userinput>
+</programlisting>
 
-              <listitem>
-                <para>
-                  <option>--add-locks </option> &ndash; Lock tables
-                  before inserting data.
-                </para>
-              </listitem>
+      <para>
+        Using the short forms shown in the preceding listing is
+        equivalent to using the <option>--user, --password,</option> and
+        <option>--all-databases</option> options. Output is sent to a
+        file using the redirection operator,
+        <quote><literal>&gt;</literal></quote>. Since the
+        <option>--host</option> option is not specified, it defaults to
+        <literal>localhost</literal>. Likewise, <option>--port</option>
+        will default to <literal>3306</literal>. Since no password is
+        given at the command line, you will be prompted for one.
+      </para>
 
-              <listitem>
-                <para>
-                  <option>--add-drop-table </option> &ndash; Remove
-                  tables before recreating them.
-                </para>
-              </listitem>
+      <para>
+        Specifying your password at the command line is allowed but note
+        that you cannot leave a space between the option and your
+        password; it must appear as
+        <option>-p<replaceable>password</replaceable></option>. If a
+        space was allowed, the <option>-A</option> option in the
+        preceding listing would be interpreted as the password.
+      </para>
 
-              <listitem>
-                <para>
-                  <option>--create-options </option> &ndash; Include all
-                  MySQL-specific table options in the <literal>CREATE
-                  TABLE</literal> statements.
-                </para>
-              </listitem>
+      <para>
+        If you wish to copy only specific databases, replace
+        <option>-A</option> with the <option>--databases</option> option
+        (or its short form, <option>-B</option>) followed by the names
+        of the databases that you wish to back up. The file created by
+        this command will contain only the databases specified.
+      </para>
 
-              <listitem>
-                <para>
-                  <option>--disable-keys </option> &ndash; Improve speed
-                  by disabling indexes before inserting data. (Applies
-                  only to MyISAM tables and only to non-unique indexes.)
-                </para>
-              </listitem>
+      <para>
+        Using <command>mysqldump</command> to back up specific databases
+        or all the databases on a server is an easy way to create
+        replacements in the event of lost data or database corruption.
+      </para>
 
-              <listitem>
-                <para>
-                  <option>--extended-insert </option> &ndash; Use
-                  multiple-row <literal>INSERT</literal> syntax that
-                  includes a <literal>VALUES</literal> list for each
-                  row.
-                </para>
-              </listitem>
+      <section id="refining-objects-selected">
 
-              <listitem>
-                <para>
-                  <option>--lock-tables </option> &ndash; Lock tables
-                  before dumping them.
-                </para>
-              </listitem>
+        <title>Further Refining the Objects and Data Selected</title>
 
-              <listitem>
-                <para>
-                  <option>--quick </option> &ndash; Retrieve rows from a
-                  table one row at a time, reducing demands on memory.
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  <option>--set-charset</option> &ndash; Add
-                  <literal>SET NAMES</literal>
-                  <replaceable>default_character_set</replaceable> to
-                  the output.
-                </para>
-              </listitem>
-
-            </itemizedlist>
-          </para>
-
-          <para>
-            Each of these options can be turned off individually by
-            using the
-            <option>--skip-<replaceable>option-name</replaceable></option>
-            syntax. For example, if you want to ensure that you recreate
-            tables as the server default table type, you can turn off
-            <option>--create-options</option> by specifying
-            <option>--skip-create-options</option>. No engine or
-            character set will be specified in the <literal>CREATE
-            TABLE</literal> statement. Turn off
-            <option>--extended-insert</option> by specifying the
-            <option>--skip-extended-inserts</option> option. Doing this
-            creates a separate <literal>INSERT</literal> statement for
-            each row, making it much easier to remove individual
-            <literal>INSERT</literal> statements.
-          </para>
-
-        </section>
-
-      </section>
-
-<!-- back-up -->
-
-      <section id="backing-up">
-
-        <title>Backing Up Data and Database Objects</title>
-
         <para>
-          To back up the contents of a server and create replacements
-          for all existing databases invoke the
-          <command>mysqldump</command> utility specifying your
-          credentials and the <option>--all-databases</option> option.
-          Using the option short forms, you can back up a server and
-          redirect output to a file in the following way:
+          If you wish to copy only one database, you do not need to use
+          the <option>--databases</option> option. Simply specify your
+          credentials and the database name in the following fashion:
         </para>
 
 <programlisting>
-shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p -A &gt; <replaceable>dump.sql</replaceable></userinput>
+shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p <replaceable>db_name</replaceable> &gt; <replaceable>dump.sql</replaceable></userinput>
 </programlisting>
 
         <para>
-          Using the short forms shown in the preceding listing is
-          equivalent to using the <option>--user, --password,</option>
-          and <option>--all-databases</option> options. Output is sent
-          to a file using the redirection operator,
-          <quote><literal>&gt;</literal></quote>. Since the
-          <option>--host</option> option is not specified, it defaults
-          to <literal>localhost</literal>. Likewise,
-          <option>--port</option> will default to
-          <literal>3306</literal>. Since no password is given at the
-          command line, you will be prompted for one.
+          A specific database is selected by using the database name
+          &mdash; no option is necessary. Output is again redirected to
+          the file using the redirection operator.
         </para>
 
         <para>
-          Specifying your password at the command line is allowed but
-          note that you cannot leave a space between the option and your
-          password; it must appear as
-          <option>-p<replaceable>password</replaceable></option>. If a
-          space was allowed, the <option>-A</option> option in the
-          preceding listing would be interpreted as the password.
+          Remember that the <option>--opt</option> group of options is
+          on by default. (For a complete list of this group of options
+          see <xref  linkend="opt-group-options"/>.) To turn off any one
+          of these options you can use the
+          <option>--skip-<replaceable>option-name</replaceable></option>
+          option.
         </para>
 
         <para>
-          If you wish to copy only specific databases, replace
-          <option>-A</option> with the <option>--databases</option>
-          option (or its short form, <option>-B</option>) followed by
-          the names of the databases that you wish to back up. The file
-          created by this command will contain only the databases
-          specified.
+          On the other hand, if you want to turn off most of the
+          <option>--opt</option> options, it may be easier to specify
+          <option>--skip-opt</option> and then list the options you wish
+          to use.
         </para>
 
-        <para>
-          Using <command>mysqldump</command> to back up specific
-          databases or all the databases on a server is an easy way to
-          create replacements in the event of lost data or database
-          corruption.
-        </para>
-
-        <section id="refining-objects-selected">
-
-          <title>Further Refining the Objects and Data Selected</title>
-
+        <note>
           <para>
-            If you wish to copy only one database, you do not need to
-            use the <option>--databases</option> option. Simply specify
-            your credentials and the database name in the following
-            fashion:
+            If you choose to do things this way, make sure that you
+            specify <option>--skip-opt</option> first. If it is the last
+            option specified, it will turn off any of the
+            <option>--opt</option> group of options that precede it.
           </para>
+        </note>
 
-<programlisting>
-shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p <replaceable>db_name</replaceable> &gt; <replaceable>dump.sql</replaceable></userinput>
-</programlisting>
+        <para>
+          In some cases you may want to copy only selected tables from a
+          database. This is done by naming the desired tables
+          immediately following the database name. For example:
+        </para>
 
-          <para>
-            A specific database is selected by using the database name
-            &mdash; no option is necessary. Output is again redirected
-            to the file using the redirection operator.
-          </para>
-
-          <para>
-            Remember that the <option>--opt</option> group of options is
-            on by default. (For a complete list of this group of options
-            see <xref  linkend="opt-group-options"/>.) To turn off any
-            one of these options you can use the
-            <option>--skip-<replaceable>option-name</replaceable></option>
-            option.
-          </para>
-
-          <para>
-            On the other hand, if you want to turn off most of the
-            <option>--opt</option> options, it may be easier to specify
-            <option>--skip-opt</option> and then list the options you
-            wish to use.
-          </para>
-
-          <note>
-            <para>
-              If you choose to do things this way, make sure that you
-              specify <option>--skip-opt</option> first. If it is the
-              last option specified, it will turn off any of the
-              <option>--opt</option> group of options that precede it.
-            </para>
-          </note>
-
-          <para>
-            In some cases you may want to copy only selected tables from
-            a database. This is done by naming the desired tables
-            immediately following the database name. For example:
-          </para>
-
 <programlisting>
 shell&gt; <userinput>mysqldump <replaceable>[options]</replaceable> <replaceable>db_name table1 table2</replaceable></userinput>
 </programlisting>
 
-          <para>
-            When dumping a specific table, the data selection can be
-            further refined by adding a <option>--where</option> option
-            in the following way:
-          </para>
+        <para>
+          When dumping a specific table, the data selection can be
+          further refined by adding a <option>--where</option> option in
+          the following way:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>mysqldump [options] <replaceable>db_name table1</replaceable> --where=<replaceable>'field_name&gt;1000'</replaceable></userinput>
 </programlisting>
 
-          <para>
-            When using the <option>--where</option> option only one
-            table may be specified. The script file created will contain
-            a <literal>CREATE TABLE</literal> statement for
-            reconstructing the table and any data that meets the
-            condition specified using the <option>--where</option>
-            option.
-          </para>
+        <para>
+          When using the <option>--where</option> option only one table
+          may be specified. The script file created will contain a
+          <literal>CREATE TABLE</literal> statement for reconstructing
+          the table and any data that meets the condition specified
+          using the <option>--where</option> option.
+        </para>
 
-          <note>
-            <para>
-              If the <option>--where</option> option contains spaces or
-              characters special to your command interpreter, then you
-              must enclose everything in the where condition in
-              quotation marks.
-            </para>
-          </note>
-
+        <note>
           <para>
-            Using a database name at the command line creates a copy of
-            the tables and the data from the specified database.
-            However, no database is created when this syntax is used.
+            If the <option>--where</option> option contains spaces or
+            characters special to your command interpreter, then you
+            must enclose everything in the where condition in quotation
+            marks.
           </para>
+        </note>
 
-          <para>
-            To dump only one database and add a <literal>CREATE
-            DATABASE</literal> statement, you must use the
-            <option>--databases</option> option. An example using the
-            short form of the <option>--databases</option> option
-            follows:
-          </para>
+        <para>
+          Using a database name at the command line creates a copy of
+          the tables and the data from the specified database. However,
+          no database is created when this syntax is used.
+        </para>
 
+        <para>
+          To dump only one database and add a <literal>CREATE
+          DATABASE</literal> statement, you must use the
+          <option>--databases</option> option. An example using the
+          short form of the <option>--databases</option> option follows:
+        </para>
+
 <programlisting>
 shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p -B <replaceable>db_name</replaceable> &gt; <replaceable>dump.sql</replaceable></userinput>
 </programlisting>
 
-          <para>
-            If you wish your dump file to contain a <literal>CREATE
-            DATABASE</literal> statement and you only wish to dump
-            selected tables use the <option>--tables</option> option as
-            shown in the following:
-          </para>
+        <para>
+          If you wish your dump file to contain a <literal>CREATE
+          DATABASE</literal> statement and you only wish to dump
+          selected tables use the <option>--tables</option> option as
+          shown in the following:
+        </para>
 
 <programlisting>
 shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p -B <replaceable>db_name</replaceable> <option>--tables <replaceable>table1</replaceable></option>  &gt; <replaceable>dump.sql</replaceable></userinput>
 </programlisting>
 
-          <para>
-            If you don't specify the <option>--tables</option> option,
-            the <option>-B</option> option interprets each name as a
-            database.
-          </para>
+        <para>
+          If you don't specify the <option>--tables</option> option, the
+          <option>-B</option> option interprets each name as a database.
+        </para>
 
-          <para>
-            The next section examines how to restore databases from the
-            script files created by <command>mysqldump</command>.
-          </para>
+        <para>
+          The next section examines how to restore databases from the
+          script files created by <command>mysqldump</command>.
+        </para>
 
-        </section>
-
       </section>
 
-      <section id="restoring-database-dumps">
+    </section>
 
-        <title>Restoring Database Dumps</title>
+    <section id="restoring-database-dumps">
 
-        <para>
-          Databases are restored by redirecting the script file to the
-          <command>mysql</command> client program.
+      <title>Restoring Database Dumps</title>
 
-          <remark>
-            xref here?
-          </remark>
+      <para>
+        Databases are restored by redirecting the script file to the
+        <command>mysql</command> client program.
 
-          If the script file was created using either the
-          <option>-A</option> or <option>-B</option> options, restore
-          the dumped files in the following way:
-        </para>
+        <remark>
+          xref here?
+        </remark>
 
+        If the script file was created using either the
+        <option>-A</option> or <option>-B</option> options, restore the
+        dumped files in the following way:
+      </para>
+
 <programlisting>
 shell&gt; <userinput>mysql -u <replaceable>user_name</replaceable> -p &lt; <replaceable>dump.sql</replaceable></userinput>
 </programlisting>
 
-        <warning>
-          <para>
-            Using the <option>-A</option> or <option>-B</option> option
-            with <command>mysqldump</command> creates a script that
-            drops and recreates databases. Any data in existing
-            databases will be lost. Furthermore, if you backed up all
-            databases then the <literal>mysql</literal> database will be
-            overwritten. Be sure that this is what you intend. For more
-            information see ...
-
-            <remark>
-              xref here
-            </remark>
-          </para>
-        </warning>
-
+      <warning>
         <para>
-          If you created your dump file without using the
-          <option>-A</option> or <option>-B</option> options, then the
-          database that you copy the tables to must already exist. Name
-          that database when invoking <command>mysql</command>:
+          Using the <option>-A</option> or <option>-B</option> option
+          with <command>mysqldump</command> creates a script that drops
+          and recreates databases. Any data in existing databases will
+          be lost. Furthermore, if you backed up all databases then the
+          <literal>mysql</literal> database will be overwritten. Be sure
+          that this is what you intend. For more information see ...
+
+          <remark>
+            xref here
+          </remark>
         </para>
+      </warning>
 
+      <para>
+        If you created your dump file without using the
+        <option>-A</option> or <option>-B</option> options, then the
+        database that you copy the tables to must already exist. Name
+        that database when invoking <command>mysql</command>:
+      </para>
+
 <programlisting>
 shell&gt; <userinput>mysql -u <replaceable>user_name</replaceable> -p <replaceable>db_name</replaceable> &lt; <replaceable>dump.sql</replaceable></userinput>  
 </programlisting>
 
-        <para>
-          In this case, you need not worry about overwriting an existing
-          database, but you will overwrite any tables in the existing
-          database that have the same names as tables in the back-up
-          file if the file contains <literal>DROP TABLE</literal> and
-          <literal>CREATE TABLE</literal> statements. To remove these
-          statements from a dump file, create it using the
-          <option>--skip-add-drop-table</option> and
-          <option>--no-create-info</option> options.
-        </para>
+      <para>
+        In this case, you need not worry about overwriting an existing
+        database, but you will overwrite any tables in the existing
+        database that have the same names as tables in the back-up file
+        if the file contains <literal>DROP TABLE</literal> and
+        <literal>CREATE TABLE</literal> statements. To remove these
+        statements from a dump file, create it using the
+        <option>--skip-add-drop-table</option> and
+        <option>--no-create-info</option> options.
+      </para>
 
-        <para>
-          If you are uploading a database dump file to a remote database
-          then you will have to specify the <option>--host</option>
-          option. If you don't have access to your MySQL server from a
-          remote location, copy your script file to the server, log in
-          using <command>ssh</command>, and then run
-          <command>mysql</command>. If neither of these options is
-          available to you, you may be able to upload and execute the
-          script file using a program such as phpMyAdmin.
-        </para>
+      <para>
+        If you are uploading a database dump file to a remote database
+        then you will have to specify the <option>--host</option>
+        option. If you don't have access to your MySQL server from a
+        remote location, copy your script file to the server, log in
+        using <command>ssh</command>, and then run
+        <command>mysql</command>. If neither of these options is
+        available to you, you may be able to upload and execute the
+        script file using a program such as phpMyAdmin.
+      </para>
 
-      </section>
+    </section>
 
 <!-- Start Exporting -->
 
-      <section id="exporting-from-mysql">
+    <section id="exporting-from-mysql">
 
-        <title>Exporting From MySQL</title>
+      <title>Exporting From MySQL</title>
 
-        <para>
-          To use the data from a MySQL database in another application
-          &mdash; a word processor or a spreadsheet, for example &mdash;
-          you might want to export data in text format. The most common
-          way of exporting a file in text format is by using the
-          <option>--tab</option> or <option>-T</option> option and
-          specifying the full pathname to the target directory:
-        </para>
+      <para>
+        To use the data from a MySQL database in another application
+        &mdash; a word processor or a spreadsheet, for example &mdash;
+        you might want to export data in text format. The most common
+        way of exporting a file in text format is by using the
+        <option>--tab</option> or <option>-T</option> option and
+        specifying the full pathname to the target directory:
+      </para>
 
 <programlisting>
 shell&gt; <userinput>mysqldump -u <replaceable>user_name</replaceable> -p <replaceable>db_name</replaceable> -T <replaceable>/tmp</replaceable></userinput> 
 </programlisting>
 
-        <para>
-          Dumping a database specifying this option creates a script
-          file of each table's structure using the table name and the
-          extension <literal>sql</literal> as the file name and a
-          tab-separated file of each table's data using the table name
-          and the extension <literal>txt</literal> as the file name.
-          These files are created in the directory specified with the
-          <option>-T</option> option. This directory must be writable
-          and the user indicated by <replaceable>user_name</replaceable>
-          must have the <literal>FILE</literal> privilege. For more
-          information about the <literal>FILE</literal> privilege see
-          ...
+      <para>
+        Dumping a database specifying this option creates a script file
+        of each table's structure using the table name and the extension
+        <literal>sql</literal> as the file name and a tab-separated file
+        of each table's data using the table name and the extension
+        <literal>txt</literal> as the file name. These files are created
+        in the directory specified with the <option>-T</option> option.
+        This directory must be writable and the user indicated by
+        <replaceable>user_name</replaceable> must have the
+        <literal>FILE</literal> privilege. For more information about
+        the <literal>FILE</literal> privilege see ...
 
-          <remark>
-            Add xref to FILE here
-          </remark>
-        </para>
+        <remark>
+          Add xref to FILE here
+        </remark>
+      </para>
 
-        <para>
-          File permissions are not usually a problem on Windows systems
-          but the file separator and spaces in file names can present
-          difficulties. Use a forward slash to separate directories and,
-          if a directory contains spaces, enclose the path in quotation
-          marks, for example, <quote>C:/Documents and
-          Settings/peter/Desktop/</quote>. Failure to include quotation
-          marks results in the following error:
-        </para>
+      <para>
+        File permissions are not usually a problem on Windows systems
+        but the file separator and spaces in file names can present
+        difficulties. Use a forward slash to separate directories and,
+        if a directory contains spaces, enclose the path in quotation
+        marks, for example, <quote>C:/Documents and
+        Settings/peter/Desktop/</quote>. Failure to include quotation
+        marks results in the following error:
+      </para>
 
 <programlisting>
 mysqldump: Got error: 1049; Unknown database 'and' when selecting the database
 </programlisting>
 
-        <para>
-          Despite its name, the <option>--tab</option> option can be
-          used to created files with a field terminator other than the
-          <literal>tab</literal> character. The field terminator is
-          changed by using the <option>--fields-terminated-by</option>
-          option. For example you can specify a
-          <quote><literal>,</literal></quote> as the terminator in order
-          to use a table in a spreadsheet program.
-        </para>
+      <para>
+        Despite its name, the <option>--tab</option> option can be used
+        to created files with a field terminator other than the
+        <literal>tab</literal> character. The field terminator is
+        changed by using the <option>--fields-terminated-by</option>
+        option. For example you can specify a
+        <quote><literal>,</literal></quote> as the terminator in order
+        to use a table in a spreadsheet program.
+      </para>
 
-        <para>
-          The <option>--tab</option> option is designed to extract data
-          from one database only and cannot be used with the
-          <option>--databases</option> option, or with the
-          <option>--all-databases</option> option. Whenever it is used a
-          database name must be one of the arguments to
-          <command>mysqldump</command>.
-        </para>
+      <para>
+        The <option>--tab</option> option is designed to extract data
+        from one database only and cannot be used with the
+        <option>--databases</option> option, or with the
+        <option>--all-databases</option> option. Whenever it is used a
+        database name must be one of the arguments to
+        <command>mysqldump</command>.
+      </para>
 
-        <para>
-          To further refine the data selected, the
-          <option>--tab</option> option can also be used to select data
-          from one table only. This is done by naming the desired table
-          after selecting the database. The <option>--tab</option>
-          option can also be used with the <option>--where</option>
-          option as shown in
-          <xref linkend="refining-objects-selected"/>.
-        </para>
+      <para>
+        To further refine the data selected, the <option>--tab</option>
+        option can also be used to select data from one table only. This
+        is done by naming the desired table after selecting the
+        database. The <option>--tab</option> option can also be used
+        with the <option>--where</option> option as shown in
+        <xref linkend="refining-objects-selected"/>.
+      </para>
 
-        <para>
-          Often, when creating text files there is no need for the
-          script file that creates the table structure &mdash; you're
-          simply interested in exporting the data. In cases like this it
-          would be nice to have an option to copy only data. No such
-          option exists but we will see how to do this when we discuss
-          <literal>SELECT ... INTO OUTFILE</literal>. For more
-          information see ...
-        </para>
+      <para>
+        Often, when creating text files there is no need for the script
+        file that creates the table structure &mdash; you're simply
+        interested in exporting the data. In cases like this it would be
+        nice to have an option to copy only data. No such option exists
+        but we will see how to do this when we discuss <literal>SELECT
+        ... INTO OUTFILE</literal>. For more information see ...
+      </para>
 
-        <para>
-          For an XML representation of the data and the database objects
-          use the <option>--xml</option> option. This option creates an
-          XML document in the following format:
-        </para>
+      <para>
+        For an XML representation of the data and the database objects
+        use the <option>--xml</option> option. This option creates an
+        XML document in the following format:
+      </para>
 
 <programlisting>
 <replaceable>

@@ -733,44 +717,42 @@
 </replaceable>
 </programlisting>
 
-        <para>
-          Given the ease with which a database can be converted to XML
-          you might wonder whether conversion to HTML is also possible.
-          Unfortunately, there is no <command>mysqldump</command> option
-          for creating HTML output. However, this can be done by
-          starting <command>mysql</command> using the
-          <option>--html</option> and <option>--tee</option> options.
-          For instructions on doing this see <xref linkend="mysql-client-other-options"/>.
+      <para>
+        Given the ease with which a database can be converted to XML you
+        might wonder whether conversion to HTML is also possible.
+        Unfortunately, there is no <command>mysqldump</command> option
+        for creating HTML output. However, this can be done by starting
+        <command>mysql</command> using the <option>--html</option> and
+        <option>--tee</option> options. For instructions on doing this
+        see <xref linkend="mysql-client-other-options"/>.
 
-          <remark>
-            xref when available
-          </remark>
-        </para>
-  
-      </section>
+        <remark>
+          xref when available
+        </remark>
+      </para>
 
     </section>
 
+  </section>
+
 <!-- end mysqldump section -->
 
-    <section id="user-guide-replication">
+  <section id="user-guide-replication">
 
-      <title>Replication</title>
+    <title>Replication</title>
 
-      <para></para>
+    <para></para>
 
-    </section>
+  </section>
 
-    <section id="user-guide-backup-other">
+  <section id="user-guide-backup-other">
 
-      <title>Other Options</title>
+    <title>Other Options</title>
 
-      <para></para>
+    <para></para>
 
-    </section>
+  </section>
 
-
-
 <!-- END backup -->
 
 </chapter>


Modified: trunk/userguide/data-types.xml
===================================================================
--- trunk/userguide/data-types.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/data-types.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 532 bytes

@@ -6,15 +6,15 @@
 %all.entities;
 ]>
 <chapter id="userguide-data-types">
-  
+
   <title>Data Types</title>
-  
+
   <section id="userguide-specific-type">
-    
+
     <title>&lt;Data Type&gt;</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/functions.xml
===================================================================
--- trunk/userguide/functions.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/functions.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 535 bytes

@@ -6,15 +6,15 @@
 %all.entities;
 ]>
 <chapter id="userguide-functions">
-  
+
   <title>Functions</title>
-  
+
   <section id="userguide-specific-function">
-    
+
     <title>&lt;Function Type&gt;</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/introduction-using.xml
===================================================================
--- trunk/userguide/introduction-using.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/introduction-using.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 31, Lines Deleted: 32; 2143 bytes

@@ -6,77 +6,76 @@
 %all.entities;
 ]>
 <chapter id="userguide-introduction-using-mysql">
-  
+
   <title>Introduction to Using MySQL</title>
-  
+
   <section id="userguide-differences-oses">
-    
+
     <title>Variations Between Operating Systems</title>
-    
+
     <para>
-      MySQL functions slightly differently on 
-      different operating systems. For the most part 
-      these differences can be ignored  but you should 
-      be aware of the following items:
-      
+      MySQL functions slightly differently on different operating
+      systems. For the most part these differences can be ignored but
+      you should be aware of the following items:
+
       <itemizedlist>
-        
+
         <listitem>
           <para>
             sockets
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             auto-completion
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             file separators
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             etc
           </para>
-        </listitem>            
-        
+        </listitem>
+
       </itemizedlist>
     </para>
-    
+
   </section>
-  
+
   <section id="userguide-command-line">
-    
+
     <title>Working From the Command Line</title>
-    
+
     <para>
       <remark>
-        [PL] Not a repeat of the MySQL Client section.
-        Basics of querying a database.
+        [PL] Not a repeat of the MySQL Client section. Basics of
+        querying a database.
       </remark>
     </para>
-    
+
   </section>
-  
+
   <section id="userguide-query-browser">
-    
+
     <title>Using Query Browser</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="userguide-sample-schema">
-    
+
     <title>Sample Schema</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/introduction.xml
===================================================================
--- trunk/userguide/introduction.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/introduction.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 3; 481 bytes

@@ -23,9 +23,8 @@
 
       <para></para>
 
-    </section>    
+    </section>
 
-
   </section>
 
   <section id="userguide-mysql-applications">

@@ -65,7 +64,6 @@
     </section>
 
   </section>
-  
 
 </chapter>
 <!-- END INTRODUCTION CHAPTER -->


Modified: trunk/userguide/mysql-client-programs.xml
===================================================================
--- trunk/userguide/mysql-client-programs.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/mysql-client-programs.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 4, Lines Added: 19, Lines Deleted: 13; 2365 bytes

@@ -40,11 +40,11 @@
 
     </formalpara>
 
-    <para>     
-      The most important client tool is the
-      <command>mysql</command> program, usually referred to as the MySQL
-      client. This is a command-line program for interacting with a
-      MySQL server. Use <command>mysql</command> to:
+    <para>
+      The most important client tool is the <command>mysql</command>
+      program, usually referred to as the MySQL client. This is a
+      command-line program for interacting with a MySQL server. Use
+      <command>mysql</command> to:
 
       <itemizedlist>
 

@@ -202,9 +202,15 @@
           any MySQL users then specify the default,
           <literal>root</literal>, as the user name. There is no
           password for this default user. For information on creating
-          additional users see &lt;xref&gt;.<remark>[PL]Add xref </remark>
+          additional users see &lt;xref&gt;.
 
           <remark>
+            [PL]Add xref
+          </remark>
+
+
+
+          <remark>
             Difference between 127.0.0.1 and localhost on Unix?
           </remark>
         </para>

@@ -704,16 +710,16 @@
   <section id="user-guide-mysqladmin">
 
     <title>The <command>mysqladmin</command> Client Program</title>
-    
+
     <formalpara role="contributor">
-      
+
       <title>MySQL Contributor</title>
-      
+
       <para>
         This section was contributed by MySQL staff. For more
         information see <ulink url="http://mysql.com"/>.
       </para>
-      
+
     </formalpara>
 
     <para>

@@ -896,9 +902,9 @@
             This command is used extensively in &lt;xref&gt;. In that
             section we examine the configuration file
             (<filename>my.ini</filename> under Windows,
-            <filename>my.cnf</filename> under Unix and Mac OS X). In order for
-            configuration changes to have effect the server must be
-            stopped and restarted.
+            <filename>my.cnf</filename> under Unix and Mac OS X). In
+            order for configuration changes to have effect the server
+            must be stopped and restarted.
           </para>
         </note>
 


Modified: trunk/userguide/mysql-server-programs.xml
===================================================================
--- trunk/userguide/mysql-server-programs.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/mysql-server-programs.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 2, Lines Added: 83, Lines Deleted: 83; 6573 bytes

@@ -12,73 +12,74 @@
   <section id="mysql-server">
 
     <title>The MySQL Server</title>
-    
+
     <section id="essential-sever-options">
-      <title>Essential Server Options</title> 
-    
-    <para>
-      The essential options and system variables are as follows:
-    </para>
 
-    <itemizedlist>
+      <title>Essential Server Options</title>
 
-      <listitem>
-        <para>
-          <option>--bind-address=<replaceable>IP_address</replaceable></option>
-        </para>
-      </listitem>
+      <para>
+        The essential options and system variables are as follows:
+      </para>
 
-      <listitem>
-        <para>
-          <option>--date_format=<replaceable>format_string</replaceable></option>
-        </para>
-      </listitem>
+      <itemizedlist>
 
-      <listitem>
-        <para>
-          <option>--datetime_format=<replaceable>format_string</replaceable></option>
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--bind-address=<replaceable>IP_address</replaceable></option>
+          </para>
+        </listitem>
 
-      <listitem>
-        <para>
-          <option>--default-storage-engine=<replaceable>engine_type</replaceable></option>
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--date_format=<replaceable>format_string</replaceable></option>
+          </para>
+        </listitem>
 
-      <listitem>
-        <para>
-          <option>--local_infile=<replaceable>[0|1]</replaceable></option>
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--datetime_format=<replaceable>format_string</replaceable></option>
+          </para>
+        </listitem>
 
-      <listitem>
-        <para>
-          <option>--sql_mode=<replaceable>mode</replaceable></option>
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--default-storage-engine=<replaceable>engine_type</replaceable></option>
+          </para>
+        </listitem>
 
-      <listitem>
-        <para>
-          <option>--skip_networking</option> &ndash; allow local
-          connections only
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--local_infile=<replaceable>[0|1]</replaceable></option>
+          </para>
+        </listitem>
 
-      <listitem>
-        <para>
-          <option>--skip_show_databases</option>
-        </para>
-      </listitem>
+        <listitem>
+          <para>
+            <option>--sql_mode=<replaceable>mode</replaceable></option>
+          </para>
+        </listitem>
 
-    </itemizedlist>
+        <listitem>
+          <para>
+            <option>--skip_networking</option> &ndash; allow local
+            connections only
+          </para>
+        </listitem>
 
-    <para>
-      To see the default format that MySQL uses for dates issue the
-      statement <userinput>SELECT NOW();</userinput> from the MySQL
-      client. You should see output like the following:
-    </para>
+        <listitem>
+          <para>
+            <option>--skip_show_databases</option>
+          </para>
+        </listitem>
 
+      </itemizedlist>
+
+      <para>
+        To see the default format that MySQL uses for dates issue the
+        statement <userinput>SELECT NOW();</userinput> from the MySQL
+        client. You should see output like the following:
+      </para>
+
 <programlisting>
 +---------------------+
 | NOW()               |

@@ -87,40 +88,39 @@
 +---------------------+
 </programlisting>
 
-    <para>
-      If you don't find this date/time format suitable, you can change
-      it by using the <option>--date-format</option> and
-      <literal>--datetime-format</literal> options. For example, to
-      change the date format to a two digit month followed by a two
-      digit day of the month and a four digit year separated by a
-      forward slash use the following option:
-      <literal>--date-format=`%m/%d/%Y`</literal>. For all the legal
-      formats see <xref linkend="userguide-date-format-specifiers"/>.
-    </para>
+      <para>
+        If you don't find this date/time format suitable, you can change
+        it by using the <option>--date-format</option> and
+        <literal>--datetime-format</literal> options. For example, to
+        change the date format to a two digit month followed by a two
+        digit day of the month and a four digit year separated by a
+        forward slash use the following option:
+        <literal>--date-format=`%m/%d/%Y`</literal>. For all the legal
+        formats see <xref linkend="userguide-date-format-specifiers"/>.
+      </para>
 
-    <para>
-      The <option>--skip-networking</option> option allows only local
-      (non-TCP) connections. On Unix, local connections use a Unix
-      socket file and on Windows, they use a named pipe or shared
-      memory. For a development server you will most likely not want to
-      use this option. However, some distributions come with this option
-      activated so it is useful to know about it so that you can disable
-      it.
-    </para>
+      <para>
+        The <option>--skip-networking</option> option allows only local
+        (non-TCP) connections. On Unix, local connections use a Unix
+        socket file and on Windows, they use a named pipe or shared
+        memory. For a development server you will most likely not want
+        to use this option. However, some distributions come with this
+        option activated so it is useful to know about it so that you
+        can disable it.
+      </para>
 
-    <para>
-      Likewise with the <option>--bind-address</option>. This option
-      binds the MySQL server to a specific IP address, typically
-      <literal>127.0.0.1</literal> effectively disabling access from a
-      remote location. It is mentioned here so that you know how to
-      disable it.
-    </para>
+      <para>
+        Likewise with the <option>--bind-address</option>. This option
+        binds the MySQL server to a specific IP address, typically
+        <literal>127.0.0.1</literal> effectively disabling access from a
+        remote location. It is mentioned here so that you know how to
+        disable it.
+      </para>
 
     </section>
-    
-        
-    </section>
 
+  </section>
+
   <section id="userguide-my.cnf-file">
 
     <title>The <filename>my.cnf/my.ini</filename> File</title>


Modified: trunk/userguide/operators.xml
===================================================================
--- trunk/userguide/operators.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/operators.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 8; 595 bytes

@@ -7,14 +7,14 @@
 ]>
 <chapter id="userguide-operators">
 
-<title>Operators</title>
+  <title>Operators</title>
 
-<section id="userguide-operators-type">
-  
-  <title>&lt;Operator Type&gt;</title>
-  
-  <para></para>
-  
-</section>
+  <section id="userguide-operators-type">
 
+    <title>&lt;Operator Type&gt;</title>
+
+    <para></para>
+
+  </section>
+
 </chapter>


Modified: trunk/userguide/optimizing.xml
===================================================================
--- trunk/userguide/optimizing.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/optimizing.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 15, Lines Deleted: 15; 808 bytes

@@ -6,31 +6,31 @@
 %all.entities;
 ]>
 <chapter id="userguide-optimization">
-  
+
   <title>Optimization</title>
-  
+
   <section id="optimization">
-    
+
     <title>Using EXPLAIN</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="userguide-optimization-select">
-    
+
     <title>Optimizing SELECT Statements</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="userguide-optimization-indexes">
-    
+
     <title>Optimizing Indexes</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/other-utilities.xml
===================================================================
--- trunk/userguide/other-utilities.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/other-utilities.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 8; 610 bytes

@@ -6,17 +6,17 @@
 %all.entities;
 ]>
 <chapter id="userguide-other-utilities">
-  
+
   <title>Other MySQL Utilities</title>
-  
+
   <para></para>
-  
+
   <section id="userguide-mysqlutility">
-    
+
     <title>Using <command>&lt;mysqlutility&gt;</command></title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/phpmyadmin.xml
===================================================================
--- trunk/userguide/phpmyadmin.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/phpmyadmin.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 397 bytes

@@ -7,8 +7,8 @@
 ]>
 <chapter id="userguide-phpmyadmin">
 
-<title>phpMyAdmin</title>
+  <title>phpMyAdmin</title>
 
-<para></para>
+  <para></para>
 
 </chapter>


Modified: trunk/userguide/schemas-tables.xml
===================================================================
--- trunk/userguide/schemas-tables.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/schemas-tables.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 670 bytes

@@ -6,18 +6,18 @@
 %all.entities;
 ]>
 <chapter id="userguide-schemas-tables">
-  
+
   <title>Creating Schemas and Tables</title>
-  
+
   <section id="designing-schemas-tables">
-    
+
     <title>Designing a Schema</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-  <!--section>
+
+<!--section>
     
     <title>Database Normalization</title>
     

@@ -32,5 +32,5 @@
     <para></para>
     
     </section-->
-  
+
 </chapter>


Modified: trunk/userguide/security.xml
===================================================================
--- trunk/userguide/security.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/security.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 2, Lines Added: 36, Lines Deleted: 36; 1937 bytes

@@ -6,48 +6,48 @@
 %all.entities;
 ]>
 <chapter id="userguide-security">
-  
+
   <title>MySQL Security</title>
-  
+
   <section id="userguide-security-basics">
-    
+
     <title>Security Basics</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="userguide-grants">
-    
+
     <title>Grants</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="security-default">
-    
+
     <title>Securing Default User Accounts</title>
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="creating-planning-schemas">
-    
+
     <title>Advanced Utilities</title>
-    
+
     <para></para>
-    
+
     <itemizedlist>
-      
+
       <listitem>
         <para>
           myisamchk &ndash; checking and repairing MyISAM tables
         </para>
       </listitem>
-      
-      <!--listitem>
+
+<!--listitem>
         <para>
         myisamlog
         </para>

@@ -64,36 +64,36 @@
         mysql_install_db
         </para>
         </listitem-->
-      
+
     </itemizedlist>
-    
-    <!--para>
+
+<!--para>
       mysql_install_db initializes the MySQL data directory instance
       manager and the mysql.server file found in /usr/share/mysql on
       Suse  manual says /etc/init.d
       </para-->
-    
+
   </section>
-  
+
   <section id="userguide-advanced-features-utilities">
-    
+
     <title>Advanced Features of Previously Mentioned Utilities</title>
-    
-    <!--para>
+
+<!--para>
       using compression with mysqldump using FOREIGN_KEY_CHECKS with
       dump files
       </para-->
-    
+
     <para></para>
-    
+
   </section>
-  
+
   <section id="userguide-best-practices">
-    
+
     <title>Best Practices</title>
-    
+
     <para></para>
-    
+
   </section>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/storage-engines.xml
===================================================================
--- trunk/userguide/storage-engines.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/storage-engines.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 10; 522 bytes

@@ -7,15 +7,13 @@
 
   <para></para>
 
-<section>
-  <title>&lt;type&gt; Engine</title>
-  
-  <para>
-    
-  </para>
-</section>
-  
-  
-  
+  <section>
+
+    <title>&lt;type&gt; Engine</title>
+
+    <para></para>
+
+  </section>
+
 </chapter>
 <!-- END STORAGE ENGINE CHAPTER -->


Modified: trunk/userguide/triggers.xml
===================================================================
--- trunk/userguide/triggers.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/triggers.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 8; 580 bytes

@@ -7,16 +7,16 @@
 ]>
 <chapter id="userguide-triggers">
 
-<title>Triggers</title>
+  <title>Triggers</title>
 
-<section id="triggers">
-  
-  <title>What Are Triggers?</title>
-  
-  <para></para>
-  
-</section>
+  <section id="triggers">
 
+    <title>What Are Triggers?</title>
+
+    <para></para>
+
+  </section>
+
 <!--section>
   
   <title>Events</title>


Modified: trunk/userguide/upgrading.xml
===================================================================
--- trunk/userguide/upgrading.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/upgrading.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 12; 638 bytes

@@ -6,19 +6,17 @@
 %all.entities;
 ]>
 <chapter id="userguide-upgrading">
-  
-  <title>Upgrading MySQL </title>
-  
+
+  <title>Upgrading MySQL</title>
+
   <para></para>
-  
+
   <section id="upgrading-operating-system">
+
     <title>Upgrading on &lt;operating system&gt;</title>
-    
-    <para>
-      
-    </para>
-    
+
+    <para></para>
+
   </section>
-  
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/userguide.xml
===================================================================
--- trunk/userguide/userguide.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/userguide.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 8, Lines Added: 23, Lines Deleted: 24; 3668 bytes

@@ -66,8 +66,9 @@
     <title>Using MySQL</title>
 
 <!--intro-->
+
     <xi:include href="introduction-using.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    
+
 <!--end intro-->
 
 <!--populating-->

@@ -84,19 +85,19 @@
 
 <!--Data Types-->
 
-    <xi:include href="data-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> 
+    <xi:include href="data-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!--end Data Types-->
 
 <!--operators-->
 
-    <xi:include href="operators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> 
-    
+    <xi:include href="operators.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <!--end operators-->
 
 <!--Functions-->
 
-    <xi:include href="functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> 
+    <xi:include href="functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!--end Functions-->
 

@@ -116,9 +117,8 @@
 
     <title>Advanced MySQL Usage</title>
 
-
     <xi:include href="schemas-tables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- 
+
 <!--end creating-->
 
 <!--Indexing-->

@@ -135,7 +135,7 @@
 
 <!--Start Triggers-->
 
-    <xi:include href="triggers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>  
+    <xi:include href="triggers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!--end triggers-->
 

@@ -149,7 +149,7 @@
 
 <!--Optimizing-->
 
-    <xi:include href="optimizing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>   
+    <xi:include href="optimizing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!--end Optimizing-->
 

@@ -188,15 +188,15 @@
   <part>
 
     <title>Advanced MySQL Administration</title>
-    
+
     <xi:include href="configuring.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    
-    <!-- END UPGRADING MYSQL -->
 
-    <xi:include href="upgrading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>    
+<!-- END UPGRADING MYSQL -->
 
-    <xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>   
+    <xi:include href="upgrading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+    <xi:include href="security.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
     <xi:include href="backups.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <xi:include href="log-files.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

@@ -211,7 +211,6 @@
 
     <title>Using the MySQL APIs</title>
 
-
     <xi:include href="php-mysqli.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- END MYSQLI CHAPTER -->

@@ -235,17 +234,17 @@
     <xi:include href="other-utilities.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <xi:include href="excel-mysql.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    
+
     <xi:include href="access-mysql.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="using-pdo.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>     
-    
-    <xi:include href="using-mysqlnd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>     
-    
-    <xi:include href="using-ruby.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>  
-    
-    <xi:include href="phpmyadmin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>  
-    
+    <xi:include href="using-pdo.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+    <xi:include href="using-mysqlnd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+    <xi:include href="using-ruby.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+    <xi:include href="phpmyadmin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
   </part>
 
 <!--end Part VI-->


Modified: trunk/userguide/using-mysqlnd.xml
===================================================================
--- trunk/userguide/using-mysqlnd.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/using-mysqlnd.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 396 bytes

@@ -6,9 +6,9 @@
 %all.entities;
 ]>
 <chapter id="userguide-using-mysqlnd">
-  
+
   <title>Using mysqlnd</title>
-  
+
   <para></para>
-  
+
 </chapter>


Modified: trunk/userguide/using-pdo.xml
===================================================================
--- trunk/userguide/using-pdo.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/using-pdo.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 444 bytes

@@ -6,9 +6,9 @@
 %all.entities;
 ]>
 <chapter id="userguide-using-pdo">
-  
+
   <title>Using PHP Data Objects (PDO) With MySQL</title>
-  
+
   <para></para>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Modified: trunk/userguide/using-ruby.xml
===================================================================
--- trunk/userguide/using-ruby.xml	2007-11-28 11:05:27 UTC (rev 8936)
+++ trunk/userguide/using-ruby.xml	2007-11-28 11:09:41 UTC (rev 8937)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 423 bytes

@@ -6,9 +6,9 @@
 %all.entities;
 ]>
 <chapter id="userguide-using-ruby">
-  
+
   <title>Ruby and MySQL</title>
-  
+
   <para></para>
-  
-</chapter>
\ No newline at end of file
+
+</chapter>


Thread
svn commit - mysqldoc@docsrva: r8937 - trunk/userguidemcbrown28 Nov