From: plavin
Date: June 26 2007 6:09pm
Subject: svn commit - mysqldoc@docsrva: r6914 - in trunk: administrator gui-common gui-common/images
List-Archive: http://lists.mysql.com/commits/29631
Message-Id: <200706261809.l5QI9U4k023929@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: plavin
Date: 2007-06-26 20:09:27 +0200 (Tue, 26 Jun 2007)
New Revision: 6914

Log:
Changes to user administration

Modified:
   trunk/administrator/administrator.xml
   trunk/administrator/chapter-options-administrator.xml
   trunk/administrator/user-administration.xml
   trunk/gui-common/chapter-options-introduction.xml
   trunk/gui-common/images/options.png


Modified: trunk/administrator/administrator.xml
===================================================================
--- trunk/administrator/administrator.xml	2007-06-26 13:50:43 UTC (rev 6913)
+++ trunk/administrator/administrator.xml	2007-06-26 18:09:27 UTC (rev 6914)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 2; 1259 bytes

@@ -66,6 +66,8 @@
 
   <xi:include href="user-administration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+  <!--xi:include href="health.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->  
+  
   <xi:include href="health.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="server-logs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

@@ -90,6 +92,8 @@
 -->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-introduction.xml"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-options-administrator.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-general.xml"/>
 

@@ -97,8 +101,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-options-editors.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter-options-administrator.xml"/>
-
+    
   </chapter>
 
 <!-- END OPTIONS CHAPTER -->


Modified: trunk/administrator/chapter-options-administrator.xml
===================================================================
--- trunk/administrator/chapter-options-administrator.xml	2007-06-26 13:50:43 UTC (rev 6913)
+++ trunk/administrator/chapter-options-administrator.xml	2007-06-26 18:09:27 UTC (rev 6914)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 700 bytes

@@ -12,7 +12,7 @@
   <para>
     The <literal>Administrator</literal> section allows you to specify
     options that affect the behavior of the &administrator;. The
-    <literal>Administrator</literal> section is divided into three
+    <literal>Administrator</literal> section is divided into four
     sub-sections that will be discussed further in the sections that
     follow.
   </para>


Modified: trunk/administrator/user-administration.xml
===================================================================
--- trunk/administrator/user-administration.xml	2007-06-26 13:50:43 UTC (rev 6913)
+++ trunk/administrator/user-administration.xml	2007-06-26 18:09:27 UTC (rev 6914)
Changed blocks: 2, Lines Added: 63, Lines Deleted: 5; 2147 bytes

@@ -141,9 +141,11 @@
           Information</link> tab. This command is useful for creating
           users with identical privileges.
 
-          <remark>
-            [SH] Not yet implemented.
-          </remark>
+          <note>
+            <para>
+              Cloning is only available on Windows.
+            </para>
+          </note>
         </para>
       </listitem>
 

@@ -542,6 +544,62 @@
    For more information about limiting user administrator, see <xref linkend="user-administrator"/>
  	</para>
  </section> Resources 
- -->
-
+-->
+  <section id="administrator-resources">
+    
+    <title>Resources</title>
+    
+    <para>
+      This tab allows you to limit a user's resources.
+      You may set limits for the following items:
+    </para>
+    
+    
+    <itemizedlist>
+      
+      <listitem>
+        <para>
+          <guilabel>max_questions</guilabel> &ndash; 
+          The number of questions allowed
+           per hour
+        </para>
+      </listitem>
+      
+      <listitem>
+        <para>
+          <guilabel>max_update</guilabel> &ndash; 
+          The number of updates allowed per hour
+        </para>
+      </listitem>
+      
+      <listitem>
+        <para>
+          <guilabel>max_connections</guilabel> &ndash; 
+          The number of connections allowed per hour
+        </para>
+      </listitem>
+      
+      <listitem>
+        <para>
+          <guilabel>max_user_connections</guilabel> 
+          The number of simultaneous
+          connections allowed
+        </para>
+        
+        <para>
+          <emphasis role="bold">Note</emphasis>: This option
+          is only available under Windows
+        </para>
+      </listitem>
+      
+    </itemizedlist>
+    
+    <para>
+      The default value for each of these settings is <literal>0</literal>,
+      indicating no restrictions whatsoever.
+    </para>
+    
+  </section>
+  
+  
 </chapter>


Modified: trunk/gui-common/chapter-options-introduction.xml
===================================================================
--- trunk/gui-common/chapter-options-introduction.xml	2007-06-26 13:50:43 UTC (rev 6913)
+++ trunk/gui-common/chapter-options-introduction.xml	2007-06-26 18:09:27 UTC (rev 6914)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 781 bytes

@@ -48,7 +48,13 @@
 
   <para>
     In the sidebar of the dialog, you can select the section you wish to
-    configure. There are three action buttons in the lower right corner
+    configure. These options are <literal>Administrator</literal>,
+    <literal>General Options</literal>, <literal>Connections</literal>,
+    and, on Windows only, <literal>Editors</literal>.
+  </para>
+  
+  <para>
+    There are three action buttons in the lower right corner
     of the window:
   </para>
 


Modified: trunk/gui-common/images/options.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 133 bytes