List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 3:58pm
Subject:svn commit - mysqldoc@docsrva: r1043 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-26 16:58:45 +0100 (Thu, 26 Jan 2006)
New Revision: 1043

Log:
 r2542@kite-hub:  paul | 2006-01-26 09:40:38 -0600
 Eliminate redundant section.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/renamed-nodes.txt
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/renamed-nodes.txt
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/renamed-nodes.txt
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-common/titles.en.ent


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6690
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2535
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6690
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2542

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-4.1/database-administration.xml	2006-01-26 15:58:45 UTC (rev 1043)
@@ -15669,7 +15669,9 @@
         Beginning with version 4.0.0, MySQL has support for secure
         (encrypted) connections between MySQL clients and the server
         using the Secure Sockets Layer (SSL) protocol. This section
-        discusses how to use SSL connections.
+        discusses how to use SSL connections. For information on
+        requiring users to use SSL connections, see
+        <xref linkend="grant"/>.
       </para>
 
       <para>
@@ -16062,184 +16064,6 @@
 
       </section>
 
-      <section id="secure-grant">
-
-        <title>&title-secure-grant;</title>
-
-        <indexterm>
-          <primary>SSL related options</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>REQUIRE GRANT option</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>GRANT statement</primary>
-        </indexterm>
-
-        <para>
-          MySQL can check X509 certificate attributes in addition to the
-          usual authentication that is based on the username and
-          password. To specify SSL-related options for a MySQL account,
-          use the <literal>REQUIRE</literal> clause of the
-          <literal>GRANT</literal> statement. See
-          <xref linkend="grant"/>.
-        </para>
-
-        <para>
-          There are different possibilities for limiting connection
-          types for an account:
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              If an account has no SSL or X509 requirements, unencrypted
-              connections are allowed if the username and password are
-              valid. However, encrypted connections also can be used at
-              the client's option, if the client has the proper
-              certificate and key files.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SSL</literal> option limits the server to
-              allow only SSL encrypted connections for the account. Note
-              that this option can be omitted if there are any ACL
-              records that allow non-SSL connections.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE SSL;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE X509</literal> means that the client must
-              have a valid certificate but that the exact certificate,
-              issuer, and subject do not matter. The only requirement is
-              that it should be possible to verify its signature with
-              one of the CA certificates.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE X509;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE ISSUER 'issuer'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate issued by CA
-              <literal>'issuer'</literal>. If the client presents a
-              certificate that is valid but has a different issuer, the
-              server rejects the connection. Use of X509 certificates
-              always implies encryption, so the <literal>SSL</literal>
-              option is unnecessary.
-            </para>
-
-            <remark role="todo">
-              is not preceding sentence also true for X509, SUBJECT, and
-              CIPHER?
-            </remark>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>ISSUER</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SUBJECT 'subject'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate with subject
-              <literal>'subject'</literal> on it. If the client presents
-              a certificate that is valid but has a different subject,
-              the server rejects the connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>SUBJECT</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE CIPHER 'cipher'</literal> is needed to
-              ensure that strong enough ciphers and key lengths are
-              used. SSL itself can be weak if old algorithms with short
-              encryption keys are used. Using this option, we can ask
-              for some exact cipher method to allow a connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-          </listitem>
-
-        </itemizedlist>
-
-        <para>
-          The <literal>SUBJECT</literal>, <literal>ISSUER</literal>, and
-          <literal>CIPHER</literal> options can be combined in the
-          <literal>REQUIRE</literal> clause like this:
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-
-        <para>
-          Note that the <literal>SUBJECT</literal> and
-          <literal>ISSUER</literal> values each should be entered as a
-          single string.
-        </para>
-
-        <para>
-          Starting from MySQL 4.0.4, the <literal>AND</literal> keyword
-          is optional between <literal>REQUIRE</literal> options.
-        </para>
-
-        <para>
-          The order of the options does not matter, but no option can be
-          specified twice.
-        </para>
-
-      </section>
-
       <section id="ssl-options">
 
         <title>&title-ssl-options;</title>

Modified: trunk/refman-4.1/renamed-nodes.txt
===================================================================
--- trunk/refman-4.1/renamed-nodes.txt	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-4.1/renamed-nodes.txt	2006-01-26 15:58:45 UTC (rev 1043)
@@ -108,3 +108,4 @@
 parentheses operator-precedence
 server-side-scripts server-side-overview
 upgrading-grant-tables mysql-fix-privilege-tables
+secure-grant grant

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-5.0/database-administration.xml	2006-01-26 15:58:45 UTC (rev 1043)
@@ -17838,7 +17838,9 @@
         MySQL supports secure (encrypted) connections between MySQL
         clients and the server using the Secure Sockets Layer (SSL)
         protocol. This section discusses how to use SSL connections. It
-        also describes a way to set up SSH on Windows.
+        also describes a way to set up SSH on Windows. For information
+        on requiring users to use SSL connections, see
+        <xref linkend="grant"/>.
       </para>
 
       <para>
@@ -18366,184 +18368,6 @@
 
       </section>
 
