svn commit - mysqldoc@docsrva: r1026 - in trunk: . refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-01-25 02:13:31 +0100 (Wed, 25 Jan 2006)
New Revision: 1026

Log:
 r6654@frost:  paul | 2006-01-24 18:25:08 -0600
 Minor updates.


Modified:
   trunk/
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


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

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-25 00:47:20 UTC (rev 1025)
+++ trunk/refman-5.0/database-administration.xml	2006-01-25 01:13:31 UTC (rev 1026)
@@ -10950,7 +10950,7 @@
             </para>
 
             <para>
-              Bind address to use for connections.
+              The IP address to bind to.
             </para>
           </listitem>
 
@@ -11057,8 +11057,8 @@
             </para>
 
             <para>
-              The TCP/IP port number to use for connections. (The
-              default port number assigned by IANA is 2273).
+              The TCP/IP port number to use for incoming connections.
+              (The default port number assigned by IANA is 2273).
             </para>
           </listitem>
 
@@ -11104,8 +11104,8 @@
             </para>
 
             <para>
-              On Unix, the socket file to use for the connection. By
-              default, the file is named
+              On Unix, the socket file to use for incoming connections.
+              By default, the file is named
               <filename>/tmp/mysqlmanager.sock</filename>.
             </para>
           </listitem>
@@ -11131,6 +11131,9 @@
               <command>mysqlmanager</command> under. It is recommended
               to run <command>mysqlmanager</command> under the same user
               account used to run the <command>mysqld</command> server.
+              (<quote>User</quote> in this context refers to a system
+              login account, not a MySQL user listed in the grant
+              tables.)
             </para>
           </listitem>
 
@@ -11219,9 +11222,9 @@
               The number of seconds IM should wait for the instance to
               shut down. The default value is 35 seconds. After the
               delay expires, the IM assumes that the instance is hanging
-              and attempts to use <literal>kill -9</literal> to
-              terminate it. If you use <literal>InnoDB</literal> with
-              large tables, you should increase this value.
+              and attempts to terminate it. If you use
+              <literal>InnoDB</literal> with large tables, you should
+              increase this value.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-25 00:47:20 UTC (rev 1025)
+++ trunk/refman-5.1/database-administration.xml	2006-01-25 01:13:31 UTC (rev 1026)
@@ -11003,7 +11003,7 @@
             </para>
 
             <para>
-              Bind address to use for connections.
+              The IP address to bind to.
             </para>
           </listitem>
 
@@ -11109,8 +11109,8 @@
             </para>
 
             <para>
-              The TCP/IP port number to use for connections. (The
-              default port number assigned by IANA is 2273).
+              The TCP/IP port number to use for incoming connections.
+              (The default port number assigned by IANA is 2273).
             </para>
           </listitem>
 
@@ -11155,8 +11155,8 @@
             </para>
 
             <para>
-              On Unix, the socket file to use for the connection. By
-              default, the file is named
+              On Unix, the socket file to use for incoming connections.
+              By default, the file is named
               <filename>/tmp/mysqlmanager.sock</filename>.
             </para>
           </listitem>
@@ -11181,6 +11181,9 @@
               <command>mysqlmanager</command> under. It is recommended
               to run <command>mysqlmanager</command> under the same user
               account used to run the <command>mysqld</command> server.
+              (<quote>User</quote> in this context refers to a system
+              login account, not a MySQL user listed in the grant
+              tables.)
             </para>
           </listitem>
 
@@ -11265,9 +11268,9 @@
               The number of seconds IM should wait for the instance to
               shut down. The default value is 35 seconds. After the
               delay expires, the IM assumes that the instance is hanging
-              and attempts to use <literal>kill -9</literal> to
-              terminate it. If you use <literal>InnoDB</literal> with
-              large tables, you should increase this value.
+              and attempts to terminate it. If you use
+              <literal>InnoDB</literal> with large tables, you should
+              increase this value.
             </para>
           </listitem>