List:Commits« Previous MessageNext Message »
From:paul Date:January 6 2006 2:19am
Subject:svn commit - mysqldoc@docsrva: r699 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-06 03:19:13 +0100 (Fri, 06 Jan 2006)
New Revision: 699

Log:
 r5898@frost:  paul | 2006-01-05 19:47:14 -0600
 Tweak xrefs.


Modified:
   trunk/
   trunk/refman-4.1/connector-net.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/porting.xml
   trunk/refman-4.1/problems.xml
   trunk/refman-4.1/renamed-nodes.txt
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/connector-net.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/porting.xml
   trunk/refman-5.0/problems.xml
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/connector-net.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/porting.xml
   trunk/refman-5.1/problems.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/connector-net.xml
===================================================================
--- trunk/refman-4.1/connector-net.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/connector-net.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -94,23 +94,41 @@
       The developers of &connector_net; greatly value the input of our
       users in the software development process. If you find
       &connector_net; lacking some feature important to you, or if you
-      discover a bug, please use our
-      <ulink 
-url="http://bugs.mysql.com">MySQL Bug System</ulink> to
-      request features or report problems.
+      discover a bug and need to file a bug report, please use the
+      instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <para>
-      Community support for &connector_net; can be found through the
-      forums at
-      <ulink url="http://forums.mysql.com">http://forums.mysql.com</ulink>
-      and through the mailing lists at
-      <ulink url="http://lists.mysql.com">http://lists.mysql.com</ulink>.
-      Paid support is available from MySQL AB, additional information is
-      available at
-      <ulink url="http://www.mysql.com/support/">http://www.mysql.com/support/</ulink>.
+      <emphasis role="bold">Additional resources</emphasis>
     </para>
 
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          Community support for &connector_net; can be found through the
+          forums at <ulink url="http://forums.mysql.com"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Community support for &connector_net; can also be found
+          through the mailing lists at
+          <ulink url="http://lists.mysql.com"/>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Paid support is available from MySQL AB. Additional
+          information is available at
+          <ulink url="http://www.mysql.com/support/"/>.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
     <para>
       This document is intended as a user's guide to &connector_net; and
       not as a syntax reference. If you need detailed syntax information
@@ -131,7 +149,7 @@
       framework. The .NET framework is primarily supported on recent
       versions of Microsoft Windows, and is supported on Linux through
       the Open Source Mono framework developed by Novell (see
-      <ulink url="http://www.mono-project.com">http://www.mono-project.com</ulink>).
+      <ulink url="http://www.mono-project.com"/>).
     </para>
 
     <para>
@@ -146,7 +164,7 @@
 
     <para>
       &connector_net; is available for download from
-      <ulink url="&base-url-downloads;connector/net/1.0.html">&base-url-downloads;connector/net/1.0.html</ulink>.
+      <ulink url="&base-url-downloads;connector/net/1.0.html"/>.
     </para>
 
     <para>
@@ -2720,10 +2738,8 @@
 
         <para>
           This section will not provide in-depth information on creating
-          Stored Procedures, for such information please refer to the
-          <ulink url="&base-url-docs;mysql/en/stored-procedures.html">
-          Stored Procedures</ulink> section of the MySQL Reference
-          Manual.
+          Stored Procedures. For such information, please refer to
+          <ulink url="&base-url-docs;mysql/en/stored-procedures.html"/>.
         </para>
 
         <para>
@@ -3855,7 +3871,7 @@
           <literal>traditional</literal> SQL mode to restrict invalid
           date values. For information on using the
           <literal>traditional</literal> SQL mode, see
-          <ulink url="&base-url-docs;mysql/en/server-sql-mode.html">&base-url-docs;mysql/en/server-sql-mode.html</ulink>.
+          <xref linkend="server-sql-mode"/>.
         </para>
 
       </section>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -5491,7 +5491,7 @@
 
             <para>
               The <literal>InnoDB</literal> system variables are listed
-              at <xref linkend="innodb-start"/>.
+              in <xref linkend="innodb-start"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/installing.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -3562,10 +3562,11 @@
         </para>
 
         <para>
-          To complete the <literal>Standard Configuration</literal>,
-          please refer to the sections on <literal>Service
-          Options</literal> and <literal>Security Options</literal>,
-          located at <xref linkend="mysql-config-wizard-service"/>, and
+          To complete the <guimenuitem>Standard
+          Configuration</guimenuitem>, please refer to the sections on
+          <guimenuitem>Service Options</guimenuitem> and
+          <guimenuitem>Security Options</guimenuitem> in
+          <xref linkend="mysql-config-wizard-service"/>, and
           <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
 
@@ -6789,7 +6790,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <indexterm>
@@ -7254,7 +7255,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <section id="quick-install">
@@ -9287,7 +9288,7 @@
         is best to use precompiled binary distributions of MySQL that
         are built specifically for optimal performance on Windows by
         MySQL AB. Instructions for installing a binary distributions are
-        available at <xref linkend="windows-installation"/>.
+        available in <xref linkend="windows-installation"/>.
       </para>
 
       <para>

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/introduction.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -307,7 +307,7 @@
 
     <para>
       Before upgrading from one release series to the next, please see
-      the notes at <xref linkend="upgrade"/>.
+      the notes in <xref linkend="upgrade"/>.
     </para>
 
     <para>

Modified: trunk/refman-4.1/porting.xml
===================================================================
--- trunk/refman-4.1/porting.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/porting.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -500,7 +500,7 @@
 
       <para>
         Include the above output in a bug report, which you can file
-        using the instructions at <xref linkend="bug-reports"/>.
+        using the instructions in <xref linkend="bug-reports"/>.
       </para>
 
       <para>

Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -4014,7 +4014,7 @@
 
           <para>
             Attach the test file to a bug report, which you can file
-            using the instructions at <xref linkend="bug-reports"/>.
+            using the instructions in <xref linkend="bug-reports"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/renamed-nodes.txt	2006-01-06 02:19:13 UTC (rev 699)
@@ -55,8 +55,8 @@
 mysql-database-administration database-administration
 mysql-optimisation optimization
 nt-start windows-start-service
-nutshell-ready-for-immediate-use mysql-4-1-nutshell
-nutshell-stepwise-rollout mysql-4-1-nutshell
+nutshell-ready-for-immediate-use roadmap
+nutshell-stepwise-rollout roadmap
 odbc odbc-connector
 odbc-problems myodbc-bug-report
 optimisation table-optimization

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -14298,10 +14298,12 @@
           and check the system (assuming that you are not giving this
           privilege to all your users).
         </para>
-        
+
         <para>
-          The output of <literal>SHOW PROCESSLIST</literal> may look like this:
-          <programlisting>
+          The output of <literal>SHOW PROCESSLIST</literal> may look
+          like this:
+
+<programlisting>
 mysql> SHOW FULL PROCESSLIST\G
 *************************** 1. row ***************************
 Id: 1
@@ -14350,241 +14352,235 @@
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
           </programlisting>
+
           The columns have the following meaning:
+
           <itemizedlist>
+
             <listitem>
               <para>
                 <literal>Id</literal>: The connection identifier
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>User</literal>: The MySQL user who is issuing the statement
+                <literal>User</literal>: The MySQL user who is issuing
+                the statement
               </para>
+
               <para>
-                If the user is <literal>system user</literal>, 
-                it can be either of these:
+                If the user is <literal>system user</literal>, it can be
+                either of these:
+
                 <itemizedlist>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_IO</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
                     </para>
                   </listitem>
+
                 </itemizedlist>
