bk commit - mysqldoc@docsrva tree (paul:1.2723)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2723 05/05/29 22:21:00 paul@stripped +56 -0
  Move administrator and query-browser documents
  to their own directories.

  query-browser/Makefile
    1.1 05/05/29 22:20:58 paul@stripped +107 -0

  query-browser/Makefile
    1.0 05/05/29 22:20:58 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/query-browser/Makefile

  administrator/Makefile
    1.1 05/05/29 22:20:57 paul@stripped +108 -0

  query-browser/query-browser.xml
    1.9 05/05/29 22:20:57 paul@stripped +11 -17
    Change paths.

  query-browser/chapter-options-query-browser.xml
    1.5 05/05/29 22:20:57 paul@stripped +1 -1
    Change paths.

  migration-toolkit/Makefile
    1.2 05/05/29 22:20:57 paul@stripped +1 -1
    Tweak

  internals/Makefile
    1.4 05/05/29 22:20:57 paul@stripped +1 -1
    Tweak

  gui-common/chapter-table-editor.xml
    1.4 05/05/29 22:20:57 paul@stripped +4 -4
    Change paths.

  gui-common/chapter-options.xml
    1.3 05/05/29 22:20:57 paul@stripped +3 -3
    Change paths.

  gui-common/appendix-troubleshooting.xml
    1.3 05/05/29 22:20:57 paul@stripped +1 -1
    Change paths.

  administrator/chapter-options-administrator.xml
    1.4 05/05/29 22:20:57 paul@stripped +121 -76
    Reformat.

  administrator/administrator.xml
    1.11 05/05/29 22:20:57 paul@stripped +13 -15
    Change paths.

  administrator/Makefile
    1.0 05/05/29 22:20:57 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/administrator/Makefile

  gui-common/images/tableeditor.png
    1.3 05/05/29 22:00:16 paul@stripped +0 -0
    Rename: gui-common/tableeditor.png -> gui-common/images/tableeditor.png

  gui-common/images/options.png
    1.4 05/05/29 22:00:16 paul@stripped +0 -0
    Rename: gui-common/options.png -> gui-common/images/options.png

  gui-common/images/options-connection.png
    1.3 05/05/29 22:00:16 paul@stripped +0 -0
    Rename: gui-common/options-connection.png ->
gui-common/images/options-connection.png

  gui-common/images/indexeditor.png
    1.3 05/05/29 22:00:16 paul@stripped +0 -0
    Rename: gui-common/indexeditor.png -> gui-common/images/indexeditor.png

  gui-common/images/connectionerror.png
    1.3 05/05/29 22:00:16 paul@stripped +0 -0
    Rename: gui-common/connectionerror.png -> gui-common/images/connectionerror.png

  gui-common/images/confirmchanges.png
    1.3 05/05/29 22:00:15 paul@stripped +0 -0
    Rename: gui-common/confirmchanges.png -> gui-common/images/confirmchanges.png

  gui-common/images/columneditor.png
    1.3 05/05/29 22:00:15 paul@stripped +0 -0
    Rename: gui-common/columneditor.png -> gui-common/images/columneditor.png

  query-browser/chapter-options-query-browser.xml
    1.4 05/05/29 21:53:51 paul@stripped +0 -0
    Rename: Docs/query-browser/chapter-options-query-browser.xml ->
query-browser/chapter-options-query-browser.xml

  query-browser/images/twosakilas.png
    1.3 05/05/29 21:53:40 paul@stripped +0 -0
    Rename: Docs/query-browser/twosakilas.png -> query-browser/images/twosakilas.png

  query-browser/images/tabletool.png
    1.4 05/05/29 21:53:40 paul@stripped +0 -0
    Rename: Docs/query-browser/tabletool.png -> query-browser/images/tabletool.png

  query-browser/images/script-editor.png
    1.4 05/05/29 21:53:40 paul@stripped +0 -0
    Rename: Docs/query-browser/script-editor.png ->
query-browser/images/script-editor.png

  query-browser/images/schematabrowser.png
    1.4 05/05/29 21:53:40 paul@stripped +0 -0
    Rename: Docs/query-browser/schematabrowser.png ->