-      <section id="secure-grant">
-
-        <title>&title-secure-grant;</title>
-
-        <indexterm>
-          <primary>SSL related options</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>REQUIRE GRANT option</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>GRANT statement</primary>
-        </indexterm>
-
-        <para>
-          MySQL can check X509 certificate attributes in addition to the
-          usual authentication that is based on the username and
-          password. To specify SSL-related options for a MySQL account,
-          use the <literal>REQUIRE</literal> clause of the
-          <literal>GRANT</literal> statement. See
-          <xref linkend="grant"/>.
-        </para>
-
-        <para>
-          There are different possibilities for limiting connection
-          types for an account:
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              If an account has no SSL or X509 requirements, unencrypted
-              connections are allowed if the username and password are
-              valid. However, encrypted connections also can be used at
-              the client's option, if the client has the proper
-              certificate and key files.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SSL</literal> option limits the server to
-              allow only SSL encrypted connections for the account. Note
-              that this option can be omitted if there are any ACL
-              records that allow non-SSL connections.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE SSL;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE X509</literal> means that the client must
-              have a valid certificate but that the exact certificate,
-              issuer, and subject do not matter. The only requirement is
-              that it should be possible to verify its signature with
-              one of the CA certificates.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE X509;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE ISSUER 'issuer'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate issued by CA
-              <literal>'issuer'</literal>. If the client presents a
-              certificate that is valid but has a different issuer, the
-              server rejects the connection. Use of X509 certificates
-              always implies encryption, so the <literal>SSL</literal>
-              option is unnecessary.
-            </para>
-
-            <remark role="todo">
-              isn't preceding sentence also true for X509, SUBJECT, and
-              CIPHER?
-            </remark>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>ISSUER</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SUBJECT 'subject'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate with subject
-              <literal>'subject'</literal> on it. If the client presents
-              a certificate that is valid but has a different subject,
-              the server rejects the connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>SUBJECT</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE CIPHER 'cipher'</literal> is needed to
-              ensure that strong enough ciphers and key lengths are
-              used. SSL itself can be weak if old algorithms with short
-              encryption keys are used. Using this option, we can ask
-              for some exact cipher method to allow a connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-          </listitem>
-
-        </itemizedlist>
-
-        <para>
-          The <literal>SUBJECT</literal>, <literal>ISSUER</literal>, and
-          <literal>CIPHER</literal> options can be combined in the
-          <literal>REQUIRE</literal> clause like this:
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-
-        <para>
-          Note that the <literal>SUBJECT</literal> and
-          <literal>ISSUER</literal> values each should be entered as a
-          single string.
-        </para>
-
-        <para>
-          In MySQL &current-series;, the <literal>AND</literal> keyword
-          is optional between <literal>REQUIRE</literal> options.
-        </para>
-
-        <para>
-          The order of the options does not matter, but no option can be
-          specified twice.
-        </para>
-
-      </section>
-
       <section id="ssl-options">
 
         <title>&title-ssl-options;</title>

Modified: trunk/refman-5.0/renamed-nodes.txt
===================================================================
--- trunk/refman-5.0/renamed-nodes.txt	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-5.0/renamed-nodes.txt	2006-01-26 15:58:45 UTC (rev 1043)
@@ -406,3 +406,4 @@
 server-side-scripts server-side-overview
 instance-manager-command-line-options instance-manager-command-options
 upgrading-grant-tables mysql-fix-privilege-tables
+secure-grant grant

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-5.1/database-administration.xml	2006-01-26 15:58:45 UTC (rev 1043)
@@ -17851,7 +17851,9 @@
         MySQL supports secure (encrypted) connections between MySQL
         clients and the server using the Secure Sockets Layer (SSL)
         protocol. This section discusses how to use SSL connections. It
-        also describes a way to set up SSH on Windows.
+        also describes a way to set up SSH on Windows. For information
+        on requiring users to use SSL connections, see
+        <xref linkend="grant"/>.
       </para>
 
       <para>
@@ -18379,184 +18381,6 @@
 
       </section>
 
