List:Commits« Previous MessageNext Message »
From:paul.dubois Date:August 1 2008 11:58pm
Subject:svn commit - mysqldoc@docsrva: r11479 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 refman-common
View as plain text  
Author: paul
Date: 2008-08-02 01:58:49 +0200 (Sat, 02 Aug 2008)
New Revision: 11479

Log:
 r33190@frost:  paul | 2008-08-01 18:57:43 -0500
 Reformat


Modified:
   trunk/refman-4.1/dba-core.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/mysql-cluster-upgrade-downgrade.xml
   trunk/refman-4.1/sql-syntax-transactions.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/installing-cs-core.xml
   trunk/refman-5.0/language-structure-core.xml
   trunk/refman-5.0/sql-syntax-transactions.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/installing-core.xml
   trunk/refman-5.1/mysql-cluster-replication.xml
   trunk/refman-5.1/sql-syntax-transactions.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/installing-core.xml
   trunk/refman-6.0/sql-syntax-transactions.xml
   trunk/refman-common/apis-php.xml
   trunk/refman-common/connector-odbc.xml

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


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-4.1/dba-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 999 bytes

@@ -5269,7 +5269,8 @@
 
           <para>
             This is not a variable, but it can be used when setting some
-            variables. It is described in <xref linkend="server-session-variables"/>.
+            variables. It is described in
+            <xref linkend="server-session-variables"/>.
           </para>
         </listitem>
 

@@ -7663,7 +7664,8 @@
           <literal>GLOBAL</literal> or <literal>SESSION</literal> (or
           both) apply. The table also lists session options that can be
           set with the <literal>SET</literal> statement.
-          <xref linkend="server-session-variables"/>, discusses these options.
+          <xref linkend="server-session-variables"/>, discusses these
+          options.
         </para>
 
         <para>


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-4.1/installing.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 719 bytes

@@ -8455,8 +8455,8 @@
           <para>
             Clients that want to convert characters between the server
             and the client should use the <literal>SET NAMES</literal>
-            statement. See <xref linkend="server-session-variables"/>, and
-            <xref linkend="charset-connection"/>.
+            statement. See <xref linkend="server-session-variables"/>,
+            and <xref linkend="charset-connection"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/mysql-cluster-upgrade-downgrade.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-upgrade-downgrade.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-4.1/mysql-cluster-upgrade-downgrade.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 702 bytes

@@ -278,8 +278,8 @@
 
     <para>
       This section provides information about MySQL Cluster software and
-      table file compatibility between MySQL &current-series; releases with regard to
-      performing upgrades and downgrades.
+      table file compatibility between MySQL &current-series; releases
+      with regard to performing upgrades and downgrades.
     </para>
 
     <important>


Modified: trunk/refman-4.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-transactions.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-4.1/sql-syntax-transactions.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 89, Lines Deleted: 92; 8937 bytes

@@ -991,14 +991,13 @@
 
     <para>
       For information about <literal>InnoDB</literal> and transaction
-       isolation level, see
+      isolation level, see
       <xref linkend="innodb-transaction-isolation"/>.
-      <literal>InnoDB</literal> supports each of the levels described here
-from MySQL
-      4.0.5 on. The default level is <literal>REPEATABLE READ</literal>.
-      See also <xref linkend="innodb-locks-set"/>, for additional
-      information about how <literal>InnoDB</literal> uses locks to
-      execute various types of statements.
+      <literal>InnoDB</literal> supports each of the levels described
+      here from MySQL 4.0.5 on. The default level is <literal>REPEATABLE
+      READ</literal>. See also <xref linkend="innodb-locks-set"/>, for
+      additional information about how <literal>InnoDB</literal> uses
+      locks to execute various types of statements.
     </para>
 
     <para>

@@ -1008,103 +1007,101 @@
       <xref linkend="server-options"/>.
     </para>
 