query-browser/images/schematabrowser.png

  query-browser/images/querybar.png
    1.4 05/05/29 21:53:40 paul@stripped +0 -0
    Rename: Docs/query-browser/querybar.png -> query-browser/images/querybar.png

  query-browser/images/qb-options.png
    1.2 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/qb-options.png -> query-browser/images/qb-options.png

  query-browser/images/mainscreen.png
    1.4 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/mainscreen.png -> query-browser/images/mainscreen.png

  query-browser/images/gui-command-line.png
    1.3 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/gui-command-line.png ->
query-browser/images/gui-command-line.png

  query-browser/images/dynamiclist.png
    1.3 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/dynamiclist.png -> query-browser/images/dynamiclist.png

  query-browser/images/connection.png
    1.4 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/connection.png -> query-browser/images/connection.png

  query-browser/images/buttonbar.png
    1.4 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/buttonbar.png -> query-browser/images/buttonbar.png

  query-browser/images/blob-buttons.png
    1.4 05/05/29 21:53:39 paul@stripped +0 -0
    Rename: Docs/query-browser/blob-buttons.png ->
query-browser/images/blob-buttons.png

  administrator/gui-common
    1.1 05/05/29 21:53:20 paul@stripped +0 -0

  administrator/gui-common
    1.0 05/05/29 21:53:20 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/administrator/gui-common

  query-browser/gui-common
    1.1 05/05/29 21:53:12 paul@stripped +0 -0

  query-browser/gui-common
    1.0 05/05/29 21:53:12 paul@stripped +0 -0
    BitKeeper file /Volumes/frost2/MySQL/bk/mysqldoc/query-browser/gui-common

  query-browser/query-browser.xml
    1.8 05/05/29 21:52:33 paul@stripped +0 -0
    Rename: Docs/query-browser.xml -> query-browser/query-browser.xml

  administrator/chapter-options-administrator.xml
    1.3 05/05/29 21:44:00 paul@stripped +0 -0
    Rename: Docs/administrator/chapter-options-administrator.xml ->
administrator/chapter-options-administrator.xml

  administrator/administrator.xml
    1.10 05/05/29 21:43:13 paul@stripped +0 -0
    Rename: Docs/administrator.xml -> administrator/administrator.xml

  administrator/images/user-information.png
    1.3 05/05/29 21:39:21 paul@stripped +0 -0
    Rename: Docs/administrator/user-information.png ->
administrator/images/user-information.png

  administrator/images/user-accounts.png
    1.3 05/05/29 21:39:21 paul@stripped +0 -0
    Rename: Docs/administrator/user-accounts.png ->
administrator/images/user-accounts.png

  administrator/images/system-tray.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/system-tray.png -> administrator/images/system-tray.png

  administrator/images/server-logs-general-log.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/server-logs-general-log.png ->
administrator/images/server-logs-general-log.png

  administrator/images/restore-content.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/restore-content.png ->
administrator/images/restore-content.png

  administrator/images/replication.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/replication.png -> administrator/images/replication.png

  administrator/images/options-general-options.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/options-general-options.png ->
administrator/images/options-general-options.png

  administrator/images/options-connections.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/options-connections.png ->
administrator/images/options-connections.png

  administrator/images/marked-area.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/marked-area.png -> administrator/images/marked-area.png

  administrator/images/mainwindow.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/mainwindow.png -> administrator/images/mainwindow.png

  administrator/images/graph-settings.png
    1.3 05/05/29 21:39:20 paul@stripped +0 -0
    Rename: Docs/administrator/graph-settings.png ->
administrator/images/graph-settings.png

  administrator/images/error.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/error.png -> administrator/images/error.png

  administrator/images/connection.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/connection.png -> administrator/images/connection.png

  administrator/images/configure-service-mode-window.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/configure-service-mode-window.png ->
administrator/images/configure-service-mode-window.png

  administrator/images/configure-service-mode-connection.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/configure-service-mode-connection.png ->
administrator/images/configure-service-mode-connection.png

  administrator/images/backup-progress.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/backup-progress.png ->
administrator/images/backup-progress.png

  administrator/images/backup-content.png
    1.3 05/05/29 21:39:19 paul@stripped +0 -0
    Rename: Docs/administrator/backup-content.png ->
administrator/images/backup-content.png

  administrator/images/backup-completed.png
    1.3 05/05/29 21:39:18 paul@stripped +0 -0
    Rename: Docs/administrator/backup-completed.png ->