+
                 For the <literal>system user</literal>, there's no host
                 specified in the <literal>Host</literal> column.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Host</literal>: The host of the client issuing the statement
-                (except for <literal>system user</literal> where there is no host)
+                <literal>Host</literal>: The host of the client issuing
+                the statement (except for <literal>system user</literal>
+                where there is no host)
               </para>
+
               <para>
-                As of MySQL 4.0.12,
-                <literal>SHOW PROCESSLIST</literal> reports the hostname for 
-                TCP/IP connections in
+                As of MySQL 4.0.12, <literal>SHOW PROCESSLIST</literal>
+                reports the hostname for TCP/IP connections in
                 <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is doing
-                what.
+                format to make it easier to determine which client is
+                doing what.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>db</literal>: The default database, if selected,
-                otherwise <literal>NULL</literal>
+                <literal>db</literal>: The default database, if
+                selected, otherwise <literal>NULL</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Command</literal>: The value of that column corresponds
-                to the <literal>COM_<replaceable>xxx</replaceable></literal> 
+                <literal>Command</literal>: The value of that column
+                corresponds to the
+                <literal>COM_<replaceable>xxx</replaceable></literal>
                 commands of the client/server protocol; see
                 <xref linkend="server-status-variables"/>
               </para>
+
               <para>
-                The <literal>Command</literal>
-                value may be one of the following:
-                <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>,
-                <literal>Close stmt</literal>,
-                <literal>Connect</literal>,
-                <literal>Connect Out</literal>,
-                <literal>Create DB</literal>,
-                <literal>Debug</literal>,
-                <literal>Delayed insert</literal>,
-                <literal>Drop DB</literal>,
-                <literal>Error</literal>,
-                <literal>Execute</literal>,
-                <literal>Fetch</literal>,
-                <literal>Field List</literal>,
-                <literal>Init DB</literal>,
-                <literal>Kill</literal>,
-                <literal>Long Data</literal>,
-                <literal>Ping</literal>,
+                The <literal>Command</literal> value may be one of the
+                following: <literal>Binlog Dump</literal>,
+                <literal>Change user</literal>, <literal>Close
+                stmt</literal>, <literal>Connect</literal>,
+                <literal>Connect Out</literal>, <literal>Create
+                DB</literal>, <literal>Debug</literal>, <literal>Delayed
+                insert</literal>, <literal>Drop DB</literal>,
+                <literal>Error</literal>, <literal>Execute</literal>,
+                <literal>Fetch</literal>, <literal>Field List</literal>,
+                <literal>Init DB</literal>, <literal>Kill</literal>,
+                <literal>Long Data</literal>, <literal>Ping</literal>,
                 <literal>Prepare</literal>,
                 <literal>Processlist</literal>,
-                <literal>Query</literal>,
-                <literal>Quit</literal>,
-                <literal>Refresh</literal>,
-                <literal>Register Slave</literal>,
-                <literal>Reset stmt</literal>,
+                <literal>Query</literal>, <literal>Quit</literal>,
+                <literal>Refresh</literal>, <literal>Register
+                Slave</literal>, <literal>Reset stmt</literal>,
                 <literal>Set option</literal>,
-                <literal>Shutdown</literal>,
-                <literal>Sleep</literal>,
-                <literal>Statistics</literal>,
-                <literal>Table Dump</literal>,
-                <literal>Time</literal>
+                <literal>Shutdown</literal>, <literal>Sleep</literal>,
+                <literal>Statistics</literal>, <literal>Table
+                Dump</literal>, <literal>Time</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Time</literal>: The time in seconds
-                between the start of the statement or command and now
+                <literal>Time</literal>: The time in seconds between the
+                start of the statement or command and now
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>State</literal>: An action, event, or state
-                which can be one of the following:
-                <literal>After create</literal>,
-                <literal>Analyzing</literal>,
-                <literal>Changing master</literal>,
-                <literal>Checking master version</literal>,
-                <literal>Checking table</literal>,
-                <literal>Connecting to master</literal>,
-                <literal>Copying to group table</literal>,
-                <literal>Copying to tmp table</literal>,
-                <literal>Creating delayed handler</literal>,
-                <literal>Creating index</literal>,
+                which can be one of the following: <literal>After
+                create</literal>, <literal>Analyzing</literal>,
+                <literal>Changing master</literal>, <literal>Checking
+                master version</literal>, <literal>Checking
+                table</literal>, <literal>Connecting to
+                master</literal>, <literal>Copying to group
+                table</literal>, <literal>Copying to tmp
+                table</literal>, <literal>Creating delayed
+                handler</literal>, <literal>Creating index</literal>,
                 <literal>Creating sort index</literal>,
                 <literal>Creating table from master dump</literal>,
                 <literal>Creating tmp table</literal>,
                 <literal>Execution of init_command</literal>,
                 <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next binlog</literal>,
-                <literal>Flushing tables</literal>,
-                <literal>Killed</literal>,
-                <literal>Killing slave</literal>,
-                <literal>Locked</literal>,
-                <literal>Making temp file </literal>,
-                <literal>Opening master dump table</literal>,
-                <literal>Opening table</literal>,
-                <literal>Opening tables</literal>,
-                <literal>Processing request</literal>,
-                <literal>Purging old relay logs</literal>,
-                <literal>Queueing master event to the relay log</literal>,
-                <literal>Reading event from the relay log</literal>,
-                <literal>Reading from net</literal>,
-                <literal>Reading master dump table data</literal>,
-                <literal>Rebuilding the index on master dump table</literal>,
-                <literal>Reconnecting after a failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event read</literal>,
-                <literal>Registering slave on master</literal>,
-                <literal>Removing duplicates</literal>,
-                <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>,
-                <literal>Repair done</literal>,
-                <literal>Repair with keycache</literal>,
+                <literal>Finished reading one binlog; switching to next
+                binlog</literal>, <literal>Flushing tables</literal>,
+                <literal>Killed</literal>, <literal>Killing
+                slave</literal>, <literal>Locked</literal>,
+                <literal>Making temp file </literal>, <literal>Opening
+                master dump table</literal>, <literal>Opening
+                table</literal>, <literal>Opening tables</literal>,
+                <literal>Processing request</literal>, <literal>Purging
+                old relay logs</literal>, <literal>Queueing master event
+                to the relay log</literal>, <literal>Reading event from
+                the relay log</literal>, <literal>Reading from
+                net</literal>, <literal>Reading master dump table
+                data</literal>, <literal>Rebuilding the index on master
+                dump table</literal>, <literal>Reconnecting after a
+                failed binlog dump request</literal>,
+                <literal>Reconnecting after a failed master event
+                read</literal>, <literal>Registering slave on
+                master</literal>, <literal>Removing
+                duplicates</literal>, <literal>Reopen tables</literal>,
+                <literal>Repair by sorting</literal>, <literal>Repair
+                done</literal>, <literal>Repair with keycache</literal>,
                 <literal>Requesting binlog dump</literal>,
-                <literal>Saving state</literal>,
-                <literal>Searching rows for update</literal>,
-                <literal>Sending binlog event to slave</literal>,
-                <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>,
-                <literal>Sorting for order</literal>,
-                <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>,
-                <literal>System lock</literal>,
-                <literal>Table lock</literal>,
+                <literal>Saving state</literal>, <literal>Searching rows
+                for update</literal>, <literal>Sending binlog event to
+                slave</literal>, <literal>Sending data</literal>,
+                <literal>Sorting for group</literal>, <literal>Sorting
+                for order</literal>, <literal>Sorting index</literal>,
+                <literal>Sorting result</literal>, <literal>System
+                lock</literal>, <literal>Table lock</literal>,
                 <literal>Thread initialized</literal>,
