List:Commits« Previous MessageNext Message »
From:plavin Date:February 7 2007 12:55am
Subject:svn commit - mysqldoc@docsrva: r4835 - trunk/administrator
View as plain text  
Author: plavin
Date: 2007-02-07 00:55:31 +0100 (Wed, 07 Feb 2007)
New Revision: 4835

Log:
Quick run through to correct errors noticed earlier and to change <literal> tags

Modified:
   trunk/administrator/backup.xml
   trunk/administrator/catalogs.xml
   trunk/administrator/chapter-options-administrator.xml
   trunk/administrator/connection-dialog.xml
   trunk/administrator/health.xml
   trunk/administrator/main-window.xml
   trunk/administrator/replication-status.xml
   trunk/administrator/restore.xml
   trunk/administrator/server-connections.xml
   trunk/administrator/server-information.xml
   trunk/administrator/server-logs.xml
   trunk/administrator/service-control.xml
   trunk/administrator/startup-variables.xml
   trunk/administrator/tray-monitor.xml
   trunk/administrator/user-administration.xml
   trunk/administrator/xml-files.xml


Modified: trunk/administrator/backup.xml
===================================================================
--- trunk/administrator/backup.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/backup.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 11, Lines Added: 38, Lines Deleted: 32; 8937 bytes

@@ -72,7 +72,7 @@
     <title>Backup Project</title>
 
     <para>
-      The <literal>Backup Project</literal> tab allows you to set the
+      The <guilabel>Backup Project</guilabel> tab allows you to set the
       name of your backup project and also determine what data will be
       backed up.
     </para>

@@ -80,7 +80,7 @@
     <para>
       You can name your project by filling out a name in the
       <guilabel>Project Name</guilabel> field. If you have enabled the
-      <literal>Add Date/Time to Backup Files</literal> option in the
+      <guilabel>Add Date/Time to Backup Files</guilabel> option in the
       <literal>Administrator Options</literal> dialog then the date and
       time of the backup will be appended to the project name
       automatically. See

@@ -112,7 +112,7 @@
     <title>Advanced Options</title>
 
     <para>
-      The <literal>Advanced Options</literal> tab allows you to
+      The <guilabel>Advanced Options</guilabel> tab allows you to
       configure advanced options that affect the way the backup
       operation behaves. These include concurrency controls, backup
       type, and output formatting.

@@ -126,34 +126,40 @@
         The <literal>Backup Execution Method</literal> affects
         concurrency within the backup itself.
       </para>
+      
+      <para>
+        <guilabel>InnoDb Online Backup</guilabel> will begin a transaction
+          before reading from the tables. Because of the InnoDB versioning
+          system this will allow all tables to be read in a consistent
+          state. This method is recommended when backing up InnoDB tables.
+      </para>
 
       <para>
-        <literal>Lock all tables</literal> will cause all tables within
+        <guilabel>Lock all tables</guilabel> will cause all tables within
         the backup to be locked simultaneously to prevent writing. This
         will prevent users from writing to the tables during the backup
         operation and will ensure that the tables are in a consistent
         state. This option is recommended for MyISAM tables.
-      </para>
+      </para>      
 
       <para>
-        <literal>Single transaction</literal> will begin a transaction
-        before reading from the tables. Because of the InnoDB versioning
-        system this will allow all tables to be read in a consistent
-        state. This method is recommended when backing up InnoDB tables.
-      </para>
-
-      <para>
-        <literal>Normal Backup</literal> will lock each table
+        <guilabel>Normal Backup</guilabel> will lock each table
         individually when performing the backup. While this can have
         less impact on the actions of users during the backup operation,
         these is a potential for tables to be backed up in an
         inconsistent state in relation to one another. This method is
         not recommended unless the risk of inconsistency is minimal.
       </para>
+      
+      <para>
+        <guilabel>Online with binlog pos</guilabel> is the same as
+        <literal>InnoDb Online Backup</literal> but also logs the 
+        current position within the binary log.
+      </para>
 
       <para>
-        <literal>Complete Backup</literal> overrides the table selection
-        made in the <literal>Backup Project</literal> tab and backs up
+        <guilabel>Complete Backup</guilabel> overrides the table selection
+        made in the <guilabel>Backup Project</guilabel> tab and backs up
         all tables in the selected schema. This option can be useful
         when scheduling the backup of a schema that changes regularly.
       </para>

@@ -167,7 +173,7 @@
       <title>Output File Options</title>
 
       <para>
-        The <literal>Output File Options</literal> control the
+        The <guilabel>Output File Options</guilabel> section controls the
         formatting of the backup file. At present there is only one
         <literal>Backup Type</literal> available, the <literal>SQL
         Files</literal> format, which outputs a file similar to the

@@ -175,14 +181,14 @@
       </para>
 
       <para>
-        <literal>No CREATEs</literal> will supress <literal>CREATE
+        <guilabel>No CREATEs</guilabel> will suppress <literal>CREATE
         DATABASE</literal> statements. This can be useful if you need to
         restore the data to a different database than it was backed up
         from.
       </para>
 
       <para>
