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

[paul]

Author: paul
Date: 2006-12-19 19:05:51 +0100 (Tue, 19 Dec 2006)
New Revision: 4304

Log:
 r17355@polar:  paul | 2006-12-19 11:32:44 -0600
 wait_timeout also applies to Unix socket file connections. (Bug#24376)


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

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17354
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13784
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17355
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13784
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015


Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-12-19 18:05:35 UTC (rev 4303)
+++ trunk/refman-4.1/database-administration.xml	2006-12-19 18:05:51 UTC (rev 4304)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 797 bytes

@@ -6410,8 +6410,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies only to TCP/IP connections, not to connections
-              made via Unix socket files, named pipes, or shared memory.
+              applies only to TCP/IP and Unix socket file connections,
+              not to connections made via named pipes, or shared memory.
             </para>
 
             <para>


Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-12-19 18:05:35 UTC (rev 4303)
+++ trunk/refman-5.0/database-administration.xml	2006-12-19 18:05:51 UTC (rev 4304)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 797 bytes

@@ -7008,8 +7008,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies only to TCP/IP connections, not to connections
-              made via Unix socket files, named pipes, or shared memory.
+              applies only to TCP/IP and Unix socket file connections,
+              not to connections made via named pipes, or shared memory.
             </para>
 
             <para>


Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-12-19 18:05:35 UTC (rev 4303)
+++ trunk/refman-5.1/database-administration.xml	2006-12-19 18:05:51 UTC (rev 4304)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 797 bytes

@@ -7160,8 +7160,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies only to TCP/IP connections, not to connections
-              made via Unix socket files, named pipes, or shared memory.
+              applies only to TCP/IP and Unix socket file connections,
+              not to connections made via named pipes, or shared memory.
             </para>
 
             <para>