Author: paul
Date: 2010-08-31 22:07:00 +0200 (Tue, 31 Aug 2010)
New Revision: 22528
Log:
r62813@frost: paul | 2010-08-31 13:15:28 -0500
Small wording changes
Modified:
trunk/dynamic-docs/changelog/mysqld.xml
trunk/refman-5.1/installing-updowngrade.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:42090
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:62808
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:42090
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:62813
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.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml 2010-08-31 15:04:47 UTC (rev 22527)
+++ trunk/dynamic-docs/changelog/mysqld.xml 2010-08-31 20:07:00 UTC (rev 22528)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 5; 1547 bytes
@@ -36945,7 +36945,7 @@
</programlisting>
<para>
- This fix enables alias declarations to be made only in the
+ This fix enables aliases to be declared only in the
<replaceable>table_references</replaceable> part. Elsewhere in
the statement, alias references are permitted but not alias
declarations. However, this patch was reverted in MySQL 5.0.54
@@ -36968,9 +36968,9 @@
</programlisting>
<para>
- This bug fix enables alias declarations to be declared only in
- the <replaceable>table_references</replaceable> part. Elsewhere
- in the statement, alias references are permitted but not alias
+ This bug fix enables aliases to be declared only in the
+ <replaceable>table_references</replaceable> part. Elsewhere in
+ the statement, alias references are permitted but not alias
declarations.
</para>
@@ -36998,7 +36998,7 @@
</programlisting>
<para>
- Now alias declarations can be declared only in the
+ Now aliases can be declared only in the
<replaceable>table_references</replaceable> part. Elsewhere in
the statement, alias references are permitted but not alias
declarations. Statements containing aliases that are no longer
Modified: trunk/refman-5.1/installing-updowngrade.xml
===================================================================
--- trunk/refman-5.1/installing-updowngrade.xml 2010-08-31 15:04:47 UTC (rev 22527)
+++ trunk/refman-5.1/installing-updowngrade.xml 2010-08-31 20:07:00 UTC (rev 22528)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1057 bytes
@@ -1426,11 +1426,11 @@
</programlisting>
<para>
- As of MySQL 5.1.23, alias declarations can be declared only
- in the <replaceable>table_references</replaceable> part.
- Elsewhere in the statement, alias references are permitted
- but not alias declarations. Statements containing aliases
- that are no longer permitted must be rewritten.
+ As of MySQL 5.1.23, aliases can be declared only in the
+ <replaceable>table_references</replaceable> part. Elsewhere
+ in the statement, alias references are permitted but not
+ alias declarations. Statements containing aliases that are
+ no longer permitted must be rewritten.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22528 - in trunk: . dynamic-docs/changelog refman-5.1 | paul.dubois | 31 Aug |
