List:Commits« Previous MessageNext Message »
From:paul Date:December 9 2005 5:11am
Subject:svn commit - mysqldoc@docsrva: r530 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2005-12-09 06:11:00 +0100 (Fri, 09 Dec 2005)
New Revision: 530

Log:
 r4634@frost:  paul | 2005-12-08 23:10:44 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/introduction.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-common/titles.en.ent


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

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2005-12-09 00:38:20 UTC (rev 529)
+++ trunk/refman-4.1/introduction.xml	2005-12-09 05:11:00 UTC (rev 530)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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 "../refman-common/fixedchars.ent">
     %fixedchars.entities;
@@ -74,7 +74,8 @@
       </remark>
       
       <para>
-        For information about upgrading from a Version 4.1 release, see
+        For information about upgrading from MySQL &previous-series; to
+MySQL-&current-series;, see
         <xref linkend="upgrading-from-4-1"/>.
       </para>
     </listitem>
@@ -82,15 +83,16 @@
 
     <listitem>
       <para>
-        For information about upgrading from a Version 4.0 release, see
+        For information about upgrading from MySQL &previous-series; to
+        MySQL &current-series;, see
         <xref linkend="upgrading-from-4-0"/>.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        For information about upgrading from a Version 3.23 release, see
-        <xref linkend="upgrading-from-3-23"/>.
+        For information about upgrading from MySQL 3.23 to MySQL 4.0,
+        see <xref linkend="upgrading-from-3-23"/>.
       </para>
     </listitem>
 
@@ -103,9 +105,9 @@
 
     <listitem>
       <para>
-        For examples of SQL and benchmarking information, see the
-        benchmarking directory (<filename>sql-bench</filename> in the
-        distribution).
+        For benchmarking information, see the
+        <filename>sql-bench</filename> benchmarking directory in your
+        MySQL distribution.
       </para>
     </listitem>
 
@@ -137,8 +139,7 @@
   </para>
 
   <para>
-    Reports of errors (often called <quote>bugs</quote>), as well as
-    questions and comments, should be sent to
+    To report errors (often called <quote>bugs</quote>), please visit
     <ulink url="http://bugs.mysql.com"/>. See
     <xref linkend="bug-reports"/>.
   </para>
@@ -226,12 +227,10 @@
     </indexterm>
 
     <para>
-      The primary document is a set of
-      <ulink url="http://docbook.org/">DocBook</ulink> XML files. The
-      HTML version and other formats are produced automatically using,
-      among other tools, the
-      <ulink url="http://docbook.sourceforge.net/release/xsl/current/doc/reference.html">DocBook
-      XSL stylesheets</ulink>.
+      The Reference Manual source files are written in DocBook XML
+      format. The HTML version and other formats are produced
+      automatically, primarily using the DocBook XSL stylesheets. For
+      information about DocBook, see <ulink url="http://docbook.org/"/>
 
       <remark role="todo">
         [SH] We might want to add details about creating CHM, PDF, INFO,
@@ -250,7 +249,7 @@
     </remark>
 
     <para>
-      This manual was initially written by David Axmark and Michael
+      This manual was originally written by David Axmark and Michael
       <quote>Monty</quote> Widenius. It is maintained by the MySQL
       Documentation Team, consisting of Paul DuBois, Stefan Hinz, Mike
       Hillyer, and Jon Stephens. For the many other contributors, see

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2005-12-09 00:38:20 UTC (rev 529)
+++ trunk/refman-5.0/introduction.xml	2005-12-09 05:11:00 UTC (rev 530)
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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 "../refman-common/fixedchars.ent">
     %fixedchars.entities;
     <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
     %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
+    <!ENTITY % versions.entities      SYSTEM "versions.ent">
     %versions.entities;
 ]>
 <chapter id="introduction">
@@ -68,7 +68,8 @@
 
     <listitem>
       <para>
-        For information about upgrading from a Version 4.1 release, see
+        For information about upgrading from MySQL &previous-series; to
+        MySQL &current-series;, see
         <xref linkend="upgrading-from-4-1"/>.
       </para>
     </listitem>