-      <para>
-        A detailed description of each isolation level in
-        <literal>InnoDB</literal> follows:
-      </para>
+    <para>
+      A detailed description of each isolation level in
+      <literal>InnoDB</literal> follows:
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            <literal>READ UNCOMMITTED</literal>
-          </para>
+      <listitem>
+        <para>
+          <literal>READ UNCOMMITTED</literal>
+        </para>
 
-          <para>
-            <literal>SELECT</literal> statements are performed in a
-            non-locking fashion, but a possible earlier version of a
-            record might be used. Thus, using this isolation level, such
-            reads are not consistent. This is also called a <quote>dirty
-            read.</quote> Otherwise, this isolation level works like
-            <literal>READ COMMITTED</literal>.
-          </para>
-        </listitem>
+        <para>
+          <literal>SELECT</literal> statements are performed in a
+          non-locking fashion, but a possible earlier version of a
+          record might be used. Thus, using this isolation level, such
+          reads are not consistent. This is also called a <quote>dirty
+          read.</quote> Otherwise, this isolation level works like
+          <literal>READ COMMITTED</literal>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>READ COMMITTED</literal>
-          </para>
+      <listitem>
+        <para>
+          <literal>READ COMMITTED</literal>
+        </para>
 
-          <para>
-            A somewhat Oracle-like isolation level. All <literal>SELECT
-            ... FOR UPDATE</literal> and <literal>SELECT ... LOCK IN
-            SHARE MODE</literal> statements lock only the index records,
-            not the gaps before them, and thus allow the free insertion
-            of new records next to locked records.
-            <literal>UPDATE</literal> and <literal>DELETE</literal>
-            statements using a unique index with a unique search
-            condition lock only the index record found, not the gap
-            before it. In range-type <literal>UPDATE</literal> and
-            <literal>DELETE</literal> statements,
-            <literal>InnoDB</literal> must set next-key or gap locks and
-            block insertions by other users to the gaps covered by the
-            range. This is necessary because <quote>phantom rows</quote>
-            must be blocked for MySQL replication and recovery to work.
-          </para>
+        <para>
+          A somewhat Oracle-like isolation level. All <literal>SELECT
+          ... FOR UPDATE</literal> and <literal>SELECT ... LOCK IN SHARE
+          MODE</literal> statements lock only the index records, not the
+          gaps before them, and thus allow the free insertion of new
+          records next to locked records. <literal>UPDATE</literal> and
+          <literal>DELETE</literal> statements using a unique index with
+          a unique search condition lock only the index record found,
+          not the gap before it. In range-type <literal>UPDATE</literal>
+          and <literal>DELETE</literal> statements,
+          <literal>InnoDB</literal> must set next-key or gap locks and
+          block insertions by other users to the gaps covered by the
+          range. This is necessary because <quote>phantom rows</quote>
+          must be blocked for MySQL replication and recovery to work.
+        </para>
 
-          <para>
-            Consistent reads behave as in Oracle: Each consistent read,
-            even within the same transaction, sets and reads its own
-            fresh snapshot. See
-            <xref linkend="innodb-consistent-read"/>.
-          </para>
-        </listitem>
+        <para>
+          Consistent reads behave as in Oracle: Each consistent read,
+          even within the same transaction, sets and reads its own fresh
+          snapshot. See <xref linkend="innodb-consistent-read"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>REPEATABLE READ</literal>
-          </para>
+      <listitem>
+        <para>
+          <literal>REPEATABLE READ</literal>
+        </para>
 
-          <para>
-            This is the default isolation level of
-            <literal>InnoDB</literal>. <literal>SELECT ... FOR
-            UPDATE</literal>, <literal>SELECT ... LOCK IN SHARE
-            MODE</literal>, <literal>UPDATE</literal>, and
-            <literal>DELETE</literal> statements that use a unique index
-            with a unique search condition lock only the index record
-            found, not the gap before it. With other search conditions,
-            these operations employ next-key locking, locking the index
-            range scanned with next-key or gap locks, and block new
-            insertions by other users.
-          </para>
+        <para>
+          This is the default isolation level of
+          <literal>InnoDB</literal>. <literal>SELECT ... FOR
+          UPDATE</literal>, <literal>SELECT ... LOCK IN SHARE
+          MODE</literal>, <literal>UPDATE</literal>, and
+          <literal>DELETE</literal> statements that use a unique index
+          with a unique search condition lock only the index record
+          found, not the gap before it. With other search conditions,
+          these operations employ next-key locking, locking the index
+          range scanned with next-key or gap locks, and block new
+          insertions by other users.
+        </para>
 
