Author: paul
Date: 2006-02-04 19:57:05 +0100 (Sat, 04 Feb 2006)
New Revision: 1210
Log:
r7145@frost: paul | 2006-02-04 10:30:01 -0600
alternate -> alternative
Modified:
trunk/
trunk/refman-4.1/database-administration.xml
trunk/refman-4.1/extending-mysql.xml
trunk/refman-4.1/installing.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/extending-mysql.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-5.1/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7057
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2848
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7145
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2848
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-4.1/database-administration.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -12307,7 +12307,7 @@
</programlisting>
<para>
- Alternate forms of the <option>-h</option>, <option>-u</option>,
+ Alternative forms of the <option>-h</option>, <option>-u</option>,
and <option>-p</option> options are
<option>--host=<replaceable>host_name</replaceable></option>,
<option>--user=<replaceable>user_name</replaceable></option>,
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-4.1/extending-mysql.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -301,7 +301,7 @@
master and slave, use <literal>connection
master;</literal> and <literal>connection
slave;</literal>. If you need to do something on an
- alternate connection, you can do <literal>connection
+ alternative connection, you can do <literal>connection
master1;</literal> for the master, and <literal>connection
slave1;</literal> for the slave.
</para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-4.1/installing.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -7386,7 +7386,7 @@
<remark role="todo">
[pd] It's no longer true that you must be in the top-level
directory, but we need information from the build team if
- we're to describe alternate procedures.
+ we're to describe alternative procedures.
</remark>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.0/database-administration.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -14429,7 +14429,7 @@
</programlisting>
<para>
- Alternate forms of the <option>-h</option>, <option>-u</option>,
+ Alternative forms of the <option>-h</option>, <option>-u</option>,
and <option>-p</option> options are
<option>--host=<replaceable>host_name</replaceable></option>,
<option>--user=<replaceable>user_name</replaceable></option>,
Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.0/extending-mysql.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -292,7 +292,7 @@
master and slave, use <literal>connection
master;</literal> and <literal>connection
slave;</literal>. If you need to do something on an
- alternate connection, you can do <literal>connection
+ alternative connection, you can do <literal>connection
master1;</literal> for the master, and <literal>connection
slave1;</literal> for the slave.
</para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.0/installing.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -7315,7 +7315,7 @@
<remark role="todo">
[pd] It's no longer true that you must be in the top-level
directory, but we need information from the build team if
- we're to describe alternate procedures.
+ we're to describe alternative procedures.
</remark>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.1/database-administration.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -14525,7 +14525,7 @@
</programlisting>
<para>
- Alternate forms of the <option>-h</option>, <option>-u</option>,
+ Alternative forms of the <option>-h</option>, <option>-u</option>,
and <option>-p</option> options are
<option>--host=<replaceable>host_name</replaceable></option>,
<option>--user=<replaceable>user_name</replaceable></option>,
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.1/extending-mysql.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -292,7 +292,7 @@
master and slave, use <literal>connection
master;</literal> and <literal>connection
slave;</literal>. If you need to do something on an
- alternate connection, you can do <literal>connection
+ alternative connection, you can do <literal>connection
master1;</literal> for the master, and <literal>connection
slave1;</literal> for the slave.
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-02-04 18:16:02 UTC (rev 1209)
+++ trunk/refman-5.1/installing.xml 2006-02-04 18:57:05 UTC (rev 1210)
@@ -7311,7 +7311,7 @@
<remark role="todo">
[pd] It's no longer true that you must be in the top-level
directory, but we need information from the build team if
- we're to describe alternate procedures.
+ we're to describe alternative procedures.
</remark>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1210 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 4 Feb |