-      <section id="secure-grant">
-
-        <title>&title-secure-grant;</title>
-
-        <indexterm>
-          <primary>SSL related options</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>REQUIRE GRANT option</primary>
-        </indexterm>
-
-        <indexterm type="function">
-          <primary>GRANT statement</primary>
-        </indexterm>
-
-        <para>
-          MySQL can check X509 certificate attributes in addition to the
-          usual authentication that is based on the username and
-          password. To specify SSL-related options for a MySQL account,
-          use the <literal>REQUIRE</literal> clause of the
-          <literal>GRANT</literal> statement. See
-          <xref linkend="grant"/>.
-        </para>
-
-        <para>
-          There are different possibilities for limiting connection
-          types for an account:
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              If an account has no SSL or X509 requirements, unencrypted
-              connections are allowed if the username and password are
-              valid. However, encrypted connections also can be used at
-              the client's option, if the client has the proper
-              certificate and key files.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SSL</literal> option limits the server to
-              allow only SSL encrypted connections for the account. Note
-              that this option can be omitted if there are any ACL
-              records that allow non-SSL connections.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE SSL;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE X509</literal> means that the client must
-              have a valid certificate but that the exact certificate,
-              issuer, and subject do not matter. The only requirement is
-              that it should be possible to verify its signature with
-              one of the CA certificates.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret' REQUIRE X509;</userinput>
-</programlisting>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE ISSUER 'issuer'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate issued by CA
-              <literal>'issuer'</literal>. If the client presents a
-              certificate that is valid but has a different issuer, the
-              server rejects the connection. Use of X509 certificates
-              always implies encryption, so the <literal>SSL</literal>
-              option is unnecessary.
-            </para>
-
-            <remark role="todo">
-              isn't preceding sentence also true for X509, SUBJECT, and
-              CIPHER?
-            </remark>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>ISSUER</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE SUBJECT 'subject'</literal> places the
-              restriction on connection attempts that the client must
-              present a valid X509 certificate with subject
-              <literal>'subject'</literal> on it. If the client presents
-              a certificate that is valid but has a different subject,
-              the server rejects the connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped';
-</programlisting>
-
-            <para>
-              Note that the <literal>SUBJECT</literal> value should be
-              entered as a single string.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>REQUIRE CIPHER 'cipher'</literal> is needed to
-              ensure that strong enough ciphers and key lengths are
-              used. SSL itself can be weak if old algorithms with short
-              encryption keys are used. Using this option, we can ask
-              for some exact cipher method to allow a connection.
-            </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-          </listitem>
-
-        </itemizedlist>
-
-        <para>
-          The <literal>SUBJECT</literal>, <literal>ISSUER</literal>, and
-          <literal>CIPHER</literal> options can be combined in the
-          <literal>REQUIRE</literal> clause like this:
-        </para>
-
-<programlisting>
-mysql&gt; <userinput>GRANT ALL PRIVILEGES ON test.* TO 'root'@'localhost'</userinput>
-    -&gt; <userinput>IDENTIFIED BY 'goodsecret'</userinput>
-    -&gt; <userinput>REQUIRE SUBJECT '/C=EE/ST=Some-State/L=Tallinn/</userinput>
-       O=MySQL demo client certificate/
-       CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND ISSUER '/C=FI/ST=Some-State/L=Helsinki/</userinput>
-       O=MySQL Finland AB/CN=Tonu Samuel/Email=tonu@stripped'
-    -&gt; <userinput>AND CIPHER 'EDH-RSA-DES-CBC3-SHA';</userinput>
-</programlisting>
-
-        <para>
-          Note that the <literal>SUBJECT</literal> and
-          <literal>ISSUER</literal> values each should be entered as a
-          single string.
-        </para>
-
-        <para>
-          In MySQL &current-series;, the <literal>AND</literal> keyword
-          is optional between <literal>REQUIRE</literal> options.
-        </para>
-
-        <para>
-          The order of the options does not matter, but no option can be
-          specified twice.
-        </para>
-
-      </section>
-
       <section id="ssl-options">
 
         <title>&title-ssl-options;</title>

Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-5.1/renamed-nodes.txt	2006-01-26 15:58:45 UTC (rev 1043)
@@ -111,3 +111,4 @@
 instance-manager-command-line-options instance-manager-command-options
 upgrading-grant-tables mysql-fix-privilege-tables
 silent-column-changes ../../5.0/en/silent-column-changes
+secure-grant grant

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-26 15:58:45 UTC (rev 1043)
@@ -13963,13 +13963,6 @@
         used to assign values to user variables or system variables.
       </para>
 
-      <para>
-        Several <literal>SHOW</literal> statements also accept a
-        <literal>WHERE</literal> clause that provides more flexibility
-        in specifying which rows to display. See
-        <xref linkend="extended-show"/>.
-      </para>
-
       <remark role="help-description-end"/>
 
       <para>
@@ -14885,6 +14878,13 @@
         values.
       </para>
 
+      <para>
+        Several <literal>SHOW</literal> statements also accept a
+        <literal>WHERE</literal> clause that provides more flexibility
+        in specifying which rows to display. See
+        <xref linkend="extended-show"/>.
+      </para>
+
       <remark role="help-description-end"/>
 
       <remark role="note">

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-26 04:14:45 UTC (rev 1042)
+++ trunk/refman-common/titles.en.ent	2006-01-26 15:58:45 UTC (rev 1043)
@@ -1476,7 +1476,6 @@
 <!ENTITY title-secure-basics "Basic SSL Concepts">
 <!ENTITY title-secure-connections "Using Secure Connections">
 <!ENTITY title-secure-create-certs "Setting Up SSL Certificates for MySQL">
-<!ENTITY title-secure-grant "SSL <literal>GRANT</literal> Options">
 <!ENTITY title-secure-requirements "Requirements (OpenSSL)">
 <!ENTITY title-secure-using-yassl "Using yaSSL">
 <!ENTITY title-security "General Security Issues">

Thread
svn commit - mysqldoc@docsrva: r1043 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul26 Jan