svn commit - mysqldoc@docsrva: r12352 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0

[paul.dubois]

Author: paul
Date: 2008-11-08 20:59:19 +0100 (Sat, 08 Nov 2008)
New Revision: 12352

Log:
 r35460@frost:  paul | 2008-11-08 14:00:03 -0500
 Reformat


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/refman-4.1/dba-core.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/sql-syntax-server-administration.xml
   trunk/refman-5.1-maria/sql-syntax-server-administration.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/sql-syntax-server-administration.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/sql-syntax-server-administration.xml
   trunk/refman-6.0/storage-engines.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35459
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34249
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:39854
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35460
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:34249


Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 4; 981 bytes

@@ -16258,10 +16258,10 @@
 
       <para>
         It was possible to execute <literal>CREATE TABLE t1 ... SELECT
-        ... FROM t2</literal> with the <literal
role="priv">CREATE</literal>
-        privilege for <literal>t1</literal> and
-        <literal role="priv">SELECT</literal> privilege for
-        <literal>t2</literal>, even in the absence of the
+        ... FROM t2</literal> with the
+        <literal role="priv">CREATE</literal> privilege for
+        <literal>t1</literal> and <literal
role="priv">SELECT</literal>
+        privilege for <literal>t2</literal>, even in the absence of the
         <literal role="priv">INSERT</literal> privilege for
         <literal>t1</literal>.
       </para>


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 732 bytes

@@ -22378,8 +22378,8 @@
         <para>
           As a result of this fix,
           <literal role="stmt" condition="truncate">TRUNCATE
-          TABLE</literal> now requires the <literal
role="priv">DROP</literal>
-          privilege rather than the
+          TABLE</literal> now requires the
+          <literal role="priv">DROP</literal> privilege rather than the
           <literal role="priv">DELETE</literal> privilege.
         </para>
       </important>


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/refman-4.1/dba-core.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1415 bytes

@@ -13128,10 +13128,9 @@
       </para>
 
       <para>
-        The <literal>GRANT OPTION</literal> privilege enables you
-        to give to other users those privileges that you yourself
-        possess. It can be used for databases, tables, and stored
-        routines.
+        The <literal>GRANT OPTION</literal> privilege enables you to
+        give to other users those privileges that you yourself possess.
+        It can be used for databases, tables, and stored routines.
       </para>
 
       <para>

@@ -13294,11 +13293,10 @@
 
         <listitem>
           <para>
-            The <literal>GRANT OPTION</literal> privilege enables
-            users to give their privileges to other users. Two users
-            that have different privileges and with the
-            <literal>GRANT OPTION</literal> privilege are able to
-            combine privileges.
+            The <literal>GRANT OPTION</literal> privilege enables users
+            to give their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT
+            OPTION</literal> privilege are able to combine privileges.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/refman-5.0/dba-core.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1415 bytes

@@ -14940,10 +14940,9 @@
       </para>
 
       <para>
-        The <literal>GRANT OPTION</literal> privilege enables you
-        to give to other users those privileges that you yourself
-        possess. It can be used for databases, tables, and stored
-        routines.
+        The <literal>GRANT OPTION</literal> privilege enables you to
+        give to other users those privileges that you yourself possess.
+        It can be used for databases, tables, and stored routines.
       </para>
 
       <para>

@@ -15103,11 +15102,10 @@
 
         <listitem>
           <para>
-            The <literal>GRANT OPTION</literal> privilege enables
-            users to give their privileges to other users. Two users
-            that have different privileges and with the
-            <literal>GRANT OPTION</literal> privilege are able to
-            combine privileges.
+            The <literal>GRANT OPTION</literal> privilege enables users
+            to give their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT
+            OPTION</literal> privilege are able to combine privileges.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-server-administration.xml	2008-11-08 19:59:08 UTC (rev
12351)
+++ trunk/refman-5.0/sql-syntax-server-administration.xml	2008-11-08 19:59:19 UTC (rev
12352)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 985 bytes

@@ -521,8 +521,8 @@
           <para>
             The <literal>CREATE ROUTINE</literal>, <literal>ALTER
             ROUTINE</literal>, <literal>EXECUTE</literal>, and
-            <literal role="priv">GRANT OPTION</literal> privileges apply to
-            stored routines (functions and procedures). They can be
+            <literal role="priv">GRANT OPTION</literal> privileges apply
+            to stored routines (functions and procedures). They can be
             granted at the global and database levels. Also, except for
             <literal>CREATE ROUTINE</literal>, these privileges can be
             granted at the routine level for individual routines and are


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/refman-5.1/dba-core.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1415 bytes

@@ -17888,10 +17888,9 @@
       </para>
 
       <para>
-        The <literal>GRANT OPTION</literal> privilege enables you
-        to give to other users those privileges that you yourself
-        possess. It can be used for databases, tables, and stored
-        routines.
+        The <literal>GRANT OPTION</literal> privilege enables you to
+        give to other users those privileges that you yourself possess.
+        It can be used for databases, tables, and stored routines.
       </para>
 
       <para>

