svn commit - mysqldoc@docsrva: r537 - in trunk: . refman-common

[paul]

Author: paul
Date: 2005-12-10 21:19:22 +0100 (Sat, 10 Dec 2005)
New Revision: 537

Log:
 r4675@frost:  paul | 2005-12-10 13:39:26 -0600
 Kill i.e. (that is) and e.g. (for example).


Modified:
   trunk/
   trunk/refman-common/news-4.0.xml
   trunk/refman-common/news-4.1.xml
   trunk/refman-common/news-5.0.xml
   trunk/refman-common/news-cluster.xml


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

Modified: trunk/refman-common/news-4.0.xml
===================================================================
--- trunk/refman-common/news-4.0.xml	2005-12-10 18:02:13 UTC (rev 536)
+++ trunk/refman-common/news-4.0.xml	2005-12-10 20:19:22 UTC (rev 537)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
     <!ENTITY % fixedchars.entities    SYSTEM "fixedchars.ent">
     %fixedchars.entities;
@@ -1358,10 +1358,10 @@
           Fixed a bug that allowed <literal>HANDLER</literal> tables
           with the same alias to be opened multiple times.
           <literal>HANDLER</literal> aliases must now be unique, even
-          though it is syntactically correct in versions below 4.1, to
-          qualify them with their base table's database name (e.g.
-          test_db.handler_tbl, but this now conflicts with e.g.
-          another_db.handler_tbl). (Bug #4335)
+          though it is syntactically correct in versions below 4.1 to
+          qualify them with their base table's database name (for
+          example, <literal>test_db.handler_tbl</literal> now conflicts
+          with <literal>another_db.handler_tbl</literal>). (Bug #4335)
         </para>
       </listitem>
 
@@ -1546,7 +1546,7 @@
         <para>
           Print <replaceable>version_comment</replaceable> (from
           <literal>./configure --comment</literal> during compilation)
-          when starting the server. E.g.: <literal>Version:
+          when starting the server. Example: <literal>Version:
           '4.0.21-debug' socket: '/tmp/mysql.sock' port: 0 Official
           MySQL Binary</literal>
         </para>

Modified: trunk/refman-common/news-4.1.xml
===================================================================
--- trunk/refman-common/news-4.1.xml	2005-12-10 18:02:13 UTC (rev 536)
+++ trunk/refman-common/news-4.1.xml	2005-12-10 20:19:22 UTC (rev 537)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
     <!ENTITY % fixedchars.entities    SYSTEM "fixedchars.ent">
     %fixedchars.entities;
@@ -5998,8 +5998,8 @@
       <listitem>
         <para>
           Fixed bug which caused MySQL to require privileges on system
-          time zone description tables for implicit access to them (i.e.
-          if one set <literal>time_zone</literal> variable or used
+          time zone description tables for implicit access to them (that
+          is, if one set <literal>time_zone</literal> variable or used
           <literal>CONVERT_TZ()</literal> function) in case when some
           table-level or column-level privileges existed. (Bug #6765)
         </para>
@@ -6442,7 +6442,7 @@
           See <xref linkend="innodb-restrictions"/>. (Bug #3299, Bug
           #5998) InnoDB: <literal>SHOW TABLE STATUS</literal> now shows
           the creation time of the table for InnoDB. Note that this
-          timestamp might not be the correct time because, e.g.,
+          timestamp might not be the correct time because, for example,
           <literal>ALTER TABLE</literal> changes this timestamp.
         </para>
       </listitem>
@@ -6878,7 +6878,7 @@
           Now MySQL does not prefer columns, which are mentioned in
           select list but are renamed, over columns from other tables
           participating in <literal>FROM</literal> clause when it
-          resolves <literal>GROUP BY</literal> clause (e.g.
+          resolves <literal>GROUP BY</literal> clause (for example,
           <literal>SELECT t1.a AS c FROM t1, t2 ORDER BY a</literal>
           produces an error if both <literal>t1</literal> and
           <literal>t2</literal> tables contain
<literal>a</literal>
@@ -8229,7 +8229,8 @@
           not work on others, such as FreeBSD or Solaris. Making these
           queries OS-independent was the goal of this change.) Use
           <literal>CONV()</literal> to convert hexadecimal numbers to
-          decimal. E.g. <literal>CONV(MID('0x10',3),16,10)+0</literal>.
+          decimal. Example:
+          <literal>CONV(MID('0x10',3),16,10)+0</literal>.
         </para>
       </listitem>
 

Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml	2005-12-10 18:02:13 UTC (rev 536)
+++ trunk/refman-common/news-5.0.xml	2005-12-10 20:19:22 UTC (rev 537)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
     <!ENTITY % fixedchars.entities    SYSTEM "fixedchars.ent">
     %fixedchars.entities;
@@ -1600,14 +1600,15 @@
         <para>
           When declaring a local variable (or parameter) named
           <literal>password</literal> or <literal>name</literal>,
and
-          setting it with <literal>SET</literal>, e.g. <literal>SET
-          password = ''</literal>, the new error message: <literal>ERROR
-          42000: Variable 'nnn' must be quoted with `...`, or
-          renamed</literal> is returned (where 'nnn' is 'password' or
-          'names'). This means there is a syntax conflict with special
-          sentences like <literal>SET PASSWORD = PASSWORD(...)</literal>
-          (for setting a user's password) and <literal>set names
-          default</literal> (for setting charset and collation).
+          setting it with <literal>SET</literal> (for example,
+          <literal>SET password = ''</literal>), the new error message
+          <literal>ERROR 42000: Variable 'nnn' must be quoted with
+          `...`, or renamed</literal> is returned (where 'nnn' is
+          'password' or 'names'). This means there is a syntax conflict
+          with special sentences like <literal>SET PASSWORD =
+          PASSWORD(...)</literal> (for setting a user's password) and
+          <literal>set names default</literal> (for setting charset and
+          collation).
         </para>
 
         <para>
@@ -5444,8 +5445,8 @@
       <listitem>
         <para>
           Wrong comparison method used in <literal>VIEW</literal> when
-          relaxed date syntax used (i.e. <literal>2005.06.10</literal>).
-          (Bug #11325)
+          relaxed date syntax used (for example,
+          <literal>2005.06.10</literal>). (Bug #11325)
         </para>
       </listitem>
 
@@ -6156,9 +6157,10 @@
       <listitem>
         <para>
           MySQL Cluster: Not allowing sufficient parallelism in cluster
-          configuration (e.g. <literal>NoOfTransactions</literal> too
-          small) caused <literal>ndb_restore</literal> to fail without
-          providing any error messages. (Bug #10294)
+          configuration (for example,
+          <literal>NoOfTransactions</literal> too small) caused
+          <literal>ndb_restore</literal> to fail without providing any
+          error messages. (Bug #10294)
         </para>
       </listitem>
 
@@ -6260,8 +6262,8 @@
           <literal>rows</literal> columns of
<literal>EXPLAIN</literal>
           output can now be <literal>NULL</literal>. This is required
           for using <literal>EXPLAIN</literal> on
-          <literal>SELECT</literal> queries that use no tables (i.e.
-          <literal>EXPLAIN SELECT 1</literal>). (Bug #9899)
+          <literal>SELECT</literal> queries that use no tables (for
+          example, <literal>EXPLAIN SELECT 1</literal>). (Bug #9899)
         </para>
       </listitem>
 
@@ -9899,7 +9901,7 @@
           Fixed that when using the <literal>RPAD()</literal> function
           (or any function adding spaces to the right) in a query that
           had to be resolved by using a temporary table, all resulting
-          strings had rightmost spaces removed (i.e.
+          strings had rightmost spaces removed (that is,
           <literal>RPAD()</literal> did not work) (Bug #4048)
         </para>
       </listitem>

Modified: trunk/refman-common/news-cluster.xml
===================================================================
--- trunk/refman-common/news-cluster.xml	2005-12-10 18:02:13 UTC (rev 536)
+++ trunk/refman-common/news-cluster.xml	2005-12-10 20:19:22 UTC (rev 537)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
     <!ENTITY % fixedchars.entities    SYSTEM "fixedchars.ent">
     %fixedchars.entities;
@@ -502,9 +502,10 @@
       <listitem>
         <para>
           (Bug #10294) Not allowing sufficient parallelism in cluster
-          configuration (e.g. <literal>NoOfTransactions</literal> too
-          small) caused <literal>ndb_restore</literal> to fail without
-          generating any error messages.
+          configuration (for example,
+          <literal>NoOfTransactions</literal> too small) caused
+          <literal>ndb_restore</literal> to fail without generating any
+          error messages.
         </para>
       </listitem>
 
@@ -1033,9 +1034,9 @@
         <para>
           As bonus of the above you can now specify all command line
           options in <filename>my.cnf</filename> using the executable
-          names as sections, i.e. <literal>[ndbd]</literal>,
+          names as sections, that is, <literal>[ndbd]</literal>,
           <literal>[ndb_mgmd]</literal>,
<literal>[ndb_mgm]</literal>,
-          <literal>[ndb_restore]</literal> etc.
+          <literal>[ndb_restore]</literal>, and so forth.
         </para>
 
 <programlisting>
@@ -1050,9 +1051,9 @@
         <para>
           Added use of section <literal>[mysql_cluster]</literal> in
           <filename>my.cnf</filename>. All cluster executables,
-          including mysqld, parse this section. Convenient place to put
-          e.g. <literal>ndb-connectstring</literal> so that it only
-          needs to be specified once.
+          including mysqld, parse this section. For example, this is a
+          convenient place to put <literal>ndb-connectstring</literal>
+          so that it need be specified only once.
         </para>
       </listitem>
 
@@ -1073,7 +1074,7 @@
       <listitem>
         <para>
           Extended connectstring syntax to allow for leaving the port
-          number out. E.g.
+          number out. For example,
          
<literal>ndb-connectstring|connect-string=myhost1,myhost2,myhost3</literal>
           is a valid connectstring and connect occurs on default port
           1186.
@@ -1561,7 +1562,7 @@
       <listitem>
         <para>
           <literal>SHOW TABLES</literal> now directly shows ndb tables
-          created on a different mysql server, i.e. without a prior
+          created on a different MySQL server, that is, without a prior
           table access.
         </para>
       </listitem>