Author: paul
Date: 2010-07-12 22:31:45 +0200 (Mon, 12 Jul 2010)
New Revision: 21671
Log:
r61073@frost: paul | 2010-07-12 14:18:29 -0500
Oracle style guidelines: acknowledgement -> acknowledgment
Modified:
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/ndbapi/ndb-internals.xml
trunk/refman-4.1/replication-options-core.xml
trunk/refman-4.1/sql-syntax-replication.xml
trunk/refman-5.0/replication-options-core.xml
trunk/refman-5.0/sql-syntax-replication.xml
trunk/refman-5.1/replication-options-core.xml
trunk/refman-5.1/sql-syntax-replication.xml
trunk/refman-5.5/dba-mysqld-server-core.xml
trunk/refman-5.5/replication-options-core.xml
trunk/refman-5.5/sql-syntax-replication.xml
trunk/refman-6.0/dba-mysqld-server-core.xml
trunk/refman-6.0/replication-options-core.xml
trunk/refman-6.0/sql-syntax-replication.xml
trunk/sample-data/sakila/sakila.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:40730
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:61071
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:40730
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:61073
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/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1705 bytes
@@ -15757,7 +15757,7 @@
sends its node ID and transporter type; the management server
then verifies that there is a transporter set up for that node
and that it is in the correct state, and then sends back an
- acknowledgement to the connecting node. If the transporter was
+ acknowledgment to the connecting node. If the transporter was
not in the correct state, no reply was sent back to the
connecting node, which would then hang until a read timeout
occurred (60 seconds). Now, if the transporter is not in the
@@ -20810,7 +20810,7 @@
<para>
An abort path in the <literal>DBLQH</literal> kernel block
- failed to release a commit acknowledgement marker. This meant
+ failed to release a commit acknowledgment marker. This meant
that, during node failure handling, the local query handler
could be added multiple times to the marker record which could
lead to additional node failures due an array overflow.
@@ -77976,7 +77976,7 @@
<para>
With semisynchronous replication, for each transaction, the
- master waits until timeout for acknowledgement of receipt from
+ master waits until timeout for acknowledgment of receipt from
some semisynchronous slave. If no response occurs during this
period, the master reverts to normal replication. A new system
variable,
Modified: trunk/ndbapi/ndb-internals.xml
===================================================================
--- trunk/ndbapi/ndb-internals.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/ndbapi/ndb-internals.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 562 bytes
@@ -11367,8 +11367,7 @@
<para>
Used for diskless operation. Generates a
- <quote>dummy</quote> acjknowledgement to write
- operations.
+ <quote>dummy</quote> acknowledgment to write operations.
</para>
</formalpara>
Modified: trunk/refman-4.1/replication-options-core.xml
===================================================================
--- trunk/refman-4.1/replication-options-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-4.1/replication-options-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes
@@ -1779,7 +1779,7 @@
<note>
<para>
- The SQL thread sends an acknowledgement to the client before
+ The SQL thread sends an acknowledgment to the client before
it executes <literal role="sysvar">init_slave</literal>.
Therefore, it is not guaranteed that
<literal role="sysvar">init_slave</literal> has been
Modified: trunk/refman-4.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-replication.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-4.1/sql-syntax-replication.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 957 bytes
@@ -1139,9 +1139,9 @@
<para>
<literal role="stmt">START SLAVE</literal> sends an
- acknowledgement to the user after both the I/O thread and the
- SQL thread have started. However, the I/O thread may not yet
- have connected. For this reason, a successful
+ acknowledgment to the user after both the I/O thread and the SQL
+ thread have started. However, the I/O thread may not yet have
+ connected. For this reason, a successful
<literal role="stmt">START SLAVE</literal> causes
<literal role="stmt">SHOW SLAVE STATUS</literal> to show
<literal>Slave_SQL_Running=Yes</literal>, but this does not
Modified: trunk/refman-5.0/replication-options-core.xml
===================================================================
--- trunk/refman-5.0/replication-options-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.0/replication-options-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes
@@ -2092,7 +2092,7 @@
<note>
<para>
- The SQL thread sends an acknowledgement to the client before
+ The SQL thread sends an acknowledgment to the client before
it executes <literal role="sysvar">init_slave</literal>.
Therefore, it is not guaranteed that
<literal role="sysvar">init_slave</literal> has been
Modified: trunk/refman-5.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-replication.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.0/sql-syntax-replication.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 957 bytes
@@ -1178,9 +1178,9 @@
<para>
<literal role="stmt">START SLAVE</literal> sends an
- acknowledgement to the user after both the I/O thread and the
- SQL thread have started. However, the I/O thread may not yet
- have connected. For this reason, a successful
+ acknowledgment to the user after both the I/O thread and the SQL
+ thread have started. However, the I/O thread may not yet have
+ connected. For this reason, a successful
<literal role="stmt">START SLAVE</literal> causes
<literal role="stmt">SHOW SLAVE STATUS</literal> to show
<literal>Slave_SQL_Running=Yes</literal>, but this does not
Modified: trunk/refman-5.1/replication-options-core.xml
===================================================================
--- trunk/refman-5.1/replication-options-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.1/replication-options-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes
@@ -2424,7 +2424,7 @@
<note>
<para>
- The SQL thread sends an acknowledgement to the client before
+ The SQL thread sends an acknowledgment to the client before
it executes <literal role="sysvar">init_slave</literal>.
Therefore, it is not guaranteed that
<literal role="sysvar">init_slave</literal> has been
Modified: trunk/refman-5.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-replication.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.1/sql-syntax-replication.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 957 bytes
@@ -1258,9 +1258,9 @@
<para>
<literal role="stmt">START SLAVE</literal> sends an
- acknowledgement to the user after both the I/O thread and the
- SQL thread have started. However, the I/O thread may not yet
- have connected. For this reason, a successful
+ acknowledgment to the user after both the I/O thread and the SQL
+ thread have started. However, the I/O thread may not yet have
+ connected. For this reason, a successful
<literal role="stmt">START SLAVE</literal> causes
<literal role="stmt">SHOW SLAVE STATUS</literal> to show
<literal>Slave_SQL_Running=Yes</literal>, but this does not
Modified: trunk/refman-5.5/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.5/dba-mysqld-server-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.5/dba-mysqld-server-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 747 bytes
@@ -9122,7 +9122,7 @@
<para>
With semisynchronous replication, for each transaction, the
- master waits until timeout for acknowledgement of receipt from
+ master waits until timeout for acknowledgment of receipt from
some semisynchronous slave. If no response occurs during this
period, the master reverts to normal replication. This
variable controls whether the master waits for the timeout to
Modified: trunk/refman-5.5/replication-options-core.xml
===================================================================
--- trunk/refman-5.5/replication-options-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.5/replication-options-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes
@@ -2062,7 +2062,7 @@
<note>
<para>
- The SQL thread sends an acknowledgement to the client before
+ The SQL thread sends an acknowledgment to the client before
it executes <literal role="sysvar">init_slave</literal>.
Therefore, it is not guaranteed that
<literal role="sysvar">init_slave</literal> has been
Modified: trunk/refman-5.5/sql-syntax-replication.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-replication.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-5.5/sql-syntax-replication.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 957 bytes
@@ -1118,9 +1118,9 @@
<para>
<literal role="stmt">START SLAVE</literal> sends an
- acknowledgement to the user after both the I/O thread and the
- SQL thread have started. However, the I/O thread may not yet
- have connected. For this reason, a successful
+ acknowledgment to the user after both the I/O thread and the SQL
+ thread have started. However, the I/O thread may not yet have
+ connected. For this reason, a successful
<literal role="stmt">START SLAVE</literal> causes
<literal role="stmt">SHOW SLAVE STATUS</literal> to show
<literal>Slave_SQL_Running=Yes</literal>, but this does not
Modified: trunk/refman-6.0/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0/dba-mysqld-server-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-6.0/dba-mysqld-server-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 747 bytes
@@ -9791,7 +9791,7 @@
<para>
With semisynchronous replication, for each transaction, the
- master waits until timeout for acknowledgement of receipt from
+ master waits until timeout for acknowledgment of receipt from
some semisynchronous slave. If no response occurs during this
period, the master reverts to normal replication. This
variable controls whether the master waits for the timeout to
Modified: trunk/refman-6.0/replication-options-core.xml
===================================================================
--- trunk/refman-6.0/replication-options-core.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-6.0/replication-options-core.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 674 bytes
@@ -2047,7 +2047,7 @@
<note>
<para>
- The SQL thread sends an acknowledgement to the client before
+ The SQL thread sends an acknowledgment to the client before
it executes <literal role="sysvar">init_slave</literal>.
Therefore, it is not guaranteed that
<literal role="sysvar">init_slave</literal> has been
Modified: trunk/refman-6.0/sql-syntax-replication.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-replication.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/refman-6.0/sql-syntax-replication.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 957 bytes
@@ -1127,9 +1127,9 @@
<para>
<literal role="stmt">START SLAVE</literal> sends an
- acknowledgement to the user after both the I/O thread and the
- SQL thread have started. However, the I/O thread may not yet
- have connected. For this reason, a successful
+ acknowledgment to the user after both the I/O thread and the SQL
+ thread have started. However, the I/O thread may not yet have
+ connected. For this reason, a successful
<literal role="stmt">START SLAVE</literal> causes
<literal role="stmt">SHOW SLAVE STATUS</literal> to show
<literal>Slave_SQL_Running=Yes</literal>, but this does not
Modified: trunk/sample-data/sakila/sakila.xml
===================================================================
--- trunk/sample-data/sakila/sakila.xml 2010-07-12 19:07:40 UTC (rev 21670)
+++ trunk/sample-data/sakila/sakila.xml 2010-07-12 20:31:45 UTC (rev 21671)
Changed blocks: 5, Lines Added: 6, Lines Deleted: 10; 1476 bytes
@@ -82,7 +82,7 @@
Development was accomplished using MySQL Query Browser for schema
design, with the tables being populated by a combination of MySQL
Query Browser and custom scripts, in addition to contributor
- efforts (see <xref linkend="sakila-acknowledgements"/>).
+ efforts (see <xref linkend="sakila-acknowledgments"/>).
</para>
<para>
@@ -371,7 +371,7 @@
tables.
</para>
- <bridgehead> Columns</bridgehead>
+ <bridgehead>Columns</bridgehead>
<itemizedlist>
@@ -826,9 +826,7 @@
tables using foreign keys.
</para>
- <bridgehead>
- Columns:
- </bridgehead>
+ <bridgehead>Columns:</bridgehead>
<itemizedlist>
@@ -877,9 +875,7 @@
tables using foreign keys.
</para>
- <bridgehead>
- Columns:
- </bridgehead>
+ <bridgehead>Columns:</bridgehead>
<itemizedlist>
@@ -2205,9 +2201,9 @@
</section>
- <section id="sakila-acknowledgements">
+ <section id="sakila-acknowledgments">
- <title>Acknowledgements</title>
+ <title>Acknowledgments</title>
<para>
The following individuals and organizations have contributed to
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r21671 - in trunk: . dynamic-docs/changelog ndbapi refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-6.0 sample-data/s... | paul.dubois | 12 Jul |