-          <para>
-            In consistent reads, there is an important difference from
-            the <literal>READ COMMITTED</literal> isolation level: All
-            consistent reads within the same transaction read the same
-            snapshot established by the first read. This convention
-            means that if you issue several plain
-            <literal>SELECT</literal> statements within the same
-            transaction, these <literal>SELECT</literal> statements are
-            consistent also with respect to each other. See
-            <xref linkend="innodb-consistent-read"/>.
-          </para>
-        </listitem>
+        <para>
+          In consistent reads, there is an important difference from the
+          <literal>READ COMMITTED</literal> isolation level: All
+          consistent reads within the same transaction read the same
+          snapshot established by the first read. This convention means
+          that if you issue several plain <literal>SELECT</literal>
+          statements within the same transaction, these
+          <literal>SELECT</literal> statements are consistent also with
+          respect to each other. See
+          <xref linkend="innodb-consistent-read"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            <literal>SERIALIZABLE</literal>
-          </para>
+      <listitem>
+        <para>
+          <literal>SERIALIZABLE</literal>
+        </para>
 
-          <para>
-            This level is like <literal>REPEATABLE READ</literal>, but
-            <literal>InnoDB</literal> implicitly converts all plain
-            <literal>SELECT</literal> statements to <literal>SELECT ...
-            LOCK IN SHARE MODE</literal>.
-          </para>
-        </listitem>
+        <para>
+          This level is like <literal>REPEATABLE READ</literal>, but
+          <literal>InnoDB</literal> implicitly converts all plain
+          <literal>SELECT</literal> statements to <literal>SELECT ...
+          LOCK IN SHARE MODE</literal>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
     <remark role="help-description-end"/>
 


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.0/dba-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 999 bytes

@@ -6240,7 +6240,8 @@
 
           <para>
             This is not a variable, but it can be used when setting some
-            variables. It is described in <xref linkend="server-session-variables"/>.
+            variables. It is described in
+            <xref linkend="server-session-variables"/>.
           </para>
         </listitem>
 

@@ -8920,7 +8921,8 @@
           <literal>GLOBAL</literal> or <literal>SESSION</literal> (or
           both) apply. The table also lists session options that can be
           set with the <literal>SET</literal> statement.
-          <xref linkend="server-session-variables"/>, discusses these options.
+          <xref linkend="server-session-variables"/>, discusses these
+          options.
         </para>
 
         <para>


Modified: trunk/refman-5.0/installing-cs-core.xml
===================================================================
--- trunk/refman-5.0/installing-cs-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.0/installing-cs-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 743 bytes

@@ -8789,8 +8789,8 @@
           <para>
             Clients that want to convert characters between the server
             and the client should use the <literal>SET NAMES</literal>
-            statement. See <xref linkend="server-session-variables"/>, and
-            <xref linkend="charset-connection"/>.
+            statement. See <xref linkend="server-session-variables"/>,
+            and <xref linkend="charset-connection"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/language-structure-core.xml
===================================================================
--- trunk/refman-5.0/language-structure-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.0/language-structure-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 653 bytes

@@ -2252,7 +2252,8 @@
     <para>
       You cannot use a placeholder for an identifier (such as the name
       of a database, table, or column) in an SQL prepared statement. See
-      <xref linkend="sql-syntax-prepared-statements"/>, for more information.
+      <xref linkend="sql-syntax-prepared-statements"/>, for more
+      information.
     </para>
 
   </section>


Modified: trunk/refman-5.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-transactions.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.0/sql-syntax-transactions.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 1482 bytes