-                <literal>Updating</literal>,
-                <literal>User lock</literal>,
-                <literal>Waiting for INSERT</literal>,
+                <literal>Updating</literal>, <literal>User
+                lock</literal>, <literal>Waiting for INSERT</literal>,
                 <literal>Waiting for master to send event</literal>,
                 <literal>Waiting for master update</literal>,
                 <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>,
-                <literal>Waiting for tables</literal>,
-                <literal>Waiting for the next event in relay log</literal>,
-                <literal>Waiting on cond</literal>,
-                <literal>Waiting to finalize termination</literal>,
-                <literal>Waiting to reconnect after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master event read</literal>,
-                <literal>Writing to net</literal>,
+                <literal>Waiting for table</literal>, <literal>Waiting
+                for tables</literal>, <literal>Waiting for the next
+                event in relay log</literal>, <literal>Waiting on
+                cond</literal>, <literal>Waiting to finalize
+                termination</literal>, <literal>Waiting to reconnect
+                after a failed binlog dump request</literal>,
+                <literal>Waiting to reconnect after a failed master
+                event read</literal>, <literal>Writing to net</literal>,
                 <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>,
-                <literal>closing tables</literal>,
-                <literal>converting HEAP to MyISAM</literal>,
-                <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>,
-                <literal>deleting from main table</literal>,
-                <literal>deleting from reference tables</literal>,
+                <literal>cleaning up</literal>, <literal>closing
+                tables</literal>, <literal>converting HEAP to
+                MyISAM</literal>, <literal>copy to tmp table</literal>,
+                <literal>creating table</literal>, <literal>deleting
+                from main table</literal>, <literal>deleting from
+                reference tables</literal>,
                 <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>,
-                <literal>freeing items</literal>,
-                <literal>got handler lock</literal>,
+                <literal>end</literal>, <literal>freeing
+                items</literal>, <literal>got handler lock</literal>,
                 <literal>got old table</literal>,
-                <literal>info</literal>,
-                <literal>init</literal>,
-                <literal>insert</literal>,
-                <literal>logging slow query</literal>,
-                <literal>login</literal>,
-                <literal>preparing</literal>,
-                <literal>purging old relay logs</literal>,
-                <literal>query end</literal>,
+                <literal>info</literal>, <literal>init</literal>,
+                <literal>insert</literal>, <literal>logging slow
+                query</literal>, <literal>login</literal>,
+                <literal>preparing</literal>, <literal>purging old relay
+                logs</literal>, <literal>query end</literal>,
                 <literal>removing tmp table</literal>,
-                <literal>rename</literal>,
-                <literal>rename result table</literal>,
-                <literal>reschedule</literal>,
-                <literal>setup</literal>,
-                <literal>starting slave</literal>,
-                <literal>statistics</literal>,
+                <literal>rename</literal>, <literal>rename result
+                table</literal>, <literal>reschedule</literal>,
+                <literal>setup</literal>, <literal>starting
+                slave</literal>, <literal>statistics</literal>,
                 <literal>storing row into queue</literal>,
-                <literal>update</literal>,
-                <literal>updating</literal>,
+                <literal>update</literal>, <literal>updating</literal>,
                 <literal>updating main table</literal>,
                 <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>,
-                <literal>waiting for delay_list</literal>,
-                <literal>waiting for handler insert</literal>,
-                <literal>waiting for handler lock</literal>,
-                <literal>waiting for handler open</literal>
+                <literal>upgrading lock</literal>, <literal>waiting for
+                delay_list</literal>, <literal>waiting for handler
+                insert</literal>, <literal>waiting for handler
+                lock</literal>, <literal>waiting for handler
+                open</literal>
               </para>
+
               <para>
-                The most common <literal>State</literal> values
-                are described in the rest of this section.
-                Most of the other <literal>State</literal>
-                values are useful only for finding bugs in the server.
+                The most common <literal>State</literal> values are
+                described in the rest of this section. Most of the other
+                <literal>State</literal> values are useful only for
+                finding bugs in the server.
               </para>
+
               <para>
-                For the <literal>SHOW PROCESSLIST</literal>
-                statement, the value of <literal>State</literal> is
+                For the <literal>SHOW PROCESSLIST</literal> statement,
+                the value of <literal>State</literal> is
                 <literal>NULL</literal>.
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by
-                the time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the 
-                <literal>SHOW PROCESSLIST</literal> statement itself,
-                and for long-running queries)
+                issuing, but only if that query was still running by the
+                time <literal>SHOW PROCESSLIST</literal> was issued
+                (this is always the case for the <literal>SHOW
+                PROCESSLIST</literal> statement itself, and for
+                long-running queries)
               </para>
             </listitem>
+
           </itemizedlist>
-          
         </para>
 
         <para>

Modified: trunk/refman-5.0/connector-net.xml
===================================================================
--- trunk/refman-5.0/connector-net.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/connector-net.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -94,43 +94,40 @@
       The developers of &connector_net; greatly value the input of our
       users in the software development process. If you find
       &connector_net; lacking some feature important to you, or if you
-      discover a bug, please use our
-      <ulink 
-url="http://bugs.mysql.com">MySQL Bug System</ulink> to
-      request features or report problems.
+      discover a bug and need to file a bug report, please use the
+      instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <para>
       <emphasis role="bold">Additional resources</emphasis>
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            Community support for &connector_net; can be found through
-            the forums at
-            <ulink url="http://forums.mysql.com">http://forums.mysql.com</ulink>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Community support for &connector_net; can be found through the
+          forums at <ulink url="http://forums.mysql.com"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            Community support for &connector_net; can also be found
-            through the mailing lists at
-            <ulink url="http://lists.mysql.com">http://lists.mysql.com</ulink>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Community support for &connector_net; can also be found
+          through the mailing lists at
+          <ulink url="http://lists.mysql.com"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            Paid support is available from MySQL AB, additional
-            information is available at
-            <ulink url="http://www.mysql.com/support/"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Paid support is available from MySQL AB. Additional
+          information is available at
+          <ulink url="http://www.mysql.com/support/"/>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
-    </para>
+    </itemizedlist>
 
     <para>
       This document is intended as a user's guide to &connector_net; and
@@ -152,7 +149,7 @@
       framework. The .NET framework is primarily supported on recent
       versions of Microsoft Windows, and is supported on Linux through
       the Open Source Mono framework developed by Novell (see
-      <ulink url="http://www.mono-project.com">http://www.mono-project.com</ulink>).
+      <ulink url="http://www.mono-project.com"/>).
     </para>
 
     <para>
@@ -167,7 +164,7 @@
 
     <para>
       &connector_net; is available for download from
-      <ulink url="&base-url-downloads;connector/net/1.0.html">&base-url-downloads;connector/net/1.0.html</ulink>.
+      <ulink url="&base-url-downloads;connector/net/1.0.html"/>.
     </para>
 
     <para>
@@ -2741,10 +2738,8 @@
 
         <para>
           This section will not provide in-depth information on creating
-          Stored Procedures, for such information please refer to the
-          <ulink url="&base-url-docs;mysql/en/stored-procedures.html">
-          Stored Procedures</ulink> section of the MySQL Reference
-          Manual.
+          Stored Procedures. For such information, please refer to
+          <ulink url="&base-url-docs;mysql/en/stored-procedures.html"/>.
         </para>
 
         <para>
@@ -3876,7 +3871,7 @@
           <literal>traditional</literal> SQL mode to restrict invalid
           date values. For information on using the
           <literal>traditional</literal> SQL mode, see
