MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:paul.dubois Date:February 4 2009 6:04pm
Subject:svn commit - mysqldoc@docsrva: r13568 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2009-02-04 19:04:00 +0100 (Wed, 04 Feb 2009)
New Revision: 13568

Log:
 r38200@frost:  paul | 2009-02-04 12:06:04 -0500
 Reformat


Modified:
   trunk/refman-4.1/dba-log-files.xml
   trunk/refman-4.1/programs-server.xml
   trunk/refman-4.1/replication-options-core.xml
   trunk/refman-4.1/se-innodb-core.xml
   trunk/refman-5.0/dba-log-files.xml
   trunk/refman-5.0/dba-privilege-system.xml
   trunk/refman-5.0/programs-server-core.xml
   trunk/refman-5.0/replication-options-core.xml
   trunk/refman-5.0/se-innodb-core.xml
   trunk/refman-5.1/dba-log-files.xml
   trunk/refman-5.1/programs-server-core.xml
   trunk/refman-5.1/replication-options-core.xml
   trunk/refman-5.1/se-innodb-core.xml
   trunk/refman-6.0/dba-log-files.xml
   trunk/refman-6.0/programs-server-core.xml
   trunk/refman-6.0/replication-options-core.xml
   trunk/refman-6.0/se-innodb-core.xml

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


Modified: trunk/refman-4.1/dba-log-files.xml
===================================================================
--- trunk/refman-4.1/dba-log-files.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-4.1/dba-log-files.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1915 bytes

@@ -790,14 +790,15 @@
       server) crashes, there is a chance that the last statements of the
       binary log are lost. To prevent this, you can make the binary log
       be synchronized to disk after every <replaceable>N</replaceable>
-      writes to the binary log, with the <literal role="sysvar">sync_binlog</literal>
-      system variable. See <xref linkend="server-system-variables"/>. 1
-      is the safest value for <literal role="sysvar">sync_binlog</literal>, but also
-      the slowest. Even with <literal role="sysvar">sync_binlog</literal> set to 1,
-      there is still the chance of an inconsistency between the table
-      content and binary log content in case of a crash. For example, if
-      you are using <literal>InnoDB</literal> tables and the MySQL
-      server processes a <literal role="stmt">COMMIT</literal>
+      writes to the binary log, with the
+      <literal role="sysvar">sync_binlog</literal> system variable. See
+      <xref linkend="server-system-variables"/>. 1 is the safest value
+      for <literal role="sysvar">sync_binlog</literal>, but also the
+      slowest. Even with <literal role="sysvar">sync_binlog</literal>
+      set to 1, there is still the chance of an inconsistency between
+      the table content and binary log content in case of a crash. For
+      example, if you are using <literal>InnoDB</literal> tables and the
+      MySQL server processes a <literal role="stmt">COMMIT</literal>
       statement, it writes the whole transaction to the binary log and
       then commits this transaction into <literal>InnoDB</literal>. If
       the server crashes between those two operations, the transaction


Modified: trunk/refman-4.1/programs-server.xml
===================================================================
--- trunk/refman-4.1/programs-server.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-4.1/programs-server.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 9, Lines Added: 42, Lines Deleted: 32; 7240 bytes

@@ -216,11 +216,13 @@
       <para>
         To override the default behavior and specify explicitly the name
         of the server you want to run, specify a
-        <option role="mysqld_safe">--mysqld</option> or <option
-role="mysqld_safe">--mysqld-version</option>
-        option to <command>mysqld_safe</command>. You can also use
-        <option role="mysqld_safe">--ledir</option> to indicate the directory where
-        <command>mysqld_safe</command> should look for the server.
+        <option role="mysqld_safe">--mysqld</option> or
+        <option
+role="mysqld_safe">--mysqld-version</option> option to
+        <command>mysqld_safe</command>. You can also use
+        <option role="mysqld_safe">--ledir</option> to indicate the
+        directory where <command>mysqld_safe</command> should look for
+        the server.
       </para>
 
       <para>

@@ -295,7 +297,8 @@
 
           <para>
             If you want NetWare to close the screen automatically
-            instead, use the <option role="mysqld_safe">--autoclose</option> option to
+            instead, use the
+            <option role="mysqld_safe">--autoclose</option> option to
             <command>mysqld_safe</command>.
           </para>
         </listitem>

@@ -412,7 +415,8 @@
           </para>
 
           <para>
-            The old form of the <option role="mysqld_safe">--log-error</option> option, to
+            The old form of the
+            <option role="mysqld_safe">--log-error</option> option, to
             be used before MySQL 4.0.
           </para>
         </listitem>

@@ -481,9 +485,10 @@
             This option is needed if you use the MySQL binary
             distribution but have the data directory outside of the
             binary distribution. If <command>mysqld_safe</command>
-            cannot find the server, use the <option role="mysqld_safe">--ledir</option>
-            option to indicate the path name to the directory where the
-            server is located.
+            cannot find the server, use the
+            <option role="mysqld_safe">--ledir</option> option to
+            indicate the path name to the directory where the server is
+            located.
           </para>
         </listitem>
 

@@ -503,16 +508,17 @@
           </para>
 
           <para>
-            This option is similar to the <option role="mysqld_safe">--mysqld</option>
-            option, but you specify only the suffix for the server
-            program name. The basename is assumed to be
-            <command>mysqld</command>. For example, if you use
+            This option is similar to the
+            <option role="mysqld_safe">--mysqld</option> option, but you
+            specify only the suffix for the server program name. The
+            basename is assumed to be <command>mysqld</command>. For
+            example, if you use
             <option role="mysqld_safe">--mysqld-version=max</option>,
             <command>mysqld_safe</command> starts the
             <command>mysqld-max</command> program in the
             <literal>ledir</literal> directory. If the argument to