administrator/images/backup-completed.png

  BitKeeper/deleted/.del-Thumbs.db~1d83f146affb6a6d
    1.3 05/05/29 21:35:20 paul@stripped +0 -0
    Delete: Docs/query-browser/Thumbs.db

  gui-common/tableeditor.png
    1.2 05/05/29 21:34:05 paul@stripped +0 -0
    mvdir

  gui-common/options.png
    1.3 05/05/29 21:34:05 paul@stripped +0 -0
    mvdir

  gui-common/options-connection.png
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/indexeditor.png
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/connectionerror.png
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/confirmchanges.png
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/columneditor.png
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/chapter-table-editor.xml
    1.3 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/chapter-options.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-troubleshooting.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-translator-notes.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-third-party.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-source-install.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-connection-storage.xml
    1.2 05/05/29 21:34:04 paul@stripped +0 -0
    mvdir

  gui-common/appendix-common-files.xml
    1.2 05/05/29 21:34:03 paul@stripped +0 -0
    mvdir

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.9/Docs/administrator.xml	2005-05-16 22:10:14 -05:00
+++ 1.11/administrator/administrator.xml	2005-05-29 22:20:57 -05:00
@@ -12,7 +12,7 @@
 <!ENTITY appendix-third-party SYSTEM "gui-common/appendix-third-party.xml">
 <!ENTITY appendix-troubleshooting SYSTEM "gui-common/appendix-troubleshooting.xml">
 <!ENTITY chapter-options SYSTEM "gui-common/chapter-options.xml">
-<!ENTITY chapter-options-administrator SYSTEM
"administrator/chapter-options-administrator.xml">
+<!ENTITY chapter-options-administrator SYSTEM "chapter-options-administrator.xml">
 <!ENTITY chapter-table-editor SYSTEM "gui-common/chapter-table-editor.xml">
 <!ENTITY appendix-source-install SYSTEM "gui-common/appendix-source-install.xml">
 ]>
@@ -361,7 +361,7 @@
 
    <figure>
     <title>Connection dialog</title>
-    <graphic fileref="administrator/connection.png" format="PNG" 
+    <graphic fileref="images/connection.png" format="PNG" 
 lang="en" />
    </figure>
 
@@ -471,8 +471,7 @@
 
    <figure>
     <title>Switching to configure-service mode</title>
-    <graphic 
-fileref="administrator/configure-service-mode-connection.png"
+    <graphic fileref="images/configure-service-mode-connection.png"
                  format="PNG" lang="en" />
    </figure>
 
@@ -484,7 +483,7 @@
 
    <figure>
     <title>Configure-service mode</title>
-    <graphic fileref="administrator/configure-service-mode-window.png"
+    <graphic fileref="images/configure-service-mode-window.png"
                  format="PNG" lang="en" />
    </figure>
 
@@ -548,7 +547,7 @@
 
    <figure>
     <title>&administrator; main window</title>
-    <graphic fileref="administrator/mainwindow.png" format="PNG" 
+    <graphic fileref="images/mainwindow.png" format="PNG" 
 lang="en" />
    </figure>
 
@@ -657,7 +656,7 @@
 
    <figure>
     <title>Marked area between sidebar and working area</title>
-    <graphic fileref="administrator/marked-area.png" format="PNG" 
+    <graphic fileref="images/marked-area.png" format="PNG" 
 lang="en" />
    </figure>
 
@@ -1920,7 +1919,7 @@
 
    <figure>
     <title>User accounts</title>
-    <graphic fileref="administrator/user-accounts.png" format="PNG" 
+    <graphic fileref="images/user-accounts.png" format="PNG" 
 lang="en" />
    </figure>
 
@@ -2028,7 +2027,7 @@
 
    <figure>
     <title>User Information tab</title>
-    <graphic fileref="administrator/user-information.png" format="PNG"
+    <graphic fileref="images/user-information.png" format="PNG"
                  lang="en" />
    </figure>
 
@@ -2480,7 +2479,7 @@
 
    <figure>
     <title>The Graph Settings dialog</title>
-    <graphic fileref="administrator/graph-settings.png" lang="en" format="PNG"/>
+    <graphic fileref="images/graph-settings.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -2683,8 +2682,7 @@
 
    <figure>
     <title>Displaying entries from the middle of the General Log</title>