@@ -1089,11 +1089,12 @@
       For information about <literal>InnoDB</literal> and transaction
       isolation level, see
       <xref linkend="innodb-transaction-isolation"/>.
-      <literal>InnoDB</literal> supports each of the levels described here in MySQL
-      &current-series;. The default level is <literal>REPEATABLE
-      READ</literal>. See also <xref linkend="innodb-locks-set"/>, for
-      additional information about how <literal>InnoDB</literal> uses
-      locks to execute various types of statements.
+      <literal>InnoDB</literal> supports each of the levels described
+      here in MySQL &current-series;. The default level is
+      <literal>REPEATABLE READ</literal>. See also
+      <xref linkend="innodb-locks-set"/>, for additional information
+      about how <literal>InnoDB</literal> uses locks to execute various
+      types of statements.
     </para>
 
     <para>

@@ -1104,8 +1105,8 @@
     </para>
 
     <para>
-      A detailed list of the transaction levels supported by MySQL and the various
-      storage engines follows:
+      A detailed list of the transaction levels supported by MySQL and
+      the various storage engines follows:
     </para>
 
     <itemizedlist>


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.1/dba-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 999 bytes

@@ -6566,7 +6566,8 @@
 
           <para>
             This is not a variable, but it can be used when setting some
-            variables. It is described in <xref linkend="server-session-variables"/>.
+            variables. It is described in
+            <xref linkend="server-session-variables"/>.
           </para>
         </listitem>
 

@@ -9359,7 +9360,8 @@
           <literal>GLOBAL</literal> or <literal>SESSION</literal> (or
           both) apply. The table also lists session options that can be
           set with the <literal>SET</literal> statement.
-          <xref linkend="server-session-variables"/>, discusses these options.
+          <xref linkend="server-session-variables"/>, discusses these
+          options.
         </para>
 
         <para>


Modified: trunk/refman-5.1/installing-core.xml
===================================================================
--- trunk/refman-5.1/installing-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.1/installing-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 734 bytes

@@ -8242,8 +8242,8 @@
           <para>
             Clients that want to convert characters between the server
             and the client should use the <literal>SET NAMES</literal>
-            statement. See <xref linkend="server-session-variables"/>, and
-            <xref linkend="charset-connection"/>.
+            statement. See <xref linkend="server-session-variables"/>,
+            and <xref linkend="charset-connection"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/mysql-cluster-replication.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-replication.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.1/mysql-cluster-replication.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 464 bytes

@@ -2640,7 +2640,6 @@
   </section>
 -->
 
-
   <section id="mysql-cluster-replication-conflict-resolution">
 
     <title>MySQL Cluster Replication Conflict Resolution</title>


Modified: trunk/refman-5.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-transactions.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-5.1/sql-syntax-transactions.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 1482 bytes

@@ -1128,11 +1128,12 @@
       For information about <literal>InnoDB</literal> and transaction
       isolation level, see
       <xref linkend="innodb-transaction-isolation"/>.
-      <literal>InnoDB</literal> supports each of the levels described here in MySQL
-      &current-series;. The default level is <literal>REPEATABLE
-      READ</literal>. See also <xref linkend="innodb-locks-set"/>, for
-      additional information about how <literal>InnoDB</literal> uses
-      locks to execute various types of statements.
+      <literal>InnoDB</literal> supports each of the levels described
+      here in MySQL &current-series;. The default level is
+      <literal>REPEATABLE READ</literal>. See also
+      <xref linkend="innodb-locks-set"/>, for additional information
+      about how <literal>InnoDB</literal> uses locks to execute various
+      types of statements.
     </para>
 
     <para>

@@ -1153,8 +1154,8 @@
     </para>
 
     <para>
-      A detailed list of the transaction levels supported by MySQL and the various
-      storage engines follows:
+      A detailed list of the transaction levels supported by MySQL and
+      the various storage engines follows:
     </para>
 
     <itemizedlist>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-6.0/dba-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 2; 999 bytes