-            <option role="mysqld_safe">--mysqld-version</option> is empty,
-            <command>mysqld_safe</command> uses
+            <option role="mysqld_safe">--mysqld-version</option> is
+            empty, <command>mysqld_safe</command> uses
             <command>mysqld</command> in the <literal>ledir</literal>
             directory.
           </para>

@@ -721,10 +727,10 @@
       <para>
         If you execute <command>mysqld_safe</command> with the
         <option role="mysqld_safe">--defaults-file</option> or
-        <option role="mysqld_safe">--defaults-extra-file</option> option to name an
-        option file, the option must be the first one given on the
-        command line or the option file will not be used. For example,
-        this command will not use the named option file:
+        <option role="mysqld_safe">--defaults-extra-file</option> option
+        to name an option file, the option must be the first one given
+        on the command line or the option file will not be used. For
+        example, this command will not use the named option file:
       </para>
 
 <programlisting>

@@ -801,9 +807,10 @@
       <para>
         If <command>mysqld_safe</command> fails, even when invoked from
         the MySQL installation directory, you can specify the
-        <option role="mysqld_safe">--ledir</option> and <option role="mysqld_safe">--datadir</option> options
-        to indicate the directories in which the server and databases
-        are located on your system.
+        <option role="mysqld_safe">--ledir</option> and
+        <option role="mysqld_safe">--datadir</option> options to
+        indicate the directories in which the server and databases are
+        located on your system.
       </para>
 
       <para>

@@ -1549,20 +1556,22 @@
             The Unix socket file and the TCP/IP port number must be
             different for every <command>mysqld</command>.
             (Alternatively, if the host has multiple network addresses,
-            you can use <option role="mysqld">--bind-address</option> to cause
-            different servers to listen to different interfaces.)
+            you can use <option role="mysqld">--bind-address</option> to
+            cause different servers to listen to different interfaces.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            The <option role="mysqld_safe">--pid-file</option> option is very important if
-            you are using <command>mysqld_safe</command> to start
+            The <option role="mysqld_safe">--pid-file</option> option is
+            very important if you are using
+            <command>mysqld_safe</command> to start
             <command>mysqld</command> (for example,
-            <option role="mysqld_safe">--mysqld=mysqld_safe</option>) Every
-            <command>mysqld</command> should have its own process ID
-            file. The advantage of using <command>mysqld_safe</command>
-            instead of <command>mysqld</command> is that
+            <option role="mysqld_safe">--mysqld=mysqld_safe</option>)
+            Every <command>mysqld</command> should have its own process
+            ID file. The advantage of using
+            <command>mysqld_safe</command> instead of
+            <command>mysqld</command> is that
             <command>mysqld_safe</command> monitors its
             <command>mysqld</command> process and restarts it if the
             process terminates due to a signal sent using <literal>kill

@@ -1594,7 +1603,8 @@
 
         <listitem>
           <para>
-            You might want to use the <option role="mysqld">--user</option> option for
+            You might want to use the
+            <option role="mysqld">--user</option> option for
             <command>mysqld</command>, but to do this you need to run
             the <command>mysqld_multi</command> script as the Unix
             <literal>root</literal> user. Having the option in the


Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-4.1/replication-options-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 9; 2083 bytes

@@ -1947,11 +1947,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,

@@ -1960,10 +1961,10 @@
         </para>
 
         <para>
-          If the value of <literal role="sysvar">sync_binlog</literal> is 0 (the
-          default), no extra flushing is done. The server relies on the
-          operating system to flush the file contents occasionally as
-          for any other file.
+          If the value of <literal role="sysvar">sync_binlog</literal>
+          is 0 (the default), no extra flushing is done. The server
+          relies on the operating system to flush the file contents
+          occasionally as for any other file.
         </para>
       </listitem>
 


Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-4.1/se-innodb-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1457 bytes

@@ -2082,11 +2082,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,


Modified: trunk/refman-5.0/dba-log-files.xml
===================================================================
--- trunk/refman-5.0/dba-log-files.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.0/dba-log-files.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1915 bytes

@@ -688,14 +688,15 @@
       server) crashes, there is a chance that the last statements of the
       binary log are lost. To prevent this, you can make the binary log
       be synchronized to disk after every <replaceable>N</replaceable>
-      writes to the binary log, with the <literal role="sysvar">sync_binlog</literal>
-      system variable. See <xref linkend="server-system-variables"/>. 1
-      is the safest value for <literal role="sysvar">sync_binlog</literal>, but also
-      the slowest. Even with <literal role="sysvar">sync_binlog</literal> set to 1,
-      there is still the chance of an inconsistency between the table
-      content and binary log content in case of a crash. For example, if
-      you are using <literal>InnoDB</literal> tables and the MySQL
-      server processes a <literal role="stmt">COMMIT</literal>
+      writes to the binary log, with the
+      <literal role="sysvar">sync_binlog</literal> system variable. See
+      <xref linkend="server-system-variables"/>. 1 is the safest value
+      for <literal role="sysvar">sync_binlog</literal>, but also the
+      slowest. Even with <literal role="sysvar">sync_binlog</literal>
+      set to 1, there is still the chance of an inconsistency between
+      the table content and binary log content in case of a crash. For
+      example, if you are using <literal>InnoDB</literal> tables and the
+      MySQL server processes a <literal role="stmt">COMMIT</literal>
       statement, it writes the whole transaction to the binary log and
       then commits this transaction into <literal>InnoDB</literal>. If
       the server crashes between those two operations, the transaction


