List:Commits« Previous MessageNext Message »
From:paul.dubois Date:December 8 2010 6:20pm
Subject:svn commit - mysqldoc@docsrva: r24330 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: paul
Date: 2010-12-08 19:20:15 +0100 (Wed, 08 Dec 2010)
New Revision: 24330

Log:
 r36931@dhcp-215:  paul | 2010-12-08 11:43:59 -0500
 Minor wording change


Modified:
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing-windows.xml
   trunk/refman-5.1/installing-windows.xml
   trunk/refman-5.5/installing-windows.xml
   trunk/refman-5.6/installing-windows.xml
   trunk/refman-6.0/installing-windows.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45180
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:36929
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45180
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:66486
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:36931


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-4.1/installing.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 990 bytes

@@ -4502,10 +4502,10 @@
 
         <listitem>
           <para>
-            When upgrading to MySQL 4.1.5 or higher from a previous
-            version, or when upgrading from a version of MySQL installed
-            from a Zip archive to a version of MySQL installed with the
-            MySQL Installation Wizard, you must manually remove the
+            Before upgrading to MySQL 4.1.5 or higher from a previous
+            version, or from a version of MySQL installed from a Zip
+            archive to a version of MySQL installed with the MySQL
+            Installation Wizard, you must first manually remove the
             previous installation and MySQL service (if the server is
             installed as a service).
           </para>


Modified: trunk/refman-5.0/installing-windows.xml
===================================================================
--- trunk/refman-5.0/installing-windows.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-5.0/installing-windows.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1077 bytes

@@ -2802,11 +2802,11 @@
 
       <listitem>
         <para>
-          When upgrading to MySQL &current-series; from a version
-          previous to 4.1.5, or when upgrading from a version of MySQL
-          installed from a Zip archive to a version of MySQL installed
-          with the MySQL Installation Wizard, you must manually remove
-          the previous installation and MySQL service (if the server is
+          Before upgrading to MySQL &current-series; from a version
+          previous to 4.1.5, or from a version of MySQL installed from a
+          Zip archive to a version of MySQL installed with the MySQL
+          Installation Wizard, you must first manually remove the
+          previous installation and MySQL service (if the server is
           installed as a service).
         </para>
 


Modified: trunk/refman-5.1/installing-windows.xml
===================================================================
--- trunk/refman-5.1/installing-windows.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-5.1/installing-windows.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1077 bytes

@@ -3865,11 +3865,11 @@
 
       <listitem>
         <para>
-          When upgrading to MySQL &current-series; from a version
-          previous to 4.1.5, or when upgrading from a version of MySQL
-          installed from a Zip archive to a version of MySQL installed
-          with the MySQL Installation Wizard, you must manually remove
-          the previous installation and MySQL service (if the server is
+          Before upgrading to MySQL &current-series; from a version
+          previous to 4.1.5, or from a version of MySQL installed from a
+          Zip archive to a version of MySQL installed with the MySQL
+          Installation Wizard, you must first manually remove the
+          previous installation and MySQL service (if the server is
           installed as a service).
         </para>
 


Modified: trunk/refman-5.5/installing-windows.xml
===================================================================
--- trunk/refman-5.5/installing-windows.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-5.5/installing-windows.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1077 bytes

@@ -3528,11 +3528,11 @@
 
       <listitem>
         <para>
-          When upgrading to MySQL &current-series; from a version
-          previous to 4.1.5, or when upgrading from a version of MySQL
-          installed from a Zip archive to a version of MySQL installed
-          with the MySQL Installation Wizard, you must manually remove
-          the previous installation and MySQL service (if the server is
+          Before upgrading to MySQL &current-series; from a version
+          previous to 4.1.5, or from a version of MySQL installed from a
+          Zip archive to a version of MySQL installed with the MySQL
+          Installation Wizard, you must first manually remove the
+          previous installation and MySQL service (if the server is
           installed as a service).
         </para>
 


Modified: trunk/refman-5.6/installing-windows.xml
===================================================================
--- trunk/refman-5.6/installing-windows.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-5.6/installing-windows.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1077 bytes

@@ -3528,11 +3528,11 @@
 
       <listitem>
         <para>
-          When upgrading to MySQL &current-series; from a version
-          previous to 4.1.5, or when upgrading from a version of MySQL
-          installed from a Zip archive to a version of MySQL installed
-          with the MySQL Installation Wizard, you must manually remove
-          the previous installation and MySQL service (if the server is
+          Before upgrading to MySQL &current-series; from a version
+          previous to 4.1.5, or from a version of MySQL installed from a
+          Zip archive to a version of MySQL installed with the MySQL
+          Installation Wizard, you must first manually remove the
+          previous installation and MySQL service (if the server is
           installed as a service).
         </para>
 


Modified: trunk/refman-6.0/installing-windows.xml
===================================================================
--- trunk/refman-6.0/installing-windows.xml	2010-12-08 17:39:57 UTC (rev 24329)
+++ trunk/refman-6.0/installing-windows.xml	2010-12-08 18:20:15 UTC (rev 24330)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1077 bytes

@@ -2810,11 +2810,11 @@
 
       <listitem>
         <para>
-          When upgrading to MySQL &current-series; from a version
-          previous to 4.1.5, or when upgrading from a version of MySQL
-          installed from a Zip archive to a version of MySQL installed
-          with the MySQL Installation Wizard, you must manually remove
-          the previous installation and MySQL service (if the server is
+          Before upgrading to MySQL &current-series; from a version
+          previous to 4.1.5, or from a version of MySQL installed from a
+          Zip archive to a version of MySQL installed with the MySQL
+          Installation Wizard, you must first manually remove the
+          previous installation and MySQL service (if the server is
           installed as a service).
         </para>
 


Thread
svn commit - mysqldoc@docsrva: r24330 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois8 Dec