-    <graphic fileref="administrator/server-logs-general-log.png" 
-format="PNG"
+    <graphic fileref="images/server-logs-general-log.png" format="PNG"
                  lang="en" />
    </figure>
 
@@ -3229,7 +3227,7 @@
 
    <figure>
     <title>The Restore Content tab</title>
-    <graphic fileref="administrator/restore-content.png" lang="en" format="PNG"/>
+    <graphic fileref="images/restore-content.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -3305,7 +3303,7 @@
 
    <figure>
     <title>The Replication Status section</title>
-    <graphic fileref="administrator/replication.png" lang="en" format="PNG"/>
+    <graphic fileref="images/replication.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -3603,7 +3601,7 @@
 
   <figure>
    <title>The &tray_monitor;</title>
-   <graphic fileref="administrator/system-tray.png" lang="en" format="PNG"/>
+   <graphic fileref="images/system-tray.png" lang="en" format="PNG"/>
   </figure>
 
   <para>

--- 1.2/Docs/administrator/chapter-options-administrator.xml	2005-04-21 22:00:55 -05:00
+++ 1.4/administrator/chapter-options-administrator.xml	2005-05-29 22:20:57 -05:00
@@ -1,80 +1,125 @@
 <sect1 id="mysql-gui-options-administrator">
 
-   <title>
-    Administrator
-   </title>
-
-   <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 sub-sections
that will be discussed further in the sections that follow.
-</para>
-
-<sect2 id="mysql-gui-options-administrator-user-administration">
-	<title>User Administration</title>
-	<para>These options affect the interface of the <link
linkend="mysql-administrator-user-administration">User Administration</link>
section of &administrator;.</para>
-
-    <itemizedlist>
-
-     <listitem><para>
-      <literal>Show Global Privileges</literal>: 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
-      Administration</link> section. In that tab, you can grant users
-      global privileges (as opposed to privileges on a database, table,
-      or column level only). This may affect security. See
-      <ulink url="http://dev.mysql.com/doc/mysql/en/Privilege_system.html">The
MySQL Access Privilege
-      System</ulink> for details. If unchecked, the
-      <link
-              
-linkend="mysql-administrator-user-administration-global-privileges">Global
-      Privileges</link> tab will not be visible in the
-      <link
-              linkend="mysql-administrator-user-administration">User
-      Administration</link> section.
-     </para></listitem>
-
-     <listitem><para>
-      <literal>Show Table/Column Privileges</literal>: 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
-      Privileges</link> tab in the
-      <link
-              linkend="mysql-administrator-user-administration">User
-      Administration</link> section by enabling this checkbox.
-     </para></listitem>
-
-    </itemizedlist>
-   
-</sect2> <!-- END USER ADMINISTRATION -->
-
-<sect2 id="mysql-gui-options-administrator-health-graphs">
-	<title>Health Graphs</title>
-	<para>These options affect the appearance of the <link
linkend="mysql-administrator-health">Health Graphs</link> section of
&administrator;.</para>
-
- <itemizedlist>
-  <listitem><para><literal>Use Peak Level Indicator</literal>:
This will display a thin yellow line on the health graphs indicating the highest value
recorded by the graph.</para></listitem>
-
-  <listitem><para><literal>Reset peak Level after a number of
ticks</literal>: 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
if you would like to know the peak level over an interval rather than the peak level
overall.</para></listitem>
-
-  <listitem><para><literal>Time after the Peak level
resets</literal>: When the <literal>Reset peak Level after a number of
ticks</literal> option is set, this determines the amount of time (in ticks) that
will pass before the <literal>Peak Level Indicator</literal> will be
reset.</para></listitem>
- </itemizedlist>
-</sect2> <!-- END HEALTH GRAPHS -->
-
-<sect2 id="mysql-gui-options-administrator-backup">
-	<title>Backup</title>
-	<para>The backup options configure how &administrator; performs backup
operations.</para>
-
- <itemizedlist>
-  <listitem><para><literal>Add Date/Time to Backup
Files</literal>: 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 section</link> for more
information.</para></listitem>
- </itemizedlist>
-</sect2> <!-- END BACKUP -->
-  </sect1>
+ <title>Administrator</title>
 