Modified: trunk/refman-5.0/dba-privilege-system.xml
===================================================================
--- trunk/refman-5.0/dba-privilege-system.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.0/dba-privilege-system.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 757 bytes

@@ -1181,7 +1181,8 @@
       <listitem>
         <para id="priv_execute">
           The <literal role="priv">EXECUTE</literal> privilege is
-          required to execute stored routines (procedures and functions). This privilege was added in MySQL 5.0.0 but did
+          required to execute stored routines (procedures and
+          functions). This privilege was added in MySQL 5.0.0 but did
           not become operational until MySQL 5.0.3.
         </para>
       </listitem>


Modified: trunk/refman-5.0/programs-server-core.xml
===================================================================
--- trunk/refman-5.0/programs-server-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.0/programs-server-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 11, Lines Added: 46, Lines Deleted: 36; 8293 bytes

@@ -211,10 +211,12 @@
       <para>
         To override the default behavior and specify explicitly the name
         of the server you want to run, specify a
-        <option role="mysqld_safe">--mysqld</option> or <option role="mysqld_safe">--mysqld-version</option>
-        option to <command>mysqld_safe</command>. You can also use
-        <option role="mysqld_safe">--ledir</option> to indicate the directory where
-        <command>mysqld_safe</command> should look for the server.
+        <option role="mysqld_safe">--mysqld</option> or
+        <option role="mysqld_safe">--mysqld-version</option> option to
+        <command>mysqld_safe</command>. You can also use
+        <option role="mysqld_safe">--ledir</option> to indicate the
+        directory where <command>mysqld_safe</command> should look for
+        the server.
       </para>
 
       <para>

@@ -311,7 +313,8 @@
 
           <para>
             If you want NetWare to close the screen automatically
-            instead, use the <option role="mysqld_safe">--autoclose</option> option to
+            instead, use the
+            <option role="mysqld_safe">--autoclose</option> option to
             <command>mysqld_safe</command>.
           </para>
         </listitem>

@@ -488,9 +491,10 @@
             This option is needed if you use the MySQL binary
             distribution but have the data directory outside of the
             binary distribution. If <command>mysqld_safe</command>
-            cannot find the server, use the <option role="mysqld_safe">--ledir</option>
-            option to indicate the path name to the directory where the
-            server is located.
+            cannot find the server, use the
+            <option role="mysqld_safe">--ledir</option> option to
+            indicate the path name to the directory where the server is
+            located.
           </para>
         </listitem>
 

@@ -510,16 +514,17 @@
           </para>
 
           <para>
-            This option is similar to the <option role="mysqld_safe">--mysqld</option>
-            option, but you specify only the suffix for the server
-            program name. The basename is assumed to be
-            <command>mysqld</command>. For example, if you use
+            This option is similar to the
+            <option role="mysqld_safe">--mysqld</option> option, but you
+            specify only the suffix for the server program name. The
+            basename is assumed to be <command>mysqld</command>. For
+            example, if you use
             <option role="mysqld_safe">--mysqld-version=debug</option>,
             <command>mysqld_safe</command> starts the
             <command>mysqld-debug</command> program in the
             <literal>ledir</literal> directory. If the argument to
-            <option role="mysqld_safe">--mysqld-version</option> is empty,
-            <command>mysqld_safe</command> uses
+            <option role="mysqld_safe">--mysqld-version</option> is
+            empty, <command>mysqld_safe</command> uses
             <command>mysqld</command> in the <literal>ledir</literal>
             directory.
           </para>

@@ -727,10 +732,10 @@
       <para>
         If you execute <command>mysqld_safe</command> with the
         <option role="mysqld_safe">--defaults-file</option> or
-        <option role="mysqld_safe">--defaults-extra-file</option> option to name an
-        option file, the option must be the first one given on the
-        command line or the option file will not be used. For example,
-        this command will not use the named option file:
+        <option role="mysqld_safe">--defaults-extra-file</option> option
+        to name an option file, the option must be the first one given
+        on the command line or the option file will not be used. For
+        example, this command will not use the named option file:
       </para>
 
 <programlisting>

@@ -807,9 +812,10 @@
       <para>
         If <command>mysqld_safe</command> fails, even when invoked from
         the MySQL installation directory, you can specify the
-        <option role="mysqld_safe">--ledir</option> and <option role="mysqld_safe">--datadir</option> options
-        to indicate the directories in which the server and databases
-        are located on your system.
+        <option role="mysqld_safe">--ledir</option> and
+        <option role="mysqld_safe">--datadir</option> options to
+        indicate the directories in which the server and databases are
+        located on your system.
       </para>
 
       <para>

@@ -1282,8 +1288,8 @@
               <secondary>mysqld_multi</secondary>
             </indexterm>
 
-            With <option role="mysqld_multi">--no-defaults</option>, no option files are
-            read.
+            With <option role="mysqld_multi">--no-defaults</option>, no
+            option files are read.
           </para>
         </listitem>
 

@@ -1340,9 +1346,9 @@
         the
         <option role="mysqld_multi">--config-file=<replaceable>file_name</replaceable></option>
         option, if one is given. A file named by
-        <option role="mysqld_multi">--config-file</option> is read only for
-        <literal>[mysqld<replaceable>N</replaceable>]</literal> option
-        groups, not the <literal>[mysqld_multi]</literal> group.
+        <option role="mysqld_multi">--config-file</option> is read only
+        for <literal>[mysqld<replaceable>N</replaceable>]</literal>
+        option groups, not the <literal>[mysqld_multi]</literal> group.
       </para>
 
       <para>

