Author: paul
Date: 2010-06-08 01:11:32 +0200 (Tue, 08 Jun 2010)
New Revision: 21095
Log:
r59855@frost: paul | 2010-06-07 17:35:16 -0500
Harmonize version diffs
Modified:
trunk/refman-4.1/installing.xml
trunk/refman-5.0/installing-core.xml
trunk/refman-5.1/installing-perl.xml
trunk/refman-5.4/installing-core.xml
trunk/refman-6.0/installing-core.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:39186
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:59851
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
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:39186
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:59855
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
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2010-06-07 20:16:09 UTC (rev 21094)
+++ trunk/refman-4.1/installing.xml 2010-06-07 23:11:32 UTC (rev 21095)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 648 bytes
@@ -16778,7 +16778,7 @@
</programlisting>
<para>
- Then you must install the new Perl. The output of <command>make
+ Then, you must install the new Perl. The output of <command>make
perl</command> indicates the exact <command>make</command>
command you need to execute to perform the installation. On SCO,
this is <command>make -f Makefile.aperl inst_perl
Modified: trunk/refman-5.0/installing-core.xml
===================================================================
--- trunk/refman-5.0/installing-core.xml 2010-06-07 20:16:09 UTC (rev 21094)
+++ trunk/refman-5.0/installing-core.xml 2010-06-07 23:11:32 UTC (rev 21095)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 663 bytes
@@ -16588,7 +16588,7 @@
</programlisting>
<para>
- Then you must install the new Perl. The output of <command>make
+ Then, you must install the new Perl. The output of <command>make
perl</command> indicates the exact <command>make</command>
command you need to execute to perform the installation. On SCO,
this is <command>make -f Makefile.aperl inst_perl
Modified: trunk/refman-5.1/installing-perl.xml
===================================================================
--- trunk/refman-5.1/installing-perl.xml 2010-06-07 20:16:09 UTC (rev 21094)
+++ trunk/refman-5.1/installing-perl.xml 2010-06-07 23:11:32 UTC (rev 21095)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 647 bytes
@@ -522,7 +522,7 @@
</programlisting>
<para>
- Then you must install the new Perl. The output of <command>make
+ Then, you must install the new Perl. The output of <command>make
perl</command> indicates the exact <command>make</command> command
you need to execute to perform the installation. On SCO, this is
<command>make -f Makefile.aperl inst_perl
Modified: trunk/refman-5.4/installing-core.xml
===================================================================
--- trunk/refman-5.4/installing-core.xml 2010-06-07 20:16:09 UTC (rev 21094)
+++ trunk/refman-5.4/installing-core.xml 2010-06-07 23:11:32 UTC (rev 21095)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 663 bytes
@@ -17218,7 +17218,7 @@
</programlisting>
<para>
- Then you must install the new Perl. The output of <command>make
+ Then, you must install the new Perl. The output of <command>make
perl</command> indicates the exact <command>make</command>
command you need to execute to perform the installation. On SCO,
this is <command>make -f Makefile.aperl inst_perl
Modified: trunk/refman-6.0/installing-core.xml
===================================================================
--- trunk/refman-6.0/installing-core.xml 2010-06-07 20:16:09 UTC (rev 21094)
+++ trunk/refman-6.0/installing-core.xml 2010-06-07 23:11:32 UTC (rev 21095)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 663 bytes
@@ -16937,7 +16937,7 @@
</programlisting>
<para>
- Then you must install the new Perl. The output of <command>make
+ Then, you must install the new Perl. The output of <command>make
perl</command> indicates the exact <command>make</command>
command you need to execute to perform the installation. On SCO,
this is <command>make -f Makefile.aperl inst_perl
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r21095 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0 | paul.dubois | 8 Jun |
