List:Commits« Previous MessageNext Message »
From:paul Date:January 23 2006 2:34am
Subject:svn commit - mysqldoc@docsrva: r993 - in trunk: . refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-23 03:34:40 +0100 (Mon, 23 Jan 2006)
New Revision: 993

Log:
 r6572@frost:  paul | 2006-01-22 18:40:03 -0600
 Regularize OBSOLETE/DEPRECATED markers.


Modified:
   trunk/
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-23 00:04:08 UTC (rev 992)
+++ trunk/refman-5.0/database-administration.xml	2006-01-23 02:34:40 UTC (rev 993)
@@ -673,8 +673,8 @@
 
           <listitem>
             <para>
+              <option>--default-character-set=<replaceable>charset</replaceable></option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
             </para>
 
             <para>
@@ -1072,8 +1072,8 @@
 
           <listitem>
             <para>
+              <option>--log-long-format</option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--log-long-format</option>
             </para>
 
             <para>
@@ -1410,8 +1410,8 @@
 
           <listitem>
             <para>
+              <option>--safe-show-database</option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--safe-show-database</option>
             </para>
 
             <para>
@@ -5313,8 +5313,8 @@
 
           <listitem>
             <para>
+              <literal>myisam_max_extra_sort_file_size</literal>
               (<emphasis>DEPRECATED</emphasis>)
-              <literal>myisam_max_extra_sort_file_size</literal>
             </para>
 
             <para>
@@ -12254,8 +12254,8 @@
 
         <listitem>
           <para>
+            <option>--safe-show-database</option>
             (<emphasis>OBSOLETE</emphasis>)
-            <option>--safe-show-database</option>
           </para>
 
           <para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-23 00:04:08 UTC (rev 992)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-23 02:34:40 UTC (rev 993)
@@ -2101,7 +2101,7 @@
               <entry>See <xref linkend="memory-storage-engine"/>.</entry>
             </row>
             <row>
-              <entry>(<emphasis>OBSOLETE</emphasis>) <literal>ISAM</literal></entry>
+              <entry><literal>ISAM</literal> (<emphasis>OBSOLETE</emphasis>)</entry>
               <entry>Not available in MySQL &current-series;. If you are upgrading to MySQL
                 &current-series; from a previous version, you should
                 convert any existing <literal>ISAM</literal> tables to

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-23 00:04:08 UTC (rev 992)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-23 02:34:40 UTC (rev 993)
@@ -1294,8 +1294,8 @@
 
           <listitem>
             <para>
+              <option>--set-character-set=<replaceable>name</replaceable></option>
               (<emphasis>OBSOLETE</emphasis>)
-              <option>--set-character-set=<replaceable>name</replaceable></option>
             </para>
 
             <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-23 00:04:08 UTC (rev 992)
+++ trunk/refman-5.1/database-administration.xml	2006-01-23 02:34:40 UTC (rev 993)
@@ -697,8 +697,8 @@
 
           <listitem>
             <para>
+              <option>--default-character-set=<replaceable>charset</replaceable></option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--default-character-set=<replaceable>charset</replaceable></option>
             </para>
 
             <para>
@@ -1067,8 +1067,8 @@
 
           <listitem>
             <para>
+              <option>--log-long-format</option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--log-long-format</option>
             </para>
 
             <para>
@@ -1405,8 +1405,8 @@
 
           <listitem>
             <para>
+              <option>--safe-show-database</option>
               (<emphasis>DEPRECATED</emphasis>)
-              <option>--safe-show-database</option>
             </para>
 
             <para>
@@ -5324,8 +5324,8 @@
 
           <listitem>
             <para>
+              <literal>myisam_max_extra_sort_file_size</literal>
               (<emphasis>DEPRECATED</emphasis>)
-              <literal>myisam_max_extra_sort_file_size</literal>
             </para>
 
             <para>
@@ -12290,8 +12290,8 @@
 
         <listitem>
           <para>
+            <option>--safe-show-database</option>
             (<emphasis>OBSOLETE</emphasis>)
-            <option>--safe-show-database</option>
           </para>
 
           <para>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-23 00:04:08 UTC (rev 992)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-23 02:34:40 UTC (rev 993)
@@ -2330,7 +2330,7 @@
               <entry>See <xref linkend="memory-storage-engine"/>.</entry>
             </row>
             <row>
-              <entry>(<emphasis>OBSOLETE</emphasis>) <literal>ISAM</literal></entry>
+              <entry><literal>ISAM</literal> (<emphasis>OBSOLETE</emphasis>)</entry>
               <entry>Not available in MySQL &current-series;. If you are upgrading to MySQL
                 &current-series; from a previous version, you should
                 convert any existing <literal>ISAM</literal> tables to

Thread
svn commit - mysqldoc@docsrva: r993 - in trunk: . refman-5.0 refman-5.1paul23 Jan