-          <ulink url="&base-url-docs;mysql/en/server-sql-mode.html">&base-url-docs;mysql/en/server-sql-mode.html</ulink>.
+          <xref linkend="server-sql-mode"/>.
         </para>
 
       </section>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -6905,7 +6905,7 @@
 
             <para>
               The <literal>InnoDB</literal> system variables are listed
-              at <xref linkend="innodb-start"/>.
+              in <xref linkend="innodb-start"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/installing.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -3603,7 +3603,7 @@
           To complete the <guimenuitem>Standard
           Configuration</guimenuitem>, please refer to the sections on
           <guimenuitem>Service Options</guimenuitem> and
-          <guimenuitem>Security Options</guimenuitem>, at
+          <guimenuitem>Security Options</guimenuitem> in
           <xref linkend="mysql-config-wizard-service"/>, and
           <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
@@ -6775,7 +6775,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <indexterm>
@@ -7224,7 +7224,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <section id="quick-install">
@@ -9182,7 +9182,7 @@
         is best to use precompiled binary distributions of MySQL that
         are built specifically for optimal performance on Windows by
         MySQL AB. Instructions for installing a binary distributions are
-        available at <xref linkend="windows-installation"/>.
+        available in <xref linkend="windows-installation"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/introduction.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -297,7 +297,7 @@
 
     <para>
       Before upgrading from one release series to the next, please see
-      the notes at <xref linkend="upgrade"/>.
+      the notes in <xref linkend="upgrade"/>.
     </para>
 
     <para>

Modified: trunk/refman-5.0/porting.xml
===================================================================
--- trunk/refman-5.0/porting.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/porting.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -500,7 +500,7 @@
 
       <para>
         Include the above output in a bug report, which you can file
-        using the instructions at <xref linkend="bug-reports"/>.
+        using the instructions in <xref linkend="bug-reports"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -3974,7 +3974,7 @@
 
           <para>
             Attach the test file to a bug report, which you can file
-            using the instructions at <xref linkend="bug-reports"/>.
+            using the instructions in <xref linkend="bug-reports"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/renamed-nodes.txt	2006-01-06 02:19:13 UTC (rev 699)
@@ -55,8 +55,8 @@
 mysql-database-administration database-administration
 mysql-optimisation optimization
 nt-start windows-start-service
-nutshell-ready-for-immediate-use mysql-4-1-nutshell
-nutshell-stepwise-rollout mysql-4-1-nutshell
+nutshell-ready-for-immediate-use roadmap
+nutshell-stepwise-rollout roadmap
 odbc odbc-connector
 odbc-problems myodbc-bug-report
 optimisation table-optimization
@@ -369,12 +369,12 @@
 timestamp-pre-4-1 ../../4.1/en/timestamp-pre-4-1
 replication-upgrade-4-0 ../../4.1/en/replication-upgrade-4-0
 mysqlcc using-mysql-programs
-todo mysql-5-0-nutshell
-todo-mysql-5-0 mysql-5-0-nutshell
-todo-mysql-5-1 mysql-5-0-nutshell
-todo-future mysql-5-0-nutshell
-todo-sometime mysql-5-0-nutshell
-todo-unplanned mysql-5-0-nutshell
+todo roadmap
+todo-mysql-5-0 roadmap
+todo-mysql-5-1 roadmap
+todo-future roadmap
+todo-sometime roadmap
+todo-unplanned roadmap
 beos operating-system-specific-notes
 open-bsd-2-8 operating-system-specific-notes
 fulltext-todo fulltext-search

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -15597,10 +15597,12 @@
           and check the system (assuming that you are not giving this
           privilege to all your users).
         </para>
-        
+
         <para>
-          The output of <literal>SHOW PROCESSLIST</literal> may look like this:
-          <programlisting>
+          The output of <literal>SHOW PROCESSLIST</literal> may look
+          like this:
+
+<programlisting>
 mysql> SHOW FULL PROCESSLIST\G
 *************************** 1. row ***************************
 Id: 1
@@ -15649,240 +15651,235 @@
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
           </programlisting>
+
           The columns have the following meaning:
+
           <itemizedlist>
+
             <listitem>
               <para>
                 <literal>Id</literal>: The connection identifier
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>User</literal>: The MySQL user who is issuing the statement
+                <literal>User</literal>: The MySQL user who is issuing
+                the statement
               </para>
+
               <para>
-                If the user is <literal>system user</literal>, 
-                it can be either of these:
+                If the user is <literal>system user</literal>, it can be
+                either of these:
+
                 <itemizedlist>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_IO</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
                     </para>
                   </listitem>
+
                 </itemizedlist>
+
                 For the <literal>system user</literal>, there's no host
                 specified in the <literal>Host</literal> column.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Host</literal>: The host of the client issuing the statement
-                (except for <literal>system user</literal> where there is no host)
+                <literal>Host</literal>: The host of the client issuing
+                the statement (except for <literal>system user</literal>
+                where there is no host)
               </para>
+
               <para>
-                <literal>SHOW PROCESSLIST</literal> reports the hostname for 
-                TCP/IP connections in
+                <literal>SHOW PROCESSLIST</literal> reports the hostname
+                for TCP/IP connections in
                 <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is doing
-                what.
+                format to make it easier to determine which client is
+                doing what.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>db</literal>: The default database, if selected,
-                otherwise <literal>NULL</literal>
+                <literal>db</literal>: The default database, if
+                selected, otherwise <literal>NULL</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Command</literal>: The value of that column corresponds
-                to the <literal>COM_<replaceable>xxx</replaceable></literal> 
+                <literal>Command</literal>: The value of that column
+                corresponds to the
+                <literal>COM_<replaceable>xxx</replaceable></literal>
                 commands of the client/server protocol; see
                 <xref linkend="server-status-variables"/>
               </para>
+
               <para>
-                The <literal>Command</literal>
-                value may be one of the following:
-                <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>,
-                <literal>Close stmt</literal>,
-                <literal>Connect</literal>,
-                <literal>Connect Out</literal>,
-                <literal>Create DB</literal>,
-                <literal>Debug</literal>,
-                <literal>Delayed insert</literal>,
-                <literal>Drop DB</literal>,
-                <literal>Error</literal>,
-                <literal>Execute</literal>,
-                <literal>Fetch</literal>,
-                <literal>Field List</literal>,
-                <literal>Init DB</literal>,
-                <literal>Kill</literal>,
-                <literal>Long Data</literal>,
-                <literal>Ping</literal>,
+                The <literal>Command</literal> value may be one of the
+                following: <literal>Binlog Dump</literal>,
+                <literal>Change user</literal>, <literal>Close
+                stmt</literal>, <literal>Connect</literal>,
+                <literal>Connect Out</literal>, <literal>Create
+                DB</literal>, <literal>Debug</literal>, <literal>Delayed
+                insert</literal>, <literal>Drop DB</literal>,
+                <literal>Error</literal>, <literal>Execute</literal>,
+                <literal>Fetch</literal>, <literal>Field List</literal>,
+                <literal>Init DB</literal>, <literal>Kill</literal>,
+                <literal>Long Data</literal>, <literal>Ping</literal>,
                 <literal>Prepare</literal>,
                 <literal>Processlist</literal>,
-                <literal>Query</literal>,
-                <literal>Quit</literal>,
-                <literal>Refresh</literal>,
-                <literal>Register Slave</literal>,
-                <literal>Reset stmt</literal>,
+                <literal>Query</literal>, <literal>Quit</literal>,
+                <literal>Refresh</literal>, <literal>Register
+                Slave</literal>, <literal>Reset stmt</literal>,
                 <literal>Set option</literal>,