+ <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
+  sub-sections that will be discussed further in the sections that
+  follow.
+ </para>
+
+ <sect2 id="mysql-gui-options-administrator-user-administration">
+
+  <title>User Administration</title>
+
+  <para>
+   These options affect the interface of the
+   <link linkend="mysql-administrator-user-administration">User
+   Administration</link> section of &administrator;.
+  </para>
+
+  <itemizedlist>
+
+   <listitem><para>
+    <literal>Show Global Privileges</literal>: 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
+    Administration</link> section. In that tab, you can grant users
+    global privileges (as opposed to privileges on a database, table, or
+    column level only). This may affect security. See
+    <ulink url="http://dev.mysql.com/doc/mysql/en/Privilege_system.html">The
+    MySQL Access Privilege System</ulink> for details. If unchecked, the
+    <link
linkend="mysql-administrator-user-administration-global-privileges">Global
+    Privileges</link> tab will not be visible in the
+    <link linkend="mysql-administrator-user-administration">User
+    Administration</link> section.
+   </para></listitem>
+
+   <listitem><para>
+    <literal>Show Table/Column Privileges</literal>: 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
+    Privileges</link> tab in the
+    <link linkend="mysql-administrator-user-administration">User
+    Administration</link> section by enabling this checkbox.
+   </para></listitem>
+
+  </itemizedlist>
+
+ </sect2>
+
+<!-- END USER ADMINISTRATION -->
+
+ <sect2 id="mysql-gui-options-administrator-health-graphs">
+
+  <title>Health Graphs</title>
+
+  <para>
+   These options affect the appearance of the
+   <link linkend="mysql-administrator-health">Health Graphs</link>
+   section of &administrator;.
+  </para>
+
+  <itemizedlist>
+
+   <listitem><para>
+    <literal>Use Peak Level Indicator</literal>: This will display a
+    thin yellow line on the health graphs indicating the highest value
+    recorded by the graph.
+   </para></listitem>
+
+   <listitem><para>
+    <literal>Reset peak Level after a number of ticks</literal>: 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 if you would like to know the peak level over an
+    interval rather than the peak level overall.
+   </para></listitem>
+
+   <listitem><para>
+    <literal>Time after the Peak level resets</literal>: When the
+    <literal>Reset peak Level after a number of ticks</literal> option
+    is set, this determines the amount of time (in ticks) that will pass
+    before the <literal>Peak Level Indicator</literal> will be reset.
+   </para></listitem>
+
+  </itemizedlist>
+
+ </sect2>
+
+<!-- END HEALTH GRAPHS -->
+
+ <sect2 id="mysql-gui-options-administrator-backup">
+
+  <title>Backup</title>
+
+  <para>
+   The backup options configure how &administrator; performs backup
+   operations.
+  </para>
+
+  <itemizedlist>
+
+   <listitem><para>
+    <literal>Add Date/Time to Backup Files</literal>: 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 section</link>
+    for more information.
+   </para></listitem>
+
+  </itemizedlist>
+
+ </sect2>
+
+<!-- END BACKUP -->
+
+</sect1>
 <!-- END ADMINISTRATOR SECTION-->

--- 1.1/Docs/gui-common/appendix-troubleshooting.xml	2004-11-26 12:36:17 -06:00
+++ 1.3/gui-common/appendix-troubleshooting.xml	2005-05-29 22:20:57 -05:00
@@ -23,7 +23,7 @@
    <title>
     Error message dialog
    </title>
-   <graphic fileref="gui-common/connectionerror.png" format="PNG" lang="en" />
+   <graphic fileref="gui-common/images/connectionerror.png" format="PNG" lang="en"
/>
   </figure>
 
   <para>

--- 1.1/Docs/gui-common/chapter-options.xml	2004-11-26 12:36:17 -06:00
+++ 1.3/gui-common/chapter-options.xml	2005-05-29 22:20:57 -05:00
@@ -31,7 +31,7 @@
    <title>
     Options dialog
    </title>
-   <graphic fileref="gui-common/options.png" format="PNG" lang="en" />
+   <graphic fileref="gui-common/images/options.png" format="PNG" lang="en" />
   </figure>
 
   In the sidebar of that dialog, you can select the section you wish to
