List:Commits« Previous MessageNext Message »
From:paul Date:January 3 2006 3:34am
Subject:svn commit - mysqldoc@docsrva: r644 - in trunk: . refman-4.1 refman-5.0 refman-5.1 tools
View as plain text  
Author: paul
Date: 2006-01-03 04:34:10 +0100 (Tue, 03 Jan 2006)
New Revision: 644

Log:
 r5768@frost:  paul | 2006-01-02 21:33:12 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/spatial-extensions.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/spatial-extensions.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/spatial-extensions.xml
   trunk/tools/xmlformat.conf


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

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-4.1/connector-j.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -247,7 +247,7 @@
       <para>The following example shows a stored procedure that returns the
       value of <varname>inOutParam</varname> incremented by 1, and the string
       passed in via <varname>inputParam</varname> as a
-      <classname>ResultSet</classname> : <example>
+      <classname>ResultSet</classname>: <example>
           <title>Stored Procedure Example</title>
 
           <programlisting>CREATE PROCEDURE demoSp(IN inputParam VARCHAR(255), INOUT inOutParam INT)
@@ -396,7 +396,7 @@
         </listitem>
 
         <listitem>
-          <para>Execute the <classname>CallableStatement</classname> , and
+          <para>Execute the <classname>CallableStatement</classname>, and
           retrieve any result sets or output parameters.</para>
 
           <para>While <classname>CallableStatement</classname> supports
@@ -2677,8 +2677,8 @@
       30%-50% faster than the standard TCP/IP access.</para>
 
       <para>You can create your own socket factories by following the example
-      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname> ,
-      or <classname>com.mysql.jdbc.StandardSocketFactory</classname> .</para>
+      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname>,
+      or <classname>com.mysql.jdbc.StandardSocketFactory</classname>.</para>
     </section>
 
     <section id="cj-implementation-notes">
@@ -2993,8 +2993,8 @@
               <row>
                 <entry><type>BOOL , BOOLEAN</type></entry>
 
-                <entry>See <type>TINYINT</type> , above as these are aliases
-                for <type>TINYINT(1)</type> , currently.</entry>
+                <entry>See <type>TINYINT</type>, above as these are aliases
+                for <type>TINYINT(1)</type>, currently.</entry>
               </row>
 
               <row>