-                <literal>Shutdown</literal>,
-                <literal>Sleep</literal>,
-                <literal>Statistics</literal>,
-                <literal>Table Dump</literal>,
-                <literal>Time</literal>
+                <literal>Shutdown</literal>, <literal>Sleep</literal>,
+                <literal>Statistics</literal>, <literal>Table
+                Dump</literal>, <literal>Time</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Time</literal>: The time in seconds
-                between the start of the statement or command and now
+                <literal>Time</literal>: The time in seconds between the
+                start of the statement or command and now
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>State</literal>: An action, event, or state
-                which can be one of the following:
-                <literal>After create</literal>,
-                <literal>Analyzing</literal>,
-                <literal>Changing master</literal>,
-                <literal>Checking master version</literal>,
-                <literal>Checking table</literal>,
-                <literal>Connecting to master</literal>,
-                <literal>Copying to group table</literal>,
-                <literal>Copying to tmp table</literal>,
-                <literal>Creating delayed handler</literal>,
-                <literal>Creating index</literal>,
+                which can be one of the following: <literal>After
+                create</literal>, <literal>Analyzing</literal>,
+                <literal>Changing master</literal>, <literal>Checking
+                master version</literal>, <literal>Checking
+                table</literal>, <literal>Connecting to
+                master</literal>, <literal>Copying to group
+                table</literal>, <literal>Copying to tmp
+                table</literal>, <literal>Creating delayed
+                handler</literal>, <literal>Creating index</literal>,
                 <literal>Creating sort index</literal>,
                 <literal>Creating table from master dump</literal>,
                 <literal>Creating tmp table</literal>,
                 <literal>Execution of init_command</literal>,
                 <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next binlog</literal>,
-                <literal>Flushing tables</literal>,
-                <literal>Killed</literal>,
-                <literal>Killing slave</literal>,
-                <literal>Locked</literal>,
-                <literal>Making temp file </literal>,
-                <literal>Opening master dump table</literal>,
-                <literal>Opening table</literal>,
-                <literal>Opening tables</literal>,
-                <literal>Processing request</literal>,
-                <literal>Purging old relay logs</literal>,
-                <literal>Queueing master event to the relay log</literal>,
-                <literal>Reading event from the relay log</literal>,
-                <literal>Reading from net</literal>,
-                <literal>Reading master dump table data</literal>,
-                <literal>Rebuilding the index on master dump table</literal>,
-                <literal>Reconnecting after a failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event read</literal>,
-                <literal>Registering slave on master</literal>,
-                <literal>Removing duplicates</literal>,
-                <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>,
-                <literal>Repair done</literal>,
-                <literal>Repair with keycache</literal>,
+                <literal>Finished reading one binlog; switching to next
+                binlog</literal>, <literal>Flushing tables</literal>,
+                <literal>Killed</literal>, <literal>Killing
+                slave</literal>, <literal>Locked</literal>,
+                <literal>Making temp file </literal>, <literal>Opening
+                master dump table</literal>, <literal>Opening
+                table</literal>, <literal>Opening tables</literal>,
+                <literal>Processing request</literal>, <literal>Purging
+                old relay logs</literal>, <literal>Queueing master event
+                to the relay log</literal>, <literal>Reading event from
+                the relay log</literal>, <literal>Reading from
+                net</literal>, <literal>Reading master dump table
+                data</literal>, <literal>Rebuilding the index on master
+                dump table</literal>, <literal>Reconnecting after a
+                failed binlog dump request</literal>,
+                <literal>Reconnecting after a failed master event
+                read</literal>, <literal>Registering slave on
+                master</literal>, <literal>Removing
+                duplicates</literal>, <literal>Reopen tables</literal>,
+                <literal>Repair by sorting</literal>, <literal>Repair
+                done</literal>, <literal>Repair with keycache</literal>,
                 <literal>Requesting binlog dump</literal>,
-                <literal>Saving state</literal>,
-                <literal>Searching rows for update</literal>,
-                <literal>Sending binlog event to slave</literal>,
-                <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>,
-                <literal>Sorting for order</literal>,
-                <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>,
-                <literal>System lock</literal>,
-                <literal>Table lock</literal>,
+                <literal>Saving state</literal>, <literal>Searching rows
+                for update</literal>, <literal>Sending binlog event to
+                slave</literal>, <literal>Sending data</literal>,
+                <literal>Sorting for group</literal>, <literal>Sorting
+                for order</literal>, <literal>Sorting index</literal>,
+                <literal>Sorting result</literal>, <literal>System
+                lock</literal>, <literal>Table lock</literal>,
                 <literal>Thread initialized</literal>,
-                <literal>Updating</literal>,
-                <literal>User lock</literal>,
-                <literal>Waiting for INSERT</literal>,
+                <literal>Updating</literal>, <literal>User
+                lock</literal>, <literal>Waiting for INSERT</literal>,
                 <literal>Waiting for master to send event</literal>,
                 <literal>Waiting for master update</literal>,
                 <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>,
-                <literal>Waiting for tables</literal>,
-                <literal>Waiting for the next event in relay log</literal>,
-                <literal>Waiting on cond</literal>,
-                <literal>Waiting to finalize termination</literal>,
-                <literal>Waiting to reconnect after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master event read</literal>,
-                <literal>Writing to net</literal>,
+                <literal>Waiting for table</literal>, <literal>Waiting
+                for tables</literal>, <literal>Waiting for the next
+                event in relay log</literal>, <literal>Waiting on
+                cond</literal>, <literal>Waiting to finalize
+                termination</literal>, <literal>Waiting to reconnect
+                after a failed binlog dump request</literal>,
+                <literal>Waiting to reconnect after a failed master
+                event read</literal>, <literal>Writing to net</literal>,
                 <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>,
-                <literal>closing tables</literal>,
-                <literal>converting HEAP to MyISAM</literal>,
-                <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>,
-                <literal>deleting from main table</literal>,
-                <literal>deleting from reference tables</literal>,
+                <literal>cleaning up</literal>, <literal>closing
+                tables</literal>, <literal>converting HEAP to
+                MyISAM</literal>, <literal>copy to tmp table</literal>,
+                <literal>creating table</literal>, <literal>deleting
+                from main table</literal>, <literal>deleting from
+                reference tables</literal>,
                 <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>,
-                <literal>freeing items</literal>,
-                <literal>got handler lock</literal>,
+                <literal>end</literal>, <literal>freeing
+                items</literal>, <literal>got handler lock</literal>,
                 <literal>got old table</literal>,
-                <literal>info</literal>,
-                <literal>init</literal>,
-                <literal>insert</literal>,
-                <literal>logging slow query</literal>,
-                <literal>login</literal>,
-                <literal>preparing</literal>,
-                <literal>purging old relay logs</literal>,
-                <literal>query end</literal>,
+                <literal>info</literal>, <literal>init</literal>,
+                <literal>insert</literal>, <literal>logging slow
+                query</literal>, <literal>login</literal>,
+                <literal>preparing</literal>, <literal>purging old relay
+                logs</literal>, <literal>query end</literal>,
                 <literal>removing tmp table</literal>,
-                <literal>rename</literal>,
-                <literal>rename result table</literal>,
-                <literal>reschedule</literal>,
-                <literal>setup</literal>,
-                <literal>starting slave</literal>,
-                <literal>statistics</literal>,
+                <literal>rename</literal>, <literal>rename result
+                table</literal>, <literal>reschedule</literal>,
+                <literal>setup</literal>, <literal>starting
+                slave</literal>, <literal>statistics</literal>,
                 <literal>storing row into queue</literal>,