@@ -18051,11 +18050,10 @@
 
         <listitem>
           <para>
-            The <literal>GRANT OPTION</literal> privilege enables
-            users to give their privileges to other users. Two users
-            that have different privileges and with the
-            <literal>GRANT OPTION</literal> privilege are able to
-            combine privileges.
+            The <literal>GRANT OPTION</literal> privilege enables users
+            to give their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT
+            OPTION</literal> privilege are able to combine privileges.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-08 19:59:08 UTC (rev
12351)
+++ trunk/refman-5.1/sql-syntax-server-administration.xml	2008-11-08 19:59:19 UTC (rev
12352)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 985 bytes

@@ -469,8 +469,8 @@
           <para>
             The <literal>CREATE ROUTINE</literal>, <literal>ALTER
             ROUTINE</literal>, <literal>EXECUTE</literal>, and
-            <literal role="priv">GRANT OPTION</literal> privileges apply to
-            stored routines (functions and procedures). They can be
+            <literal role="priv">GRANT OPTION</literal> privileges apply
+            to stored routines (functions and procedures). They can be
             granted at the global and database levels. Also, except for
             <literal>CREATE ROUTINE</literal>, these privileges can be
             granted at the routine level for individual routines and are


Modified: trunk/refman-5.1-maria/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-08 19:59:08 UTC
(rev 12351)
+++ trunk/refman-5.1-maria/sql-syntax-server-administration.xml	2008-11-08 19:59:19 UTC
(rev 12352)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 4; 1397 bytes

@@ -469,8 +469,8 @@
           <para>
             The <literal>CREATE ROUTINE</literal>, <literal>ALTER
             ROUTINE</literal>, <literal>EXECUTE</literal>, and
-            <literal role="priv">GRANT OPTION</literal> privileges apply to
-            stored routines (functions and procedures). They can be
+            <literal role="priv">GRANT OPTION</literal> privileges apply
+            to stored routines (functions and procedures). They can be
             granted at the global and database levels. Also, except for
             <literal>CREATE ROUTINE</literal>, these privileges can be
             granted at the routine level for individual routines and are

@@ -3287,8 +3287,8 @@
 
       <para>
         To use <literal role="stmt">INSTALL PLUGIN</literal>, you must
-        have the <literal role="priv">INSERT privilege</literal> privilege
for the
-        <literal>mysql.plugin</literal> table.
+        have the <literal role="priv">INSERT privilege</literal>
+        privilege for the <literal>mysql.plugin</literal> table.
       </para>
 
       <para>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/refman-6.0/dba-core.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1415 bytes

@@ -17887,10 +17887,9 @@
       </para>
 
       <para>
-        The <literal>GRANT OPTION</literal> privilege enables you
-        to give to other users those privileges that you yourself
-        possess. It can be used for databases, tables, and stored
-        routines.
+        The <literal>GRANT OPTION</literal> privilege enables you to
+        give to other users those privileges that you yourself possess.
+        It can be used for databases, tables, and stored routines.
       </para>
 
       <para>

@@ -18050,11 +18049,10 @@
 
         <listitem>
           <para>
-            The <literal>GRANT OPTION</literal> privilege enables
-            users to give their privileges to other users. Two users
-            that have different privileges and with the
-            <literal>GRANT OPTION</literal> privilege are able to
-            combine privileges.
+            The <literal>GRANT OPTION</literal> privilege enables users
+            to give their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT
+            OPTION</literal> privilege are able to combine privileges.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-08 19:59:08 UTC (rev
12351)
+++ trunk/refman-6.0/sql-syntax-server-administration.xml	2008-11-08 19:59:19 UTC (rev
12352)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 985 bytes

@@ -469,8 +469,8 @@
           <para>
             The <literal>CREATE ROUTINE</literal>, <literal>ALTER
             ROUTINE</literal>, <literal>EXECUTE</literal>, and
-            <literal role="priv">GRANT OPTION</literal> privileges apply to
-            stored routines (functions and procedures). They can be
+            <literal role="priv">GRANT OPTION</literal> privileges apply
+            to stored routines (functions and procedures). They can be
             granted at the global and database levels. Also, except for
             <literal>CREATE ROUTINE</literal>, these privileges can be
             granted at the routine level for individual routines and are


Modified: trunk/refman-6.0/storage-engines.xml
===================================================================
--- trunk/refman-6.0/storage-engines.xml	2008-11-08 19:59:08 UTC (rev 12351)
+++ trunk/refman-6.0/storage-engines.xml	2008-11-08 19:59:19 UTC (rev 12352)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 789 bytes

@@ -351,8 +351,8 @@
           To install a pluggable storage engine, the plugin file must be
           located in the MySQL plugin directory, and the user issuing
           the <literal role="stmt">INSTALL PLUGIN</literal> statement
-          must have the <literal role="priv">INSERT</literal> privilege for
-          the <literal>mysql.plugin</literal> table.
+          must have the <literal role="priv">INSERT</literal> privilege
+          for the <literal>mysql.plugin</literal> table.
         </para>
 
       </section>