Author: paul
Date: 2007-10-13 20:42:30 +0200 (Sat, 13 Oct 2007)
New Revision: 8084
Log:
r25610@frost: paul | 2007-10-13 13:40:28 -0500
Adjust admonitions.
Modified:
trunk/dynamic-docs/changelog/connector-j.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/news-5.0.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.2/dba-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31047
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25498
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31047
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25610
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/dynamic-docs/changelog/connector-j.xml
===================================================================
--- trunk/dynamic-docs/changelog/connector-j.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/dynamic-docs/changelog/connector-j.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 6; 1318 bytes
@@ -14060,14 +14060,18 @@
<para>
Failover for <literal>autoReconnect</literal> not using port
numbers for any hosts, and not retrying all hosts.
- (<emphasis role="bold">Warning</emphasis>: This required a
- change to the <literal>SocketFactory</literal>
- <literal>connect()</literal> method signature, which is now
- <literal>public Socket connect(String host, int portNumber,
- Properties props)</literal>; therefore, any third-party socket
- factories will have to be changed to support this signature.
</para>
+ <warning>
+ <para>
+ This required a change to the <literal>SocketFactory</literal>
+ <literal>connect()</literal> method signature, which is now
+ <literal>public Socket connect(String host, int portNumber,
+ Properties props)</literal>; therefore, any third-party socket
+ factories will have to be changed to support this signature.
+ </para>
+ </warning>
+
</message>
</logentry>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/refman-4.1/dba-core.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 3, Lines Added: 17, Lines Deleted: 11; 2200 bytes
@@ -6621,9 +6621,9 @@
tables. Starting from MySQL 4.1, this variable can be set
to a list of several paths that are used in round-robin
fashion. Paths should be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2.
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2.
</para>
<para>
@@ -12634,13 +12634,18 @@
</programlisting>
<para>
- (This works under Linux and should work with small
- modifications under other systems.)
- <emphasis role="bold">Warning</emphasis>: If you do not see
- plaintext data, this does not always mean that the
- information actually is encrypted. If you need high
- security, you should consult with a security expert.
+ This works under Linux and should work with small
+ modifications under other systems.
</para>
+
+ <warning>
+ <para>
+ If you do not see plaintext data, this does not always
+ mean that the information actually is encrypted. If you
+ need high security, you should consult with a security
+ expert.
+ </para>
+ </warning>
</listitem>
</itemizedlist>
@@ -22286,8 +22291,9 @@
<listitem>
<para>
- Comments start with a <quote><literal>#</literal></quote>
- character and continue to the end of the line.
+ Comments start with a
+ <quote><literal>#</literal></quote> character and
+ continue to the end of the line.
</para>
</listitem>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/refman-5.0/dba-core.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 5, Lines Added: 23, Lines Deleted: 16; 3709 bytes
@@ -3135,10 +3135,10 @@
that is too small to hold temporary tables. This option
accepts several paths that are used in round-robin
fashion. Paths should be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2. If the MySQL server is acting
- as a replication slave, you should not set
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2. If the MySQL server is
+ acting as a replication slave, you should not set
<option>--tmpdir</option> to point to a directory on a
memory-based filesystem or to a directory that is cleared
when the server host restarts. For more information about
@@ -7254,9 +7254,9 @@
tables. This variable can be set to a list of several
paths that are used in round-robin fashion. Paths should
be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2.
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2.
</para>
<para>
@@ -16348,12 +16348,18 @@
</programlisting>
<para>
- (This works under Linux and should work with small
- modifications under other systems.) Warning: If you do not
- see plaintext data, this doesn't always mean that the
- information actually is encrypted. If you need high
- security, you should consult with a security expert.
+ This works under Linux and should work with small
+ modifications under other systems.
</para>
+
+ <warning>
+ <para>
+ If you do not see plaintext data, this does not always
+ mean that the information actually is encrypted. If you
+ need high security, you should consult with a security
+ expert.
+ </para>
+ </warning>
</listitem>
</itemizedlist>
@@ -19387,8 +19393,8 @@
<literal>LIKE</literal> operator. If you want to use either
character literally when granting privileges, you must
escape it with a backslash. For example, to include the
- underscore character (<quote><literal>_</literal></quote>) as
- part of a database name, specify it as
+ underscore character (<quote><literal>_</literal></quote>)
+ as part of a database name, specify it as
<quote><literal>\_</literal></quote> in the
<literal>GRANT</literal> statement.
</para>
@@ -26197,8 +26203,9 @@
<listitem>
<para>
- Comments start with a <quote><literal>#</literal></quote>
- character and continue to the end of the line.
+ Comments start with a
+ <quote><literal>#</literal></quote> character and
+ continue to the end of the line.
</para>
</listitem>
Modified: trunk/refman-5.0/news-5.0.xml
===================================================================
--- trunk/refman-5.0/news-5.0.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/refman-5.0/news-5.0.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 3; 832 bytes
@@ -5828,10 +5828,15 @@
<listitem>
<para>
<literal>NDB Cluster</literal>: A node restart immediately
- following a <literal>CREATE TABLE</literal> would fail.
- <emphasis role="bold">Important</emphasis>: This fix supports
- 2-node Clusters only. (Bug #18385)
+ following a <literal>CREATE TABLE</literal> would fail. (Bug
+ #18385)
</para>
+
+ <important>
+ <para>
+ This fix supports 2-node Clusters only. (Bug #18385)
+ </para>
+ </important>
</listitem>
<listitem>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/refman-5.1/dba-core.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 5; 1113 bytes
@@ -17411,12 +17411,18 @@
</programlisting>
<para>
- (This works under Linux and should work with small
- modifications under other systems.) Warning: If you do not
- see plaintext data, this doesn't always mean that the
- information actually is encrypted. If you need high
- security, you should consult with a security expert.
+ This works under Linux and should work with small
+ modifications under other systems.
</para>
+
+ <warning>
+ <para>
+ If you do not see plaintext data, this does not always
+ mean that the information actually is encrypted. If you
+ need high security, you should consult with a security
+ expert.
+ </para>
+ </warning>
</listitem>
</itemizedlist>
Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml 2007-10-12 19:29:22 UTC (rev 8083)
+++ trunk/refman-5.2/dba-core.xml 2007-10-13 18:42:30 UTC (rev 8084)
Changed blocks: 5, Lines Added: 23, Lines Deleted: 16; 3709 bytes
@@ -3205,10 +3205,10 @@
that is too small to hold temporary tables. This option
accepts several paths that are used in round-robin
fashion. Paths should be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2. If the MySQL server is acting
- as a replication slave, you should not set
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2. If the MySQL server is
+ acting as a replication slave, you should not set
<option>--tmpdir</option> to point to a directory on a
memory-based filesystem or to a directory that is cleared
when the server host restarts. For more information about
@@ -7544,9 +7544,9 @@
tables. This variable can be set to a list of several
paths that are used in round-robin fashion. Paths should
be separated by colon characters
- (<quote><literal>:</literal></quote>) on Unix and semicolon
- characters (<quote><literal>;</literal></quote>) on
- Windows, NetWare, and OS/2.
+ (<quote><literal>:</literal></quote>) on Unix and
+ semicolon characters (<quote><literal>;</literal></quote>)
+ on Windows, NetWare, and OS/2.
</para>
<para>
@@ -17172,12 +17172,18 @@
</programlisting>
<para>
- (This works under Linux and should work with small
- modifications under other systems.) Warning: If you do not
- see plaintext data, this doesn't always mean that the
- information actually is encrypted. If you need high
- security, you should consult with a security expert.
+ This works under Linux and should work with small
+ modifications under other systems.
</para>
+
+ <warning>
+ <para>
+ If you do not see plaintext data, this does not always
+ mean that the information actually is encrypted. If you
+ need high security, you should consult with a security
+ expert.
+ </para>
+ </warning>
</listitem>
</itemizedlist>
@@ -20249,8 +20255,8 @@
<literal>LIKE</literal> operator. If you want to use either
character literally when granting privileges, you must
escape it with a backslash. For example, to include the
- underscore character (<quote><literal>_</literal></quote>) as
- part of a database name, specify it as
+ underscore character (<quote><literal>_</literal></quote>)
+ as part of a database name, specify it as
<quote><literal>\_</literal></quote> in the
<literal>GRANT</literal> statement.
</para>
@@ -27053,8 +27059,9 @@
<listitem>
<para>
- Comments start with a <quote><literal>#</literal></quote>
- character and continue to the end of the line.
+ Comments start with a
+ <quote><literal>#</literal></quote> character and
+ continue to the end of the line.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8084 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 13 Oct |