@@ -6357,7 +6357,8 @@
 
           <para>
             This is not a variable, but it can be used when setting some
-            variables. It is described in <xref linkend="server-session-variables"/>.
+            variables. It is described in
+            <xref linkend="server-session-variables"/>.
           </para>
         </listitem>
 

@@ -9230,7 +9231,8 @@
           <literal>GLOBAL</literal> or <literal>SESSION</literal> (or
           both) apply. The table also lists session options that can be
           set with the <literal>SET</literal> statement.
-          <xref linkend="server-session-variables"/>, discusses these options.
+          <xref linkend="server-session-variables"/>, discusses these
+          options.
         </para>
 
         <para>


Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-6.0/installing-core.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 734 bytes

@@ -8231,8 +8231,8 @@
           <para>
             Clients that want to convert characters between the server
             and the client should use the <literal>SET NAMES</literal>
-            statement. See <xref linkend="server-session-variables"/>, and
-            <xref linkend="charset-connection"/>.
+            statement. See <xref linkend="server-session-variables"/>,
+            and <xref linkend="charset-connection"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-transactions.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-6.0/sql-syntax-transactions.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 1482 bytes

@@ -1746,11 +1746,12 @@
       For information about <literal>InnoDB</literal> and transaction
       isolation level, see
       <xref linkend="innodb-transaction-isolation"/>.
-      <literal>InnoDB</literal> supports each of the levels described here in MySQL
-      &current-series;. The default level is <literal>REPEATABLE
-      READ</literal>. See also <xref linkend="innodb-locks-set"/>, for
-      additional information about how <literal>InnoDB</literal> uses
-      locks to execute various types of statements.
+      <literal>InnoDB</literal> supports each of the levels described
+      here in MySQL &current-series;. The default level is
+      <literal>REPEATABLE READ</literal>. See also
+      <xref linkend="innodb-locks-set"/>, for additional information
+      about how <literal>InnoDB</literal> uses locks to execute various
+      types of statements.
     </para>
 
     <para>

@@ -1771,8 +1772,8 @@
     </para>
 
     <para>
-      A detailed list of the transaction levels supported by MySQL and the various
-      storage engines follows:
+      A detailed list of the transaction levels supported by MySQL and
+      the various storage engines follows:
     </para>
 
     <itemizedlist>


Modified: trunk/refman-common/apis-php.xml
===================================================================
--- trunk/refman-common/apis-php.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-common/apis-php.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 507 bytes

@@ -67,7 +67,7 @@
 
   <para>
     The PHP distribution and documentation are available from the
-    <ulink url="http://www.php.net/">PHP Web site</ulink>. 
+    <ulink url="http://www.php.net/">PHP Web site</ulink>.
   </para>
 
   <formalpara role="mnmas-kb">


Modified: trunk/refman-common/connector-odbc.xml
===================================================================
--- trunk/refman-common/connector-odbc.xml	2008-08-01 23:58:40 UTC (rev 11478)
+++ trunk/refman-common/connector-odbc.xml	2008-08-01 23:58:49 UTC (rev 11479)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 4; 1197 bytes

@@ -3024,8 +3024,8 @@
                 applications to correctly identify
                 <literal>AUTO_INCREMENT</literal> values. For more
                 information. See <function role="sqlop">IS
-                NULL</function>. This option was added in
-                Connector/ODBC 3.51.13.</entry>
+                NULL</function>. This option was added in Connector/ODBC
+                3.51.13.</entry>
             </row>
             <row>
               <entry>16777216</entry>

@@ -3055,8 +3055,7 @@
               <entry>67108864</entry>
               <entry><literal>FLAG_MULTI_STATEMENTS</literal></entry>
               <entry>Allow multiple statements</entry>
-              <entry>Enables support for batched statements. This option was
-added in
+              <entry>Enables support for batched statements. This option was added in
                 Connector/ODBC 3.51.18.</entry>
             </row>
             <row>


Thread
svn commit - mysqldoc@docsrva: r11479 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 refman-commonpaul.dubois2 Aug