From: Date: April 22 2008 5:40am
Subject: svn commit - mysqldoc@docsrva: r10560 - in trunk: . dynamic-docs/changelog it/refman-5.1 ndbapi pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
List-Archive: http://lists.mysql.com/commits/45798
Message-Id: <200804220340.m3M3eIhj028914@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: paul
Date: 2008-04-22 05:40:17 +0200 (Tue, 22 Apr 2008)
New Revision: 10560
Log:
r30881@frost: paul | 2008-04-21 22:36:21 -0500
favour -> favor
backwards compatibility -> backward compatibility
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/it/refman-5.1/sql-syntax.xml
trunk/ndbapi/mgm-api.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30848
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30865
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30881
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30865
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 774 bytes
@@ -5451,7 +5451,7 @@
renamed to page_size_bytes. The name
page_size_kb is now deprecated and thus
subject to removal in a future release, although it currently
- remains supported for reasons of backwards compatibility. See
+ remains supported for reasons of backward compatibility. See
, for more information about
NDB_LE_MemoryUsage.
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1873 bytes
@@ -3952,7 +3952,7 @@
The older TYPE option was synonymous with
ENGINE. TYPE has been
deprecated since MySQL 4.0 but is still supported for
- backwards compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
+ backward compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
Since MySQL 5.1.8, it produces a warning. It is removed as of
MySQL 5.2. You should not use
TYPE in any new applications, and you
@@ -24469,7 +24469,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -24506,9 +24506,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.
Modified: trunk/ndbapi/mgm-api.xml
===================================================================
--- trunk/ndbapi/mgm-api.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/ndbapi/mgm-api.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1090 bytes
@@ -3711,7 +3711,7 @@
These changes were done in order to make this function
thread-safe. The pre-5.1.14 version is still supported for
- backwards compatibility, but you should protect it with a
+ backward compatibility, but you should protect it with a
mutex if you intend to call it from more than one thread.
@@ -4089,7 +4089,7 @@
This version of the function is now deprecated, but is still
- available for backwards compatibility; however, in new
+ available for backward compatibility; however, in new
applications, it is recommended that you use
ndb_mgm_get_clusterlog_loglevel(), since
it is thread-safe, and the older function is not.
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1873 bytes
@@ -3952,7 +3952,7 @@
The older TYPE option was synonymous with
ENGINE. TYPE has been
deprecated since MySQL 4.0 but is still supported for
- backwards compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
+ backward compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
Since MySQL 5.1.8, it produces a warning. It is removed as of
MySQL 5.2. You should not use
TYPE in any new applications, and you
@@ -24469,7 +24469,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -24506,9 +24506,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/refman-4.1/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1306 bytes
@@ -18443,7 +18443,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -18480,9 +18480,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/refman-5.0/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1306 bytes
@@ -21675,7 +21675,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -21712,9 +21712,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/refman-5.1/dba-core.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 609 bytes
@@ -12870,7 +12870,7 @@
For MySQL 5.1.20 and later (and MySQL 5.0.46 and later for
- backwards compatibility), the following session variables are
+ backward compatibility), the following session variables are
written to the binary log and honored by the replication slave
when parsing the binary log:
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/refman-5.1/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1864 bytes
@@ -3960,7 +3960,7 @@
The older TYPE option was synonymous with
ENGINE. TYPE has been
deprecated since MySQL 4.0 but is still supported for
- backwards compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
+ backward compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
Since MySQL 5.1.8, it produces a warning. It is removed as of
MySQL 5.2. You should not use
TYPE in any new applications, and you
@@ -24605,7 +24605,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -24642,9 +24642,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-04-21 23:15:08 UTC (rev 10559)
+++ trunk/refman-6.0/sql-syntax.xml 2008-04-22 03:40:17 UTC (rev 10560)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1306 bytes
@@ -24878,7 +24878,7 @@
logs, resets the binary log index file and creates a new
binary log. FLUSH MASTER is deprecated
in favor of RESET MASTER, and is
- supported for backwards compatibility only. See
+ supported for backward compatibility only. See
.
@@ -24915,9 +24915,9 @@
(DEPRECATED). Resets all replication
slave parameters, including relay log files and
replication position in the master's binary logs.
- FLUSH SLAVE is deprecated in favour of
+ FLUSH SLAVE is deprecated in favor of
RESET SLAVE, and is supported for
- backwards compatibility only. See
+ backward compatibility only. See
.