@@ -82,9 +83,9 @@
 
     <listitem>
       <para>
-        For examples of SQL and benchmarking information, see the
-        benchmarking directory (<filename>sql-bench</filename> in the
-        distribution).
+        For benchmarking information, see the
+        <filename>sql-bench</filename> benchmarking directory in your
+        MySQL distribution.
       </para>
     </listitem>
 
@@ -122,8 +123,7 @@
   </para>
 
   <para>
-    Reports of errors (often called <quote>bugs</quote>), as well as
-    questions and comments, should be sent to
+    To report errors (often called <quote>bugs</quote>), please visit
     <ulink url="http://bugs.mysql.com"/>. See
     <xref linkend="bug-reports"/>.
   </para>
@@ -172,9 +172,9 @@
 
     <para>
       This is the Reference Manual for the MySQL Database System,
-      Version &current-series;, up to Release &current-version;. It is
-      not intended for use with older versions of the MySQL software due
-      to the many functional and other differences between MySQL
+      Version &current-series;, up through Release &current-version;. It
+      is not intended for use with older versions of the MySQL software
+      due to the many functional and other differences between MySQL
       &current-series; and previous versions.
 
       <remark role="todo">
@@ -185,11 +185,11 @@
 
       If you are using a Version &previous-series; release of the MySQL
       software, please refer to the
-      <citetitle>&title-refman-previous;</citetitle>, which provides
-      coverage of the 3.22, 3.23, 4.0, and 4.1 series of MySQL software
-      releases. Differences between minor versions of MySQL
-      &current-series; are noted in the present text with reference to
-      release numbers (&current-series;.<replaceable>x</replaceable>).
+      <citetitle>&title-refman-previous;</citetitle>, which covers the
+      3.23, 4.0, and 4.1 series of MySQL software releases. Differences
+      between minor versions of MySQL &current-series; are noted in the
+      present text with reference to release numbers
+      (&current-series;.<replaceable>x</replaceable>).
     </para>
 
     <para>
@@ -218,12 +218,10 @@
     </indexterm>
 
     <para>
-      The primary document is a set of
-      <ulink url="http://docbook.org/">DocBook</ulink> XML files. The
-      HTML version and other formats are produced automatically using,
-      among other tools, the
-      <ulink url="http://docbook.sourceforge.net/release/xsl/current/doc/reference.html">DocBook
-      XSL stylesheets</ulink>.
+      The Reference Manual source files are written in DocBook XML
+      format. The HTML version and other formats are produced
+      automatically, primarily using the DocBook XSL stylesheets. For
+      information about DocBook, see <ulink url="http://docbook.org/"/>
 
       <remark role="todo">
         [SH] We might want to add details about creating CHM, PDF, INFO,
@@ -242,7 +240,7 @@
     </remark>
 
     <para>
-      This manual was initially written by David Axmark and Michael
+      This manual was originally written by David Axmark and Michael
       <quote>Monty</quote> Widenius. It is maintained by the MySQL
       Documentation Team, consisting of Paul DuBois, Stefan Hinz, Mike
       Hillyer, and Jon Stephens. For the many other contributors, see

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2005-12-09 00:38:20 UTC (rev 529)
+++ trunk/refman-5.1/introduction.xml	2005-12-09 05:11:00 UTC (rev 530)
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter 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 "../refman-common/fixedchars.ent">
     %fixedchars.entities;
     <!ENTITY % title.entities         SYSTEM "../refman-common/titles.en.ent">
     %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
+    <!ENTITY % versions.entities      SYSTEM "versions.ent">
     %versions.entities;
 ]>
 <chapter id="introduction">
@@ -68,8 +68,9 @@
 
     <listitem>
       <para>
-        For information about upgrading from a Version &previous-series;
-        release, see <xref linkend="upgrading-from-5-0"/>.
+        For information about upgrading from MySQL &previous-series; to
+        MySQL &current-series;, see
+        <xref linkend="upgrading-from-5-0"/>.
       </para>
     </listitem>
 