@@ -150,7 +150,7 @@
   <title>
    Options dialog: Connections
   </title>
-  <graphic fileref="gui-common/options-connection.png" format="PNG" lang="en" />
+  <graphic fileref="gui-common/images/options-connection.png" format="PNG" lang="en"
/>
  </figure>
 
  <para>
@@ -326,4 +326,4 @@
 
   <listitem><para><literal>Def. Datatype</literal> is the default
datatype assigned to all new columns that are not part of a <literal>PRIMARY
KEY</literal>.</para></listitem>
  </itemizedlist>
-</sect1> <!-- END EDITORS -->
\ No newline at end of file
+</sect1> <!-- END EDITORS -->

--- 1.2/Docs/gui-common/chapter-table-editor.xml	2004-12-04 13:33:25 -06:00
+++ 1.4/gui-common/chapter-table-editor.xml	2005-05-29 22:20:57 -05:00
@@ -44,7 +44,7 @@
    <title>
      The &table_editor;
     </title>
-   <graphic fileref="gui-common/tableeditor.png" lang="en" format="PNG"/>
+   <graphic fileref="gui-common/images/tableeditor.png" lang="en" format="PNG"/>
   </figure>
   <para>
     The tabbed area is divided into three sections:
@@ -100,7 +100,7 @@
     <title>
       The column editor
      </title>
-    <graphic fileref="gui-common/columneditor.png" lang="en" format="PNG"/>
+    <graphic fileref="gui-common/images/columneditor.png" lang="en" format="PNG"/>
    </figure>
    <para>
      To change the name, data type, default value, or comment of a
@@ -143,7 +143,7 @@
      <title>
        The index editor
       </title>
-     <graphic fileref="gui-common/indexeditor.png" lang="en" format="PNG"/>
+     <graphic fileref="gui-common/images/indexeditor.png" lang="en" format="PNG"/>
     </figure>
     <para>
       To add an index, click the <guibutton>+</guibutton> (plus) button
@@ -386,7 +386,7 @@
    <title>
      The Confirm Table Edit dialog
     </title>
-   <graphic fileref="gui-common/confirmchanges.png" lang="en" format="PNG"/>
+   <graphic fileref="gui-common/images/confirmchanges.png" lang="en" format="PNG"/>
   </figure>
   <para>
     You can click the <guibutton>Execute</guibutton> button to confirm

--- 1.7/Docs/query-browser.xml	2005-04-21 22:00:39 -05:00
+++ 1.9/query-browser/query-browser.xml	2005-05-29 22:20:57 -05:00
@@ -11,7 +11,7 @@
 <!ENTITY appendix-third-party SYSTEM "gui-common/appendix-third-party.xml">
 <!ENTITY appendix-troubleshooting SYSTEM "gui-common/appendix-troubleshooting.xml">
 <!ENTITY chapter-options SYSTEM "gui-common/chapter-options.xml">
-<!ENTITY chapter-options-query-browser SYSTEM
"query-browser/chapter-options-query-browser.xml">
+<!ENTITY chapter-options-query-browser SYSTEM "chapter-options-query-browser.xml">
 <!ENTITY chapter-table-editor SYSTEM "gui-common/chapter-table-editor.xml">
 <!ENTITY appendix-source-install SYSTEM "gui-common/appendix-source-install.xml">
 ]>
@@ -348,8 +348,7 @@
     <title>
      Connection dialog
     </title>
-    <graphic fileref="query-browser/connection.png" 
-format="PNG" lang="en" />
+    <graphic fileref="images/connection.png" format="PNG" lang="en" />
    </figure>
 
    <para>
@@ -420,8 +419,7 @@
     <title>
      The &query_browser; main query window
     </title>
-    <graphic fileref="query-browser/mainscreen.png" 
-lang="en" format="PNG"/>
+    <graphic fileref="images/mainscreen.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -573,8 +571,7 @@
      <title>
       The query area expanded to ten lines
      </title>
-     <graphic fileref="query-browser/querybar.png" 
-lang="en" format="PNG"/>
+     <graphic fileref="images/querybar.png" lang="en" format="PNG"/>
     </figure>
 
     <para>
@@ -653,8 +650,7 @@
      <title>
       The &query_browser; status icons
      </title>