@@ -1389,7 +1395,8 @@
           <para>
             As of MySQL 5.0.42, this option is deprecated. If given, it
             is treated the same way as
-            <option role="mysqld_multi">--defaults-extra-file</option>, described earlier.
+            <option role="mysqld_multi">--defaults-extra-file</option>,
+            described earlier.
           </para>
 
           <para>

@@ -1734,20 +1741,22 @@
             The Unix socket file and the TCP/IP port number must be
             different for every <command>mysqld</command>.
             (Alternatively, if the host has multiple network addresses,
-            you can use <option role="mysqld">--bind-address</option> to cause
-            different servers to listen to different interfaces.)
+            you can use <option role="mysqld">--bind-address</option> to
+            cause different servers to listen to different interfaces.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            The <option role="mysqld_safe">--pid-file</option> option is very important if
-            you are using <command>mysqld_safe</command> to start
+            The <option role="mysqld_safe">--pid-file</option> option is
+            very important if you are using
+            <command>mysqld_safe</command> to start
             <command>mysqld</command> (for example,
-            <option role="mysqld_safe">--mysqld=mysqld_safe</option>) Every
-            <command>mysqld</command> should have its own process ID
-            file. The advantage of using <command>mysqld_safe</command>
-            instead of <command>mysqld</command> is that
+            <option role="mysqld_safe">--mysqld=mysqld_safe</option>)
+            Every <command>mysqld</command> should have its own process
+            ID file. The advantage of using
+            <command>mysqld_safe</command> instead of
+            <command>mysqld</command> is that
             <command>mysqld_safe</command> monitors its
             <command>mysqld</command> process and restarts it if the
             process terminates due to a signal sent using <literal>kill

@@ -1779,7 +1788,8 @@
 
         <listitem>
           <para>
-            You might want to use the <option role="mysqld">--user</option> option for
+            You might want to use the
+            <option role="mysqld">--user</option> option for
             <command>mysqld</command>, but to do this you need to run
             the <command>mysqld_multi</command> script as the Unix
             <literal>root</literal> user. Having the option in the


Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.0/replication-options-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 9; 2083 bytes

@@ -2252,11 +2252,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,

@@ -2264,10 +2265,10 @@
         </para>
 
         <para>
-          If the value of <literal role="sysvar">sync_binlog</literal> is 0 (the
-          default), no extra flushing is done. The server relies on the
-          operating system to flush the file contents occasionally as
-          for any other file.
+          If the value of <literal role="sysvar">sync_binlog</literal>
+          is 0 (the default), no extra flushing is done. The server
+          relies on the operating system to flush the file contents
+          occasionally as for any other file.
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.0/se-innodb-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1457 bytes

@@ -2245,11 +2245,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,


Modified: trunk/refman-5.1/dba-log-files.xml
===================================================================
--- trunk/refman-5.1/dba-log-files.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.1/dba-log-files.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1917 bytes

@@ -1204,14 +1204,15 @@
       server) crashes, there is a chance that the last statements of the
       binary log are lost. To prevent this, you can make the binary log
       be synchronized to disk after every <replaceable>N</replaceable>
-      writes to the binary log, with the <literal role="sysvar">sync_binlog</literal>
-      system variable. See <xref linkend="server-system-variables"/>. 1
-      is the safest value for <literal role="sysvar">sync_binlog</literal>, but also
-      the slowest. Even with <literal role="sysvar">sync_binlog</literal> set to 1,
-      there is still the chance of an inconsistency between the table
-      content and binary log content in case of a crash. For example, if
-      you are using <literal>InnoDB</literal> tables and the MySQL
-      server processes a <literal role="stmt">COMMIT</literal>
+      writes to the binary log, with the
+      <literal role="sysvar">sync_binlog</literal> system variable. See
+      <xref linkend="server-system-variables"/>. 1 is the safest value
+      for <literal role="sysvar">sync_binlog</literal>, but also the
+      slowest. Even with <literal role="sysvar">sync_binlog</literal>
+      set to 1, there is still the chance of an inconsistency between
+      the table content and binary log content in case of a crash. For
+      example, if you are using <literal>InnoDB</literal> tables and the
+      MySQL server processes a <literal role="stmt">COMMIT</literal>
       statement, it writes the whole transaction to the binary log and
       then commits this transaction into <literal>InnoDB</literal>. If
       the server crashes between those two operations, the transaction


Modified: trunk/refman-5.1/programs-server-core.xml
===================================================================
--- trunk/refman-5.1/programs-server-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.1/programs-server-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 16, Lines Added: 73, Lines Deleted: 58; 12910 bytes

@@ -163,7 +163,8 @@
           <emphasis role="bold">In 5.1.20, logging to
           <literal>syslog</literal> may fail to operate correctly in
           some cases, so we recommend that you use
-          <option role="mysqld_safe" condition="syslog">--skip-syslog</option> to use the default log file or
+          <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
+          to use the default log file or
           <option role="mysqld_safe">--log-error=<replaceable>file_name</replaceable></option>
           to specify a log file name explicitly.</emphasis>
         </para>

@@ -173,11 +174,12 @@
         <command>mysqld_safe</command> tries to start an executable
         named <command>mysqld</command>. To override the default
         behavior and specify explicitly the name of the server you want