@@ -82,9 +83,9 @@
 
     <listitem>
       <para>
-        For examples of SQL and benchmarking information, see the
-        benchmarking directory (<filename>sql-bench</filename> in the
-        distribution).
+        For benchmarking information, see the
+        <filename>sql-bench</filename> benchmarking directory in your
+        MySQL distribution.
       </para>
     </listitem>
 
@@ -122,8 +123,7 @@
   </para>
 
   <para>
-    Reports of errors (often called <quote>bugs</quote>), as well as
-    questions and comments, should be sent to
+    To report errors (often called <quote>bugs</quote>), please visit
     <ulink url="http://bugs.mysql.com"/>. See
     <xref linkend="bug-reports"/>.
   </para>
@@ -172,9 +172,9 @@
 
     <para>
       This is the Reference Manual for the MySQL Database System,
-      Version &current-series;, up to Release &current-version;. It is
-      not intended for use with older versions of the MySQL software due
-      to the many functional and other differences between MySQL
+      Version &current-series;, up through Release &current-version;. It
+      is not intended for use with older versions of the MySQL software
+      due to the many functional and other differences between MySQL
       &current-series; and previous versions.
 
       <remark role="todo">
@@ -185,9 +185,8 @@
 
       If you are using an earlier release of the MySQL software, please
       refer to the <citetitle>&title-refman-previous;</citetitle>, which
-      provides coverage of the &previous-series; series of MySQL
-      software releases, or to
-      <citetitle>&title-refman-4-1;</citetitle>, which covers the 3.22,
+      covers the &previous-series; series of MySQL software releases, or
+      to <citetitle>&title-refman-4-1;</citetitle>, which covers the
       3.23, 4.0, and 4.1 series of MySQL software releases. Differences
       between minor versions of MySQL &current-series; are noted in the
       present text with reference to release numbers
@@ -220,12 +219,10 @@
     </indexterm>
 
     <para>
-      The primary document is a set of
-      <ulink url="http://docbook.org/">DocBook</ulink> XML files. The
-      HTML version and other formats are produced automatically using,
-      among other tools, the
-      <ulink url="http://docbook.sourceforge.net/release/xsl/current/doc/reference.html">DocBook
-      XSL stylesheets</ulink>.
+      The Reference Manual source files are written in DocBook XML
+      format. The HTML version and other formats are produced
+      automatically, primarily using the DocBook XSL stylesheets. For
+      information about DocBook, see <ulink url="http://docbook.org/"/>
 
       <remark role="todo">
         [SH] We might want to add details about creating CHM, PDF, INFO,
@@ -244,7 +241,7 @@
     </remark>
 
     <para>
-      This manual was initially written by David Axmark and Michael
+      This manual was originally written by David Axmark and Michael
       <quote>Monty</quote> Widenius. It is maintained by the MySQL
       Documentation Team, consisting of Paul DuBois, Stefan Hinz, Mike
       Hillyer, and Jon Stephens. For the many other contributors, see
@@ -393,83 +390,85 @@
       <title id="title-mysql-5-1-nutshell">&title-mysql-5-1-nutshell;</title>
 
       <para>
-        The following features are implemented in MySQL 5.1.
-        We will add more detailed information
-        to this section as 5.1 development continues.
+        The following features are implemented in MySQL 5.1. We will add
+        more detailed information to this section as 5.1 development
+        continues.
       </para>
 
       <itemizedlist>
-        
+
         <listitem>
           <para>