-     <graphic fileref="query-browser/twosakilas.png" 
-lang="en" format="PNG"/>
+     <graphic fileref="images/twosakilas.png" lang="en" format="PNG"/>
     </figure>
 
    </sect2>
@@ -681,8 +677,7 @@
     <title>
      The advanced toolbar
     </title>
-    <graphic fileref="query-browser/buttonbar.png" 
-lang="en" format="PNG"/>
+    <graphic fileref="images/buttonbar.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -822,8 +817,7 @@
       The database browser
      </title>
      <graphic 
-fileref="query-browser/schematabrowser.png" 
-lang="en" format="PNG"/>
+fileref="images/schematabrowser.png" lang="en" format="PNG"/>
     </figure>
 
     <para>
@@ -1065,7 +1059,7 @@
     <title>
      The script editor
     </title>
-    <graphic fileref="query-browser/script-editor.png" lang="en" format="PNG"/>
+    <graphic fileref="images/script-editor.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1293,7 +1287,7 @@
     <title>
      The table tool
     </title>
-    <graphic fileref="query-browser/tabletool.png" lang="en" format="PNG"/>
+    <graphic fileref="images/tabletool.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1547,7 +1541,7 @@
     <title>
      The BLOB handling icons
     </title>
-    <graphic fileref="query-browser/blob-buttons.png" lang="en" format="PNG"/>
+    <graphic fileref="images/blob-buttons.png" lang="en" format="PNG"/>
    </figure>
 
    <para>
@@ -1746,7 +1740,7 @@
     <title>
      The dynamic parameter list
     </title>
-    <graphic fileref="query-browser/dynamiclist.png" lang="en" format="PNG"/>
+    <graphic fileref="images/dynamiclist.png" lang="en" format="PNG"/>
    </figure>
 
    <para>

--- 1.3/Docs/query-browser/chapter-options-query-browser.xml	2005-05-01 22:34:16 -05:00
+++ 1.5/query-browser/chapter-options-query-browser.xml	2005-05-29 22:20:57 -05:00
@@ -14,7 +14,7 @@
 
 <figure>
  <title>The query browser options dialog</title>
- <graphic fileref="query-browser/qb-options.png" lang="en" format="PNG"/>
+ <graphic fileref="images/qb-options.png" lang="en" format="PNG"/>
 </figure>
 
  <sect2 id="gui-options-query-browser-display-options">
--- New file ---
+++ administrator/Makefile	05/05/29 22:20:57
# Makefile for MySQL Administrator manual

# Formats we need for docsrva
# chm
# html-chapter
# html-section
# html-web
# pdf-a4
# pdf

# xhtml

# Location of repository root relative to current directory
REPO_ROOT = ..

# Location of directory containing Makefile components
MAKE_DIR = $(REPO_ROOT)/make.d

all::
	@echo "You must say what you want to do."
	@echo "Some commands supported by this Makefile:"
	@echo "  make clean"
	@echo "  make doc_name.html"
	@echo "  make doc_name.pdf"
	@echo "  make doc_name.txt"

# Dependency list for MySQL Administrator document

# NOTE: THIS ISN'T CORRECT BECAUSE SOME FILES ARE REFERENCED
# WITH ENTITIES RATHER THAN WITH XINCLUDEs.

ADMINISTRATOR_SRCS = \
	administrator.xml \
	images/connection.png \
	images/configure-service-mode-connection.png \
	images/configure-service-mode-window.png \
	images/mainwindow.png \
	images/marked-area.png \
	images/user-accounts.png \
	images/user-information.png \
	images/graph-settings.png \
	images/server-logs-general-log.png \
	images/restore-content.png \
	images/replication.png \
	gui-common/images/tableeditor.png \
	gui-common/images/columneditor.png \
	gui-common/images/indexeditor.png \
	gui-common/images/confirmchanges.png \
	gui-common/images/options.png \
	gui-common/images/options-connection.png \
	images/system-tray.png \
	gui-common/images/connectionerror.png

administrator-prepped.xml: $(ADMINISTRATOR_SRCS)

# Overrides for generic rules

administrator.html-section: administrator.html-section.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

administrator.html-chapter: administrator.html-chapter.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

administrator.html-web: administrator.html-web.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

administrator.html-help: administrator.html-help.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