-        to run, specify a <option role="mysqld_safe">--mysqld</option> or
-        <option role="mysqld_safe">--mysqld-version</option> option to
-        <command>mysqld_safe</command>. You can also use
-        <option role="mysqld_safe">--ledir</option> to indicate the directory where
-        <command>mysqld_safe</command> should look for the server.
+        to run, specify a <option role="mysqld_safe">--mysqld</option>
+        or <option role="mysqld_safe">--mysqld-version</option> option
+        to <command>mysqld_safe</command>. You can also use
+        <option role="mysqld_safe">--ledir</option> to indicate the
+        directory where <command>mysqld_safe</command> should look for
+        the server.
       </para>
 
       <para>

@@ -274,7 +276,8 @@
 
           <para>
             If you want NetWare to close the screen automatically
-            instead, use the <option role="mysqld_safe">--autoclose</option> option to
+            instead, use the
+            <option role="mysqld_safe">--autoclose</option> option to
             <command>mysqld_safe</command>.
           </para>
         </listitem>

@@ -450,9 +453,10 @@
             This option is needed if you use the MySQL binary
             distribution but have the data directory outside of the
             binary distribution. If <command>mysqld_safe</command>
-            cannot find the server, use the <option role="mysqld_safe">--ledir</option>
-            option to indicate the path name to the directory where the
-            server is located.
+            cannot find the server, use the
+            <option role="mysqld_safe">--ledir</option> option to
+            indicate the path name to the directory where the server is
+            located.
           </para>
         </listitem>
 

@@ -472,16 +476,17 @@
           </para>
 
           <para>
-            This option is similar to the <option role="mysqld_safe">--mysqld</option>
-            option, but you specify only the suffix for the server
-            program name. The basename is assumed to be
-            <command>mysqld</command>. For example, if you use
+            This option is similar to the
+            <option role="mysqld_safe">--mysqld</option> option, but you
+            specify only the suffix for the server program name. The
+            basename is assumed to be <command>mysqld</command>. For
+            example, if you use
             <option role="mysqld_safe">--mysqld-version=debug</option>,
             <command>mysqld_safe</command> starts the
             <command>mysqld-debug</command> program in the
             <literal>ledir</literal> directory. If the argument to
-            <option role="mysqld_safe">--mysqld-version</option> is empty,
-            <command>mysqld_safe</command> uses
+            <option role="mysqld_safe">--mysqld-version</option> is
+            empty, <command>mysqld_safe</command> uses
             <command>mysqld</command> in the <literal>ledir</literal>
             directory.
           </para>

@@ -660,13 +665,14 @@
               <secondary>mysqld_safe</secondary>
             </indexterm>
 
-            <option role="mysqld_safe">--syslog</option>, <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
+            <option role="mysqld_safe">--syslog</option>,
+            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
           </para>
 
           <para>
-            <option role="mysqld_safe">--syslog</option> causes error messages to be sent
-            to <literal>syslog</literal> on systems that support the
-            <command>logger</command> program.
+            <option role="mysqld_safe">--syslog</option> causes error
+            messages to be sent to <literal>syslog</literal> on systems
+            that support the <command>logger</command> program.
             <literal>--skip-syslog</literal> suppresses the use of
             <literal>syslog</literal>; messages are written to an error
             log file. These options were added in MySQL 5.1.20.

@@ -754,10 +760,10 @@
       <para>
         If you execute <command>mysqld_safe</command> with the
         <option role="mysqld_safe">--defaults-file</option> or
-        <option role="mysqld_safe">--defaults-extra-file</option> option to name an
-        option file, the option must be the first one given on the
-        command line or the option file will not be used. For example,
-        this command will not use the named option file:
+        <option role="mysqld_safe">--defaults-extra-file</option> option
+        to name an option file, the option must be the first one given
+        on the command line or the option file will not be used. For
+        example, this command will not use the named option file:
       </para>
 
 <programlisting>

@@ -834,9 +840,10 @@
       <para>
         If <command>mysqld_safe</command> fails, even when invoked from
         the MySQL installation directory, you can specify the
-        <option role="mysqld_safe">--ledir</option> and <option role="mysqld_safe">--datadir</option> options
-        to indicate the directories in which the server and databases
-        are located on your system.
+        <option role="mysqld_safe">--ledir</option> and
+        <option role="mysqld_safe">--datadir</option> options to
+        indicate the directories in which the server and databases are
+        located on your system.
       </para>
 
       <para>

@@ -856,20 +863,21 @@
 
         <listitem>
           <para>
-            <option role="mysqld_safe">--syslog</option>: Write error messages to
-            <literal>syslog</literal> on systems that support the
-            <command>logger</command> program.
+            <option role="mysqld_safe">--syslog</option>: Write error
+            messages to <literal>syslog</literal> on systems that
+            support the <command>logger</command> program.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>: Do not write error messages
-            to <literal>syslog</literal>. Messages are written to the
-            default error log file
+            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>:
+            Do not write error messages to <literal>syslog</literal>.
+            Messages are written to the default error log file
             (<filename><replaceable>host_name</replaceable>.err</filename>
             in the data directory), or to a named file if the
-            <option role="mysqld_safe">--log-error</option> option is given.
+            <option role="mysqld_safe">--log-error</option> option is
+            given.
           </para>
         </listitem>
 

@@ -890,16 +898,19 @@
       <note>
         <para>
           In MySQL 5.1.20 <emphasis>only</emphasis>, the default is
-          <option role="mysqld_safe">--syslog</option>. This differs from logging behavior
-          for other versions of MySQL, for which the default is to write
-          messages to the default error log file.
+          <option role="mysqld_safe">--syslog</option>. This differs
+          from logging behavior for other versions of MySQL, for which
+          the default is to write messages to the default error log
+          file.
         </para>
       </note>
 
       <para>
