List:Commits« Previous MessageNext Message »
From:paul Date:January 28 2006 8:55pm
Subject:svn commit - mysqldoc@docsrva: r1085 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-28 21:55:25 +0100 (Sat, 28 Jan 2006)
New Revision: 1085

Log:
 r6820@frost:  paul | 2006-01-28 14:41:46 -0600
 Begin split of GRANT/REVOKE section into separate sections.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/introduction.xml
   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:6817
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6820
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-4.1/database-administration.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -10686,7 +10686,8 @@
         indirectly by using the <literal>GRANT</literal> and
         <literal>REVOKE</literal> statements to set up accounts and
         control the privileges available to each one. See
-        <xref linkend="grant"/>. The discussion here describes the
+        <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>. The discussion here describes the
         underlying structure of the grant tables and how the server uses
         their contents when interacting with clients.
       </para>
@@ -14478,7 +14479,8 @@
         to assign passwords to them. Thereafter, you normally set up,
         modify, and remove MySQL accounts using the
         <literal>GRANT</literal> and <literal>REVOKE</literal>
-        statements. See <xref linkend="grant"/>.
+        statements. See <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>.
       </para>
 
       <para>

Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-4.1/introduction.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -1945,7 +1945,7 @@
             a table are not automatically revoked when you delete a
             table. You must explicitly issue a <literal>REVOKE</literal>
             statement to revoke privileges for a table. For more
-            information, see <xref linkend="grant"/>.
+            information, see <xref linkend="revoke"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -10177,6 +10177,8 @@
 
       <title>&title-account-management-sql;</title>
 
+      <remark role="help-category" condition="Account Management"/>
+
       <para>
         MySQL account information is stored in the tables of the
         <literal>mysql</literal> database. This database and the access
@@ -10351,45 +10353,28 @@
           <primary>GRANT</primary>
         </indexterm>
 
-        <indexterm type="function">
-          <primary>REVOKE</primary>
-        </indexterm>
-
         <indexterm>
           <primary>privileges</primary>
           <secondary>granting</secondary>
         </indexterm>
 
         <indexterm>
-          <primary>privileges</primary>
-          <secondary>revoking</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>global privileges</primary>
         </indexterm>
 
         <indexterm>
-          <primary>revoking</primary>
-          <secondary>privileges</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>granting</primary>
           <secondary>privileges</secondary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="GRANT"/>
 
         <remark role="help-keywords">
-          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT REVOKE ISSUER
-          CIPHER WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR
-          MAX_UPDATES_PER_HOUR MAX_CONNECTIONS_PER_HOUR
-          MAX_USER_CONNECTIONS CLIENT EXECUTE FILE SSL X509 SECURITY
-          USAGE SUPER NONE PROCESS PRIVILEGES REFERENCES RELOAD
-          REPLICATION SHUTDOWN
+          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT ISSUER CIPHER
+          WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR MAX_UPDATES_PER_HOUR
+          MAX_CONNECTIONS_PER_HOUR MAX_USER_CONNECTIONS CLIENT EXECUTE
+          FILE SSL X509 SECURITY USAGE SUPER NONE PROCESS PRIVILEGES
+          REFERENCES RELOAD REPLICATION SHUTDOWN
         </remark>
 
         <remark role="help-syntax-begin"/>
@@ -10414,27 +10399,26 @@
   | MAX_CONNECTIONS_PER_HOUR <replaceable>count</replaceable>
 </programlisting>
 
