Author: paul
Date: 2006-12-19 17:15:50 +0100 (Tue, 19 Dec 2006)
New Revision: 4302
Log:
r13784@frost: paul | 2006-12-19 09:52:11 -0600
Minor revisions.
Modified:
trunk/refman-4.1/installing.xml
trunk/refman-4.1/language-structure.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.0/installing-cs.xml
trunk/refman-5.0/language-structure.xml
trunk/refman-5.1/database-administration.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/language-structure.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17341
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13783
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17341
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13784
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-4.1/installing.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 547 bytes
@@ -2748,7 +2748,7 @@
<para>
<remark role="todo">
This is changing to VS.NET. Determine which versions the
- change will effect. [js]
+ change will affect. [js]
</remark>
The source distribution contains all the code and support
Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-4.1/language-structure.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 2021 bytes
@@ -908,8 +908,8 @@
reserved word or contains special characters, you
<emphasis>must</emphasis> quote it whenever you refer to it.
(Exception: A word that follows a period in a qualified name must
- be an identifier, so it is not necessary to quote it, even if it
- is a reserved word.) For a list of reserved words, see
+ be an identifier, so it need not be quoted even if it is
+ reserved.) For a list of reserved words, see
<xref linkend="reserved-words"/>. Special characters are those
outside the set of alphanumeric characters from the current
character set, ‘<literal>_</literal>’, and
@@ -1731,17 +1731,17 @@
If an identifier is a reserved word, you must quote it as
described in <xref linkend="identifiers"/>. Exception: A word that
follows a period in a qualified name must be an identifier, so it
- is not necessary to quote it, even if it is a reserved word.
+ need not be quoted even if it is reserved.
</para>
<para>
- You are permitted to use function names as identifiers. For
- example, <literal>ABS</literal> is acceptable as a column name.
- However, by default, no whitespace is allowed in function
- invocations between the function name and the following
+ Function names are permitted as identifiers. For example,
+ <literal>ABS</literal> is acceptable as a column name. However, by
+ default, no whitespace is allowed in function invocations between
+ the function name and the following
‘<literal>(</literal>’ character. This requirement
allows a function call to be distinguished from a reference to a
- column name.
+ non-function call.
</para>
<para>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.0/database-administration.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 1416 bytes
@@ -10445,10 +10445,10 @@
</para>
<para>
- Prevent <literal>GRANT</literal> from automatically
- creating new users if it would otherwise do so, unless a
- non-empty password also is specified. (Added in MySQL
- 5.0.2)
+ Prevent the <literal>GRANT</literal> statement from
+ automatically creating new users if it would otherwise do
+ so, unless a non-empty password also is specified. (Added
+ in MySQL 5.0.2)
</para>
</listitem>
@@ -10532,10 +10532,11 @@
</para>
<para>
- Prevents automatic substitution of the default storage
+ Prevent automatic substitution of the default storage
engine when a statement such as <literal>CREATE
TABLE</literal> specifies a storage engine that is
- disabled or not compiled in. (Implemented in MySQL 5.0.8)
+ disabled or not compiled in. An error occurs instead.
+ (Implemented in MySQL 5.0.8)
</para>
</listitem>
Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.0/installing-cs.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 555 bytes
@@ -2682,7 +2682,7 @@
<para>
<remark role="todo">
[JS] This is changing to VS.NET. Determine which versions
- the change will effect.
+ the change will affect.
</remark>
The source distribution contains all the code and support
Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.0/language-structure.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 2021 bytes
@@ -931,8 +931,8 @@
reserved word or contains special characters, you
<emphasis>must</emphasis> quote it whenever you refer to it.
(Exception: A word that follows a period in a qualified name must
- be an identifier, so it is not necessary to quote it, even if it
- is a reserved word.) For a list of reserved words, see
+ be an identifier, so it need not be quoted even if it is
+ reserved.) For a list of reserved words, see
<xref linkend="reserved-words"/>. Special characters are those
outside the set of alphanumeric characters from the current
character set, ‘<literal>_</literal>’, and
@@ -1729,17 +1729,17 @@
If an identifier is a reserved word, you must quote it as
described in <xref linkend="identifiers"/>. Exception: A word that
follows a period in a qualified name must be an identifier, so it
- is not necessary to quote it, even if it is a reserved word.
+ need not be quoted even if it is reserved.
</para>
<para>
- You are permitted to use function names as identifiers. For
- example, <literal>ABS</literal> is acceptable as a column name.
- However, by default, no whitespace is allowed in function
- invocations between the function name and the following
+ Function names are permitted as identifiers. For example,
+ <literal>ABS</literal> is acceptable as a column name. However, by
+ default, no whitespace is allowed in function invocations between
+ the function name and the following
‘<literal>(</literal>’ character. This requirement
allows a function call to be distinguished from a reference to a
- column name.
+ non-function call.
</para>
<para>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.1/database-administration.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1268 bytes
@@ -10608,9 +10608,9 @@
</para>
<para>
- Prevent <literal>GRANT</literal> from automatically
- creating new users if it would otherwise do so, unless a
- non-empty password also is specified.
+ Prevent the <literal>GRANT</literal> statement from
+ automatically creating new users if it would otherwise do
+ so, unless a non-empty password also is specified.
</para>
</listitem>
@@ -10693,10 +10693,10 @@
</para>
<para>
- Prevents automatic substitution of the default storage
+ Prevent automatic substitution of the default storage
engine when a statement such as <literal>CREATE
TABLE</literal> specifies a storage engine that is
- disabled or not compiled in.
+ disabled or not compiled in. An error occurs instead.
</para>
</listitem>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.1/installing.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 547 bytes
@@ -2780,7 +2780,7 @@
<para>
<remark role="todo">
This is changing to VS.NET. Determine which versions the
- change will effect. [js]
+ change will affect. [js]
</remark>
The source distribution contains all the code and support
Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml 2006-12-19 16:15:08 UTC (rev 4301)
+++ trunk/refman-5.1/language-structure.xml 2006-12-19 16:15:50 UTC (rev 4302)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 8; 2021 bytes
@@ -948,8 +948,8 @@
reserved word or contains special characters, you
<emphasis>must</emphasis> quote it whenever you refer to it.
(Exception: A word that follows a period in a qualified name must
- be an identifier, so it is not necessary to quote it, even if it
- is a reserved word.) For a list of reserved words, see
+ be an identifier, so it need not be quoted even if it is
+ reserved.) For a list of reserved words, see
<xref linkend="reserved-words"/>. Special characters are those
outside the set of alphanumeric characters from the current
character set, ‘<literal>_</literal>’, and
@@ -1928,17 +1928,17 @@
If an identifier is a reserved word, you must quote it as
described in <xref linkend="identifiers"/>. Exception: A word that
follows a period in a qualified name must be an identifier, so it
- is not necessary to quote it, even if it is a reserved word.
+ need not be quoted even if it is reserved.
</para>
<para>
- You are permitted to use function names as identifiers. For
- example, <literal>ABS</literal> is acceptable as a column name.
- However, by default, no whitespace is allowed in function
- invocations between the function name and the following
+ Function names are permitted as identifiers. For example,
+ <literal>ABS</literal> is acceptable as a column name. However, by
+ default, no whitespace is allowed in function invocations between
+ the function name and the following
‘<literal>(</literal>’ character. This requirement
allows a function call to be distinguished from a reference to a
- column name.
+ non-function call.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4302 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 19 Dec |