-                <literal>update</literal>,
-                <literal>updating</literal>,
+                <literal>update</literal>, <literal>updating</literal>,
                 <literal>updating main table</literal>,
                 <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>,
-                <literal>waiting for delay_list</literal>,
-                <literal>waiting for handler insert</literal>,
-                <literal>waiting for handler lock</literal>,
-                <literal>waiting for handler open</literal>
+                <literal>upgrading lock</literal>, <literal>waiting for
+                delay_list</literal>, <literal>waiting for handler
+                insert</literal>, <literal>waiting for handler
+                lock</literal>, <literal>waiting for handler
+                open</literal>
               </para>
+
               <para>
-                The most common <literal>State</literal> values
-                are described in the rest of this section.
-                Most of the other <literal>State</literal>
-                values are useful only for finding bugs in the server.
+                The most common <literal>State</literal> values are
+                described in the rest of this section. Most of the other
+                <literal>State</literal> values are useful only for
+                finding bugs in the server.
               </para>
+
               <para>
-                For the <literal>SHOW PROCESSLIST</literal>
-                statement, the value of <literal>State</literal> is
+                For the <literal>SHOW PROCESSLIST</literal> statement,
+                the value of <literal>State</literal> is
                 <literal>NULL</literal>.
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by
-                the time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the 
-                <literal>SHOW PROCESSLIST</literal> statement itself,
-                and for long-running queries)
+                issuing, but only if that query was still running by the
+                time <literal>SHOW PROCESSLIST</literal> was issued
+                (this is always the case for the <literal>SHOW
+                PROCESSLIST</literal> statement itself, and for
+                long-running queries)
               </para>
             </listitem>
+
           </itemizedlist>
-          
         </para>
 
         <para>

Modified: trunk/refman-5.1/connector-net.xml
===================================================================
--- trunk/refman-5.1/connector-net.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/connector-net.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -94,43 +94,40 @@
       The developers of &connector_net; greatly value the input of our
       users in the software development process. If you find
       &connector_net; lacking some feature important to you, or if you
-      discover a bug, please use our
-      <ulink 
-url="http://bugs.mysql.com">MySQL Bug System</ulink> to
-      request features or report problems.
+      discover a bug and need to file a bug report, please use the
+      instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <para>
       <emphasis role="bold">Additional resources</emphasis>
+    </para>
 
-      <itemizedlist>
+    <itemizedlist>
 
-        <listitem>
-          <para>
-            Community support for &connector_net; can be found through
-            the forums at
-            <ulink url="http://forums.mysql.com">http://forums.mysql.com</ulink>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Community support for &connector_net; can be found through the
+          forums at <ulink url="http://forums.mysql.com"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            Community support for &connector_net; can also be found
-            through the mailing lists at
-            <ulink url="http://lists.mysql.com">http://lists.mysql.com</ulink>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Community support for &connector_net; can also be found
+          through the mailing lists at
+          <ulink url="http://lists.mysql.com"/>.
+        </para>
+      </listitem>
 
-        <listitem>
-          <para>
-            Paid support is available from MySQL AB, additional
-            information is available at
-            <ulink url="http://www.mysql.com/support/"/>.
-          </para>
-        </listitem>
+      <listitem>
+        <para>
+          Paid support is available from MySQL AB. Additional
+          information is available at
+          <ulink url="http://www.mysql.com/support/"/>.
+        </para>
+      </listitem>
 
-      </itemizedlist>
-    </para>
+    </itemizedlist>
 
     <para>
       This document is intended as a user's guide to &connector_net; and
@@ -152,7 +149,7 @@
       framework. The .NET framework is primarily supported on recent
       versions of Microsoft Windows, and is supported on Linux through
       the Open Source Mono framework developed by Novell (see
-      <ulink url="http://www.mono-project.com">http://www.mono-project.com</ulink>).
+      <ulink url="http://www.mono-project.com"/>).
     </para>
 
     <para>
@@ -167,7 +164,7 @@
 
     <para>
       &connector_net; is available for download from
-      <ulink url="&base-url-downloads;connector/net/1.0.html">&base-url-downloads;connector/net/1.0.html</ulink>.
+      <ulink url="&base-url-downloads;connector/net/1.0.html"/>.
     </para>
 
     <para>
@@ -2741,10 +2738,8 @@
 
         <para>
           This section will not provide in-depth information on creating
-          Stored Procedures, for such information please refer to the
-          <ulink url="&base-url-docs;mysql/en/stored-procedures.html">
-          Stored Procedures</ulink> section of the MySQL Reference
-          Manual.
+          Stored Procedures. For such information, please refer to
+          <ulink url="&base-url-docs;mysql/en/stored-procedures.html"/>.
         </para>
 
         <para>
@@ -3876,7 +3871,7 @@
           <literal>traditional</literal> SQL mode to restrict invalid
           date values. For information on using the
           <literal>traditional</literal> SQL mode, see
-          <ulink url="&base-url-docs;mysql/en/server-sql-mode.html">&base-url-docs;mysql/en/server-sql-mode.html</ulink>.
+          <xref linkend="server-sql-mode"/>.
         </para>
 
       </section>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/database-administration.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -6896,7 +6896,7 @@
 
             <para>
               The <literal>InnoDB</literal> system variables are listed
-              at <xref linkend="innodb-start"/>.
+              in <xref linkend="innodb-start"/>.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/installing.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -3600,7 +3600,7 @@
           To complete the <guimenuitem>Standard
           Configuration</guimenuitem>, please refer to the sections on
           <guimenuitem>Service Options</guimenuitem> and
-          <guimenuitem>Security Options</guimenuitem>, at
+          <guimenuitem>Security Options</guimenuitem> in
           <xref linkend="mysql-config-wizard-service"/>, and
           <xref linkend="mysql-config-wizard-security"/>, respectively.
         </para>
@@ -6768,7 +6768,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <indexterm>
@@ -7217,7 +7217,7 @@
 
     <para>
       If you run into problems and need to file a bug report, please use
-      the instructions at <xref linkend="bug-reports"/>.
+      the instructions in <xref linkend="bug-reports"/>.
     </para>
 
     <section id="quick-install">
@@ -9184,7 +9184,7 @@
         is best to use precompiled binary distributions of MySQL that
         are built specifically for optimal performance on Windows by
         MySQL AB. Instructions for installing a binary distributions are
-        available at <xref linkend="windows-installation"/>.
+        available in <xref linkend="windows-installation"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/introduction.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -298,7 +298,7 @@
 
     <para>
       Before upgrading from one release series to the next, please see
-      the notes at <xref linkend="upgrade"/>.
+      the notes in <xref linkend="upgrade"/>.
     </para>
 
     <para>

Modified: trunk/refman-5.1/porting.xml
===================================================================
--- trunk/refman-5.1/porting.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/porting.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -500,7 +500,7 @@
 
       <para>
         Include the above output in a bug report, which you can file
-        using the instructions at <xref linkend="bug-reports"/>.
+        using the instructions in <xref linkend="bug-reports"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/problems.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -3963,7 +3963,7 @@
 
           <para>
             Attach the test file to a bug report, which you can file
-            using the instructions at <xref linkend="bug-reports"/>.
+            using the instructions in <xref linkend="bug-reports"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-01-06 02:19:13 UTC (rev 699)
@@ -55,8 +55,8 @@
 mysql-database-administration database-administration
 mysql-optimisation optimization
 nt-start windows-start-service
