List:Commits« Previous MessageNext Message »
From:paul Date:January 5 2006 8:43pm
Subject:svn commit - mysqldoc@docsrva: r690 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-05 21:43:33 +0100 (Thu, 05 Jan 2006)
New Revision: 690

Log:
 r5875@frost:  paul | 2006-01-05 13:13:48 -0600
 Kill "and/or", replace with "and", "or", or something else.


Modified:
   trunk/
   trunk/refman-4.1/client-side-scripts.xml
   trunk/refman-4.1/connector-j.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/extending-mysql.xml
   trunk/refman-4.1/functions.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/porting.xml
   trunk/refman-5.0/client-side-scripts.xml
   trunk/refman-5.0/connector-j.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/porting.xml
   trunk/refman-5.1/client-side-scripts.xml
   trunk/refman-5.1/connector-j.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/ndbcluster.xml
   trunk/refman-5.1/optimization.xml
   trunk/refman-5.1/porting.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/client-side-scripts.xml
===================================================================
--- trunk/refman-4.1/client-side-scripts.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/client-side-scripts.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -5263,7 +5263,7 @@
           database or a collection of databases for backup or for
           transferring the data to another SQL server (not necessarily a
           MySQL server). The dump contains SQL statements to create the
-          table and/or populate the table.
+          table or populate it, or both.
         </para>
 
         <para>

Modified: trunk/refman-4.1/connector-j.xml
===================================================================
--- trunk/refman-4.1/connector-j.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/connector-j.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1061,7 +1061,7 @@
         </para>
 
         <para>
-          If you are developing servlets and/or JSPs, and your
+          If you are developing servlets or JSPs, and your
           application server is J2EE-compliant, you can put the driver's
           .jar file in the WEB-INF/lib subdirectory of your webapp, as
           this is a standard location for third party class libraries in
@@ -1622,7 +1622,7 @@
             </row>
             <row>
               <entry>autoReconnect</entry>
-              <entry>Should the driver try to re-establish stale and/or dead connections? If
+              <entry>Should the driver try to re-establish stale or dead connections? If
                 enabled the driver will throw an exception for a queries
                 issued on a stale or dead connection, which belong to
                 the current transaction, but will attempt reconnect

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4992,7 +4992,7 @@
       <para>
         Here is an excellent article from Mike Hillyer
         (<email>m.hillyer@stripped</email>); explaining how to
-        insert and/or fetch data from blob columns through MyODBC from
+        insert or fetch data from blob columns through MyODBC from
         ADO:
         <ulink url="http://www.dynamergy.com/mike/articles/blobaccessvb.html">MySQL
         BLOB columns and Visual Basic 6</ulink>.

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/data-types.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -3205,7 +3205,7 @@
         <para>
           Any single <literal>TIMESTAMP</literal> column in a table can
           be set to be the one that is initialized to the current
-          timestamp and/or updated automatically.
+          timestamp or updated automatically.
         </para>
 
         <para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/database-administration.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -436,7 +436,7 @@
 
       <para>
         The following table shows on which platforms allow MySQL-Max
-        binaries include support for <literal>BDB</literal> and/or
+        binaries include support for <literal>BDB</literal> and
         <literal>NDB Cluster</literal>:
       </para>
 

Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/extending-mysql.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -189,7 +189,7 @@
           long as it is not using ports <literal>9306</literal> or
           <literal>9307</literal>. If either of those ports is taken,
           you should edit <command>mysql-test-run</command> and change
-          the values of the master and/or slave port to one that is
+          the values of the master or slave port to one that is
           available.
         </para>
 
@@ -260,7 +260,7 @@
               the generated result files, if needed, to adjust them to
               the expected output. In that case, be very careful about
               not adding or deleting any invisible characters. Make sure
-              to only change the text and/or delete lines. If you have
+              to only change the text or delete lines. If you have
               to insert a line, make sure that the fields are separated
               by a hard tab, and that there is a hard tab at the end.
               You may want to use <command>od -c</command> to make sure
@@ -460,7 +460,7 @@
             <para>
               If you have compiled MySQL with debugging you can try to
               debug this by running <command>mysql-test-run</command>