-<programlisting>
-REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
-    ON {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
-    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
         <remark role="help-syntax-end"/>
 
         <remark role="help-description-begin"/>
 
         <para>
-          The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements enable system administrators to create MySQL user
-          accounts and to grant rights to and revoke them from accounts.
-          <literal>GRANT</literal> and <literal>REVOKE</literal> are
+          The <literal>GRANT</literal>
+          statement enables system administrators to create MySQL user
+          accounts and to grant rights to accounts.
+          <literal>GRANT</literal> is
           implemented in MySQL 3.22.11 or later. For earlier MySQL
-          versions, these statements do nothing.
+          versions, it does nothing.
         </para>
 
+          <para>
+           To use <literal>GRANT</literal>, you must have the
+           <literal>GRANT OPTION</literal> privilege, and you must have
+           the privileges that you are granting.
+         </para>
+
+
         <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
@@ -10538,13 +10522,6 @@
         <remark role="help-description-end"/>
 
         <para>
-          To use <literal>GRANT</literal> or <literal>REVOKE</literal>,
-          you must have the <literal>GRANT OPTION</literal> privilege,
-          and you must have the privileges that you are granting or
-          revoking.
-        </para>
-
-        <para>
           To make it easy to revoke all privileges, MySQL 4.1.2 has
           added the following syntax, which drops all global, database-,
           table-, and column-level privileges for the named users:
@@ -11378,6 +11355,82 @@
 
       </section>
 
+      <section id="revoke">
+
+        <title>&title-revoke;</title>
+
+        <remark role="todo">
+          This section has few useful examples
+        </remark>
+
+        <indexterm type="function">
+          <primary>REVOKE</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>privileges</primary>
+          <secondary>revoking</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>global privileges</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>revoking</primary>
+          <secondary>privileges</secondary>
+        </indexterm>
+
+        <remark role="help-topic" condition="REVOKE"/>
+
+        <remark role="help-keywords">
+          REVOKE ALL PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+<programlisting>
+REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
+    ON {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
+    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          The <literal>REVOKE</literal> statement enables system
+          administrators to revoke privileges from MySQL accounts.
+          <literal>REVOKE</literal> is
+          implemented in MySQL 3.22.11 or later. For earlier MySQL
+          versions, it does nothing.
+        </para>
+
+        <para>
+          To use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <para>
+          If the grant tables hold privilege rows that contain
+          mixed-case database or table names and the
+          <literal>lower_case_table_names</literal> system variable is
+          set to a non-zero value, <literal>REVOKE</literal> cannot be
+          used to revoke these privileges. It will be necessary to
+          manipulate the grant tables directly.
+          (<literal>GRANT</literal> will not create such rows when
+          <literal>lower_case_table_names</literal> is set, but such
+          rows might have been created prior to setting the variable.)
+        </para>
+
+      </section>
+
       <section id="set-password">
 
         <title>&title-set-password;</title>
@@ -11395,8 +11448,6 @@
           <primary>setting passwords</primary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="SET PASSWORD"/>
 
         <remark role="help-syntax"/>
@@ -11478,6 +11529,8 @@
 
       <title>&title-table-maintenance-sql;</title>
 
+      <remark role="help-category" condition="Table Maintenance"/>
+
       <section id="analyze-table">
 
         <title>&title-analyze-table;</title>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.0/database-administration.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -12690,7 +12690,8 @@
         indirectly by using the <literal>GRANT</literal> and
         <literal>REVOKE</literal> statements to set up accounts and
         control the privileges available to each one. See
-        <xref linkend="grant"/>. The discussion here describes the
+        <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>. The discussion here describes the
         underlying structure of the grant tables and how the server uses
         their contents when interacting with clients.
       </para>
@@ -16587,7 +16588,8 @@
         to assign passwords to them. Thereafter, you normally set up,
         modify, and remove MySQL accounts using the
         <literal>GRANT</literal> and <literal>REVOKE</literal>
-        statements. See <xref linkend="grant"/>.
+        statements. See <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.0/introduction.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -1554,7 +1554,7 @@
             a table are not automatically revoked when you delete a
             table. You must explicitly issue a <literal>REVOKE</literal>
             statement to revoke privileges for a table. For more
-            information, see <xref linkend="grant"/>.
+            information, see <xref linkend="revoke"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -11168,6 +11168,8 @@
 
       <title>&title-account-management-sql;</title>
 
+      <remark role="help-category" condition="Account Management"/>
+
       <para>
         MySQL account information is stored in the tables of the
         <literal>mysql</literal> database. This database and the access
@@ -11409,45 +11411,28 @@
           <primary>GRANT</primary>
         </indexterm>
 
-        <indexterm type="function">
-          <primary>REVOKE</primary>
-        </indexterm>
-
         <indexterm>
           <primary>privileges</primary>
           <secondary>granting</secondary>
         </indexterm>
 
         <indexterm>
-          <primary>privileges</primary>
-          <secondary>revoking</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>global privileges</primary>
         </indexterm>
 
         <indexterm>
-          <primary>revoking</primary>
-          <secondary>privileges</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>granting</primary>
           <secondary>privileges</secondary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="GRANT"/>
 
         <remark role="help-keywords">
-          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT REVOKE ISSUER
-          CIPHER WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR
-          MAX_UPDATES_PER_HOUR MAX_CONNECTIONS_PER_HOUR
-          MAX_USER_CONNECTIONS CLIENT EXECUTE FILE SSL X509 SECURITY
-          USAGE SUPER NONE PROCESS PRIVILEGES REFERENCES RELOAD
-          REPLICATION SHUTDOWN
+          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT ISSUER CIPHER
+          WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR MAX_UPDATES_PER_HOUR
+          MAX_CONNECTIONS_PER_HOUR MAX_USER_CONNECTIONS CLIENT EXECUTE
+          FILE SSL X509 SECURITY USAGE SUPER NONE PROCESS PRIVILEGES
+          REFERENCES RELOAD REPLICATION SHUTDOWN
         </remark>
 
         <remark role="help-syntax-begin"/>
@@ -11478,25 +11463,23 @@
   | MAX_USER_CONNECTIONS <replaceable>count</replaceable>
 </programlisting>
 
-<programlisting>
-REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
-    ON [<replaceable>object_type</replaceable>] {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
-    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
         <remark role="help-syntax-end"/>
 
         <remark role="help-description-begin"/>
 
         <para>
-          The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements enable system administrators to create MySQL user
-          accounts and to grant rights to and revoke them from accounts.
+          The <literal>GRANT</literal> statement enables system
+          administrators to create MySQL user accounts and to grant
+          rights to from accounts.
         </para>
 
         <para>
+          To use <literal>GRANT</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are granting.
+        </para>
+
+        <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
           access control system are discussed extensively in
@@ -11625,13 +11608,6 @@
         <remark role="help-description-end"/>
 
         <para>
-          To use <literal>GRANT</literal> or <literal>REVOKE</literal>,
-          you must have the <literal>GRANT OPTION</literal> privilege,
-          and you must have the privileges that you are granting or
-          revoking.
-        </para>
-
-        <para>
           To revoke all privileges, use the following syntax, which
           drops all global, database-, table-, and column-level
           privileges for the named user or users:
@@ -12504,8 +12480,6 @@
           <primary>renaming user accounts</primary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="RENAME USER"/>
 
         <remark role="help-syntax"/>
@@ -12542,6 +12516,79 @@
 
       </section>
 
+      <section id="revoke">
+
+        <title>&title-revoke;</title>
+
+        <remark role="todo">
+          This section has few useful examples
+        </remark>
+
+        <indexterm type="function">
+          <primary>REVOKE</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>privileges</primary>
+          <secondary>revoking</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>global privileges</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>revoking</primary>
+          <secondary>privileges</secondary>
+        </indexterm>
+
+        <remark role="help-topic" condition="REVOKE"/>
+
+        <remark role="help-keywords">
+          REVOKE ALL PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+<programlisting>
+REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
+    ON [<replaceable>object_type</replaceable>] {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
+    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          The <literal>REVOKE</literal> statement enables system
+          administrators to revoke privileges from MySQL accounts.
+        </para>
+
+        <para>
+          To use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <para>
+          If the grant tables hold privilege rows that contain
+          mixed-case database or table names and the
+          <literal>lower_case_table_names</literal> system variable is
+          set to a non-zero value, <literal>REVOKE</literal> cannot be
+          used to revoke these privileges. It will be necessary to
+          manipulate the grant tables directly.
+          (<literal>GRANT</literal> will not create such rows when
+          <literal>lower_case_table_names</literal> is set, but such
+          rows might have been created prior to setting the variable.)
+        </para>
+
+      </section>
+
       <section id="set-password">
 
         <title>&title-set-password;</title>
@@ -12559,8 +12606,6 @@
           <primary>setting passwords</primary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="SET PASSWORD"/>
 
         <remark role="help-syntax"/>
@@ -12641,6 +12686,8 @@
 
       <title>&title-table-maintenance-sql;</title>
 
+      <remark role="help-category" condition="Table Maintenance"/>
+
       <section id="analyze-table">
 
         <title>&title-analyze-table;</title>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.1/database-administration.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -12731,7 +12731,8 @@
         indirectly by using the <literal>GRANT</literal> and
         <literal>REVOKE</literal> statements to set up accounts and
         control the privileges available to each one. See
-        <xref linkend="grant"/>. The discussion here describes the
+        <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>. The discussion here describes the
         underlying structure of the grant tables and how the server uses
         their contents when interacting with clients.
       </para>
@@ -16601,7 +16602,8 @@
         to assign passwords to them. Thereafter, you normally set up,
         modify, and remove MySQL accounts using the
         <literal>GRANT</literal> and <literal>REVOKE</literal>
-        statements. See <xref linkend="grant"/>.
+        statements. See <xref linkend="grant"/>, and
+        <xref linkend="revoke"/>.
       </para>
 
       <para>

Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.1/introduction.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -1313,7 +1313,7 @@
             a table are not automatically revoked when you delete a
             table. You must explicitly issue a <literal>REVOKE</literal>
             statement to revoke privileges for a table. For more
-            information, see <xref linkend="grant"/>.
+            information, see <xref linkend="revoke"/>.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-28 20:55:25 UTC (rev 1085)
@@ -11707,6 +11707,8 @@
 
       <title>&title-account-management-sql;</title>
 
+      <remark role="help-category" condition="Account Management"/>
+
       <para>
         MySQL account information is stored in the tables of the
         <literal>mysql</literal> database. This database and the access
@@ -11895,45 +11897,28 @@
           <primary>GRANT</primary>
         </indexterm>
 
-        <indexterm type="function">
-          <primary>REVOKE</primary>
-        </indexterm>
-
         <indexterm>
           <primary>privileges</primary>
           <secondary>granting</secondary>
         </indexterm>
 
         <indexterm>
-          <primary>privileges</primary>
-          <secondary>revoking</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>global privileges</primary>
         </indexterm>
 
         <indexterm>
-          <primary>revoking</primary>
-          <secondary>privileges</secondary>
-        </indexterm>
-
-        <indexterm>
           <primary>granting</primary>
           <secondary>privileges</secondary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="GRANT"/>
 
         <remark role="help-keywords">
-          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT REVOKE ISSUER
-          CIPHER WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR
-          MAX_UPDATES_PER_HOUR MAX_CONNECTIONS_PER_HOUR
-          MAX_USER_CONNECTIONS CLIENT EXECUTE FILE SSL X509 SECURITY
-          USAGE SUPER NONE PROCESS PRIVILEGES REFERENCES RELOAD
-          REPLICATION SHUTDOWN
+          ALL BY ALTER IDENTIFIED REQUIRE PASSWORD GRANT ISSUER CIPHER
+          WITH SUBJECT OPTION MAX_QUERIES_PER_HOUR MAX_UPDATES_PER_HOUR
+          MAX_CONNECTIONS_PER_HOUR MAX_USER_CONNECTIONS CLIENT EXECUTE
+          FILE SSL X509 SECURITY USAGE SUPER NONE PROCESS PRIVILEGES
+          REFERENCES RELOAD REPLICATION SHUTDOWN
         </remark>
 
         <remark role="help-syntax-begin"/>
@@ -11964,25 +11949,23 @@
   | MAX_USER_CONNECTIONS <replaceable>count</replaceable>
 </programlisting>
 
-<programlisting>
-REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
-    ON [<replaceable>object_type</replaceable>] {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
-    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-
-REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
-</programlisting>
-
         <remark role="help-syntax-end"/>
 
         <remark role="help-description-begin"/>
 
         <para>
-          The <literal>GRANT</literal> and <literal>REVOKE</literal>
-          statements enable system administrators to create MySQL user
-          accounts and to grant rights to and revoke them from accounts.
+          The <literal>GRANT</literal> statement enables system
+          administrators to create MySQL user accounts and to grant
+          rights to from accounts.
         </para>
 
         <para>
+          To use <literal>GRANT</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are granting.
+        </para>
+
+        <para>
           MySQL account information is stored in the tables of the
           <literal>mysql</literal> database. This database and the
           access control system are discussed extensively in
@@ -12111,13 +12094,6 @@
         <remark role="help-description-end"/>
 
         <para>
-          To use <literal>GRANT</literal> or <literal>REVOKE</literal>,
-          you must have the <literal>GRANT OPTION</literal> privilege,
-          and you must have the privileges that you are granting or
-          revoking.
-        </para>
-
-        <para>
           To revoke all privileges, use the following syntax, which
           drops all global, database-, table-, and column-level
           privileges for the named user or users:
@@ -12979,8 +12955,6 @@
           <primary>renaming user accounts</primary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="RENAME USER"/>
 
         <remark role="help-syntax"/>
@@ -13012,6 +12986,79 @@
 
       </section>
 
+      <section id="revoke">
+
+        <title>&title-revoke;</title>
+
+        <remark role="todo">
+          This section has few useful examples
+        </remark>
+
+        <indexterm type="function">
+          <primary>REVOKE</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>privileges</primary>
+          <secondary>revoking</secondary>
+        </indexterm>
+
+        <indexterm>
+          <primary>global privileges</primary>
+        </indexterm>
+
+        <indexterm>
+          <primary>revoking</primary>
+          <secondary>privileges</secondary>
+        </indexterm>
+
+        <remark role="help-topic" condition="REVOKE"/>
+
+        <remark role="help-keywords">
+          REVOKE ALL PRIVILEGES
+        </remark>
+
+        <remark role="help-syntax-begin"/>
+
+<programlisting>
+REVOKE <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)] [, <replaceable>priv_type</replaceable> [(<replaceable>column_list</replaceable>)]] ...
+    ON [<replaceable>object_type</replaceable>] {<replaceable>tbl_name</replaceable> | * | *.* | <replaceable>db_name</replaceable>.*}
+    FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM <replaceable>user</replaceable> [, <replaceable>user</replaceable>] ...
+</programlisting>
+
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
+        <para>
+          The <literal>REVOKE</literal> statement enables system
+          administrators to revoke privileges from MySQL accounts.
+        </para>
+
+        <para>
+          To use <literal>REVOKE</literal>, you must have the
+          <literal>GRANT OPTION</literal> privilege, and you must have
+          the privileges that you are revoking.
+        </para>
+
+        <remark role="help-description-end"/>
+
+        <para>
+          If the grant tables hold privilege rows that contain
+          mixed-case database or table names and the
+          <literal>lower_case_table_names</literal> system variable is
+          set to a non-zero value, <literal>REVOKE</literal> cannot be
+          used to revoke these privileges. It will be necessary to
+          manipulate the grant tables directly.
+          (<literal>GRANT</literal> will not create such rows when
+          <literal>lower_case_table_names</literal> is set, but such
+          rows might have been created prior to setting the variable.)
+        </para>
+
+      </section>
+
       <section id="set-password">
 
         <title>&title-set-password;</title>
@@ -13029,8 +13076,6 @@
           <primary>setting passwords</primary>
         </indexterm>
 
-        <remark role="help-category" condition="Administration"/>
-
         <remark role="help-topic" condition="SET PASSWORD"/>
 
         <remark role="help-syntax"/>
@@ -13111,6 +13156,8 @@
 
       <title>&title-table-maintenance-sql;</title>
 
+      <remark role="help-category" condition="Table Maintenance"/>
+
       <section id="analyze-table">
 
         <title>&title-analyze-table;</title>

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-01-28 20:19:54 UTC (rev 1084)
+++ trunk/refman-common/titles.en.ent	2006-01-28 20:55:25 UTC (rev 1085)
@@ -433,7 +433,7 @@
 <!ENTITY title-gis-wkt-functions "Creating Geometry Values Using WKT Functions">
 <!ENTITY title-gone-away "<literal>MySQL server has gone away</literal>">
 <!ENTITY title-gpl-license "GNU General Public License">
-<!ENTITY title-grant "<literal>GRANT</literal> and <literal>REVOKE</literal> Syntax">
+<!ENTITY title-grant "<literal>GRANT</literal> Syntax">
 <!ENTITY title-group-by-functions "<literal>GROUP BY</literal> (Aggregate) Functions">
 <!ENTITY title-group-by-functions-and-modifiers "Functions and Modifiers for Use with <literal>GROUP BY</literal> Clauses">
 <!ENTITY title-group-by-hidden-fields "<literal>GROUP BY</literal> with Hidden Fields">
@@ -1454,6 +1454,7 @@
 <!ENTITY title-restore-table "<literal>RESTORE TABLE</literal> Syntax">
 <!ENTITY title-restrictions "Feature Restrictions">
 <!ENTITY title-retrieving-data "Retrieving Information from a Table">
+<!ENTITY title-revoke "<literal>REVOKE</literal> Syntax">
 <!ENTITY title-rewriting-subqueries "Rewriting Subqueries as Joins for Earlier MySQL Versions">
 <!ENTITY title-roadmap "MySQL Development Roadmap">
 <!ENTITY title-routine-restrictions "Restrictions on Stored Routines and Triggers">

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