-nutshell-ready-for-immediate-use mysql-4-1-nutshell
-nutshell-stepwise-rollout mysql-4-1-nutshell
+nutshell-ready-for-immediate-use roadmap
+nutshell-stepwise-rollout roadmap
 odbc odbc-connector
 odbc-problems myodbc-bug-report
 optimisation table-optimization

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-06 02:18:57 UTC (rev 698)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-06 02:19:13 UTC (rev 699)
@@ -16070,10 +16070,12 @@
           and check the system (assuming that you are not giving this
           privilege to all your users).
         </para>
-        
+
         <para>
-          The output of <literal>SHOW PROCESSLIST</literal> may look like this:
-          <programlisting>
+          The output of <literal>SHOW PROCESSLIST</literal> may look
+          like this:
+
+<programlisting>
 mysql> SHOW FULL PROCESSLIST\G
 *************************** 1. row ***************************
 Id: 1
@@ -16122,240 +16124,235 @@
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
           </programlisting>
+
           The columns have the following meaning:
+
           <itemizedlist>
+
             <listitem>
               <para>
                 <literal>Id</literal>: The connection identifier
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>User</literal>: The MySQL user who is issuing the statement
+                <literal>User</literal>: The MySQL user who is issuing
+                the statement
               </para>
+
               <para>
-                If the user is <literal>system user</literal>, 
-                it can be either of these:
+                If the user is <literal>system user</literal>, it can be
+                either of these:
+
                 <itemizedlist>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_DELAYED_INSERT</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_IO</literal>
                     </para>
                   </listitem>
+
                   <listitem>
                     <para>
                       <literal>SYSTEM_THREAD_SLAVE_SQL</literal>
                     </para>
                   </listitem>
+
                 </itemizedlist>
+
                 For the <literal>system user</literal>, there's no host
                 specified in the <literal>Host</literal> column.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Host</literal>: The host of the client issuing the statement
-                (except for <literal>system user</literal> where there is no host)
+                <literal>Host</literal>: The host of the client issuing
+                the statement (except for <literal>system user</literal>
+                where there is no host)
               </para>
+
               <para>
-                <literal>SHOW PROCESSLIST</literal> reports the hostname for 
-                TCP/IP connections in
+                <literal>SHOW PROCESSLIST</literal> reports the hostname
+                for TCP/IP connections in
                 <literal><replaceable>host_name</replaceable>:<replaceable>client_port</replaceable></literal>
-                format to make it easier to determine which client is doing
-                what.
+                format to make it easier to determine which client is
+                doing what.
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>db</literal>: The default database, if selected,
-                otherwise <literal>NULL</literal>
+                <literal>db</literal>: The default database, if
+                selected, otherwise <literal>NULL</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Command</literal>: The value of that column corresponds
-                to the <literal>COM_<replaceable>xxx</replaceable></literal> 
+                <literal>Command</literal>: The value of that column
+                corresponds to the
+                <literal>COM_<replaceable>xxx</replaceable></literal>
                 commands of the client/server protocol; see
                 <xref linkend="server-status-variables"/>
               </para>
+
               <para>
-                The <literal>Command</literal>
-                value may be one of the following:
-                <literal>Binlog Dump</literal>,
-                <literal>Change user</literal>,
-                <literal>Close stmt</literal>,
-                <literal>Connect</literal>,
-                <literal>Connect Out</literal>,
-                <literal>Create DB</literal>,
-                <literal>Debug</literal>,
-                <literal>Delayed insert</literal>,
-                <literal>Drop DB</literal>,
-                <literal>Error</literal>,
-                <literal>Execute</literal>,
-                <literal>Fetch</literal>,
-                <literal>Field List</literal>,
-                <literal>Init DB</literal>,
-                <literal>Kill</literal>,
-                <literal>Long Data</literal>,
-                <literal>Ping</literal>,
+                The <literal>Command</literal> value may be one of the
+                following: <literal>Binlog Dump</literal>,
+                <literal>Change user</literal>, <literal>Close
+                stmt</literal>, <literal>Connect</literal>,
+                <literal>Connect Out</literal>, <literal>Create
+                DB</literal>, <literal>Debug</literal>, <literal>Delayed
+                insert</literal>, <literal>Drop DB</literal>,
+                <literal>Error</literal>, <literal>Execute</literal>,
+                <literal>Fetch</literal>, <literal>Field List</literal>,
+                <literal>Init DB</literal>, <literal>Kill</literal>,
+                <literal>Long Data</literal>, <literal>Ping</literal>,
                 <literal>Prepare</literal>,
                 <literal>Processlist</literal>,
-                <literal>Query</literal>,
-                <literal>Quit</literal>,
-                <literal>Refresh</literal>,
-                <literal>Register Slave</literal>,
-                <literal>Reset stmt</literal>,
+                <literal>Query</literal>, <literal>Quit</literal>,
+                <literal>Refresh</literal>, <literal>Register
+                Slave</literal>, <literal>Reset stmt</literal>,
                 <literal>Set option</literal>,
-                <literal>Shutdown</literal>,
-                <literal>Sleep</literal>,
-                <literal>Statistics</literal>,
-                <literal>Table Dump</literal>,
-                <literal>Time</literal>
+                <literal>Shutdown</literal>, <literal>Sleep</literal>,
+                <literal>Statistics</literal>, <literal>Table
+                Dump</literal>, <literal>Time</literal>
               </para>
             </listitem>
+
             <listitem>
               <para>
-                <literal>Time</literal>: The time in seconds
-                between the start of the statement or command and now
+                <literal>Time</literal>: The time in seconds between the
+                start of the statement or command and now
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>State</literal>: An action, event, or state
-                which can be one of the following:
-                <literal>After create</literal>,
-                <literal>Analyzing</literal>,
-                <literal>Changing master</literal>,
-                <literal>Checking master version</literal>,
-                <literal>Checking table</literal>,
-                <literal>Connecting to master</literal>,
-                <literal>Copying to group table</literal>,
-                <literal>Copying to tmp table</literal>,
-                <literal>Creating delayed handler</literal>,
-                <literal>Creating index</literal>,
+                which can be one of the following: <literal>After
+                create</literal>, <literal>Analyzing</literal>,
+                <literal>Changing master</literal>, <literal>Checking
+                master version</literal>, <literal>Checking
+                table</literal>, <literal>Connecting to
+                master</literal>, <literal>Copying to group
+                table</literal>, <literal>Copying to tmp
+                table</literal>, <literal>Creating delayed
+                handler</literal>, <literal>Creating index</literal>,
                 <literal>Creating sort index</literal>,
                 <literal>Creating table from master dump</literal>,
                 <literal>Creating tmp table</literal>,
                 <literal>Execution of init_command</literal>,
                 <literal>FULLTEXT initialization</literal>,