-        If <option role="mysqld_safe">--syslog</option> and <option role="mysqld_safe">--log-error</option>
-        are both given, a warning is issued and
-        <option role="mysqld_safe">--log-error</option> takes precedence.
+        If <option role="mysqld_safe">--syslog</option> and
+        <option role="mysqld_safe">--log-error</option> are both given,
+        a warning is issued and
+        <option role="mysqld_safe">--log-error</option> takes
+        precedence.
       </para>
 
       <para>

@@ -911,9 +922,9 @@
 
       <para>
         Before MySQL 5.1.20, error logging is controlled only with the
-        <option role="mysqld_safe">--log-error</option> option. If it is given, messages go
-        to the named error file. Otherwise, messages go to the default
-        error file.
+        <option role="mysqld_safe">--log-error</option> option. If it is
+        given, messages go to the named error file. Otherwise, messages
+        go to the default error file.
       </para>
 
       <para>

@@ -1384,8 +1395,8 @@
               <secondary>mysqld_multi</secondary>
             </indexterm>
 
-            With <option role="mysqld_multi">--no-defaults</option>, no option files are
-            read.
+            With <option role="mysqld_multi">--no-defaults</option>, no
+            option files are read.
           </para>
         </listitem>
 

@@ -1442,9 +1453,9 @@
         the
         <option role="mysqld_multi">--config-file=<replaceable>file_name</replaceable></option>
         option, if one is given. A file named by
-        <option role="mysqld_multi">--config-file</option> is read only for
-        <literal>[mysqld<replaceable>N</replaceable>]</literal> option
-        groups, not the <literal>[mysqld_multi]</literal> group.
+        <option role="mysqld_multi">--config-file</option> is read only
+        for <literal>[mysqld<replaceable>N</replaceable>]</literal>
+        option groups, not the <literal>[mysqld_multi]</literal> group.
       </para>
 
       <para>

@@ -1491,7 +1502,8 @@
           <para>
             As of MySQL 5.1.18, this option is deprecated. If given, it
             is treated the same way as
-            <option role="mysqld_multi">--defaults-extra-file</option>, described earlier.
+            <option role="mysqld_multi">--defaults-extra-file</option>,
+            described earlier.
           </para>
 
           <para>

@@ -1836,20 +1848,22 @@
             The Unix socket file and the TCP/IP port number must be
             different for every <command>mysqld</command>.
             (Alternatively, if the host has multiple network addresses,
-            you can use <option role="mysqld">--bind-address</option> to cause
-            different servers to listen to different interfaces.)
+            you can use <option role="mysqld">--bind-address</option> to
+            cause different servers to listen to different interfaces.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            The <option role="mysqld_safe">--pid-file</option> option is very important if
-            you are using <command>mysqld_safe</command> to start
+            The <option role="mysqld_safe">--pid-file</option> option is
+            very important if you are using
+            <command>mysqld_safe</command> to start
             <command>mysqld</command> (for example,
-            <option role="mysqld_safe">--mysqld=mysqld_safe</option>) Every
-            <command>mysqld</command> should have its own process ID
-            file. The advantage of using <command>mysqld_safe</command>
-            instead of <command>mysqld</command> is that
+            <option role="mysqld_safe">--mysqld=mysqld_safe</option>)
+            Every <command>mysqld</command> should have its own process
+            ID file. The advantage of using
+            <command>mysqld_safe</command> instead of
+            <command>mysqld</command> is that
             <command>mysqld_safe</command> monitors its
             <command>mysqld</command> process and restarts it if the
             process terminates due to a signal sent using <literal>kill

@@ -1882,7 +1896,8 @@
 
         <listitem>
           <para>
-            You might want to use the <option role="mysqld">--user</option> option for
+            You might want to use the
+            <option role="mysqld">--user</option> option for
             <command>mysqld</command>, but to do this you need to run
             the <command>mysqld_multi</command> script as the Unix
             <literal>root</literal> user. Having the option in the


Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.1/replication-options-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 9; 2083 bytes

@@ -2661,11 +2661,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,

@@ -2673,10 +2674,10 @@
         </para>
 
         <para>
-          If the value of <literal role="sysvar">sync_binlog</literal> is 0 (the
-          default), no extra flushing is done. The server relies on the
-          operating system to flush the file contents occasionally as
-          for any other file.
+          If the value of <literal role="sysvar">sync_binlog</literal>
+          is 0 (the default), no extra flushing is done. The server
+          relies on the operating system to flush the file contents
+          occasionally as for any other file.
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-5.1/se-innodb-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1457 bytes

@@ -2318,11 +2318,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,


Modified: trunk/refman-6.0/dba-log-files.xml
===================================================================
--- trunk/refman-6.0/dba-log-files.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-6.0/dba-log-files.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 9, Lines Deleted: 8; 1917 bytes

@@ -1150,14 +1150,15 @@
       server) crashes, there is a chance that the last statements of the
       binary log are lost. To prevent this, you can make the binary log
       be synchronized to disk after every <replaceable>N</replaceable>
-      writes to the binary log, with the <literal role="sysvar">sync_binlog</literal>
-      system variable. See <xref linkend="server-system-variables"/>. 1
-      is the safest value for <literal role="sysvar">sync_binlog</literal>, but also
-      the slowest. Even with <literal role="sysvar">sync_binlog</literal> set to 1,
-      there is still the chance of an inconsistency between the table
-      content and binary log content in case of a crash. For example, if
-      you are using <literal>InnoDB</literal> tables and the MySQL
-      server processes a <literal role="stmt">COMMIT</literal>
+      writes to the binary log, with the
+      <literal role="sysvar">sync_binlog</literal> system variable. See
+      <xref linkend="server-system-variables"/>. 1 is the safest value
+      for <literal role="sysvar">sync_binlog</literal>, but also the
+      slowest. Even with <literal role="sysvar">sync_binlog</literal>
+      set to 1, there is still the chance of an inconsistency between
+      the table content and binary log content in case of a crash. For
+      example, if you are using <literal>InnoDB</literal> tables and the
+      MySQL server processes a <literal role="stmt">COMMIT</literal>
       statement, it writes the whole transaction to the binary log and
       then commits this transaction into <literal>InnoDB</literal>. If
       the server crashes between those two operations, the transaction