# Import standard variables and target rules
include $(MAKE_DIR)/vars-layout
include $(MAKE_DIR)/vars-shell
include $(MAKE_DIR)/vars-docbook
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
include $(MAKE_DIR)/xml-prep
#include $(MAKE_DIR)/xml-html
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
include $(MAKE_DIR)/xml-html-help
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
#include $(MAKE_DIR)/xml-txt
#include $(MAKE_DIR)/xml-texi
#include $(MAKE_DIR)/texi-info
include $(MAKE_DIR)/xml-toc

--- New file ---
+++ administrator/gui-common	05/05/29 21:53:20
SYMLINK -> ../gui-common


--- 1.3/internals/Makefile	2005-05-28 22:57:02 -05:00
+++ 1.4/internals/Makefile	2005-05-29 22:20:57 -05:00
@@ -1,4 +1,4 @@
-# Makefile for MySQL Internals Manual
+# Makefile for MySQL Internals manual
 
 # Formats we need for docsrva
 # chm

--- 1.1/migration-toolkit/Makefile	2005-05-28 22:57:02 -05:00
+++ 1.2/migration-toolkit/Makefile	2005-05-29 22:20:57 -05:00
@@ -1,4 +1,4 @@
-# Makefile for MySQL Migration Toolkit Manual
+# Makefile for MySQL Migration Toolkit manual
 
 # Formats we need for docsrva
 # chm
--- New file ---
+++ query-browser/Makefile	05/05/29 22:20:58
# Makefile for MySQL Query Browser manual

# Formats we need for docsrva
# chm
# html-chapter
# html-section
# html-web
# pdf-a4
# pdf

# xhtml

# Location of repository root relative to current directory
REPO_ROOT = ..

# Location of directory containing Makefile components
MAKE_DIR = $(REPO_ROOT)/make.d

all::
	@echo "You must say what you want to do."
	@echo "Some commands supported by this Makefile:"
	@echo "  make clean"
	@echo "  make doc_name.html"
	@echo "  make doc_name.pdf"
	@echo "  make doc_name.txt"

# Dependency list for MySQL Query Browser document

# NOTE: THIS ISN'T CORRECT BECAUSE SOME FILES ARE REFERENCED
# WITH ENTITIES RATHER THAN WITH XINCLUDEs.

QUERY_BROWSER_SRCS = \
	query-browser.xml \
	images/connection.png \
	images/mainscreen.png \
	images/querybar.png \
	images/twosakilas.png \
	images/buttonbar.png \
	images/schematabrowser.png \
	images/script-editor.png \
	images/tabletool.png \
	images/blob-buttons.png \
	images/dynamiclist.png \
	gui-common/images/tableeditor.png \
	gui-common/images/columneditor.png \
	gui-common/images/indexeditor.png \
	gui-common/images/confirmchanges.png \
	gui-common/images/options.png \
	gui-common/images/options-connection.png \
	images/qb-options.png \
	gui-common/images/connectionerror.png

query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)

# Overrides for generic rules

query-browser.html-section: query-browser.html-section.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

query-browser.html-chapter: query-browser.html-chapter.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

query-browser.html-web: query-browser.html-web.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

query-browser.html-help: query-browser.html-help.d
	-$(RM) -r $</images
	mkdir $</images
	cp gui-common/images/*.png $</images
	cp images/*.png $</images
	$(TOOLS_DIR)/remap-img-paths.pl $</*.html
	touch $@

# Import standard variables and target rules
include $(MAKE_DIR)/vars-layout
include $(MAKE_DIR)/vars-shell
include $(MAKE_DIR)/vars-docbook
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
include $(MAKE_DIR)/xml-prep
#include $(MAKE_DIR)/xml-html
include $(MAKE_DIR)/xml-html-section
include $(MAKE_DIR)/xml-html-chapter
include $(MAKE_DIR)/xml-html-web
include $(MAKE_DIR)/xml-html-help
#include $(MAKE_DIR)/xml-xhtml
include $(MAKE_DIR)/xml-pdf
#include $(MAKE_DIR)/xml-txt
#include $(MAKE_DIR)/xml-texi
#include $(MAKE_DIR)/texi-info
include $(MAKE_DIR)/xml-toc

--- New file ---
+++ query-browser/gui-common	05/05/29 21:53:12
SYMLINK -> ../gui-common