Author: paul
Date: 2011-01-21 18:02:28 +0100 (Fri, 21 Jan 2011)
New Revision: 24860
Log:
r44257@dhcp-213: paul | 2011-01-21 10:46:33 -0500
Minor wording changes
Modified:
trunk/refman-5.0/programs-installation.xml
trunk/refman-5.1/programs-installation.xml
trunk/refman-5.5/programs-installation.xml
trunk/refman-5.5/sql-syntax-server-administration.xml
trunk/refman-5.6/programs-installation.xml
trunk/refman-5.6/sql-syntax-server-administration.xml
trunk/refman-6.0/programs-installation.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:46375
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:66486
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
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44237
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:46375
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:66486
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
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:44257
Modified: trunk/refman-5.0/programs-installation.xml
===================================================================
--- trunk/refman-5.0/programs-installation.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.0/programs-installation.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 998 bytes
@@ -1566,11 +1566,11 @@
</para>
<para>
- If a table is found to have a possible incompatibility,
- <command>mysql_upgrade</command> performs a table check. If any
- problems are found, a table repair is attempted. If the table
- cannot be repaired, see <xref linkend="rebuilding-tables"/> for
- manual table repair strategies.
+ If <command>mysql_upgrade</command> finds that a table has a
+ possible incompatibility, it performs a table check and, if
+ problems are found, attempts a table repair. If the table cannot
+ be repaired, see <xref linkend="rebuilding-tables"/> for manual
+ table repair strategies.
</para>
<caution>
Modified: trunk/refman-5.1/programs-installation.xml
===================================================================
--- trunk/refman-5.1/programs-installation.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.1/programs-installation.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 995 bytes
@@ -1365,11 +1365,11 @@
</para>
<para>
- If a table is found to have a possible incompatibility,
- <command>mysql_upgrade</command> performs a table check. If any
- problems are found, a table repair is attempted. If the table
- cannot be repaired, see <xref linkend="rebuilding-tables"/> for
- manual table repair strategies.
+ If <command>mysql_upgrade</command> finds that a table has a
+ possible incompatibility, it performs a table check and, if
+ problems are found, attempts a table repair. If the table cannot
+ be repaired, see <xref linkend="rebuilding-tables"/> for manual
+ table repair strategies.
</para>
<note>
Modified: trunk/refman-5.5/programs-installation.xml
===================================================================
--- trunk/refman-5.5/programs-installation.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.5/programs-installation.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 995 bytes
@@ -1005,11 +1005,11 @@
</para>
<para>
- If a table is found to have a possible incompatibility,
- <command>mysql_upgrade</command> performs a table check. If any
- problems are found, a table repair is attempted. If the table
- cannot be repaired, see <xref linkend="rebuilding-tables"/> for
- manual table repair strategies.
+ If <command>mysql_upgrade</command> finds that a table has a
+ possible incompatibility, it performs a table check and, if
+ problems are found, attempts a table repair. If the table cannot
+ be repaired, see <xref linkend="rebuilding-tables"/> for manual
+ table repair strategies.
</para>
<note>
Modified: trunk/refman-5.5/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-server-administration.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.5/sql-syntax-server-administration.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 10; 2012 bytes
@@ -160,11 +160,10 @@
<listitem>
<para>
- If the account should authenticate using a specific
- authentication plugin, use <literal>IDENTIFIED
- WITH</literal>. <replaceable>auth_plugin</replaceable> is an
- authentication plugin name. It can be an unquoted name or a
- quoted string literal.
+ To authenticate the account using a specific authentication
+ plugin, use <literal>IDENTIFIED WITH</literal>, where
+ <replaceable>auth_plugin</replaceable> is the plugin name.
+ It can be an unquoted name or a quoted string literal.
<literal>'<replaceable>auth_string</replaceable>'</literal>
is an optional quoted string literal to pass to the plugin.
The plugin interprets the meaning of the string.
@@ -176,11 +175,13 @@
</programlisting>
<para>
- The server uses the named plugin and clients must provide
- credentials as required for the authentication method that
- the plugin implements. If the server cannot find the plugin,
- an error occurs. <literal>IDENTIFIED WITH</literal> can be
- given as of MySQL 5.5.7.
+ For connections that use this account, the server invokes
+ the named plugin and clients must provide credentials as
+ required for the authentication method that the plugin
+ implements. If the server cannot find the plugin, either at
+ account-creation time or connect time, an error occurs.
+ <literal>IDENTIFIED WITH</literal> can be used as of MySQL
+ 5.5.7.
</para>
</listitem>
Modified: trunk/refman-5.6/programs-installation.xml
===================================================================
--- trunk/refman-5.6/programs-installation.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.6/programs-installation.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 995 bytes
@@ -1005,11 +1005,11 @@
</para>
<para>
- If a table is found to have a possible incompatibility,
- <command>mysql_upgrade</command> performs a table check. If any
- problems are found, a table repair is attempted. If the table
- cannot be repaired, see <xref linkend="rebuilding-tables"/> for
- manual table repair strategies.
+ If <command>mysql_upgrade</command> finds that a table has a
+ possible incompatibility, it performs a table check and, if
+ problems are found, attempts a table repair. If the table cannot
+ be repaired, see <xref linkend="rebuilding-tables"/> for manual
+ table repair strategies.
</para>
<note>
Modified: trunk/refman-5.6/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-server-administration.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-5.6/sql-syntax-server-administration.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 9; 1843 bytes
@@ -160,11 +160,10 @@
<listitem>
<para>
- If the account should authenticate using a specific
- authentication plugin, use <literal>IDENTIFIED
- WITH</literal>. <replaceable>auth_plugin</replaceable> is an
- authentication plugin name. It can be an unquoted name or a
- quoted string literal.
+ To authenticate the account using a specific authentication
+ plugin, use <literal>IDENTIFIED WITH</literal>, where
+ <replaceable>auth_plugin</replaceable> is the plugin name.
+ It can be an unquoted name or a quoted string literal.
<literal>'<replaceable>auth_string</replaceable>'</literal>
is an optional quoted string literal to pass to the plugin.
The plugin interprets the meaning of the string.
@@ -176,10 +175,11 @@
</programlisting>
<para>
- The server uses the named plugin and clients must provide
- credentials as required for the authentication method that
- the plugin implements. If the server cannot find the plugin,
- an error occurs.
+ For connections that use this account, the server invokes
+ the named plugin and clients must provide credentials as
+ required for the authentication method that the plugin
+ implements. If the server cannot find the plugin, either at
+ account-creation time or connect time, an error occurs.
</para>
</listitem>
Modified: trunk/refman-6.0/programs-installation.xml
===================================================================
--- trunk/refman-6.0/programs-installation.xml 2011-01-21 14:09:52 UTC (rev 24859)
+++ trunk/refman-6.0/programs-installation.xml 2011-01-21 17:02:28 UTC (rev 24860)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 998 bytes
@@ -1347,11 +1347,11 @@
</para>
<para>
- If a table is found to have a possible incompatibility,
- <command>mysql_upgrade</command> performs a table check. If any
- problems are found, a table repair is attempted. If the table
- cannot be repaired, see <xref linkend="rebuilding-tables"/> for
- manual table repair strategies.
+ If <command>mysql_upgrade</command> finds that a table has a
+ possible incompatibility, it performs a table check and, if
+ problems are found, attempts a table repair. If the table cannot
+ be repaired, see <xref linkend="rebuilding-tables"/> for manual
+ table repair strategies.
</para>
<caution>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24860 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 21 Jan |
