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

[paul]

Author: paul
Date: 2006-02-13 20:44:04 +0100 (Mon, 13 Feb 2006)
New Revision: 1301

Log:
 r3043@kite-hub:  paul | 2006-02-13 13:41:14 -0600
 Some updates from Novell.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/installing.xml


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

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-02-13 19:19:48 UTC (rev 1300)
+++ trunk/refman-4.1/installing.xml	2006-02-13 19:44:04 UTC (rev 1301)
@@ -6612,6 +6612,11 @@
 SEARCH ADD SYS:MYSQL\BIN
 MYSQLD_SAFE --autoclose
 </programlisting>
+
+        <para>
+          The behavior of <command>mysqld_safe</command> on NetWare is
+          described further in <xref linkend="mysqld-safe"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -6644,11 +6649,6 @@
     </orderedlist>
 
     <para>
-      The behavior of <command>mysqld_safe</command> on NetWare is
-      described further in <xref linkend="mysqld-safe"/>.
-    </para>
-
-    <para>
       If there was an existing installation of MySQL on the NetWare
       server, be sure to check for existing MySQL startup commands in
       <filename>autoexec.ncf</filename>, and edit or delete them as

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-02-13 19:19:48 UTC (rev 1300)
+++ trunk/refman-5.0/installing.xml	2006-02-13 19:44:04 UTC (rev 1301)
@@ -6493,6 +6493,11 @@
 SEARCH ADD SYS:MYSQL\BIN
 MYSQLD_SAFE --autoclose
 </programlisting>
+
+        <para>
+          The behavior of <command>mysqld_safe</command> on NetWare is
+          described further in <xref linkend="mysqld-safe"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -6523,11 +6528,6 @@
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/php/Modules/"/>
             </para>
-
-            <para>
-              (The PHP 5 Extension for MySQL 4.1 should also work with
-              MYSQL &current-series;.)
-            </para>
           </listitem>
 
         </itemizedlist>
@@ -6536,11 +6536,6 @@
     </orderedlist>
 
     <para>
-      The behavior of <command>mysqld_safe</command> on NetWare is
-      described further in <xref linkend="mysqld-safe"/>.
-    </para>
-
-    <para>
       If there was an existing installation of MySQL on the NetWare
       server, be sure to check for existing MySQL startup commands in
       <filename>autoexec.ncf</filename>, and edit or delete them as

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-02-13 19:19:48 UTC (rev 1300)
+++ trunk/refman-5.1/installing.xml	2006-02-13 19:44:04 UTC (rev 1301)
@@ -6451,6 +6451,11 @@
 SEARCH ADD SYS:MYSQL\BIN
 MYSQLD_SAFE --autoclose
 </programlisting>
+
+        <para>
+          The behavior of <command>mysqld_safe</command> on NetWare is
+          described further in <xref linkend="mysqld-safe"/>.
+        </para>
       </listitem>
 
       <listitem>
@@ -6481,11 +6486,6 @@
               <ulink
 url="http://forge.novell.com/modules/xfcontent/downloads.php/php/Modules/"/>
             </para>
-
-            <para>
-              (The PHP 5 Extension for MySQL 4.1 should also work with
-              MYSQL &current-series;.)
-            </para>
           </listitem>
 
         </itemizedlist>
@@ -6494,11 +6494,6 @@
     </orderedlist>
 
     <para>
-      The behavior of <command>mysqld_safe</command> on NetWare is
-      described further in <xref linkend="mysqld-safe"/>.
-    </para>
-
-    <para>
       If there was an existing installation of MySQL on the NetWare
       server, be sure to check for existing MySQL startup commands in
       <filename>autoexec.ncf</filename>, and edit or delete them as