Modified: trunk/refman-6.0/programs-server-core.xml
===================================================================
--- trunk/refman-6.0/programs-server-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-6.0/programs-server-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 13, Lines Added: 65, Lines Deleted: 53; 10883 bytes

@@ -153,11 +153,12 @@
         <command>mysqld_safe</command> tries to start an executable
         named <command>mysqld</command>. To override the default
         behavior and specify explicitly the name of the server you want
-        to run, specify a <option role="mysqld_safe">--mysqld</option> or
-        <option role="mysqld_safe">--mysqld-version</option> option to
-        <command>mysqld_safe</command>. You can also use
-        <option role="mysqld_safe">--ledir</option> to indicate the directory where
-        <command>mysqld_safe</command> should look for the server.
+        to run, specify a <option role="mysqld_safe">--mysqld</option>
+        or <option role="mysqld_safe">--mysqld-version</option> option
+        to <command>mysqld_safe</command>. You can also use
+        <option role="mysqld_safe">--ledir</option> to indicate the
+        directory where <command>mysqld_safe</command> should look for
+        the server.
       </para>
 
       <para>

@@ -254,7 +255,8 @@
 
           <para>
             If you want NetWare to close the screen automatically
-            instead, use the <option role="mysqld_safe">--autoclose</option> option to
+            instead, use the
+            <option role="mysqld_safe">--autoclose</option> option to
             <command>mysqld_safe</command>.
           </para>
         </listitem>

@@ -430,9 +432,10 @@
             This option is needed if you use the MySQL binary
             distribution but have the data directory outside of the
             binary distribution. If <command>mysqld_safe</command>
-            cannot find the server, use the <option role="mysqld_safe">--ledir</option>
-            option to indicate the path name to the directory where the
-            server is located.
+            cannot find the server, use the
+            <option role="mysqld_safe">--ledir</option> option to
+            indicate the path name to the directory where the server is
+            located.
           </para>
         </listitem>
 

@@ -452,16 +455,17 @@
           </para>
 
           <para>
-            This option is similar to the <option role="mysqld_safe">--mysqld</option>
-            option, but you specify only the suffix for the server
-            program name. The basename is assumed to be
-            <command>mysqld</command>. For example, if you use
+            This option is similar to the
+            <option role="mysqld_safe">--mysqld</option> option, but you
+            specify only the suffix for the server program name. The
+            basename is assumed to be <command>mysqld</command>. For
+            example, if you use
             <option role="mysqld_safe">--mysqld-version=debug</option>,
             <command>mysqld_safe</command> starts the
             <command>mysqld-debug</command> program in the
             <literal>ledir</literal> directory. If the argument to
-            <option role="mysqld_safe">--mysqld-version</option> is empty,
-            <command>mysqld_safe</command> uses
+            <option role="mysqld_safe">--mysqld-version</option> is
+            empty, <command>mysqld_safe</command> uses
             <command>mysqld</command> in the <literal>ledir</literal>
             directory.
           </para>

@@ -640,17 +644,17 @@
               <secondary>mysqld_safe</secondary>
             </indexterm>
 
-            <option role="mysqld_safe">--syslog</option>, <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
+            <option role="mysqld_safe">--syslog</option>,
+            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
           </para>
 
           <para>
-            <option role="mysqld_safe">--syslog</option> causes error messages to be sent
-            to <literal>syslog</literal> on systems that support the
-            <command>logger</command> program.
-             <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
-            suppresses the use of
-            <literal>syslog</literal>; messages are written to an error
-            log file.
+            <option role="mysqld_safe">--syslog</option> causes error
+            messages to be sent to <literal>syslog</literal> on systems
+            that support the <command>logger</command> program.
+            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>
+            suppresses the use of <literal>syslog</literal>; messages
+            are written to an error log file.
           </para>
         </listitem>
 

@@ -734,10 +738,10 @@
       <para>
         If you execute <command>mysqld_safe</command> with the
         <option role="mysqld_safe">--defaults-file</option> or
-        <option role="mysqld_safe">--defaults-extra-file</option> option to name an
-        option file, the option must be the first one given on the
-        command line or the option file will not be used. For example,
-        this command will not use the named option file:
+        <option role="mysqld_safe">--defaults-extra-file</option> option
+        to name an option file, the option must be the first one given
+        on the command line or the option file will not be used. For
+        example, this command will not use the named option file:
       </para>
 
 <programlisting>

@@ -814,9 +818,10 @@
       <para>
         If <command>mysqld_safe</command> fails, even when invoked from
         the MySQL installation directory, you can specify the
-        <option role="mysqld_safe">--ledir</option> and <option role="mysqld_safe">--datadir</option> options
-        to indicate the directories in which the server and databases
-        are located on your system.
+        <option role="mysqld_safe">--ledir</option> and
+        <option role="mysqld_safe">--datadir</option> options to
+        indicate the directories in which the server and databases are
+        located on your system.
       </para>
 
       <para>

@@ -835,20 +840,21 @@
 
         <listitem>
           <para>
