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

[paul]

Author: paul
Date: 2006-11-30 17:09:31 +0100 (Thu, 30 Nov 2006)
New Revision: 4084

Log:
 r12842@frost:  paul | 2006-11-30 10:09:21 -0600
 pre-i -> prei


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

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


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-11-30 14:11:06 UTC (rev 4083)
+++ trunk/refman-4.1/installing.xml	2006-11-30 16:09:31 UTC (rev 4084)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 5; 2308 bytes

@@ -6241,7 +6241,7 @@
     </remark>
 
     <para>
-      For pre-installed versions of MySQL on Mac OS X Server, note
+      For preinstalled versions of MySQL on Mac OS X Server, note
       especially that you should start <command>mysqld</command> with
       <command>safe_mysqld</command> instead of
       <command>mysqld_safe</command> if MySQL is older than version 4.0.

@@ -6858,11 +6858,11 @@
         <para>
           A reasonable <command>tar</command> to unpack the
           distribution. GNU <command>tar</command> is known to work.
-          Some operating systems come with a pre-installed version of
+          Some operating systems come with a preinstalled version of
           <command>tar</command> that is known to have problems. For
           example, Mac OS X <command>tar</command> and Sun
           <command>tar</command> are known to have problems with long
-          filenames. On Mac OS X, you can use the pre-installed
+          filenames. On Mac OS X, you can use the preinstalled
           <command>gnutar</command> program. On other systems with a
           deficient <command>tar</command>, you should install GNU
           <command>tar</command> first.

@@ -7267,12 +7267,12 @@
         <para>
           A reasonable <command>tar</command> to unpack the
           distribution. GNU <command>tar</command> is known to work.
-          Some operating systems come with a pre-installed version of
+          Some operating systems come with a preinstalled version of
           <command>tar</command> that is known to have problems. For
           example, the <command>tar</command> provided with early
           versions of Mac OS X <command>tar</command>, SunOS 4.x and
           Solaris 8 and earlier are known to have problems with long
-          filenames. On Mac OS X, you can use the pre-installed
+          filenames. On Mac OS X, you can use the preinstalled
           <command>gnutar</command> program. On other systems with a
           deficient <command>tar</command>, you should install GNU
           <command>tar</command> first.


Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-11-30 14:11:06 UTC (rev 4083)
+++ trunk/refman-5.1/installing.xml	2006-11-30 16:09:31 UTC (rev 4084)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1937 bytes

@@ -6764,11 +6764,11 @@
         <para>
           A reasonable <command>tar</command> to unpack the
           distribution. GNU <command>tar</command> is known to work.
-          Some operating systems come with a pre-installed version of
+          Some operating systems come with a preinstalled version of
           <command>tar</command> that is known to have problems. For
           example, Mac OS X <command>tar</command> and Sun
           <command>tar</command> are known to have problems with long
-          filenames. On Mac OS X, you can use the pre-installed
+          filenames. On Mac OS X, you can use the preinstalled
           <command>gnutar</command> program. On other systems with a
           deficient <command>tar</command>, you should install GNU
           <command>tar</command> first.

@@ -7157,12 +7157,12 @@
         <para>
           A reasonable <command>tar</command> to unpack the
           distribution. GNU <command>tar</command> is known to work.
-          Some operating systems come with a pre-installed version of
+          Some operating systems come with a preinstalled version of
           <command>tar</command> that is known to have problems. For
           example, the <command>tar</command> provided with early
           versions of Mac OS X <command>tar</command>, SunOS 4.x and
           Solaris 8 and earlier are known to have problems with long
-          filenames. On Mac OS X, you can use the pre-installed
+          filenames. On Mac OS X, you can use the preinstalled
           <command>gnutar</command> program. On other systems with a
           deficient <command>tar</command>, you should install GNU
           <command>tar</command> first.