-        <literal>No EXTENDED INSERTS</literal> will supress the default
+        <guilabel>No EXTENDED INSERTS</guilabel> will supress the default
         behavior of combining multiple inserts into a single statement
         (for example <literal>INSERT INTO test VALUES ('1',Some
         data',2234),('2','Some More Data',23444)</literal>). While the

@@ -192,12 +198,12 @@
       </para>
 
       <para>
-        <literal>Add DROP Statements</literal> adds <literal>DROP TABLE
+        <guilabel>Add DROP Statements</guilabel> adds <literal>DROP
TABLE
         IF EXISTS</literal> statements to the backup file.
       </para>
 
       <para>
-        <literal>Complete INSERTs</literal> will produce full
+        <guilabel>Complete INSERTs</guilabel> will produce full
         <literal>INSERT</literal> statements that include a column list
         (i.e. <literal>INSERT INTO tablename(columnA, columnB)
         VALUES(valueA, valueB)</literal>). Without this option the

@@ -205,32 +211,32 @@
       </para>
 
       <para>
-        <literal>Comment</literal> writes additional backup information
+        <guilabel>Comment</guilabel> writes additional backup information
         to the backup file in the form of SQL comments.
       </para>
 
       <para>
-        <literal>Fully Qualified Identifiers</literal> causes
&administrator;
+        <guilabel>Fully Qualified Identifiers</guilabel> causes
&administrator;
         to write statements in the format,
<literal>schema_name.table_name</literal>, 
         instead of writing only the object name. (Under Linux this
-        check box is labeled <literal>Don't write full path</literal>.)
+        check box is labeled <guilabel>Don't write full path</guilabel>.)
         Don't check this option if you plan to restore your database
         objects to a different database.
       </para>
 
       <para>
-        <literal>Compatibility mode</literal> creates backup files that
+        <guilabel>Compatibility mode</guilabel> creates backup files that
         are compatible with older versions of &administrator;.
       </para>
 
       <para>
-        <literal>ANSI Quotes</literal> will cause all table and database
+        <guilabel>ANSI Quotes</guilabel> will cause all table and database
         names to be quoted with ANSI style double quotes instead of
         backticks.
       </para>
 
       <para>
-        <literal>Disable keys</literal> will add an <literal>ALTER
TABLE
+        <guilabel>Disable keys</guilabel> will add an <literal>ALTER
TABLE
         ... DISABLE KEYS</literal> statement to the backup file before
         the <literal>INSERT</literal> statements that populate the
         tables. This allows for faster recovery by loading all data

@@ -250,7 +256,7 @@
     <title>Schedule</title>
 
     <para>
-      The <literal>Schedule</literal> tab. is used to execute backup
+      The <guilabel>Schedule</guilabel> tab. is used to execute backup
       operations on a daily, weekly, or monthly basis.
     </para>
     

@@ -280,9 +286,9 @@
     </para>
 
     <para>
-      If you have enabled the <literal>Add Date/Time to Backup
-      Files</literal> option in the <literal>Administrator
-      Options</literal> dialogue, then the date and time of the backup
+      If you have enabled the <guilabel>Add Date/Time to Backup
+      Files</guilabel> option in the <literal>Administrator
+      Options</literal> dialog, then the date and time of the backup
       will be appended to the file name automatically. See
       <xref linkend="mysql-gui-options-administrator-backup" /> for more
       information on setting this option.

@@ -292,12 +298,12 @@
       Once you have decided on a file name and target directory, you can
       set the interval of the backup operation. Regardless of your
       choice of daily, weekly, or monthly backups, you can set the time
-      that the backup will occur by setting the <literal>Time</literal>
+      that the backup will occur by setting the <guilabel>Time</guilabel>
       option. Set the backup time in a 24 hour format (i.e. 23:30).
     </para>
 
     <para>
-      When you select the <literal>Execute Backup Weekly</literal>
+      When you select the <guilabel>Execute Backup Weekly</guilabel>
       option, a set of check boxes representing the days of the week
       will be displayed. Check the boxes corresponding to the days when
       you want to perform backups.


Modified: trunk/administrator/catalogs.xml
===================================================================
--- trunk/administrator/catalogs.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/catalogs.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 6, Lines Added: 9, Lines Deleted: 9; 3321 bytes

@@ -44,8 +44,8 @@
       Select the database that you wish to view. Right click on any
       database and choose the <guimenu>Refresh Schemata List</guimenu>
       option to refresh the database list. Clicking on a database will
-      cause the <literal>Schema Tables</literal> and <literal>Schema
-      Indices</literal> tabs to be populated with the tables and indexes
+      cause the <guilabel>Schema Tables</guilabel> and <guilabel>Schema
+      Indices</guilabel> tabs to be populated with the tables and indexes
       of the selected database.
     </para>
 

@@ -63,18 +63,18 @@
     <title>Schema Tables</title>
 
     <para>
-      The <literal>Schema Tables</literal> tab lists the different
+      The <guilabel>Schema Tables</guilabel> tab lists the different
       tables in the selected database, along with the rowcount, data
       length, and index length for those tables. For MyISAM tables, you
       also find the date and time when the table was last modified,
-      under <literal>Update Time</literal>. You can update the list of
+      under <guilabel>Update Time</guilabel>. You can update the list of
       tables by pressing the <guibutton>Refresh</guibutton> button.
     </para>
 
     <para>
       The tables are ordered by table name initially, but you may change
       that sorting by clicking on the appropriate headings
-      (<literal>Type</literal>, <literal>Row Format</literal>,
etc.).
+      (<guilabel>Type</guilabel>, <guilabel>Row
Format</guilabel>, etc.).
     </para>
 
     <para>

@@ -118,7 +118,7 @@
 
       <listitem>
         <para>
-          <literal>Optimize Table</literal>: This corresponds to the
+          <guimenu>Optimize Table</guimenu>: This corresponds to the
           <literal>OPTIMIZE TABLE</literal> SQL command and should be
           used if you have deleted a large part of a table or if you
           have made many changes to a table with variable-length rows

@@ -135,7 +135,7 @@
 
       <listitem>
         <para>
-          <literal>Check Table</literal>: This corresponds to the
+          <guimenu>Check Table</guimenu>: This corresponds to the
           <literal>CHECK TABLE</literal> SQL command and is used to
           diagnose table problems. For more information see
           <xref linkend="check-table"/>.

@@ -144,7 +144,7 @@
 
       <listitem>
         <para>
-          <literal>Repair Table</literal>: This corresponds to the
+          <guimenu>Repair Table</guimenu>: This corresponds to the
           <literal>REPAIR TABLE</literal> SQL command and should be used
           in case of table problems. Note that this command works for
           MyISAM tables only. For more information see

@@ -201,7 +201,7 @@
     <title>Schema Indexes</title>
 
     <para>
-      The <literal>Schema Indices</literal> tab lists the indexes of the
+      The <guilabel>Schema Indices</guilabel> tab lists the indexes of the
       selected database. Besides the index names and the table the index
       belongs to, you can also see the index type, whether values are
       unique, and whether NULL values are allowed. You can also get this


Modified: trunk/administrator/chapter-options-administrator.xml
===================================================================
--- trunk/administrator/chapter-options-administrator.xml	2007-02-06 20:48:16 UTC (rev
4834)
+++ trunk/administrator/chapter-options-administrator.xml	2007-02-06 23:55:31 UTC (rev
4835)
Changed blocks: 6, Lines Added: 9, Lines Deleted: 9; 3233 bytes

@@ -33,7 +33,7 @@
 
       <listitem>
         <para>
-          <literal>Show Global Privileges</literal>: If checked, the
+          <guilabel>Show Global Privileges</guilabel>: If checked, the
           <link
linkend="mysql-administrator-user-administration-global-privileges">Global
           Privileges</link> tab will be visible in the
           <link linkend="mysql-administrator-user-administration">User

@@ -51,7 +51,7 @@
 
       <listitem>
         <para>
-          <literal>Show Table/Column Privileges</literal>: In most
+          <guilabel>Show Table/Column Privileges</guilabel>: In most
           situations, it is sufficient to grant either global or
           database privileges for users. You can hide the
           <link
linkend="mysql-administrator-user-administration-table-column-privileges">Table/Column

@@ -81,7 +81,7 @@
 
       <listitem>
         <para>
-          <literal>Use Peak Level Indicator</literal>: This will display
+          <guilabel>Use Peak Level Indicator</guilabel>: This will display
           a thin yellow line on the health graphs indicating the highest
           value recorded by the graph.
         </para>

@@ -89,13 +89,13 @@
 
       <listitem>
         <para>
-          <literal>Reset peak Level after a number of ticks</literal>:
+          <guilabel>Reset Peak Level after a number of ticks</guilabel>:
           If this box is not checked, the <literal>Peak Level
           Indicator</literal> will be permanently positioned at the
           highest value ever recorded on the health graph. With this box
           checked, the <literal>Peak Value Indicator</literal> will be
-          reset after a period of time indicated by the <literal>Time
-          after the Peak level resets</literal> option. Use this option
+          reset after a period of time indicated by the <guilabel>Time
+          after the Peak level resets</guilabel> option. Use this option
           if you would like to know the peak level over an interval
           rather than the peak level overall.
         </para>

@@ -103,8 +103,8 @@
 
       <listitem>
         <para>
-          <literal>Time after the Peak level resets</literal>: When the
-          <literal>Reset peak Level after a number of ticks</literal>
+          <guilabel>Ticks after the Peak level resets</guilabel>: When the
+          <guilabel>Reset Peak Level after a number of ticks</guilabel>
           option is set, this determines the amount of time (in ticks)
           that will pass before the <literal>Peak Level
           Indicator</literal> will be reset.

@@ -130,7 +130,7 @@
 
       <listitem>
         <para>
-          <literal>Add Date/Time to Backup Files</literal>: This
+          <guilabel>Add Date/Time to Backup Files</guilabel>: This
           determines whether the date and time of the backup operation
           are added to the name of the backup file. See
           <link linkend="mysql-administrator-backup">the backup


Modified: trunk/administrator/connection-dialog.xml
===================================================================
--- trunk/administrator/connection-dialog.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/connection-dialog.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 6; 2726 bytes

@@ -62,7 +62,7 @@
       for future connections (see the section that describes
       <link linkend="mysql-gui-appendix-store-connections">how
       &administrator; stores connection information</link>). The
-      <literal>Password</literal> field, however, will always be empty:
+      <guilabel>Password</guilabel> field, however, will always be empty:
       For security reasons, the password is not stored along with the
       other options, unless you explicitly specify otherwise in the
       <link linkend="mysql-gui-options-general-options">General Options

@@ -79,11 +79,11 @@
       However, the preferred method for changing a profile is to click
       the <guibutton>...</guibutton> button next to the
       <guilabel>Connection</guilabel> drop-down box. That brings up an
-      <literal>Options</literal> dialog window that has a
-      <literal>Connections</literal> section for modifying connection
+      <guilabel>Options</guilabel> dialog window that has a
+      <guilabel>Connections</guilabel> section for modifying connection
       profiles. You can find the values you can set in the Connection
       dialog window in the description of the
-      <literal>Connections</literal> section of the
+      <guilabel>Connections</guilabel> section of the
       <literal>Options</literal> dialog (see
       <link linkend="mysql-gui-options-connections">Options
       dialog</link>).

@@ -179,7 +179,7 @@
     </figure>
 
     <para>
-      Under <literal>Installed Services</literal> in the
+      Under <guilabel>Installed Services</guilabel> in the
       <link linkend="mysql-administrator-sidebar">sidebar</link>, you
       can select the service that you wish to configure, or the server
       that you want to stop or start. In configure-service mode, not all

@@ -206,11 +206,22 @@
           server startup.
         </para>
       </listitem>
+      
+      <listitem>
+        <para>
+          The
+          <link linkend="mysql-administrator-server-logs-introduction">Server
+            Logs</link> section allows you to examine the server logs.
+          Note: You do not need to connect in configure-service mode to
+          examine the server logs. This option is available when you
+          connect to a specific server instance.
+        </para>
+      </listitem>
 
     </itemizedlist>
 
     <para>
-      Both of those sections are described in what follows.
+      All of these sections are described in what follows.
     </para>
 
   </section>


Modified: trunk/administrator/health.xml
===================================================================
--- trunk/administrator/health.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/health.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2724 bytes

@@ -58,7 +58,7 @@
 
       <listitem>
         <para>
-          <literal>Connection Usage</literal>: Displays a percentage of
+          <guilabel>Connection Usage</guilabel>: Displays a percentage of
           the maximum number of simultaneous clients allowed
           (<literal>threads connected</literal> /
           <literal>max_connections</literal>). If this value gets close

@@ -75,7 +75,7 @@
 
       <listitem>
         <para>
-          <literal>Traffic</literal>: This is a representation of the
+          <guilabel>Traffic</guilabel>: This is a representation of the
           <literal>bytes_sent</literal> status variable. This does not
           represent total bytes sent since server startup, but instead
           represents the current number of bytes sent (the

@@ -87,7 +87,7 @@
 
       <listitem>
         <para>
-          <literal>Number of SQL Queries</literal>: This is a
+          <guilabel>Number of SQL Queries</guilabel>: This is a
           representation os the <literal>com_select</literal> status
           variable. This does not represent total queries since server
           startup, but instead represents the current number of queries

@@ -119,7 +119,7 @@
 
       <listitem>
         <para>
-          <literal>Query Cache Hitrate</literal>: When in use, the query
+          <guilabel>Query Cache Hitrate</guilabel>: When in use, the query
           cache of the MySQL server stores the text of a
           <literal>SELECT</literal> query together with the
           corresponding result that was sent to the client. If an

@@ -135,7 +135,7 @@
 
       <listitem>
         <para>
-          <literal>Key Efficiency</literal>: The horizontal bar graph
+          <guilabel>Key Efficiency</guilabel>: The horizontal bar graph
           indicates how much of the allocated key buffer is in use. If a
           fairly large percentage of the key buffer is in use you may
           wish to increase the <literal>key_cache_size</literal> setting

@@ -250,8 +250,8 @@
   </programlisting>
 
     <para>
-      After creating your formula, select the <literal>Value
-      Unit</literal> that best represents your data. You can choose from
+      After creating your formula, select the <guilabel>Value
+      Unit</guilabel> that best represents your data. You can choose from
       <literal>Percentage</literal>, <literal>Count</literal>,
       <literal>Byte</literal>, and <literal>Seconds</literal>. In
our
       examples we would use <literal>Percentage</literal> for the first


Modified: trunk/administrator/main-window.xml
===================================================================
--- trunk/administrator/main-window.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/main-window.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 2015 bytes

@@ -271,11 +271,11 @@
           <link 
 linkend="mysql-gui-options-connections">Connections
           section</link> preselected. Furthermore, a new connection
-          profile labeled <literal>New Connection</literal> is created,
-          which is also preselected. The fields are filled with the
+          profile labeled <guilabel>New Connection</guilabel> is created,
+          and it is also preselected. The fields are filled with the
           values of the most recent connection. You can edit the values
           and save the settings in the new profile. You may also want to
-          rename the profile from <literal>New Connection</literal> to
+          rename the profile from <guilabel>New Connection</guilabel> to
           something more appropriate. If you click the
           <guibutton>Close</guibutton> button without saving your
           changes using the <guibutton>Apply Changes</guibutton> button,

@@ -366,10 +366,10 @@
         <para>
           This menu item is available only if &administrator; finds the
           executable file for the MySQL client. At the moment, it
-          searches locations such as <literal>C:\mysql\bin</literal>,
-          <literal>D:\mysql\bin</literal>, and
-          <literal>C:\<replaceable>program
-          directory</replaceable>\mysql\bin</literal> to find
+          searches locations such as <filename>C:\mysql\bin</filename>,
+          <filename>D:\mysql\bin</filename>, and
+          <filename>C:\<replaceable>program
+          directory</replaceable>\mysql\bin</filename> to find
           <literal>mysql.exe</literal>. If the executable file is found,
           you can start the command-line client with this command.
           &administrator; will use the credentials provided in the


Modified: trunk/administrator/replication-status.xml
===================================================================
--- trunk/administrator/replication-status.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/replication-status.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 4, Lines Added: 7, Lines Deleted: 7; 2347 bytes

@@ -16,7 +16,7 @@
     <title>Introduction</title>
 
     <para>
-      The <literal>Replication Status</literal> sections give you a
+      The <guilabel>Replication Status</guilabel> sections give you a
       visual overview of your MySQL replication master and slaves. The
       server status icons beside each machine tells you which slave
       machines are connected to the master and which ones are offline.

@@ -29,7 +29,7 @@
     <title>Configuring Replication Servers</title>
 
     <para>
-      To use the <literal>Replication Status</literal> section you must
+      To use the <guilabel>Replication Status</guilabel> section you must
       be connected to the server that acts as the master in your
       replication scheme. Your MySQL servers must be version 4 or higher
       to use this feature.

@@ -45,8 +45,8 @@
     </para>
 
     <para>
-      You can also set the value in the <literal>Replication</literal>
-      tab of the <literal>Startup Variables</literal> section of
+      You can also set the value in the <guilabel>Replication</guilabel>
+      tab of the <guilabel>Startup Variables</guilabel> section of
       &administrator;.
     </para>
 

@@ -77,21 +77,21 @@
     </figure>
 
     <para>
-      All servers are listed under the <literal>Hostname</literal>
+      All servers are listed under the <guilabel>Hostname</guilabel>
       column, along with their server ID, Port, and current status.
     </para>
 
     <para>
       New servers that are not currently being monitored will have an
       exclamation mark as their status symbol, and will be listed as a
-      <literal>New Instance</literal> in the
<literal>Status</literal>
+      <literal>New Instance</literal> in the
<guilabel>Status</guilabel>
       column of their entry.
     </para>
 
     <para>
       Servers that are currently being monitored and are online will
       have a green status icon and will be listed as
-      <literal>Available</literal> in the
<literal>Status</literal>
+      <literal>Available</literal> in the
<guilabel>Status</guilabel>
       column of their entry.
     </para>
 


Modified: trunk/administrator/restore.xml
===================================================================
--- trunk/administrator/restore.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/restore.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 8, Lines Added: 12, Lines Deleted: 12; 3636 bytes

@@ -17,7 +17,7 @@
     <title>Introduction</title>
 
     <para>
-      The <literal>Restore</literal> section helps with disaster recover
+      The <guilabel>Restore</guilabel> section helps with disaster recover
       by helping you restore backup files created using &administrator;.
       See <xref linkend="mysql-administrator-backup" /> for more
       information on creating backups with &administrator;.

@@ -60,7 +60,7 @@
 
       <listitem>
         <para>
-          <literal>File to restore</literal>: Specify the path and
+          <guilabel>File to restore</guilabel>: Specify the path and
           filename of the backup file. You can browse for that file by
           clicking the <guibutton>Open Backup File</guibutton> button.
         </para>

@@ -68,10 +68,10 @@
 
       <listitem>
         <para>
-          <literal>Target Schema</literal>: You can choose the
-          <literal>Original Schema</literal> option to have all tables
+          <guilabel>Target Schema</guilabel>: You can choose the
+          <guimenu>Original Schema</guimenu> option to have all tables
           restored into their original databases. You can also choose
-          the <literal>New Schema &hellip;</literal> option to restore
+          the <guimenu>New Schema ...</guimenu> option to restore
           all tables into a new database. Finally you can choose from
           one of the existing databases in the drop-down list to force
           all tables to be restored to that database.

@@ -80,8 +80,8 @@
 
       <listitem>
         <para>
-          <literal>Backup Type</literal>: At the moment, the only
-          available option is <literal>SQL Files</literal>. Those are
+          <guilabel>Backup Type</guilabel>: At the moment, the only
+          available option is <guimenu>SQL Files</guimenu>. Those are
           backup files containing SQL statements such as those produced
           by <literal>mysqldump</literal>.
         </para>

@@ -89,7 +89,7 @@
 
       <listitem>
         <para>
-          <literal>Ignore Errors</literal>:
+          <guilabel>Ignore Errors</guilabel>:
           Selecting this option allows a user
           to continue with the restore operation even if errors are encountered.
           However, results are not likely to be 100% correct. 

@@ -98,7 +98,7 @@
 
       <listitem>
         <para>
-          <literal>Create database(s) if they don't exist</literal>: If
+          <guilabel>Create database(s) if they don't exist</guilabel>: If
           a non-existent database is referenced it will automatically be
           created if this option is checked.
         </para>

@@ -106,7 +106,7 @@
 
       <listitem>
         <para>
-          <literal>File Charset</literal>: Backup files created with
+          <guilabel>File Charset</guilabel>: Backup files created with
           &administrator; are encoded in the <literal>utf8</literal>
           character set. Backup files created with other tools such as
           <literal>winmysqladmin</literal> may be encoded with other

@@ -134,8 +134,8 @@
 
     <para>
       If you do not wish to restore all the databases or tables listed
-      within your backup file, you can use the <literal>Restore
-      Content</literal> tab to limit which databases and tables are
+      within your backup file, you can use the <guilabel>Restore
+      Content</guilabel> tab to limit which databases and tables are
       restored.
     </para>
 


Modified: trunk/administrator/server-connections.xml
===================================================================
--- trunk/administrator/server-connections.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/server-connections.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 10; 2427 bytes

@@ -54,7 +54,7 @@
       (threads). By default, threads are sorted by their
       <literal>PID</literal> (MySQL process identification number), but
       you can change that order by clicking on the appropriate headings
-      (<literal>User</literal>, <literal>Host</literal>, etc.).
+      (<guilabel>User</guilabel>, <guilabel>Host</guilabel>,
etc.).
 
       <remark>
         [SH] This is not implemented yet.

@@ -98,19 +98,19 @@
          
linkend="mysql-administrator-server-connections-threads">Threads</link>
       tab does: You will see users rather than individual threads. The
       number of connections for each user is listed under
-      <literal>Num.</literal>. Right-clicking on a username and
-      selecting <guimenu>Show User Info</guimenu> displays the
-      <literal>Full Name</literal> and the
-      <literal>Description</literal>, as specified in the <literal>User
-      Information</literal> tab of the
+      <guilabel>Num.</guilabel>. Right-clicking on a username and
+      selecting <guimenu>Show User Infos</guimenu> displays the
+      <guilabel>Full Name</guilabel> and the
+      <guilabel>Description</guilabel>, as specified in the
<guilabel>User
+      Information</guilabel> tab of the
       <link 
           linkend="mysql-administrator-user-administration-user-information"
           >User
       Administration</link> section. Initially, users are sorted by
       their MySQL <literal>Username</literal>, but you can change the
-      order by clicking on the appropriate headings
-      (<literal>Num.</literal>, <literal>Full Name</literal>, or
-      <literal>Description</literal>).
+      order by clicking on the headings
+      (<guilabel>Num.</guilabel>, <guilabel>Full Name</guilabel>,
or
+      <guilabel>Description</guilabel>).
 
       <remark>
         [SH] Not implemented yet.

@@ -118,7 +118,7 @@
 
       Clicking on a username will display the individual threads of that
       user in the lower box of the tab, ordered by
-      <literal>PID</literal>. Likewise, you can change the order by
+      <guilabel>PID</guilabel>. Likewise, you can change the order by
       clicking on one of the headings.
 
       <remark>


Modified: trunk/administrator/server-information.xml
===================================================================
--- trunk/administrator/server-information.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/server-information.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 5, Lines Added: 12, Lines Deleted: 12; 3527 bytes

@@ -36,16 +36,16 @@
 
         <listitem>
           <para>
-            <literal>User</literal>: Username used for the current
+            <guilabel>Username:</guilabel> Username used for the current
             connection to the MySQL server.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>Host</literal>: The name of the machine hosting the
+            <guilabel>Hostname:</guilabel> The name of the machine hosting
the
             MySQL server. This is either identical to the name listed in
-            <literal>Network Name</literal>, or it is
+            <guilabel>Network Name</guilabel>, or it is
             <literal>localhost</literal>. The former indicates that you
             are connecting to a server that either runs on a remote
             machine, or that you have specified a hostname different

@@ -57,7 +57,7 @@
 
         <listitem>
           <para>
-            <literal>Port</literal>: The port used for connecting to the
+            <guilabel>Port</guilabel>: The port used for connecting to the
             MySQL server.
           </para>
         </listitem>

@@ -78,14 +78,14 @@
 
         <listitem>
           <para>
-            <literal>MySQL Version</literal>: The version of the MySQL
+            <guilabel>MySQL Version</guilabel>: The version of the MySQL
             server.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>Network Name</literal>: The name of the machine
+            <guilabel>Network Name</guilabel>: The name of the machine
             hosting the MySQL server.
           </para>
         </listitem>

@@ -97,7 +97,7 @@
               addresses.
             </remark>
 
-            <literal>IP</literal>: The IP number of the MySQL server
+            <guilabel>IP</guilabel>: The IP number of the MySQL server
             host.
           </para>
         </listitem>

@@ -118,35 +118,35 @@
 
         <listitem>
           <para>
-            <literal>Version</literal>: The version of &administrator;,
+            <guilabel>Version</guilabel>: The version of &administrator;,
             and the version number of the MySQL client/server protocol.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>Network name</literal>: The name of the host where
+            <guilabel>Network name</guilabel>: The name of the host where
             MySQL Administrator runs.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>IP</literal>: The IP number of the MySQL
+            <guilabel>IP</guilabel>: The IP number of the MySQL
             Administrator host.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>Operating System</literal>: Information about the
+            <guilabel>Operating System</guilabel>: Information about the
             operating system on which &administrator; runs.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>Hardware</literal>: Information about the hardware
+            <guilabel>Hardware</guilabel>: Information about the hardware
             on which &administrator; runs.
           </para>
         </listitem>


Modified: trunk/administrator/server-logs.xml
===================================================================
--- trunk/administrator/server-logs.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/server-logs.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 963 bytes

@@ -62,11 +62,11 @@
     </remark>
 
     <para>
-      The left box (labeled <literal>Events of page
+      The left box (labeled <guilabel>Events of page
       <replaceable>x</replaceable> /
-      <replaceable>y</replaceable></literal>) displays the major events
+      <replaceable>y</replaceable></guilabel>) displays the major
events
       that have occurred on the current page of the log file. The right
-      box (labeled <literal>Page Content</literal>) displays the
+      box (labeled <guilabel>Page Content</guilabel>) displays the
       detailed lines of the log file. By clicking on an event in the
       left box, the first detailed entry of the event will be
       highlighted in the right box.


Modified: trunk/administrator/service-control.xml
===================================================================
--- trunk/administrator/service-control.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/service-control.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 14, Lines Added: 16, Lines Deleted: 15; 5731 bytes

@@ -23,6 +23,7 @@
       starting and stopping MySQL servers on remote machines.) If the
       server runs as a stand-alone application, the Service Control
       section will not be enabled.
+      <remark>[PL] Future reference</remark>
     </para>
 
     <para>

@@ -39,9 +40,9 @@
     <title>Start/Stop Service</title>
 
     <para>
-      The <literal>Start/Stop Service</literal> tab displays the status
+      The <guilabel>Start/Stop Service</guilabel> tab displays the status
       of the MySQL service. This service starts and stops the MySQL
-      server. Under <literal>Service Status</literal>, a text message
+      server. Under <guilabel>Service Status</guilabel>, a text message
       indicates whether or not the service has been started. If the
       service is running, the button label is <guibutton>Stop
       Service</guibutton>. Click it to stop the server. If the service

@@ -50,7 +51,7 @@
     </para>
 
     <para>
-      Under <literal>Log Messages</literal>, you will find messages that
+      Under <guilabel>Log Messages</guilabel>, you will find messages that
       the MySQL server produces when it starts or stops. Messages
       produced by the server during startup look something like this:
     </para>

@@ -141,7 +142,7 @@
 
           <listitem>
             <para>
-              <literal>Launch MySQL server automatically</literal>: If
+              <guilabel>Launch MySQL server automatically</guilabel>: If
               checked, the Windows service starts the MySQL server
               automatically on operating system startup.
             </para>

@@ -149,7 +150,7 @@
 
           <listitem>
             <para>
-              <literal>Display Name</literal>: The display name of the
+              <guilabel>Display Name</guilabel>: The display name of the
               Windows service (not the service name!) as it will appear
               in the Windows services manager when displaying the
               properties of that service.

@@ -158,7 +159,7 @@
 
           <listitem>
             <para>
-              <literal>Service Description</literal>: The description of
+              <guilabel>Service Description</guilabel>: The description of
               the Windows service as it will appear in the Windows
               services manager.
             </para>

@@ -176,7 +177,7 @@
 
           <listitem>
             <para>
-              <literal>Config Filename</literal>:
+              <guilabel>Config Filename</guilabel>:
 
               <remark>
                 [SH] Mike: "Config" is ugly. Suggestion: Filename

@@ -194,8 +195,8 @@
               MySQL will enter that information in the Windows registry,
               and the Windows service starting the MySQL server will use
               that file, rather than the default file
-              (<literal>C:\<replaceable>windows installation
-              directory</replaceable>\my.ini</literal>). <emphasis>Note
+              (<filename>C:\<replaceable>windows installation
+              directory</replaceable>\my.ini</filename>).
<emphasis>Note
               that this is available for MySQL servers as of version
               4.0.3 only.</emphasis> See
               <xref linkend="windows-create-option-file"/>, for details

@@ -212,7 +213,7 @@
 
           <listitem>
             <para>
-              <literal>Section Name</literal>:
+              <guilabel>Section Name</guilabel>:
 
               <remark>
                 [SH] FILL IN

@@ -246,7 +247,7 @@
 
           <listitem>
             <para>
-              <literal>Support for InnoDB</literal>: If checked, the
+              <guilabel>Support for InnoDB</guilabel>: If checked, the
               MySQL server is started with support for InnoDB tables. If
               unchecked, it doesn't start the InnoDB storage engine;
               this saves memory, but InnoDB tables cannot be used. If

@@ -267,7 +268,7 @@
 
           <listitem>
             <para>
-              <literal>Support for BDB</literal>: If checked, the MySQL
+              <guilabel>Support for BDB</guilabel>: If checked, the MySQL
               server is started with support for BDB tables. If
               unchecked, it doesn't start the BDB storage engine; this
               saves memory, but BDB tables cannot be used. If this

@@ -288,7 +289,7 @@
 
           <listitem>
             <para>
-              <literal>Named Pipes</literal>: On operating systems of
+              <guilabel>Named Pipes</guilabel>: On operating systems of
               the Windows NT family, including Windows NT, Windows 2000,
               and Windows XP, you may use named pipes to connect to a
               MySQL server running on the local machine, rather than

@@ -301,7 +302,7 @@
 
           <listitem>
             <para>
-              <literal>Debug Information (slow)</literal>: If checked,
+              <guilabel>Debug Information (slow)</guilabel>: If checked,
               the MySQL server is started with an option that allows for
               easier debugging of problems. Using this option slows down
               the server significantly, so it is recommended only for

@@ -313,7 +314,7 @@
 
           <listitem>
             <para>
-              <literal>Path to Binary</literal>: Contains the pathname
+              <guilabel>Path to Binary</guilabel>: Contains the pathname
               of the MySQL server binary file as it is listed in the
               Windows service manager (for example
               <literal>C:\mysql\bin\mysqld-max-nt</literal>). Note that


Modified: trunk/administrator/startup-variables.xml
===================================================================
--- trunk/administrator/startup-variables.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/startup-variables.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1489 bytes

@@ -19,13 +19,13 @@
       This section allows you to set variables that the MySQL server
       reads on startup. These variables are stored in the option file of
       the server. On Windows, the option file is called
-      <literal>my.ini</literal>, and it is located in the Windows
+      <filename>my.ini</filename>, and it is located in the Windows
       installation directory (for example,
-      <literal>C:\WinNT\my.ini</literal>). Note that it can
-      alternatively be stored in <literal>C:\</literal>, in which case
-      it is named <literal>my.cnf</literal>. Also note that there can be
+      <filename>C:\WinNT\my.ini</filename>). Note that it can
+      alternatively be stored in <filename>C:\</filename>, in which case
+      it is named <filename>my.cnf</filename>. Also note that there can be
       more than one option file. On operating systems other than
-      Windows, the option file is called <literal>my.cnf</literal>,
+      Windows, the option file is called <filename>my.cnf</filename>,
       regardless of where it resides. On Windows, &administrator; allows
       you to store the option file in any location you specify. See
       <xref linkend="option-files"/> for more information.


Modified: trunk/administrator/tray-monitor.xml
===================================================================
--- trunk/administrator/tray-monitor.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/tray-monitor.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 5, Lines Added: 15, Lines Deleted: 15; 3336 bytes

@@ -20,7 +20,7 @@
 
   <para>
     To start the &tray_monitor;, you can either execute the
-    <literal>MySQLSystemTrayMonitor.exe</literal> application that
+    <filename>MySQLSystemTrayMonitor.exe</filename> application that
     resides in your &administrator; installation directory, or choose
     the <guimenu>MySQL System Tray Monitor</guimenu> option of the
     <guimenu>Tools</guimenu> menu.

@@ -57,21 +57,21 @@
 
     <listitem>
       <para>
-        <literal>Shutdown Instance:</literal> this will begin the
+        <guimenu>Shutdown Instance:</guimenu> this will begin the
         shutdown operation on the selected running service.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <literal>Start Instance:</literal> this will start a currently
+        <guimenu>Start Instance:</guimenu> this will start a currently
         stopped server instance.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        <literal>Configure Instance:</literal> this will launch the
+        <guimenu>Configure Instance:</guimenu> this will launch the
         &administrator; in configure service mode for the currently
         selected instance. See
         <link linkend="mysql-administrator-starting-configure-service">Configure

@@ -81,10 +81,10 @@
 
     <listitem>
       <para>
-        <literal>Monitoring Options:</literal> currently the
-        <literal>Monitoring Options</literal> submenu has one available
-        option: <literal>Ignore Instance State</literal>.
-        <literal>Ignore Instance State</literal> will cause the
+        <guimenu>Monitoring Options:</guimenu> currently the
+        <guimenu>Monitoring Options</guimenu> submenu has one available
+        option: <guimenu>Ignore Instance State</guimenu>.
+        <guimenu>Ignore Instance State</guimenu> will cause the
         &tray_monitor; to stop monitoring the selected service.
       </para>
     </listitem>

@@ -97,8 +97,8 @@
   </para>
 
   <para>
-    The <literal>Manage MySQL Instances</literal> option of the
-    <literal>Actions</literal> menu can be used to start &administrator;
+    The <guimenu>Manage MySQL Instances</guimenu> option of the
+    <guimenu>Actions</guimenu> menu can be used to start &administrator;
     in configure service mode so you can manage your server
     configurations. See
     <link linkend="mysql-administrator-starting-configure-service">Configure

@@ -106,11 +106,11 @@
   </para>
 
   <para>
-    The <literal>Monitor Options</literal> menu has two options, which
-    affect the general behavior of the &tray_monitor;. <literal>Display
-    CPU Load</literal> determines whether the CPU usage is displayed on
-    the right of the &tray_monitor;. <literal>Launch Monitor after Login
-    </literal>
+    The <guimenu>Monitor Options</guimenu> menu has two options, which
+    affect the general behavior of the &tray_monitor;. <guimenu>Display
+    CPU Load</guimenu> determines whether the CPU usage is displayed on
+    the right of the &tray_monitor;. <guimenu>Launch Monitor after Login
+    </guimenu>
 
     <remark>
       [MH] APPLICATION CAPITALIZATION ERROR


Modified: trunk/administrator/user-administration.xml
===================================================================
--- trunk/administrator/user-administration.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/user-administration.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 14, Lines Added: 26, Lines Deleted: 26; 7830 bytes

@@ -104,10 +104,10 @@
 
       <listitem>
         <para>
-          <literal>Add a new User</literal>: Selecting this command adds
+          <guimenu>Add a new User</guimenu>: Selecting this command adds
           a new user with the default name <literal>New User</literal>
           to the user list. You will have to fill in at least a username
-          in the <literal>MySQL User</literal> field of the
+          in the <guilabel>MySQL User</guilabel> field of the
           <link 
 linkend="mysql-administrator-user-administration-user-information">User
           Information</link> tab, which, after applying this change,

@@ -117,7 +117,7 @@
 
       <listitem>
         <para>
-          <literal>Add Host from which the User can connect</literal>:
+          <guimenu>Add Host from which the User can connect</guimenu>:
           Allows you to specify a host from which the user can connect.
           This command is unavailable if you highlight a subcategory.
         </para>

@@ -125,8 +125,8 @@
 
       <listitem>
         <para>
-          <literal>Remove Host from which the User can
-          connect</literal>: Allows you to remove a host from which the
+          <guimenu>Remove Host from which the User can
+          connect</guimenu>: Allows you to remove a host from which the
           user can connect. If there are no sub-categories, the user
           will be removed (you will be prompted to confirm the removal).
         </para>

@@ -134,10 +134,10 @@
 
       <listitem>
         <para>
-          <literal>Clone User</literal>: Makes a copy of the selected
+          <guimenu>Clone User</guimenu>: Makes a copy of the selected
           user, including all subcategories. The new user is called
           <literal>New User</literal> until you specify another name in
-          the <literal>MySQL User</literal> field of the
+          the <guilabel>MySQL User</guilabel> field of the
           <link 
 linkend="mysql-administrator-user-administration-user-information">User
           Information</link> tab. This command is useful for creating

@@ -151,7 +151,7 @@
 
       <listitem>
         <para>
-          <literal>Delete User</literal>: Allows you to delete the
+          <guimenu>Delete User</guimenu>: Allows you to delete the
           selected user. You will be prompted to confirm that you really
           want to delete that user.
         </para>

@@ -159,7 +159,7 @@
 
       <listitem>
         <para>
-          <literal>Refresh User List</literal>: Rereads the user list
+          <guimenu>Refresh User List</guimenu>: Rereads the user list
           from the MySQL server. This is helpful when other users (on
           other connections) are editing user accounts. Note that
           selecting that command will collapse all subcategories.

@@ -243,7 +243,7 @@
 
           <listitem>
             <para>
-              <literal>MySQL User</literal>: Username that is specified
+              <guilabel>MySQL User</guilabel>: Username that is specified
               when connecting to the MySQL server. Note that this
               username has nothing to do with usernames you might use
               elsewhere on your operating system. Using special

@@ -253,7 +253,7 @@
 
           <listitem>
             <para>
-              <literal>Password</literal>: Password that is specified
+              <guilabel>Password</guilabel>: Password that is specified
               when connecting to the MySQL server. Note that this
               password has nothing to do with passwords you might use
               elsewhere on your operating system. Again, don't use

@@ -262,14 +262,14 @@
               very trivial password might be <literal>abcde</literal>,
               while a non-trivial password might be
               <literal>lEtusMak3iThartdoGesz</literal>. Note that it is
-              not mandatory to specify a password, although it is highly
-              recommendable to do so.
+              not mandatory to specify a password, although it is strongly
+              recommended that you do so.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Confirm Password</literal>: Fill in the password
+              <guilabel>Confirm Password</guilabel>: Fill in the password
               once again to make sure you do not accidentally introduce
               a typo.
             </para>

@@ -291,28 +291,28 @@
 
           <listitem>
             <para>
-              <literal>Full Name</literal>: As opposed to the username
-              in <literal>MySQL User</literal>, the full name may
+              <guilabel>Full Name</guilabel>: As opposed to the username
+              in <guilabel>MySQL User</guilabel>, the full name may
               contain any characters, including spaces.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Description</literal>: Additional description of
+              <guilabel>Description</guilabel>: Additional description of
               user.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Email</literal>: Email address of user.
+              <guilabel>Email</guilabel>: Email address of user.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>Contact Information</literal>: More contact
+              <guilabel>Contact Information</guilabel>: More contact
               information, like postal address, or messenger
               information.
 

@@ -324,7 +324,7 @@
 
           <listitem>
             <para>
-              <literal>Icon</literal>: Rather than using the default
+              <guilabel>Icon</guilabel>: Rather than using the default
               icon, you may select a different icon by pressing the
               <guibutton>Load from Disk</guibutton> button.
 

@@ -353,8 +353,8 @@
     <title>Global Privileges</title>
 
     <para>
-      This tab is available only if the <literal>Show Global
-      Privileges</literal> checkbox in the
+      This tab is available only if the <guilabel>Show Global
+      Privileges</guilabel> checkbox in the
       <link 
 linkend="mysql-gui-options-administrator">Administrator
       section of the Options dialog</link> has been checked.

@@ -438,11 +438,11 @@
       The <guilabel>Schema Privileges</guilabel> tab only displays 
       privileges that have been granted for a specific schema.
       No schema privileges will show in the 
-      <literal>Assigned Privileges</literal> column for
+      <guilabel>Assigned Privileges</guilabel> column for
       users with global privileges. For example, the <guilabel>Assigned 
       Privileges</guilabel> column will be blank for a
<literal>root</literal>
       user with global privileges on all schemata. Likewise,
-      the <literal>Assigned Privileges</literal> column will be blank for
+      the <guilabel>Assigned Privileges</guilabel> column will be blank for
       a user with a global <literal>SELECT</literal> privilege, unless 
       <literal>SELECT</literal> has also specifically been granted for 
       the currently selected schema.

@@ -459,8 +459,8 @@
     <title>Table Column Privileges</title>
 
     <para>
-      This tab is available only if the <literal>Show Schema Object
-      Privileges</literal> checkbox in the
+      This tab is available only if the <guilabel>Show Schema Object
+      Privileges</guilabel> checkbox in the
       <link 
 linkend="mysql-gui-options-administrator">Administrator
       section of the Options dialog</link> has been checked. It allows


Modified: trunk/administrator/xml-files.xml
===================================================================
--- trunk/administrator/xml-files.xml	2007-02-06 20:48:16 UTC (rev 4834)
+++ trunk/administrator/xml-files.xml	2007-02-06 23:55:31 UTC (rev 4835)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2740 bytes

@@ -21,7 +21,7 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-options.xml</literal>: Stores options selected
+          <filename>mysqlx-options.xml</filename>: Stores options selected
           in the <link 
             linkend="mysql-gui-options">Options
             dialog</link>.

@@ -30,7 +30,7 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-status-variables.xml</literal>: Stores the
+          <filename>mysqlx-status-variables.xml</filename>: Stores the
           status variables known to &administrator;, so that they can be
           assigned descriptions in various languages (see below for the
           XML file containing those descriptions). Those descriptions

@@ -52,7 +52,7 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-system-variables.xml</literal>: Stores the
+          <filename>mysqlx-system-variables.xml</filename>: Stores the
           system variables known to &administrator;, so that they can be
           assigned descriptions in various languages (see below for the
           XML file containing those descriptions). Those descriptions

@@ -74,7 +74,7 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-translations-administrator.xml</literal> :
+          <filename>mysqlx-translations-administrator.xml</filename> :
           Stores descriptions specific to &administrator;, like
           descriptions for status and server variables, or category
           names, or labels used in dialogs. Here is an excerpt from that

@@ -153,11 +153,11 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-translations-general.xml</literal>: Stores
+          <filename>mysqlx-translations-general.xml</filename>: Stores
           terms and descriptions that appear not only in
           &administrator;, but also in other graphical MySQL programs.
           Its format, however, is identical with the format of the
-          <literal>mysqlx-translations-administrator.xml</literal> file.
+          <filename>mysqlx-translations-administrator.xml</filename> file.
           Here is an excerpt from that file:
         </para>
         

@@ -176,7 +176,7 @@
       
       <listitem>
         <para>
-          <literal>mysqlx-user-connections.xml</literal>: This file is
+          <filename>mysqlx-user-connections.xml</filename>: This file is
           described in
           <link linkend="mysql-gui-appendix-store-connections">How
             &administrator; Stores Connections</link>.


Thread
svn commit - mysqldoc@docsrva: r4835 - trunk/administratorplavin7 Feb