-            <option role="mysqld_safe">--syslog</option>: Write error messages to
-            <literal>syslog</literal> on systems that support the
-            <command>logger</command> program.
+            <option role="mysqld_safe">--syslog</option>: Write error
+            messages to <literal>syslog</literal> on systems that
+            support the <command>logger</command> program.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>: Do not write error messages
-            to <literal>syslog</literal>. Messages are written to the
-            default error log file
+            <option role="mysqld_safe" condition="syslog">--skip-syslog</option>:
+            Do not write error messages to <literal>syslog</literal>.
+            Messages are written to the default error log file
             (<filename><replaceable>host_name</replaceable>.err</filename>
             in the data directory), or to a named file if the
-            <option role="mysqld_safe">--log-error</option> option is given.
+            <option role="mysqld_safe">--log-error</option> option is
+            given.
           </para>
         </listitem>
 

@@ -867,9 +873,11 @@
       </para>
 
       <para>
-        If <option role="mysqld_safe">--syslog</option> and <option role="mysqld_safe">--log-error</option>
-        are both given, a warning is issued and
-        <option role="mysqld_safe">--log-error</option> takes precedence.
+        If <option role="mysqld_safe">--syslog</option> and
+        <option role="mysqld_safe">--log-error</option> are both given,
+        a warning is issued and
+        <option role="mysqld_safe">--log-error</option> takes
+        precedence.
       </para>
 
       <para>

@@ -1326,8 +1334,8 @@
               <secondary>mysqld_multi</secondary>
             </indexterm>
 
-            With <option role="mysqld_multi">--no-defaults</option>, no option files are
-            read.
+            With <option role="mysqld_multi">--no-defaults</option>, no
+            option files are read.
           </para>
         </listitem>
 

@@ -1421,8 +1429,9 @@
 
           <para>
             This option is deprecated. If given, it is treated the same
-            way as <option role="mysqld_multi">--defaults-extra-file</option>, described
-            earlier.
+            way as
+            <option role="mysqld_multi">--defaults-extra-file</option>,
+            described earlier.
           </para>
         </listitem>
 

@@ -1754,20 +1763,22 @@
             The Unix socket file and the TCP/IP port number must be
             different for every <command>mysqld</command>.
             (Alternatively, if the host has multiple network addresses,
-            you can use <option role="mysqld">--bind-address</option> to cause
-            different servers to listen to different interfaces.)
+            you can use <option role="mysqld">--bind-address</option> to
+            cause different servers to listen to different interfaces.)
           </para>
         </listitem>
 
         <listitem>
           <para>
-            The <option role="mysqld_safe">--pid-file</option> option is very important if
-            you are using <command>mysqld_safe</command> to start
+            The <option role="mysqld_safe">--pid-file</option> option is
+            very important if you are using
+            <command>mysqld_safe</command> to start
             <command>mysqld</command> (for example,
-            <option role="mysqld_safe">--mysqld=mysqld_safe</option>) Every
-            <command>mysqld</command> should have its own process ID
-            file. The advantage of using <command>mysqld_safe</command>
-            instead of <command>mysqld</command> is that
+            <option role="mysqld_safe">--mysqld=mysqld_safe</option>)
+            Every <command>mysqld</command> should have its own process
+            ID file. The advantage of using
+            <command>mysqld_safe</command> instead of
+            <command>mysqld</command> is that
             <command>mysqld_safe</command> monitors its
             <command>mysqld</command> process and restarts it if the
             process terminates due to a signal sent using <literal>kill

@@ -1800,7 +1811,8 @@
 
         <listitem>
           <para>
-            You might want to use the <option role="mysqld">--user</option> option for
+            You might want to use the
+            <option role="mysqld">--user</option> option for
             <command>mysqld</command>, but to do this you need to run
             the <command>mysqld_multi</command> script as the Unix
             <literal>root</literal> user. Having the option in the


Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-6.0/replication-options-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 6; 1621 bytes

@@ -2328,12 +2328,13 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk &mdash; in this case, the server relies
-          on the operating system to flush the binary log&apos;s
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk &mdash; in this case, the server
+          relies on the operating system to flush the binary log&apos;s
           contents from to time as for any other file. A value of 1 is
           the safest choice, because in the event of a crash you lose at
           most one statement or transaction from the binary log.


Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml	2009-02-04 18:03:52 UTC (rev 13567)
+++ trunk/refman-6.0/se-innodb-core.xml	2009-02-04 18:04:00 UTC (rev 13568)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 5; 1457 bytes

@@ -2179,11 +2179,12 @@
           If the value of this variable is greater than 0, the MySQL
           server synchronizes its binary log to disk (using
           <literal>fdatasync()</literal>) after every
-          <literal role="sysvar">sync_binlog</literal> writes to the binary log. There
-          is one write to the binary log per statement if autocommit is
-          enabled, and one write per transaction otherwise. The default
-          value of <literal role="sysvar">sync_binlog</literal> is 0, which does no
-          synchronizing to disk. A value of 1 is the safest choice,
+          <literal role="sysvar">sync_binlog</literal> writes to the
+          binary log. There is one write to the binary log per statement
+          if autocommit is enabled, and one write per transaction
+          otherwise. The default value of
+          <literal role="sysvar">sync_binlog</literal> is 0, which does
+          no synchronizing to disk. A value of 1 is the safest choice,
           because in the event of a crash you lose at most one statement
           or transaction from the binary log. However, it is also the
           slowest choice (unless the disk has a battery-backed cache,


Thread
svn commit - mysqldoc@docsrva: r13568 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0paul.dubois4 Feb