@@ -3014,14 +3014,14 @@
               <row>
                 <entry><type>INT,INTEGER[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Integer</classname> , if UNSIGNED
+                <entry><classname>java.lang.Integer</classname>, if UNSIGNED
                 <classname>java.lang.Long</classname></entry>
               </row>
 
               <row>
                 <entry><type>BIGINT[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Long</classname> , if UNSIGNED
+                <entry><classname>java.lang.Long</classname>, if UNSIGNED
                 <classname>java.math.BigInteger</classname></entry>
               </row>
 
@@ -3078,7 +3078,7 @@
                 <entry><type>CHAR(M)</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3086,7 +3086,7 @@
                 <entry><type>VARCHAR(M) [BINARY]</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3192,7 +3192,7 @@
       <para>Starting with MySQL Server 4.1, Connector/J supports a single
       character encoding between client and server, and any number of
       character encodings for data returned by the server to the client in
-      <classname>ResultSets</classname> .</para>
+      <classname>ResultSets</classname>.</para>
 
       <para>The character encoding between client and server is automatically
       detected upon connection. The encoding used by the driver is specified
@@ -4582,8 +4582,7 @@
       testcase that doesn't involve any third-party classes.</para>
 
       <para>To streamline this process, we ship a base class for testcases
-      with Connector/J, named '
-      <classname>com.mysql.jdbc.util.BaseBugReport</classname> '. To create a
+      with Connector/J, named '<classname>com.mysql.jdbc.util.BaseBugReport</classname>'. To create a
       testcase for Connector/J using this class, create your own class that
       inherits from <classname>com.mysql.jdbc.util.BaseBugReport</classname>
       and override the methods <methodname>setUp()</methodname>,
@@ -4658,4 +4657,4 @@
 
   <xi:include href="../refman-common/news-connector-j.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file
+</section>

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -4807,8 +4807,7 @@
 
           <listitem>
             <para>
-              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>
-              ,
+              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>,
               <literal>[TCP]<replaceable>NodeId2</replaceable></literal>
             </para>
 

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-4.1/replication.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -2532,14 +2532,10 @@
       <listitem>
         <para>
           <option>--master-ssl</option>,
-          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>
-          ,
-          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>
-          ,
+          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>,
+          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>,
           <option>--master-ssl-key=<replaceable>file_name</replaceable></option>
         </para>
 

Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-4.1/spatial-extensions.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -1849,8 +1849,7 @@
                 <primary>GeometryCollectionFromText()</primary>
               </indexterm>
 
-              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1880,8 +1879,7 @@
                 <primary>GeometryFromText()</primary>
               </indexterm>
 
-              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1911,8 +1909,7 @@
                 <primary>LineStringFromText()</primary>
               </indexterm>
 
-              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1942,8 +1939,7 @@
                 <primary>MultiLineStringFromText()</primary>
               </indexterm>
 
-              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1973,8 +1969,7 @@
                 <primary>MultiPointFromText()</primary>
               </indexterm>
 
-              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2004,8 +1999,7 @@
                 <primary>MultiPolygonFromText()</primary>
               </indexterm>
 
-              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2056,8 +2050,7 @@
                 <primary>PolygonFromText()</primary>
               </indexterm>
 
-              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2161,8 +2154,7 @@
                 <primary>GeometryCollectionFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2192,8 +2184,7 @@
                 <primary>GeometryFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2223,8 +2214,7 @@
                 <primary>LineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2254,8 +2244,7 @@
                 <primary>MultiLineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2285,8 +2274,7 @@
                 <primary>MultiPointFromWKB()</primary>
               </indexterm>
 
-              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2316,8 +2304,7 @@
                 <primary>MultiPolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2372,8 +2359,7 @@
                 <primary>PolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.0/connector-j.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -247,7 +247,7 @@
       <para>The following example shows a stored procedure that returns the
       value of <varname>inOutParam</varname> incremented by 1, and the string
       passed in via <varname>inputParam</varname> as a
-      <classname>ResultSet</classname> : <example>
+      <classname>ResultSet</classname>: <example>
           <title>Stored Procedure Example</title>
 
           <programlisting>CREATE PROCEDURE demoSp(IN inputParam VARCHAR(255), INOUT inOutParam INT)
@@ -396,7 +396,7 @@
         </listitem>
 
         <listitem>
-          <para>Execute the <classname>CallableStatement</classname> , and
+          <para>Execute the <classname>CallableStatement</classname>, and
           retrieve any result sets or output parameters.</para>
 
           <para>While <classname>CallableStatement</classname> supports
@@ -2677,8 +2677,8 @@
       30%-50% faster than the standard TCP/IP access.</para>
 
       <para>You can create your own socket factories by following the example
-      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname> ,
-      or <classname>com.mysql.jdbc.StandardSocketFactory</classname> .</para>
+      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname>,
+      or <classname>com.mysql.jdbc.StandardSocketFactory</classname>.</para>
     </section>
 
     <section id="cj-implementation-notes">
@@ -2993,8 +2993,8 @@
               <row>
                 <entry><type>BOOL , BOOLEAN</type></entry>
 
-                <entry>See <type>TINYINT</type> , above as these are aliases
-                for <type>TINYINT(1)</type> , currently.</entry>
+                <entry>See <type>TINYINT</type>, above as these are aliases
+                for <type>TINYINT(1)</type>, currently.</entry>
               </row>
 
               <row>
@@ -3014,14 +3014,14 @@
               <row>
                 <entry><type>INT,INTEGER[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Integer</classname> , if UNSIGNED
+                <entry><classname>java.lang.Integer</classname>, if UNSIGNED
                 <classname>java.lang.Long</classname></entry>
               </row>
 
               <row>
                 <entry><type>BIGINT[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Long</classname> , if UNSIGNED
+                <entry><classname>java.lang.Long</classname>, if UNSIGNED
                 <classname>java.math.BigInteger</classname></entry>
               </row>
 
@@ -3078,7 +3078,7 @@
                 <entry><type>CHAR(M)</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3086,7 +3086,7 @@
                 <entry><type>VARCHAR(M) [BINARY]</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3192,7 +3192,7 @@
       <para>Starting with MySQL Server 4.1, Connector/J supports a single
       character encoding between client and server, and any number of
       character encodings for data returned by the server to the client in
-      <classname>ResultSets</classname> .</para>
+      <classname>ResultSets</classname>.</para>
 
       <para>The character encoding between client and server is automatically
       detected upon connection. The encoding used by the driver is specified
@@ -4582,8 +4582,7 @@
       testcase that doesn't involve any third-party classes.</para>
 
       <para>To streamline this process, we ship a base class for testcases
-      with Connector/J, named '
-      <classname>com.mysql.jdbc.util.BaseBugReport</classname> '. To create a
+      with Connector/J, named '<classname>com.mysql.jdbc.util.BaseBugReport</classname>'. To create a
       testcase for Connector/J using this class, create your own class that
       inherits from <classname>com.mysql.jdbc.util.BaseBugReport</classname>
       and override the methods <methodname>setUp()</methodname>,
@@ -4658,4 +4657,4 @@
 
   <xi:include href="../refman-common/news-connector-j.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file
+</section>

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -4820,8 +4820,7 @@
 
           <listitem>
             <para>
-              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>
-              ,
+              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>,
               <literal>[TCP]<replaceable>NodeId2</replaceable></literal>
             </para>
 

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.0/replication.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -2394,14 +2394,10 @@
       <listitem>
         <para>
           <option>--master-ssl</option>,
-          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>
-          ,
-          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>
-          ,
+          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>,
+          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>,
           <option>--master-ssl-key=<replaceable>file_name</replaceable></option>
         </para>
 

Modified: trunk/refman-5.0/spatial-extensions.xml
===================================================================
--- trunk/refman-5.0/spatial-extensions.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.0/spatial-extensions.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -1864,8 +1864,7 @@
                 <primary>GeometryCollectionFromText()</primary>
               </indexterm>
 
-              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1895,8 +1894,7 @@
                 <primary>GeometryFromText()</primary>
               </indexterm>
 
-              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1926,8 +1924,7 @@
                 <primary>LineStringFromText()</primary>
               </indexterm>
 
-              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1957,8 +1954,7 @@
                 <primary>MultiLineStringFromText()</primary>
               </indexterm>
 
-              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1988,8 +1984,7 @@
                 <primary>MultiPointFromText()</primary>
               </indexterm>
 
-              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2019,8 +2014,7 @@
                 <primary>MultiPolygonFromText()</primary>
               </indexterm>
 
-              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2071,8 +2065,7 @@
                 <primary>PolygonFromText()</primary>
               </indexterm>
 
-              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2176,8 +2169,7 @@
                 <primary>GeometryCollectionFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2207,8 +2199,7 @@
                 <primary>GeometryFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2238,8 +2229,7 @@
                 <primary>LineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2269,8 +2259,7 @@
                 <primary>MultiLineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2300,8 +2289,7 @@
                 <primary>MultiPointFromWKB()</primary>
               </indexterm>
 
-              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2331,8 +2319,7 @@
                 <primary>MultiPolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2387,8 +2374,7 @@
                 <primary>PolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.1/connector-j.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -247,7 +247,7 @@
       <para>The following example shows a stored procedure that returns the
       value of <varname>inOutParam</varname> incremented by 1, and the string
       passed in via <varname>inputParam</varname> as a
-      <classname>ResultSet</classname> : <example>
+      <classname>ResultSet</classname>: <example>
           <title>Stored Procedure Example</title>
 
           <programlisting>CREATE PROCEDURE demoSp(IN inputParam VARCHAR(255), INOUT inOutParam INT)
@@ -396,7 +396,7 @@
         </listitem>
 
         <listitem>
-          <para>Execute the <classname>CallableStatement</classname> , and
+          <para>Execute the <classname>CallableStatement</classname>, and
           retrieve any result sets or output parameters.</para>
 
           <para>While <classname>CallableStatement</classname> supports
@@ -2677,8 +2677,8 @@
       30%-50% faster than the standard TCP/IP access.</para>
 
       <para>You can create your own socket factories by following the example
-      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname> ,
-      or <classname>com.mysql.jdbc.StandardSocketFactory</classname> .</para>
+      code in <classname>com.mysql.jdbc.NamedPipeSocketFactory</classname>,
+      or <classname>com.mysql.jdbc.StandardSocketFactory</classname>.</para>
     </section>
 
     <section id="cj-implementation-notes">
@@ -2993,8 +2993,8 @@
               <row>
                 <entry><type>BOOL , BOOLEAN</type></entry>
 
-                <entry>See <type>TINYINT</type> , above as these are aliases
-                for <type>TINYINT(1)</type> , currently.</entry>
+                <entry>See <type>TINYINT</type>, above as these are aliases
+                for <type>TINYINT(1)</type>, currently.</entry>
               </row>
 
               <row>
@@ -3014,14 +3014,14 @@
               <row>
                 <entry><type>INT,INTEGER[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Integer</classname> , if UNSIGNED
+                <entry><classname>java.lang.Integer</classname>, if UNSIGNED
                 <classname>java.lang.Long</classname></entry>
               </row>
 
               <row>
                 <entry><type>BIGINT[(M)] [UNSIGNED]</type></entry>
 
-                <entry><classname>java.lang.Long</classname> , if UNSIGNED
+                <entry><classname>java.lang.Long</classname>, if UNSIGNED
                 <classname>java.math.BigInteger</classname></entry>
               </row>
 
@@ -3078,7 +3078,7 @@
                 <entry><type>CHAR(M)</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3086,7 +3086,7 @@
                 <entry><type>VARCHAR(M) [BINARY]</type></entry>
 
                 <entry><classname>java.lang.String</classname> (unless the
-                character set for the column is <type>BINARY</type> , then
+                character set for the column is <type>BINARY</type>, then
                 <classname>byte[]</classname> is returned.</entry>
               </row>
 
@@ -3192,7 +3192,7 @@
       <para>Starting with MySQL Server 4.1, Connector/J supports a single
       character encoding between client and server, and any number of
       character encodings for data returned by the server to the client in
-      <classname>ResultSets</classname> .</para>
+      <classname>ResultSets</classname>.</para>
 
       <para>The character encoding between client and server is automatically
       detected upon connection. The encoding used by the driver is specified
@@ -4582,8 +4582,7 @@
       testcase that doesn't involve any third-party classes.</para>
 
       <para>To streamline this process, we ship a base class for testcases
-      with Connector/J, named '
-      <classname>com.mysql.jdbc.util.BaseBugReport</classname> '. To create a
+      with Connector/J, named '<classname>com.mysql.jdbc.util.BaseBugReport</classname>'. To create a
       testcase for Connector/J using this class, create your own class that
       inherits from <classname>com.mysql.jdbc.util.BaseBugReport</classname>
       and override the methods <methodname>setUp()</methodname>,
@@ -4658,4 +4657,4 @@
 
   <xi:include href="../refman-common/news-connector-j.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
-</section>
\ No newline at end of file
+</section>

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -4820,8 +4820,7 @@
 
           <listitem>
             <para>
-              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>
-              ,
+              <literal>[TCP]<replaceable>NodeId1</replaceable></literal>,
               <literal>[TCP]<replaceable>NodeId2</replaceable></literal>
             </para>
 

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.1/replication.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -2526,14 +2526,10 @@
       <listitem>
         <para>
           <option>--master-ssl</option>,
-          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>
-          ,
-          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>
-          ,
-          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>
-          ,
+          <option>--master-ssl-ca=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-capath=<replaceable>directory_name</replaceable></option>,
+          <option>--master-ssl-cert=<replaceable>file_name</replaceable></option>,
+          <option>--master-ssl-cipher=<replaceable>cipher_list</replaceable></option>,
           <option>--master-ssl-key=<replaceable>file_name</replaceable></option>
         </para>
 

Modified: trunk/refman-5.1/spatial-extensions.xml
===================================================================
--- trunk/refman-5.1/spatial-extensions.xml	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/refman-5.1/spatial-extensions.xml	2006-01-03 03:34:10 UTC (rev 644)
@@ -1864,8 +1864,7 @@
                 <primary>GeometryCollectionFromText()</primary>
               </indexterm>
 
-              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1895,8 +1894,7 @@
                 <primary>GeometryFromText()</primary>
               </indexterm>
 
-              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1926,8 +1924,7 @@
                 <primary>LineStringFromText()</primary>
               </indexterm>
 
-              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1957,8 +1954,7 @@
                 <primary>MultiLineStringFromText()</primary>
               </indexterm>
 
-              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -1988,8 +1984,7 @@
                 <primary>MultiPointFromText()</primary>
               </indexterm>
 
-              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2019,8 +2014,7 @@
                 <primary>MultiPolygonFromText()</primary>
               </indexterm>
 
-              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2071,8 +2065,7 @@
                 <primary>PolygonFromText()</primary>
               </indexterm>
 
-              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromText(<replaceable>wkt</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2176,8 +2169,7 @@
                 <primary>GeometryCollectionFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomCollFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryCollectionFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2207,8 +2199,7 @@
                 <primary>GeometryFromWKB()</primary>
               </indexterm>
 
-              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>GeomFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>GeometryFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2238,8 +2229,7 @@
                 <primary>LineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>LineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>LineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2269,8 +2259,7 @@
                 <primary>MultiLineStringFromWKB()</primary>
               </indexterm>
 
-              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MLineFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiLineStringFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2300,8 +2289,7 @@
                 <primary>MultiPointFromWKB()</primary>
               </indexterm>
 
-              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPointFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2331,8 +2319,7 @@
                 <primary>MultiPolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>MPolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>MultiPolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 
@@ -2387,8 +2374,7 @@
                 <primary>PolygonFromWKB()</primary>
               </indexterm>
 
-              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
-              ,
+              <literal>PolyFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>,
               <literal>PolygonFromWKB(<replaceable>wkb</replaceable>[,<replaceable>srid</replaceable>])</literal>
             </para>
 

Modified: trunk/tools/xmlformat.conf
===================================================================
--- trunk/tools/xmlformat.conf	2006-01-03 03:33:54 UTC (rev 643)
+++ trunk/tools/xmlformat.conf	2006-01-03 03:34:10 UTC (rev 644)
@@ -84,7 +84,8 @@
 filename citetitle keycap \
 guibutton guilabel guimenu guisubmenu guimenuitem \
 quote superscript firstterm \
-methodname property function phrase envar foreignphrase errortext
+methodname classname property function phrase envar foreignphrase errortext \
+classname type
     format          inline
 
 # Begin each element on new line, indenting sub elements two spaces.

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