-                <literal>Finished reading one binlog; switching to next binlog</literal>,
-                <literal>Flushing tables</literal>,
-                <literal>Killed</literal>,
-                <literal>Killing slave</literal>,
-                <literal>Locked</literal>,
-                <literal>Making temp file </literal>,
-                <literal>Opening master dump table</literal>,
-                <literal>Opening table</literal>,
-                <literal>Opening tables</literal>,
-                <literal>Processing request</literal>,
-                <literal>Purging old relay logs</literal>,
-                <literal>Queueing master event to the relay log</literal>,
-                <literal>Reading event from the relay log</literal>,
-                <literal>Reading from net</literal>,
-                <literal>Reading master dump table data</literal>,
-                <literal>Rebuilding the index on master dump table</literal>,
-                <literal>Reconnecting after a failed binlog dump request</literal>,
-                <literal>Reconnecting after a failed master event read</literal>,
-                <literal>Registering slave on master</literal>,
-                <literal>Removing duplicates</literal>,
-                <literal>Reopen tables</literal>,
-                <literal>Repair by sorting</literal>,
-                <literal>Repair done</literal>,
-                <literal>Repair with keycache</literal>,
+                <literal>Finished reading one binlog; switching to next
+                binlog</literal>, <literal>Flushing tables</literal>,
+                <literal>Killed</literal>, <literal>Killing
+                slave</literal>, <literal>Locked</literal>,
+                <literal>Making temp file </literal>, <literal>Opening
+                master dump table</literal>, <literal>Opening
+                table</literal>, <literal>Opening tables</literal>,
+                <literal>Processing request</literal>, <literal>Purging
+                old relay logs</literal>, <literal>Queueing master event
+                to the relay log</literal>, <literal>Reading event from
+                the relay log</literal>, <literal>Reading from
+                net</literal>, <literal>Reading master dump table
+                data</literal>, <literal>Rebuilding the index on master
+                dump table</literal>, <literal>Reconnecting after a
+                failed binlog dump request</literal>,
+                <literal>Reconnecting after a failed master event
+                read</literal>, <literal>Registering slave on
+                master</literal>, <literal>Removing
+                duplicates</literal>, <literal>Reopen tables</literal>,
+                <literal>Repair by sorting</literal>, <literal>Repair
+                done</literal>, <literal>Repair with keycache</literal>,
                 <literal>Requesting binlog dump</literal>,
-                <literal>Saving state</literal>,
-                <literal>Searching rows for update</literal>,
-                <literal>Sending binlog event to slave</literal>,
-                <literal>Sending data</literal>,
-                <literal>Sorting for group</literal>,
-                <literal>Sorting for order</literal>,
-                <literal>Sorting index</literal>,
-                <literal>Sorting result</literal>,
-                <literal>System lock</literal>,
-                <literal>Table lock</literal>,
+                <literal>Saving state</literal>, <literal>Searching rows
+                for update</literal>, <literal>Sending binlog event to
+                slave</literal>, <literal>Sending data</literal>,
+                <literal>Sorting for group</literal>, <literal>Sorting
+                for order</literal>, <literal>Sorting index</literal>,
+                <literal>Sorting result</literal>, <literal>System
+                lock</literal>, <literal>Table lock</literal>,
                 <literal>Thread initialized</literal>,
-                <literal>Updating</literal>,
-                <literal>User lock</literal>,
-                <literal>Waiting for INSERT</literal>,
+                <literal>Updating</literal>, <literal>User
+                lock</literal>, <literal>Waiting for INSERT</literal>,
                 <literal>Waiting for master to send event</literal>,
                 <literal>Waiting for master update</literal>,
                 <literal>Waiting for slave mutex on exit</literal>,
-                <literal>Waiting for table</literal>,
-                <literal>Waiting for tables</literal>,
-                <literal>Waiting for the next event in relay log</literal>,
-                <literal>Waiting on cond</literal>,
-                <literal>Waiting to finalize termination</literal>,
-                <literal>Waiting to reconnect after a failed binlog dump request</literal>,
-                <literal>Waiting to reconnect after a failed master event read</literal>,
-                <literal>Writing to net</literal>,
+                <literal>Waiting for table</literal>, <literal>Waiting
+                for tables</literal>, <literal>Waiting for the next
+                event in relay log</literal>, <literal>Waiting on
+                cond</literal>, <literal>Waiting to finalize
+                termination</literal>, <literal>Waiting to reconnect
+                after a failed binlog dump request</literal>,
+                <literal>Waiting to reconnect after a failed master
+                event read</literal>, <literal>Writing to net</literal>,
                 <literal>allocating local table</literal>,
-                <literal>cleaning up</literal>,
-                <literal>closing tables</literal>,
-                <literal>converting HEAP to MyISAM</literal>,
-                <literal>copy to tmp table</literal>,
-                <literal>creating table</literal>,
-                <literal>deleting from main table</literal>,
-                <literal>deleting from reference tables</literal>,
+                <literal>cleaning up</literal>, <literal>closing
+                tables</literal>, <literal>converting HEAP to
+                MyISAM</literal>, <literal>copy to tmp table</literal>,
+                <literal>creating table</literal>, <literal>deleting
+                from main table</literal>, <literal>deleting from
+                reference tables</literal>,
                 <literal>discard_or_import_tablespace</literal>,
-                <literal>end</literal>,
-                <literal>freeing items</literal>,
-                <literal>got handler lock</literal>,
+                <literal>end</literal>, <literal>freeing
+                items</literal>, <literal>got handler lock</literal>,
                 <literal>got old table</literal>,
-                <literal>info</literal>,
-                <literal>init</literal>,
-                <literal>insert</literal>,
-                <literal>logging slow query</literal>,
-                <literal>login</literal>,
-                <literal>preparing</literal>,
-                <literal>purging old relay logs</literal>,
-                <literal>query end</literal>,
+                <literal>info</literal>, <literal>init</literal>,
+                <literal>insert</literal>, <literal>logging slow
+                query</literal>, <literal>login</literal>,
+                <literal>preparing</literal>, <literal>purging old relay
+                logs</literal>, <literal>query end</literal>,
                 <literal>removing tmp table</literal>,
-                <literal>rename</literal>,
-                <literal>rename result table</literal>,
-                <literal>reschedule</literal>,
-                <literal>setup</literal>,
-                <literal>starting slave</literal>,
-                <literal>statistics</literal>,
+                <literal>rename</literal>, <literal>rename result
+                table</literal>, <literal>reschedule</literal>,
+                <literal>setup</literal>, <literal>starting
+                slave</literal>, <literal>statistics</literal>,
                 <literal>storing row into queue</literal>,
-                <literal>update</literal>,
-                <literal>updating</literal>,
+                <literal>update</literal>, <literal>updating</literal>,
                 <literal>updating main table</literal>,
                 <literal>updating reference tables</literal>,
-                <literal>upgrading lock</literal>,
-                <literal>waiting for delay_list</literal>,
-                <literal>waiting for handler insert</literal>,
-                <literal>waiting for handler lock</literal>,
-                <literal>waiting for handler open</literal>
+                <literal>upgrading lock</literal>, <literal>waiting for
+                delay_list</literal>, <literal>waiting for handler
+                insert</literal>, <literal>waiting for handler
+                lock</literal>, <literal>waiting for handler
+                open</literal>
               </para>
+
               <para>
-                The most common <literal>State</literal> values
-                are described in the rest of this section.
-                Most of the other <literal>State</literal>
-                values are useful only for finding bugs in the server.
+                The most common <literal>State</literal> values are
+                described in the rest of this section. Most of the other
+                <literal>State</literal> values are useful only for
+                finding bugs in the server.
               </para>
+
               <para>
-                For the <literal>SHOW PROCESSLIST</literal>
-                statement, the value of <literal>State</literal> is
+                For the <literal>SHOW PROCESSLIST</literal> statement,
+                the value of <literal>State</literal> is
                 <literal>NULL</literal>.
               </para>
             </listitem>
+
             <listitem>
               <para>
                 <literal>Info</literal>: The query that the thread was
-                issuing, but only if that query was still running by
-                the time <literal>SHOW PROCESSLIST</literal> was issued
-                (this is always the case for the 
-                <literal>SHOW PROCESSLIST</literal> statement itself,
-                and for long-running queries)
+                issuing, but only if that query was still running by the
+                time <literal>SHOW PROCESSLIST</literal> was issued
+                (this is always the case for the <literal>SHOW
+                PROCESSLIST</literal> statement itself, and for
+                long-running queries)
               </para>
             </listitem>
+
           </itemizedlist>
-          
         </para>
 
         <para>

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