-              with the <option>--gdb</option> and/or
+              with either or both of the <option>--gdb</option> and
               <option>--debug</option> options. See
               <xref linkend="making-trace-files"/>.
             </para>

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/functions.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -3653,7 +3653,7 @@
 
         <para>
           Returns the string <replaceable>str</replaceable> with all
-          <replaceable>remstr</replaceable> prefixes and/or suffixes
+          <replaceable>remstr</replaceable> prefixes or suffixes
           removed. If none of the specifiers <literal>BOTH</literal>,
           <literal>LEADING</literal>, or <literal>TRAILING</literal> is
           given, <literal>BOTH</literal> is assumed.

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/language-structure.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -2080,7 +2080,7 @@
       version, so it's a good idea to have a look at future reserved
       words, too. You can find these in the manuals that cover higher
       versions of MySQL. Most of the words in the table are forbidden by
-      standard SQL as column and/or table names (for example,
+      standard SQL as column or table names (for example,
       <literal>GROUP</literal>). A few are reserved because MySQL needs
       them and (currently) uses a <command>yacc</command> parser. A
       reserved word can be used as an identifier if you quote it.

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/ndbcluster.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4294,7 +4294,7 @@
             <para>
               This buffer is 2MB by default. The minimum value is 1MB,
               and for most applications the minimum is sufficient. For
-              applications doing extremely large and/or numerous inserts
+              applications doing extremely large or numerous inserts
               and deletes together with large transactions and large
               primary keys, it may be necessary to increase the size of
               this buffer. If this buffer is too small, the NDB storage
@@ -9701,7 +9701,7 @@
           As of MySQL 4.1.11 there is no easy way determine exactly how
           much memory is being used for storage of Cluster indexes;
           however, warnings are written to the Cluster log when 80% of
-          available <literal>DataMemory</literal> and/or
+          available <literal>DataMemory</literal> or
           <literal>IndexMemory</literal> is in use, and again when 85%,
           90%, and so on is in use.
         </para>

Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/optimization.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -7956,7 +7956,7 @@
 
             <para>
               This means that, for <literal>MyISAM</literal> tables, you
-              symlink the index file and/or data file from their usual
+              symlink the index file and data files from their usual
               location in the data directory to another disk (that may
               also be striped). This makes both the seek and read times
               better, assuming that the disk is not used for other

Modified: trunk/refman-4.1/porting.xml
===================================================================
--- trunk/refman-4.1/porting.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-4.1/porting.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1015,7 +1015,7 @@
           </row>
           <row>
             <entry><literal>f</literal></entry>
-            <entry>Limit debugging and/or tracing, and profiling to the list of named
+            <entry>Limit debugging, tracing, and profiling to the list of named
               functions. Note that a null list disables all functions.
               The appropriate <literal>d</literal> or
               <literal>t</literal> flags must still be given; this flag

Modified: trunk/refman-5.0/client-side-scripts.xml
===================================================================
--- trunk/refman-5.0/client-side-scripts.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/client-side-scripts.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -5409,7 +5409,7 @@
           database or a collection of databases for backup or for
           transferring the data to another SQL server (not necessarily a
           MySQL server). The dump contains SQL statements to create the
-          table and/or populate the table.
+          table or populate it, or both.
         </para>
 
         <para>

Modified: trunk/refman-5.0/connector-j.xml
===================================================================
--- trunk/refman-5.0/connector-j.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/connector-j.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1061,7 +1061,7 @@
         </para>
 
         <para>
-          If you are developing servlets and/or JSPs, and your
+          If you are developing servlets or JSPs, and your
           application server is J2EE-compliant, you can put the driver's
           .jar file in the WEB-INF/lib subdirectory of your webapp, as
           this is a standard location for third party class libraries in
@@ -1622,7 +1622,7 @@
             </row>
             <row>
               <entry>autoReconnect</entry>
-              <entry>Should the driver try to re-establish stale and/or dead connections? If
+              <entry>Should the driver try to re-establish stale or dead connections? If
                 enabled the driver will throw an exception for a queries
                 issued on a stale or dead connection, which belong to
                 the current transaction, but will attempt reconnect

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4992,7 +4992,7 @@
       <para>
         Here is an excellent article from Mike Hillyer
         (<email>m.hillyer@stripped</email>); explaining how to
-        insert and/or fetch data from blob columns through MyODBC from
+        insert or fetch data from blob columns through MyODBC from
         ADO:
         <ulink url="http://www.dynamergy.com/mike/articles/blobaccessvb.html">MySQL
         BLOB columns and Visual Basic 6</ulink>.

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/data-types.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -2921,7 +2921,7 @@
             <para>
               Any single <literal>TIMESTAMP</literal> column in a table
               can be set to be the one that is initialized to the
-              current timestamp and/or updated automatically.
+              current timestamp or updated automatically.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/database-administration.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -434,7 +434,7 @@
 
       <para>
         The following table shows on which platforms MySQL-Max binaries
-        include support for BDB and/or NDB Cluster:
+        include support for BDB and NDB Cluster:
       </para>
 
       <informaltable>

Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/extending-mysql.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -189,7 +189,7 @@
           <literal>9306</literal> or <literal>9307</literal>. If either
           of those ports is taken, you should edit
           <command>mysql-test-run</command> and change the values of the
-          master and/or slave port to one that is available.
+          master or slave port to one that is available.
         </para>
 
         <para>
@@ -251,7 +251,7 @@
               the generated result files, if needed, to adjust them to
               the expected output. In that case, be very careful about
               not adding or deleting any invisible characters. Make sure
-              to only change the text and/or delete lines. If you have
+              to only change the text or delete lines. If you have
               to insert a line, make sure that the fields are separated
               by a hard tab, and that there is a hard tab at the end.
               You may want to use <command>od -c</command> to make sure
@@ -451,7 +451,7 @@
             <para>
               If you have compiled MySQL with debugging you can try to
               debug this by running <command>mysql-test-run</command>
-              with the <option>--gdb</option> and/or
+              with either or both of the <option>--gdb</option> and
               <option>--debug</option> options. See
               <xref linkend="making-trace-files"/>.
             </para>

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/functions.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -3702,7 +3702,7 @@
 
         <para>
           Returns the string <replaceable>str</replaceable> with all
-          <replaceable>remstr</replaceable> prefixes and/or suffixes
+          <replaceable>remstr</replaceable> prefixes or suffixes
           removed. If none of the specifiers <literal>BOTH</literal>,
           <literal>LEADING</literal>, or <literal>TRAILING</literal> is
           given, <literal>BOTH</literal> is assumed.

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/language-structure.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -2030,7 +2030,7 @@
       version, so it's a good idea to have a look at future reserved
       words, too. You can find these in the manuals that cover higher
       versions of MySQL. Most of the words in the table are forbidden by
-      standard SQL as column and/or table names (for example,
+      standard SQL as column or table names (for example,
       <literal>GROUP</literal>). A few are reserved because MySQL needs
       them and (currently) uses a <command>yacc</command> parser. A
       reserved word can be used as an identifier if you quote it.

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/ndbcluster.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4307,7 +4307,7 @@
             <para>
               This buffer is 2MB by default. The minimum value is 1MB,
               and for most applications the minimum is sufficient. For
-              applications doing extremely large and/or numerous inserts
+              applications doing extremely large or numerous inserts
               and deletes together with large transactions and large
               primary keys, it may be necessary to increase the size of
               this buffer. If this buffer is too small, the NDB storage
@@ -9987,7 +9987,7 @@
           There is no easy way to determine exactly how much memory is
           being used for storage of Cluster indexes at any given time;
           however, warnings are written to the Cluster log when 80% of
-          available <literal>DataMemory</literal> and/or
+          available <literal>DataMemory</literal> or
           <literal>IndexMemory</literal> is in use, and again when 85%,
           90%, and so on is in use.
         </para>

Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/optimization.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -9532,7 +9532,7 @@
 
             <para>
               This means that, for <literal>MyISAM</literal> tables, you
-              symlink the index file and/or data file from their usual
+              symlink the index file and data files from their usual
               location in the data directory to another disk (that may
               also be striped). This makes both the seek and read times
               better, assuming that the disk is not used for other

Modified: trunk/refman-5.0/porting.xml
===================================================================
--- trunk/refman-5.0/porting.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.0/porting.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1015,7 +1015,7 @@
           </row>
           <row>
             <entry><literal>f</literal></entry>
-            <entry>Limit debugging and/or tracing, and profiling to the list of named
+            <entry>Limit debugging, tracing, and profiling to the list of named
               functions. Note that a null list disables all functions.
               The appropriate <literal>d</literal> or
               <literal>t</literal> flags must still be given; this flag

Modified: trunk/refman-5.1/client-side-scripts.xml
===================================================================
--- trunk/refman-5.1/client-side-scripts.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/client-side-scripts.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -5433,7 +5433,7 @@
           database or a collection of databases for backup or for
           transferring the data to another SQL server (not necessarily a
           MySQL server). The dump contains SQL statements to create the
-          table and/or populate the table.
+          table or populate it, or both.
         </para>
 
         <para>

Modified: trunk/refman-5.1/connector-j.xml
===================================================================
--- trunk/refman-5.1/connector-j.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/connector-j.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1061,7 +1061,7 @@
         </para>
 
         <para>
-          If you are developing servlets and/or JSPs, and your
+          If you are developing servlets or JSPs, and your
           application server is J2EE-compliant, you can put the driver's
           .jar file in the WEB-INF/lib subdirectory of your webapp, as
           this is a standard location for third party class libraries in
@@ -1622,7 +1622,7 @@
             </row>
             <row>
               <entry>autoReconnect</entry>
-              <entry>Should the driver try to re-establish stale and/or dead connections? If
+              <entry>Should the driver try to re-establish stale or dead connections? If
                 enabled the driver will throw an exception for a queries
                 issued on a stale or dead connection, which belong to
                 the current transaction, but will attempt reconnect

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4992,7 +4992,7 @@
       <para>
         Here is an excellent article from Mike Hillyer
         (<email>m.hillyer@stripped</email>); explaining how to
-        insert and/or fetch data from blob columns through MyODBC from
+        insert or fetch data from blob columns through MyODBC from
         ADO:
         <ulink url="http://www.dynamergy.com/mike/articles/blobaccessvb.html">MySQL
         BLOB columns and Visual Basic 6</ulink>.

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/data-types.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -2816,7 +2816,7 @@
             <para>
               Any single <literal>TIMESTAMP</literal> column in a table
               can be set to be the one that is initialized to the
-              current timestamp and/or updated automatically.
+              current timestamp or updated automatically.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/database-administration.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -434,7 +434,7 @@
 
       <para>
         The following table shows on which platforms MySQL-Max binaries
-        include support for BDB and/or NDB Cluster:
+        include support for BDB and NDB Cluster:
       </para>
 
       <informaltable>

Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/extending-mysql.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -189,7 +189,7 @@
           <literal>9306</literal> or <literal>9307</literal>. If either
           of those ports is taken, you should edit
           <command>mysql-test-run</command> and change the values of the
-          master and/or slave port to one that is available.
+          master or slave port to one that is available.
         </para>
 
         <para>
@@ -251,7 +251,7 @@
               the generated result files, if needed, to adjust them to
               the expected output. In that case, be very careful about
               not adding or deleting any invisible characters. Make sure
-              to only change the text and/or delete lines. If you have
+              to only change the text or delete lines. If you have
               to insert a line, make sure that the fields are separated
               by a hard tab, and that there is a hard tab at the end.
               You may want to use <command>od -c</command> to make sure
@@ -451,7 +451,7 @@
             <para>
               If you have compiled MySQL with debugging you can try to
               debug this by running <command>mysql-test-run</command>
-              with the <option>--gdb</option> and/or
+              with either or both of the <option>--gdb</option> and
               <option>--debug</option> options. See
               <xref linkend="making-trace-files"/>.
             </para>

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/functions.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -3674,7 +3674,7 @@
 
         <para>
           Returns the string <replaceable>str</replaceable> with all
-          <replaceable>remstr</replaceable> prefixes and/or suffixes
+          <replaceable>remstr</replaceable> prefixes or suffixes
           removed. If none of the specifiers <literal>BOTH</literal>,
           <literal>LEADING</literal>, or <literal>TRAILING</literal> is
           given, <literal>BOTH</literal> is assumed.

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/language-structure.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -2030,7 +2030,7 @@
       version, so it's a good idea to have a look at future reserved
       words, too. You can find these in the manuals that cover higher
       versions of MySQL. Most of the words in the table are forbidden by
-      standard SQL as column and/or table names (for example,
+      standard SQL as column or table names (for example,
       <literal>GROUP</literal>). A few are reserved because MySQL needs
       them and (currently) uses a <command>yacc</command> parser. A
       reserved word can be used as an identifier if you quote it.

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/ndbcluster.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -4307,7 +4307,7 @@
             <para>
               This buffer is 2MB by default. The minimum value is 1MB,
               and for most applications the minimum is sufficient. For
-              applications doing extremely large and/or numerous inserts
+              applications doing extremely large or numerous inserts
               and deletes together with large transactions and large
               primary keys, it may be necessary to increase the size of
               this buffer. If this buffer is too small, the NDB storage
@@ -9572,8 +9572,8 @@
           
           <listitem>
             <para>
-              Issue any desried <literal>ALTER TABLE</literal> commands
-              that add and/or remove columns to or from an existing table,
+              Issue any desired <literal>ALTER TABLE</literal> commands
+              that add or remove columns to or from an existing table,
               for example:
             </para>
             
@@ -11567,7 +11567,7 @@
           There is no easy way to determine exactly how much memory is
           being used for storage of Cluster indexes at any given time;
           however, warnings are written to the Cluster log when 80% of
-          available <literal>DataMemory</literal> and/or
+          available <literal>DataMemory</literal> or
           <literal>IndexMemory</literal> is in use, and again when 85%,
           90%, and so on is in use.
         </para>

Modified: trunk/refman-5.1/optimization.xml
===================================================================
--- trunk/refman-5.1/optimization.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/optimization.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -9635,7 +9635,7 @@
 
             <para>
               This means that, for <literal>MyISAM</literal> tables, you
-              symlink the index file and/or data file from their usual
+              symlink the index file and data files from their usual
               location in the data directory to another disk (that may
               also be striped). This makes both the seek and read times
               better, assuming that the disk is not used for other

Modified: trunk/refman-5.1/porting.xml
===================================================================
--- trunk/refman-5.1/porting.xml	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-5.1/porting.xml	2006-01-05 20:43:33 UTC (rev 690)
@@ -1015,7 +1015,7 @@
           </row>
           <row>
             <entry><literal>f</literal></entry>
-            <entry>Limit debugging and/or tracing, and profiling to the list of named
+            <entry>Limit debugging, tracing, and profiling to the list of named
               functions. Note that a null list disables all functions.
               The appropriate <literal>d</literal> or
               <literal>t</literal> flags must still be given; this flag

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-05 20:43:02 UTC (rev 689)
+++ trunk/refman-common/titles.en.ent	2006-01-05 20:43:33 UTC (rev 690)
@@ -40,7 +40,7 @@
 <!ENTITY title-ansi-diff-select-into-table "<literal>SELECT INTO TABLE</literal>">
 <!ENTITY title-ansi-diff-subqueries "Subquery Support">
 <!ENTITY title-ansi-diff-transactions "Transactions and Atomic Operations">
-<!ENTITY title-ansi-diff-triggers "Stored Procedures and Triggers">
+<!ENTITY title-ansi-diff-triggers "Stored Routines and Triggers">
 <!ENTITY title-ansi-diff-views "Views">
 <!ENTITY title-ansi-mode "Running MySQL in ANSI Mode">
 <!ENTITY title-any-in-some-subqueries "Subqueries with <literal>ANY</literal>, <literal>IN</literal>, and <literal>SOME</literal>">

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