-            <emphasis role="bold">Partitioning</emphasis>:
-            allows distributing portions of individual tables
-            across a filesystem, according to rules which can be set when the
-            table is created. In effect, different portions of a table are stored
-            as separate tables in different locations, but from the user
-            point of view, the partitioned table is still a single table. See
-            <xref linkend="partitioning"/> for further
-            information on this functionality. (Author: Mikael Ronström)
+            <emphasis role="bold">Partitioning</emphasis>: allows
+            distributing portions of individual tables across a
+            filesystem, according to rules which can be set when the
+            table is created. In effect, different portions of a table
+            are stored as separate tables in different locations, but
+            from the user point of view, the partitioned table is still
+            a single table. See <xref linkend="partitioning"/> for
+            further information on this functionality. (Author: Mikael
+            Ronström)
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <emphasis role="bold">Plugin API</emphasis>:
-            MySQL 5.1 will add support for a very flexible plugin API that will
-            allow the loading and unloading of various components at runtime,
-            without restarting the server. While the work on this are not finished
-            yet, <emphasis>pluggable full-text parsers</emphasis> 
-            are a first step in this direction.
-            This allows users to implement their own input filter on the indexed
-            text, enabling full-text search capability on arbitrary data like PDF
-            files or other document formats. A pre-parser full-text plugin
-            performs the actual parsing and extraction of the text and hands it
-            over to the builtin MySQL full-text search.
-            (Author: Sergey Vojtovich)
+            <emphasis role="bold">Plugin API</emphasis>: MySQL 5.1 will
+            add support for a very flexible plugin API that will allow
+            the loading and unloading of various components at runtime,
+            without restarting the server. While the work on this are
+            not finished yet, <emphasis>pluggable full-text
+            parsers</emphasis> are a first step in this direction. This
+            allows users to implement their own input filter on the
+            indexed text, enabling full-text search capability on
+            arbitrary data like PDF files or other document formats. A
+            pre-parser full-text plugin performs the actual parsing and
+            extraction of the text and hands it over to the builtin
+            MySQL full-text search. (Author: Sergey Vojtovich)
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <emphasis role="bold">The Instance Manager (IM)</emphasis> 
+            <emphasis role="bold">The Instance Manager (IM)</emphasis>
             now has some additional functionality:
-            
+
             <itemizedlist>
-              
+
               <listitem>
                 <para>
-                  <literal>SHOW <replaceable>instance_name</replaceable> LOG FILES</literal>
-                  provides a listing of all log files used by the instance. (Author: Petr Chardin)
+                  <literal>SHOW <replaceable>instance_name</replaceable>
+                  LOG FILES</literal> provides a listing of all log
+                  files used by the instance. (Author: Petr Chardin)
                 </para>
               </listitem>
-              
+
               <listitem>
                 <para>
-                  <literal>SHOW <replaceable>instance_name</replaceable> 
-                    LOG {ERROR | SLOW | GENERAL} <replaceable>size</replaceable></literal>
-                  retrieves a part of the specified log file. (Author: Petr Chardin)
+                  <literal>SHOW <replaceable>instance_name</replaceable>
+                  LOG {ERROR | SLOW | GENERAL}
+                  <replaceable>size</replaceable></literal> retrieves a
+                  part of the specified log file. (Author: Petr Chardin)
                 </para>
               </listitem>
-              
+
               <listitem>
                 <para>
                   <literal>SET <replaceable>instance_name</replaceable>.
-                    <replaceable>option_name</replaceable>=<replaceable>option_value</replaceable></literal>
-                  sets an option to
-                  the specified value and writes it to the config file
-                  See <xref linkend="instance-manager"/> for
-                  more details on these new commands. (Author: Petr Chardin)
+                  <replaceable>option_name</replaceable>=<replaceable>option_value</replaceable></literal>
+                  sets an option to the specified value and writes it to
+                  the config file See <xref linkend="instance-manager"/>
+                  for more details on these new commands. (Author: Petr
+                  Chardin)
                 </para>
               </listitem>
-              
+
             </itemizedlist>
-            
           </para>
         </listitem>
-        
+
       </itemizedlist>
-      
+
     </section>
 
   </section>

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2005-12-09 00:38:20 UTC (rev 529)
+++ trunk/refman-common/titles.en.ent	2005-12-09 05:11:00 UTC (rev 530)
@@ -191,7 +191,7 @@
 <!ENTITY title-cj-j2ee "Using Connector/J with J2EE and Other Java Frameworks">
 <!ENTITY title-cj-jboss-config "Using Connector/J with JBoss">
 <!ENTITY title-cj-jdbc-reference "JDBC Reference">
-<!ENTITY title-cj-jdbc-upgrading-issues "JDBC-Specific Issues When Upgrading to MySQL Server Version 4.1 or Newer">
+<!ENTITY title-cj-jdbc-upgrading-issues "JDBC-Specific Issues When Upgrading to MySQL Server 4.1 or Newer">
 <!ENTITY title-cj-replication-connection "Using Master/Slave Replication with ReplicationConnection">
 <!ENTITY title-cj-reporting-bugs "How to Report Bugs or Problems">
 <!ENTITY title-cj-retrieve-autoinc "Retrieving AUTO_INCREMENT Column Values">
@@ -352,8 +352,8 @@
 <!ENTITY title-error-messages-client "Client Error Codes and Messages">
 <!ENTITY title-error-messages-server "Server Error Codes and Messages">
 <!ENTITY title-errors-in-3-23 "Issues in MySQL 3.23 Fixed in a Later MySQL Version">
-<!ENTITY title-errors-in-4-0 "Issues in 4.0 Fixed in a Later MySQL Version">
-<!ENTITY title-errors-in-4-1 "Issues in 4.1 Fixed in a Later MySQL Version">
+<!ENTITY title-errors-in-4-0 "Issues in MySQL 4.0 Fixed in a Later Version">
+<!ENTITY title-errors-in-4-1 "Issues in MySQL 4.1 Fixed in a Later Version">
 <!ENTITY title-estimating-performance "Estimating Query Performance">
 <!ENTITY title-example-auto-increment "Using <literal>AUTO_INCREMENT</literal>">
 <!ENTITY title-example-foreign-keys "Using Foreign Keys">
@@ -1621,13 +1621,13 @@
 <!ENTITY title-update-log "The Update Log">
 <!ENTITY title-update-speed "Speed of <literal>UPDATE</literal> Statements">
 <!ENTITY title-upgrade "Upgrading MySQL">
-<!ENTITY title-upgrading-from-3-20 "Upgrading from Version 3.20 to 3.21">
-<!ENTITY title-upgrading-from-3-21 "Upgrading from Version 3.21 to 3.22">
-<!ENTITY title-upgrading-from-3-22 "Upgrading from Version 3.22 to 3.23">
-<!ENTITY title-upgrading-from-3-23 "Upgrading from Version 3.23 to 4.0">
-<!ENTITY title-upgrading-from-4-0 "Upgrading from Version 4.0 to 4.1">
-<!ENTITY title-upgrading-from-4-1 "Upgrading from Version 4.1 to 5.0">
-<!ENTITY title-upgrading-from-5-0 "Upgrading from Version 5.0">
+<!ENTITY title-upgrading-from-3-20 "Upgrading from MySQL 3.20 to 3.21">
+<!ENTITY title-upgrading-from-3-21 "Upgrading from MySQL 3.21 to 3.22">
+<!ENTITY title-upgrading-from-3-22 "Upgrading from MySQL 3.22 to 3.23">
+<!ENTITY title-upgrading-from-3-23 "Upgrading from MySQL 3.23 to 4.0">
+<!ENTITY title-upgrading-from-4-0 "Upgrading from MySQL 4.0 to 4.1">
+<!ENTITY title-upgrading-from-4-1 "Upgrading from MySQL 4.1 to 5.0">
+<!ENTITY title-upgrading-from-5-0 "Upgrading from MySQL 5.0">
 <!ENTITY title-upgrading-grant-tables "Upgrading the Grant Tables">
 <!ENTITY title-upgrading-to-arch "Copying MySQL Databases to Another Machine">
 <!ENTITY title-use "<literal>USE</literal> Syntax">

Thread
svn commit - mysqldoc@docsrva: r530 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul9 Dec