List:Commits« Previous MessageNext Message »
From:mcbrown Date:March 17 2008 4:57pm
Subject:svn commit - mysqldoc@docsrva: r10276 - in trunk: . dynamic-docs/changelog falcon gui-common guibook migration-toolkit quick-guides refman-4.1 refman-...
View as plain text  
Author: mcbrown
Date: 2008-03-17 17:57:55 +0100 (Mon, 17 Mar 2008)
New Revision: 10276

Log:
Updating the Workbench version 5.0.15 to be RC, not beta
Removing the userguide directory (moved to Forge)
Reformat



Modified:
   trunk/dynamic-docs/changelog/workbench-versions.xml
   trunk/dynamic-docs/changelog/workbench.xml
   trunk/falcon/falcon.xml
   trunk/gui-common/chapter-grt-shell.xml
   trunk/gui-common/chapter-table-editor.xml
   trunk/gui-common/chapter-upgrade-all.xml
   trunk/gui-common/fdl-notice.xml
   trunk/gui-common/installation-all.xml
   trunk/gui-common/starting-all.xml
   trunk/guibook/guibook.xml
   trunk/migration-toolkit/scripted-migration.xml
   trunk/quick-guides/mysqld-optvar-core.xml
   trunk/refman-4.1/dba-core.xml
   trunk/refman-4.1/mysql-cluster.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/mysql-cluster.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.1-maria/se-maria.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-6.0/errors-problems.xml
   trunk/refman-6.0/mysql-cluster.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-common/ha-heartbeat.xml
   trunk/refman-common/ha-topology.xml
   trunk/refman-common/news-cnet-core.xml
   trunk/workbench/change-history.xml
   trunk/workbench/documenting-database.xml
   trunk/workbench/editions.xml
   trunk/workbench/expanding.xml
   trunk/workbench/foreign-key-relationships.xml
   trunk/workbench/grt-shell.xml
   trunk/workbench/images.xml
   trunk/workbench/initial-startup.xml
   trunk/workbench/layers.xml
   trunk/workbench/mysql-enterprise.xml
   trunk/workbench/news-workbench-core.xml
   trunk/workbench/notes.xml
   trunk/workbench/plugins.xml
   trunk/workbench/printing.xml
   trunk/workbench/reference.xml
   trunk/workbench/reverse-engineering.xml
   trunk/workbench/server-connection-wizard.xml
   trunk/workbench/stored-procedures.xml
   trunk/workbench/tables.xml
   trunk/workbench/text-objects.xml
   trunk/workbench/tutorial.xml
   trunk/workbench/upgrading.xml
   trunk/workbench/validation-plugins.xml
   trunk/workbench/views.xml
   trunk/workbench/workbench.xml
   trunk/workbench/writing-scripts.xml


Modified: trunk/dynamic-docs/changelog/workbench-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/workbench-versions.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/dynamic-docs/changelog/workbench-versions.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 528 bytes

@@ -4,7 +4,7 @@
 
   <mysqlproductname title="MySQL Workbench"/>
   
-  <versionentry ver="5.0.15beta" reldate="17 March 2008">
+  <versionentry ver="5.0.15rc" reldate="17 March 2008">
     
     <versionentrypreamble>
       


Modified: trunk/dynamic-docs/changelog/workbench.xml
===================================================================
--- trunk/dynamic-docs/changelog/workbench.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/dynamic-docs/changelog/workbench.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 36, Lines Added: 36, Lines Deleted: 36; 5459 bytes

@@ -13,7 +13,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -34,7 +34,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -58,7 +58,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -81,7 +81,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -104,7 +104,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -126,7 +126,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -147,7 +147,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -168,7 +168,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -189,7 +189,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -211,7 +211,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -233,7 +233,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -255,7 +255,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -277,7 +277,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -299,7 +299,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -321,7 +321,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -344,7 +344,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -366,7 +366,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -387,7 +387,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -409,7 +409,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -433,7 +433,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -455,7 +455,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -478,7 +478,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -499,7 +499,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -521,7 +521,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -543,7 +543,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -566,7 +566,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -589,7 +589,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -611,7 +611,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -634,7 +634,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -656,7 +656,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -677,7 +677,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -699,7 +699,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -720,7 +720,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -741,7 +741,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -785,7 +785,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>

@@ -807,7 +807,7 @@
     </bugs>
 
     <versions>
-      <version ver="5.0.15beta"/>
+      <version ver="5.0.15rc"/>
     </versions>
 
     <message>


Modified: trunk/falcon/falcon.xml
===================================================================
--- trunk/falcon/falcon.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/falcon/falcon.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 804 bytes

@@ -14,7 +14,10 @@
     <abstract>
 
       <para>
-        This manual has been deprecated - please use <ulink url="http://dev.mysql.com.doc/6.0/en/se-falcon.html">Falcon Storage Engine</ulink> within the         <ulink url="http://dev.mysql.com/doc/refman/6.0/en/index.html">MySQL
+        This manual has been deprecated - please use
+        <ulink url="http://dev.mysql.com.doc/6.0/en/se-falcon.html">Falcon
+        Storage Engine</ulink> within the
+        <ulink url="http://dev.mysql.com/doc/refman/6.0/en/index.html">MySQL
         6.0 Reference Manual</ulink>.
       </para>
 


Modified: trunk/gui-common/chapter-grt-shell.xml
===================================================================
--- trunk/gui-common/chapter-grt-shell.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/chapter-grt-shell.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 9, Lines Added: 29, Lines Deleted: 34; 5488 bytes

@@ -18,11 +18,10 @@
     <para>
       The GRT is a thin C layer, inspired by Objective C, which allows
       for dynamic typing and dynamic data objects. The GRT is used by
-       the &migration_toolkit; and provides a means
-      for expanding these tools. Through the use of the GRT, these tools
-      can support new behavior and data sources using code written in
-      languages such as C, C++, Java, Python, and Lua with support for
-      Mono forthcoming.
+      the &migration_toolkit; and provides a means for expanding these
+      tools. Through the use of the GRT, these tools can support new
+      behavior and data sources using code written in languages such as
+      C, C++, Java, Python, and Lua with support for Mono forthcoming.
     </para>
 
     <para>

@@ -41,16 +40,14 @@
       applications. For more information about this language see
       <ulink url="http://www.lua.org/">lua.org</ulink>.
     </para>
-    
-    
+
     <note>
       <para>
-        The GRT supports Lua version 5.0. Version 5.1 is
-        not supported.
+        The GRT supports Lua version 5.0. Version 5.1 is not supported.
       </para>
     </note>
 
-    <!--note>
+<!--note>
       <para>
         The GRT shell is used both in the &migration_toolkit; and the
         &workbench;. However, the &migration_toolkit; is only available

@@ -72,8 +69,8 @@
       the <guimenu>GRT Environment Shell</guimenu> option under the
       <guimenu>Tools</guimenu> menu. I
     </para>
-    
-    <!--para>
+
+<!--para>
       n &workbench; under Windows,
       choose <guimenu>View</guimenu>, <guimenu>Advanced</guimenu>,
       <guimenu>Show GRT Shell</guimenu>. Under Linux simply choose

@@ -303,7 +300,7 @@
 
         <title>The <literal>Values</literal> Tab</title>
 
-        <!--para>
+<!--para>
           The objects shown in this tab differ depending upon which
           &gui_tools; application you are running. For example, if you
           are running &workbench; you should find a

@@ -323,8 +320,8 @@
         </para-->
 
         <para>
-          If you are running &migration_toolkit;, 
-          find a <literal>migration</literal> object beneath the
+          If you are running &migration_toolkit;, find a
+          <literal>migration</literal> object beneath the
           <literal>root</literal> object. Both applications show the
           <literal>rdbmsMgmt</literal> object.
         </para>

@@ -545,8 +542,7 @@
 
     <para>
       Running this <literal>for</literal> loop outputs the names of the
-      database formats supported by  the
-      &migration_toolkit;:
+      database formats supported by the &migration_toolkit;:
     </para>
 
 <programlisting>

@@ -602,12 +598,11 @@
     </note>
 
     <para>
-      In addition to using the GRT shell from within 
-      the &migration_toolkit;, you can invoke it directly from the
-      command line. If the location of the &gui_tools; is not included
-      in the <literal>PATH</literal> variable, navigate to the
-      installation directory and find the <filename>grtsh.exe</filename>
-      file.
+      In addition to using the GRT shell from within the
+      &migration_toolkit;, you can invoke it directly from the command
+      line. If the location of the &gui_tools; is not included in the
+      <literal>PATH</literal> variable, navigate to the installation
+      directory and find the <filename>grtsh.exe</filename> file.
     </para>
 
     <para>

@@ -710,13 +705,13 @@
     <para>
       Perhaps most importantly, you can pass a <literal>Lua</literal>
       script to the shell on startup. This allows you to perform tasks
-      using a script file without even opening the
-      &migration_toolkit;. This is an especially useful feature if you
-      need to migrate the same database a number of times or you want to
-      customize a migration. You can easily create a
-      <literal>Lua</literal> script by clicking the <guibutton>Generate
-      Migration Script</guibutton> when migrating using the graphical
-      interface. For information on creating a Lua script see,
+      using a script file without even opening the &migration_toolkit;.
+      This is an especially useful feature if you need to migrate the
+      same database a number of times or you want to customize a
+      migration. You can easily create a <literal>Lua</literal> script
+      by clicking the <guibutton>Generate Migration Script</guibutton>
+      when migrating using the graphical interface. For information on
+      creating a Lua script see,
       <xref linkend="mysql-migration-toolkit-indepth-summary"/>. A Lua
       migration script is examined in detail in
       <xref linkend="scripted-migration" />.

@@ -730,10 +725,10 @@
 
     <para>
       The appearance of the GRT shell run from the command line is
-      identical to its appearance when run from within 
-      the &migration_toolkit;. All the commands and options described
-      in <xref linkend="using-grt-shell"/> are available when the GRT
-      shell is invoked from the command line.
+      identical to its appearance when run from within the
+      &migration_toolkit;. All the commands and options described in
+      <xref linkend="using-grt-shell"/> are available when the GRT shell
+      is invoked from the command line.
     </para>
 
   </section>


Modified: trunk/gui-common/chapter-table-editor.xml
===================================================================
--- trunk/gui-common/chapter-table-editor.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/chapter-table-editor.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 885 bytes

@@ -15,8 +15,8 @@
 
     <para>
       The &table_editor; is a component of the &query_browser; and the
-      &administrator; enabling the visual creation and
-      modification of tables.
+      &administrator; enabling the visual creation and modification of
+      tables.
     </para>
 
     <para>

@@ -36,7 +36,7 @@
       button to access the &table_editor;.
     </para>
 
-    <!--para>
+<!--para>
       The &table_editor; can be accessed from the &workbench; by double
       clicking a table in the <literal>Main View</literal> panel. On
       Windows you also have the option of right-clicking in the schemata


Modified: trunk/gui-common/chapter-upgrade-all.xml
===================================================================
--- trunk/gui-common/chapter-upgrade-all.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/chapter-upgrade-all.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 3; 814 bytes

@@ -43,7 +43,6 @@
 
     <title>Upgrading &ndash; Linux</title>
 
-    
     <section id="guitools-tarball-upgrade">
 
       <title>Tarball Upgrade</title>

@@ -99,8 +98,8 @@
 
       <para>
         If your previous installation of &gui_tools; included Workbench,
-        (this tool has been removed from the GUI Tools package)
-        you may encounter the following error when upgrading:
+        (this tool has been removed from the GUI Tools package) you may
+        encounter the following error when upgrading:
       </para>
 
 <programlisting>


Modified: trunk/gui-common/fdl-notice.xml
===================================================================
--- trunk/gui-common/fdl-notice.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/fdl-notice.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 19; 2009 bytes

@@ -5,27 +5,33 @@
   <!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
 ]>
- <section id="note-gnu-fdl">
-   <title>Preface</title>
+<section id="note-gnu-fdl">
 
-   <para>Unlike the other chapters in this book, <emphasis
-role="bold">this chapter</emphasis>
-     is licensed under the GNU Free Documentation License.</para>
+  <title>Preface</title>
 
-   <para>Copyright (c) 2007-2008 MySQL AB</para>
+  <para>
+    Unlike the other chapters in this book, <emphasis
+role="bold">this
+    chapter</emphasis> is licensed under the GNU Free Documentation
+    License.
+  </para>
 
-   <para>
-     Permission is granted to copy, distribute and/or modify this document
-     under the terms of the GNU Free Documentation License, Version 1.2
-     or any later version published by the Free Software Foundation;
-     with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-     Texts.  A copy of the license is included in the section entitled "GNU
-     Free Documentation License".
-   </para>
+  <para>
+    Copyright (c) 2007-2008 MySQL AB
+  </para>
 
-   <para>
-     A copy of the GNU Free Documentation License is included in this
-     document; see <xref linkend="gfdl"/>.
-   </para>
+  <para>
+    Permission is granted to copy, distribute and/or modify this
+    document under the terms of the GNU Free Documentation License,
+    Version 1.2 or any later version published by the Free Software
+    Foundation; with no Invariant Sections, no Front-Cover Texts, and no
+    Back-Cover Texts. A copy of the license is included in the section
+    entitled "GNU Free Documentation License".
+  </para>
 
- </section>
+  <para>
+    A copy of the GNU Free Documentation License is included in this
+    document; see <xref linkend="gfdl"/>.
+  </para>
+
+</section>


Modified: trunk/gui-common/installation-all.xml
===================================================================
--- trunk/gui-common/installation-all.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/installation-all.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 7; 1293 bytes

@@ -21,12 +21,11 @@
     </para>
 
     <para>
-      The &migration_toolkit;  requires the Java
-      Runtime Environment (JRE). The minimum version supported is 5.0
-      update 8.
+      The &migration_toolkit; requires the Java Runtime Environment
+      (JRE). The minimum version supported is 5.0 update 8.
     </para>
 
-    <!--para>
+<!--para>
       Regardless of platform, a working, current
       <literal>OpenGL</literal> installation is required by the
       &workbench;. To find out more about <literal>OpenGL</literal> got

@@ -152,9 +151,8 @@
         Using a ZIP program, unpack it to the directory of your choice.
         You may also want to create shortcuts to
         <literal>MySQLAdministrator.exe</literal>,
-        <literal>MySQLMigrationTool.exe</literal>,  and
-        <literal>MySQLQueryBrowser.exe</literal>
-        for your desktop or the
+        <literal>MySQLMigrationTool.exe</literal>, and
+        <literal>MySQLQueryBrowser.exe</literal> for your desktop or the
         quick launch bar.
       </para>
 


Modified: trunk/gui-common/starting-all.xml
===================================================================
--- trunk/gui-common/starting-all.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/gui-common/starting-all.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 2; 518 bytes

@@ -39,7 +39,6 @@
         </para>
       </listitem>
 
-      
       <listitem>
         <para>
           <literal>MySQLMigrationTool.exe</literal>

@@ -95,7 +94,7 @@
         </para>
       </listitem>
 
-      </itemizedlist>
+    </itemizedlist>
 
     <note>
       <para>


Modified: trunk/guibook/guibook.xml
===================================================================
--- trunk/guibook/guibook.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/guibook/guibook.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 3; 759 bytes

@@ -81,7 +81,6 @@
         </para>
       </listitem>
 
-      
     </itemizedlist>
 
     <note>

@@ -204,12 +203,12 @@
     <xi:include href="../migration-toolkit/extending.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <xi:include href="../migration-toolkit/accessprep.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-    
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../gui-common/chapter-grt-shell.xml"/>
 
   </part>
 
-  <!--part id="workbench">
+<!--part id="workbench">
 
     <title>&workbench;</title>
 


Modified: trunk/migration-toolkit/scripted-migration.xml
===================================================================
--- trunk/migration-toolkit/scripted-migration.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/migration-toolkit/scripted-migration.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 676 bytes

@@ -25,13 +25,13 @@
     have some familiarity with programming you should be able to make
     sense of this script without too much effort.
   </para>
-  
+
   <note>
     <para>
       The &migration_toolkit; supports Lua version 5.0. Version 5.1 is
       not supported.
     </para>
-  </note>  
+  </note>
 
   <para>
     For a better understanding of the migration script, it is useful to


Modified: trunk/quick-guides/mysqld-optvar-core.xml
===================================================================
--- trunk/quick-guides/mysqld-optvar-core.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/quick-guides/mysqld-optvar-core.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 3; 744 bytes

@@ -28,8 +28,8 @@
 
     <listitem>
       <para>
-        <emphasis role="bold">Intr</emphasis> &mdash; the version in which
-        the option or variable was introduced in
+        <emphasis role="bold">Intr</emphasis> &mdash; the version in
+        which the option or variable was introduced in
         <literal>mysqld</literal>
       </para>
     </listitem>

@@ -126,4 +126,3 @@
   <para condition="dynamic:optvar:versionsummary" role="all:mysqld:all"/>
 
 </chapter>
-


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-4.1/dba-core.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 772 bytes

@@ -9154,7 +9154,8 @@
     <para>
       You might also see <literal>DISABLED</literal> for a storage
       engine if the server was compiled to support it, but was started
-      with a <option>--skip-<replaceable>engine_name</replaceable></option>
+      with a
+      <option>--skip-<replaceable>engine_name</replaceable></option>
       option. For example, <option>--skip-innodb</option> disables the
       <literal>InnoDB</literal> engine. For the <literal>NDB
       Cluster</literal> storage engine, <literal>DISABLED</literal>


Modified: trunk/refman-4.1/mysql-cluster.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-4.1/mysql-cluster.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 687 bytes

@@ -139,7 +139,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
-  
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.0/errors-problems.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 913 bytes

@@ -2246,8 +2246,8 @@
           To change the number of file descriptors available to
           <command>mysqld</command>, you can use the
           <option>--open-files-limit</option> option to
-          <command>mysqld_safe</command> or set
-          the <literal>open_files_limit</literal> system variable. See
+          <command>mysqld_safe</command> or set the
+          <literal>open_files_limit</literal> system variable. See
           <xref linkend="server-system-variables"/>. The easiest way to
           set these values is to add an option to your option file. See
           <xref linkend="option-files"/>. If you have an old version of


Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.0/mysql-cluster.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 687 bytes

@@ -136,7 +136,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
-  
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>


Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.0/restrictions.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 637 bytes

@@ -37,8 +37,8 @@
     <para>
       Some of the restrictions noted here apply to all stored routines;
       that is, both to stored procedures and stored functions. Some of
-      these restrictions apply only to stored functions, and not to stored
-      procedures.
+      these restrictions apply only to stored functions, and not to
+      stored procedures.
     </para>
 
     <para>


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.1/errors-problems-core.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 928 bytes

@@ -2250,8 +2250,8 @@
           To change the number of file descriptors available to
           <command>mysqld</command>, you can use the
           <option>--open-files-limit</option> option to
-          <command>mysqld_safe</command> or set
-          the <literal>open_files_limit</literal> system variable. See
+          <command>mysqld_safe</command> or set the
+          <literal>open_files_limit</literal> system variable. See
           <xref linkend="server-system-variables"/>. The easiest way to
           set these values is to add an option to your option file. See
           <xref linkend="option-files"/>. If you have an old version of


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.1/restrictions.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 637 bytes

@@ -46,8 +46,8 @@
     <para>
       Some of the restrictions noted here apply to all stored routines;
       that is, both to stored procedures and stored functions. Some of
-      these restrictions apply only to stored functions, and not to stored
-      procedures.
+      these restrictions apply only to stored functions, and not to
+      stored procedures.
     </para>
 
     <para>


Modified: trunk/refman-5.1-maria/se-maria.xml
===================================================================
--- trunk/refman-5.1-maria/se-maria.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-5.1-maria/se-maria.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 6, Lines Added: 38, Lines Deleted: 16; 3340 bytes

@@ -244,9 +244,18 @@
           page size without recreating all your <literal>Maria</literal>
           tables.
         </para>
-        
-        <note><para>To change the block size of existing tables, you should use <command>mysqldump</command> to  save a copy of the table data, stop <command>mysqld</command>, remove the <filename>maria_log_control</filename> file and reconfigure the block size before starting up <command>mysqld</command> again.</para></note>
 
+        <note>
+          <para>
+            To change the block size of existing tables, you should use
+            <command>mysqldump</command> to save a copy of the table
+            data, stop <command>mysqld</command>, remove the
+            <filename>maria_log_control</filename> file and reconfigure
+            the block size before starting up <command>mysqld</command>
+            again.
+          </para>
+        </note>
+
         <para>
           The configuration setting of this value is recorded within the
           <filename>maria_log_control</filename> file the first time

@@ -296,11 +305,18 @@
           files will be stored. You can set this to another device to
           improve performance.
         </para>
-        
-        <para>The default value is to use the same directory as the <option>datadir</option> option. </para>
-        
-        <note><para>This option is not available through a variable within <command>mysqld</command>.</para></note>
-        
+
+        <para>
+          The default value is to use the same directory as the
+          <option>datadir</option> option.
+        </para>
+
+        <note>
+          <para>
+            This option is not available through a variable within
+            <command>mysqld</command>.
+          </para>
+        </note>
       </listitem>
 
       <listitem>

@@ -361,8 +377,10 @@
           </listitem>
 
         </itemizedlist>
-        <para>Default is <literal>immediate</literal>.</para>
-        
+
+        <para>
+          Default is <literal>immediate</literal>.
+        </para>
       </listitem>
 
       <listitem>

@@ -374,8 +392,10 @@
           Don't use the fast sort index method to create index id the
           temporary file would get bigger than this size.
         </para>
-        <para>Default is the maximum file size.</para>
-        
+
+        <para>
+          Default is the maximum file size.
+        </para>
       </listitem>
 
       <listitem>

@@ -392,9 +412,11 @@
           <literal>CHECKSUM</literal> option during <literal>CREATE
           TABLE</literal>.
         </para>
-        
-        <para>Default is for <option>maria_page_checksum</option> to be enabled.</para>
-        
+
+        <para>
+          Default is for <option>maria_page_checksum</option> to be
+          enabled.
+        </para>
       </listitem>
 
       <listitem>

@@ -590,8 +612,8 @@
       </programlisting>
 
         <para>
-          If you create a non-crash safe (non-transactional) table then the
-          option is shown
+          If you create a non-crash safe (non-transactional) table then
+          the option is shown
         </para>
 
 <programlisting>


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-6.0/errors-problems.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 913 bytes

@@ -2239,8 +2239,8 @@
           To change the number of file descriptors available to
           <command>mysqld</command>, you can use the
           <option>--open-files-limit</option> option to
-          <command>mysqld_safe</command> or set
-          the <literal>open_files_limit</literal> system variable. See
+          <command>mysqld_safe</command> or set the
+          <literal>open_files_limit</literal> system variable. See
           <xref linkend="server-system-variables"/>. The easiest way to
           set these values is to add an option to your option file. See
           <xref linkend="option-files"/>. If you have an old version of


Modified: trunk/refman-6.0/mysql-cluster.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-6.0/mysql-cluster.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 687 bytes

@@ -157,7 +157,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
-  
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-mysql-cluster-optvar.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-6.0/restrictions.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 637 bytes

@@ -46,8 +46,8 @@
     <para>
       Some of the restrictions noted here apply to all stored routines;
       that is, both to stored procedures and stored functions. Some of
-      these restrictions apply only to stored functions, and not to stored
-      procedures.
+      these restrictions apply only to stored functions, and not to
+      stored procedures.
     </para>
 
     <para>


Modified: trunk/refman-common/ha-heartbeat.xml
===================================================================
--- trunk/refman-common/ha-heartbeat.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-common/ha-heartbeat.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 737 bytes

@@ -262,8 +262,8 @@
 
     <para>
       To use Heartbeat in combination with MySQL you should be using
-      DRBD (see <xref linkend="ha-drbd"/>) or another solution
-      that allows for sharing of the MySQL database files in event of a
+      DRBD (see <xref linkend="ha-drbd"/>) or another solution that
+      allows for sharing of the MySQL database files in event of a
       system failure. In these examples, DRBD is used as the data
       sharing solution.
     </para>


Modified: trunk/refman-common/ha-topology.xml
===================================================================
--- trunk/refman-common/ha-topology.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-common/ha-topology.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 6; 811 bytes

@@ -256,8 +256,10 @@
 
       <title>Replicating Multiple Masters to One Slave</title>
 
-      <para>Fill...</para>
-      
+      <para>
+        Fill...
+      </para>
+
     </section>
 
   </section>

@@ -266,16 +268,20 @@
 
     <title>Setting up MySQL for High Availability</title>
 
-    <para>Fill...</para>
-    
+    <para>
+      Fill...
+    </para>
+
   </section>
 
   <section id="ha-topology-scalability">
 
     <title>Setting up MySQL for High Scalaibility</title>
 
-    <para>Fill...</para>
-    
+    <para>
+      Fill...
+    </para>
+
   </section>
 
 </section>


Modified: trunk/refman-common/news-cnet-core.xml
===================================================================
--- trunk/refman-common/news-cnet-core.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/refman-common/news-cnet-core.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 542 bytes

@@ -2097,8 +2097,8 @@
 
       <listitem>
         <para>
-          Fixed string encoding so that European characters
-          will work correctly.
+          Fixed string encoding so that European characters will work
+          correctly.
         </para>
       </listitem>
 


Modified: trunk/workbench/change-history.xml
===================================================================
--- trunk/workbench/change-history.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/change-history.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 512 bytes

@@ -8,11 +8,9 @@
 <appendix id="wb-change-history">
 
   <title>&workbench; Change History</title>
-  
-  <para>
-    
-  </para>
 
+  <para></para>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-news-workbench.xml"/>
- 
+
 </appendix>


Modified: trunk/workbench/documenting-database.xml
===================================================================
--- trunk/workbench/documenting-database.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/documenting-database.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 4, Lines Added: 20, Lines Deleted: 21; 3508 bytes

@@ -11,19 +11,18 @@
 
   <para>
     This chapter highlights the capabilities of &workbench; as a
-    documentation tool using the <literal>sakila</literal> database
-    as an example. This is a sample database provided by MySQL and
-    found in the <literal>Example Databases</literal> section
-    of the <ulink url="&base-url-docs;"/> page. 
-    An EER diagram is an invaluable aid to a quick understanding of 
-    any database. There is no need to read through table definition statements;
-    glancing at an EER diagram can immediately indicate that various tables
-    are related.
+    documentation tool using the <literal>sakila</literal> database as
+    an example. This is a sample database provided by MySQL and found in
+    the <literal>Example Databases</literal> section of the
+    <ulink url="&base-url-docs;"/> page. An EER diagram is an invaluable
+    aid to a quick understanding of any database. There is no need to
+    read through table definition statements; glancing at an EER diagram
+    can immediately indicate that various tables are related.
   </para>
-  
+
   <para>
-    You can also see how tables are related; what the foreign keys 
-    are and what the nature of the relationship is. 
+    You can also see how tables are related; what the foreign keys are
+    and what the nature of the relationship is.
   </para>
 
   <section id="wb-sakila-eer-png">

@@ -31,9 +30,9 @@
     <title>A PNG File of the <literal>sakila</literal> Database</title>
 
     <para>
-      Find below an EER digram showing all the tables in 
-      the <literal>sakila</literal> database. This image was
-      created using the menu options <guimenu>File</guimenu>,
+      Find below an EER digram showing all the tables in the
+      <literal>sakila</literal> database. This image was created using
+      the menu options <guimenu>File</guimenu>,
       <guimenu>Export</guimenu>, <guimenu>Export as PNG ...</guimenu>.
     </para>
 

@@ -66,9 +65,9 @@
       <literal>film</literal> table has two foreign keys that relate to
       the <literal>language</literal> table, namely
       <literal>fk_film_language_original</literal> and
-      <literal>fk_film_language</literal>. Where there is more than
-      one relationship between two tables, the connection
-      lines run concurrently.
+      <literal>fk_film_language</literal>. Where there is more than one
+      relationship between two tables, the connection lines run
+      concurrently.
     </para>
 
     <para>

@@ -76,10 +75,10 @@
       solid and broken lines respectively. For example, the foreign key
       <literal>category_id</literal> is part of the primary key in the
       <literal>film_category</literal> table so its relationship to the
-      <literal>category</literal> table is drawn with a solid line.
-      On the other hand, in the <literal>city</literal> table,
-      the foreign key, <literal>country_id</literal>, is not
-      part of the primary key so the connection uses a broken line.
+      <literal>category</literal> table is drawn with a solid line. On
+      the other hand, in the <literal>city</literal> table, the foreign
+      key, <literal>country_id</literal>, is not part of the primary key
+      so the connection uses a broken line.
     </para>
 
   </section>


Modified: trunk/workbench/editions.xml
===================================================================
--- trunk/workbench/editions.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/editions.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 22; 2799 bytes

@@ -9,30 +9,33 @@
 
   <title>&workbench; Editions</title>
 
-    <para><emphasis role="bold">The Community Edition (OSS)</emphasis></para>
+  <para>
+    <emphasis role="bold">The Community Edition (OSS)</emphasis>
+  </para>
 
-    <para>
-      The Community Edition is the foundation of all &workbench;
-      editions&mdash;versions that are currently available or those that
-      will become available in the future. All editions of &workbench;
-      are based on the Community Edition and all future improvements to
-      the base framework and feature set will be included in this
-      version. The Community Edition is a full feature product that puts
-      a powerful database management tool into the hands of the
-      MySQL community.
-    </para>
+  <para>
+    The Community Edition is the foundation of all &workbench;
+    editions&mdash;versions that are currently available or those that
+    will become available in the future. All editions of &workbench; are
+    based on the Community Edition and all future improvements to the
+    base framework and feature set will be included in this version. The
+    Community Edition is a full feature product that puts a powerful
+    database management tool into the hands of the MySQL community.
+  </para>
 
-    <para><emphasis role="bold">The Standard Edition</emphasis></para>
+  <para>
+    <emphasis role="bold">The Standard Edition</emphasis>
+  </para>
 
-    <para>
-      The Standard Edition is a commercial extension that builds on top
-      of the OSS Edition and adds modules and plugins, allowing for an
-      optimized work flow. The highlights of this edition are the added
-      schema object privilege system, schema validation plugins, model
-      reporting, and online printing, as well as reverse engineering and
-      synchronization against live database connections. If you use the
-      &workbench; in a professional environment upgrading to the
-      commercial edition can greatly improve your work flow.
-    </para>
+  <para>
+    The Standard Edition is a commercial extension that builds on top of
+    the OSS Edition and adds modules and plugins, allowing for an
+    optimized work flow. The highlights of this edition are the added
+    schema object privilege system, schema validation plugins, model
+    reporting, and online printing, as well as reverse engineering and
+    synchronization against live database connections. If you use the
+    &workbench; in a professional environment upgrading to the
+    commercial edition can greatly improve your work flow.
+  </para>
 
 </chapter>


Modified: trunk/workbench/expanding.xml
===================================================================
--- trunk/workbench/expanding.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/expanding.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 2; 507 bytes

@@ -8,9 +8,11 @@
 <chapter id="wb-expanding">
 
   <title>Customizing and Expanding MySQL Workbench</title>
-  
+
   <para>
-    <remark>[PL]Will this differ from plugins?</remark>
+    <remark>
+      [PL]Will this differ from plugins?
+    </remark>
   </para>
 
 </chapter>


Modified: trunk/workbench/foreign-key-relationships.xml
===================================================================
--- trunk/workbench/foreign-key-relationships.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/foreign-key-relationships.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 8, Lines Added: 40, Lines Deleted: 37; 6421 bytes

@@ -13,7 +13,8 @@
     Foreign key constraints are supported for the
     <literal>InnoDB</literal> storage engine only. For other storage
     engines the foreign key syntax is correctly parsed but not
-    implemented. For more information see<xref
+    implemented. For more information
+    see<xref
       linkend="ansi-diff-foreign-keys"/>.
   </para>
 

@@ -84,9 +85,9 @@
       where an intermediary table is created to resolve a many-to-many
       relationship. In such cases, the primary key is usually a
       composite key made up of the primary keys from the two original
-      tables. An identifying relationship is indicated by a solid
-      line between the tables and a non-identifying relationship
-      is indicated by a broken line.
+      tables. An identifying relationship is indicated by a solid line
+      between the tables and a non-identifying relationship is indicated
+      by a broken line.
     </para>
 
     <para>

@@ -104,14 +105,14 @@
       relationship. The default name of this field is
       <replaceable>table_name_key_name</replaceable> where the table
       name and the key name are both derived from the table containing
-      the referenced key. 
+      the referenced key.
     </para>
-    
+
     <para>
-      When the many-to-many tool is active, double clicking a table 
-      creates an associative table with a many-to-many relationship.
-      For this tool to function there must be a primary key defined
-      in the initial table.
+      When the many-to-many tool is active, double clicking a table
+      creates an associative table with a many-to-many relationship. For
+      this tool to function there must be a primary key defined in the
+      initial table.
     </para>
 
     <para>

@@ -148,33 +149,35 @@
     <para>
       The <literal>film</literal> and the <literal>film_actor</literal>
       tables are related on the <literal>film_id</literal> field and
-      these fields are highlighted in both tables. Since the <literal>film_id</literal>
-      field is part of the primary key in the <literal>film_actor</literal>
-      table, a solid line is used for the connector between the two tables.
-     </para>
-      
-      <para>
-      If the placement of a connection's caption is not suitable, you can change its position
-      by dragging it to a different location. If you have set a secondary
-      caption, its position can also be changed. (For more information about
-      secondary captions see <xref linkend="wb-connection-properties"/>.
-      Where the notation style allows, <literal>Classic</literal> for instance,
-      the cardinality indicators can also be repositioned.
+      these fields are highlighted in both tables. Since the
+      <literal>film_id</literal> field is part of the primary key in the
+      <literal>film_actor</literal> table, a solid line is used for the
+      connector between the two tables.
     </para>
 
     <para>
+      If the placement of a connection's caption is not suitable, you
+      can change its position by dragging it to a different location. If
+      you have set a secondary caption, its position can also be
+      changed. (For more information about secondary captions see
+      <xref linkend="wb-connection-properties"/>. Where the notation
+      style allows, <literal>Classic</literal> for instance, the
+      cardinality indicators can also be repositioned.
+    </para>
+
+    <para>
       The relationship notation style in
       <xref linkend="wb-foreign-key-image"/> is the default, crow's
       foot. If you are using a commercial version of &workbench; you can
       change this. For more information see
       <xref linkend="wb-relationship-notation-menu"/>.
     </para>
-    
+
     <para>
       You can select multiple connections by holding down the
-      <keycap>Ctrl</keycap> key as you click on a connection.
-      This can be useful for highlighting specific relationships
-      on an EER diagram.
+      <keycap>Ctrl</keycap> key as you click on a connection. This can
+      be useful for highlighting specific relationships on an EER
+      diagram.
     </para>
 
   </section>

@@ -217,10 +220,10 @@
       <guilabel>Visibility</guilabel> frame determines how the
       relationship is displayed on the EER Diagram canvas.
       <literal>Fully Visible</literal> is the default but you can also
-      choose to hide relationship lines or to use split lines.
-      The split line style is pictured in the following:
+      choose to hide relationship lines or to use split lines. The split
+      line style is pictured in the following:
     </para>
-    
+
     <figure id="wb-drawSplit-image">
       <title>The split connector</title>
       <mediaobject>

@@ -232,14 +235,14 @@
         </textobject>
       </mediaobject>
     </figure>
-    
+
     <note>
       <para>
         A broken line connector is used to indicate a non-identifying
         relationship. The split line style can be used with either an
-        identifying relationship or a non-identifying relationship. It is
-        used for display purposes only and does not indicate anything about the
-        nature of a relationship.
+        identifying relationship or a non-identifying relationship. It
+        is used for display purposes only and does not indicate anything
+        about the nature of a relationship.
       </para>
     </note>
 

@@ -268,8 +271,8 @@
         <listitem>
           <para>
             <literal>caption</literal> &ndash; The name of the object.
-            By default this property is centered above the
-            connection line. Its default value is the name of the foreign key.
+            By default this property is centered above the connection
+            line. Its default value is the name of the foreign key.
           </para>
         </listitem>
 

@@ -318,8 +321,8 @@
         <listitem>
           <para>
             <literal>extraCaption</literal> &ndash; A secondary caption.
-            The default location for this extra caption is centered beneath the
-            connection line.
+            The default location for this extra caption is centered
+            beneath the connection line.
           </para>
         </listitem>
 


Modified: trunk/workbench/grt-shell.xml
===================================================================
--- trunk/workbench/grt-shell.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/grt-shell.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 12, Lines Added: 71, Lines Deleted: 72; 8701 bytes

@@ -17,18 +17,22 @@
       The GRT is a thin C layer, inspired by Objective C, which allows
       for dynamic typing and dynamic data objects. The GRT provides a
       means for expanding &workbench;. Through the use of the GRT,
-      &workbench; can support new behavior and data sources using
-      code written in languages such as  C++ and Lua.
+      &workbench; can support new behavior and data sources using code
+      written in languages such as C++ and Lua.
     </para>
 
     <para>
-      The GRT is not only useful for expanding &workbench;. By using
-      a script file from within the GRT shell you can perform repetitive
-      tasks programmatically from the command line. <remark>Suppose, for
-      example, that you have multiple schemata that you wish to migrate
-      to MySQL. You can do this once using the graphical interface, in
-      the process saving the procedure as a script file. You can then
-      adapt this script file and run it unattended from the GRT shell.</remark>
+      The GRT is not only useful for expanding &workbench;. By using a
+      script file from within the GRT shell you can perform repetitive
+      tasks programmatically from the command line.
+
+      <remark>
+        Suppose, for example, that you have multiple schemata that you
+        wish to migrate to MySQL. You can do this once using the
+        graphical interface, in the process saving the procedure as a
+        script file. You can then adapt this script file and run it
+        unattended from the GRT shell.
+      </remark>
     </para>
 
     <para>

@@ -51,9 +55,8 @@
       and choose the <guimenu>GRT Shell</guimenu> option under the
       <guimenu>Advanced</guimenu> submenu. However, the simplest way to
       open the GRT Shell is to use the <keycap>Ctrl</keycap>
-      <keycap>F3</keycap> key combination.
-      If you haven't docked the GRT shell
-      window you should see something similar to the following:
+      <keycap>F3</keycap> key combination. If you haven't docked the GRT
+      shell window you should see something similar to the following:
     </para>
 
     <figure>

@@ -73,8 +76,8 @@
       application The GRT shell itself is the default tab labeled
       <guilabel>Console</guilabel> on the left. Beside it is the
       <literal>Snippets</literal> tab, used for saving code snippets.
-    </para>   
-    
+    </para>
+
   </section>
 
   <section id="wb-grt-shell-window">

@@ -110,13 +113,13 @@
       any of the tabs. This gives you the opportunity to test code from
       the command line.
     </para>
-    
+
     <para>
-      For information on running script files,
-      type <command>? run</command> at the GRT shell prompt.
-      The following message is displayed:
+      For information on running script files, type <command>?
+      run</command> at the GRT shell prompt. The following message is
+      displayed:
     </para>
-    
+
 <programlisting>
   Shell Command - shell.run
   -------------------------

@@ -131,36 +134,36 @@
   run scripts/test.lua
   Runs the script scripts/test.lua.
 </programlisting>
-    
+
     <para>
-      Opening the GRT shell opens additional palettes
-      docked to the immediate left of the shell window
-      or docked on the left side of the application.
-      
+      Opening the GRT shell opens additional palettes docked to the
+      immediate left of the shell window or docked on the left side of
+      the application.
+
       <itemizedlist>
-        
+
         <listitem>
           <para>
             The <literal>Modules and Structs Palettes</literal>
           </para>
         </listitem>
+
         <listitem>
           <para>
             The <literal>GRT Tree</literal>
           </para>
         </listitem>
+
         <listitem>
           <para>
             The <literal>GRT Inspector</literal>
           </para>
         </listitem>
-        
-      </itemizedlist>      
-      
+
+      </itemizedlist>
+
       Discussion of these palettes follows.
     </para>
-    
-   
 
   </section>
 

@@ -170,27 +173,25 @@
 
     <para>
       On the right side bar of the GRT shell window are the
-      <literal>Structs</literal> and <literal>Modules</literal> palettes.
-      Expand these views by mousing over them. To make a view fixed,
-      click the push pin icon in the title bar on the left.
+      <literal>Structs</literal> and <literal>Modules</literal>
+      palettes. Expand these views by mousing over them. To make a view
+      fixed, click the push pin icon in the title bar on the left.
     </para>
-    
+
     <para>
-      Unlike the GRT shell window,
-      the <literal>Modules</literal> and the
-      <literal>structs</literal> windows cannot be be
-      detached from the main application window.       
+      Unlike the GRT shell window, the <literal>Modules</literal> and
+      the <literal>structs</literal> windows cannot be be detached from
+      the main application window.
     </para>
 
     <section id="wb-grt-modules-tab">
 
       <title>The <literal>Modules</literal> Tab</title>
-      
+
       <para>
-        View the <guilabel>Modules</guilabel> tab
-        by mousing over it. To keep this tab
-        open click the push pin icon in the top
-        right corner.
+        View the <guilabel>Modules</guilabel> tab by mousing over it. To
+        keep this tab open click the push pin icon in the top right
+        corner.
       </para>
 
       <para>

@@ -202,7 +203,7 @@
         click a module and you will see its methods.
       </para>
 
-      <!--para>
+<!--para>
         Double clicking a method name will copy it into the GRT shell
         window. You will see how useful this can be in
         <xref linkend="wb-using-grt-shell"/>.

@@ -213,13 +214,11 @@
     <section id="wb-grt-struct-tab">
 
       <title>The <literal>Struct</literal> Tab</title>
-      
-      
+
       <para>
-        View the <guilabel>Struct</guilabel> tab
-        by mousing over it. To keep this tab
-        open click the push pin icon in the top
-        right corner.
+        View the <guilabel>Struct</guilabel> tab by mousing over it. To
+        keep this tab open click the push pin icon in the top right
+        corner.
       </para>
 
       <para>

@@ -285,8 +284,8 @@
 
       <para>
         <remark>
-          [PL]Group by functionality, also need to explain what the icons
-          mean, "S" for struct and so on.
+          [PL]Group by functionality, also need to explain what the
+          icons mean, "S" for struct and so on.
         </remark>
       </para>
 

@@ -320,36 +319,34 @@
     </para>
 
   </section>
-  
+
   <section id="wb-grt-inspector">
-    
+
     <title>The GRT Inspector</title>
-    
+
     <para>
-      The GRT inspector displays the
-      properties of the object that is
+      The GRT inspector displays the properties of the object that is
       currently selected in the <literal>GRT Global Tree</literal>.
-      <remark>Not yet functional.</remark>
+
+      <remark>
+        Not yet functional.
+      </remark>
     </para>
-    
+
   </section>
-  
 
 <!--End Exploring-->
 
-
   <section id="invoking-grt-from-command-line">
 
     <title>Invoking the GRT Shell From the Command Line</title>
 
-    
     <para>
-      In addition to using the GRT shell from within the &workbench;, 
-      you can invoke it directly from the
-      command line. If the location of the &workbench; is not included
-      in the <literal>PATH</literal> variable, navigate to the
-      installation directory and find the <filename>MySQLGrtShell.exe</filename>
-      file.
+      In addition to using the GRT shell from within the &workbench;,
+      you can invoke it directly from the command line. If the location
+      of the &workbench; is not included in the <literal>PATH</literal>
+      variable, navigate to the installation directory and find the
+      <filename>MySQLGrtShell.exe</filename> file.
     </para>
 
     <para>

@@ -362,16 +359,18 @@
 
     <para>
       Doing this opens the GRT shell window as a stand alone window.
-      <remark>[PL]GRT tree window not there.</remark>
+
+      <remark>
+        [PL]GRT tree window not there.
+      </remark>
     </para>
 
-
     <para>
       The default shell is the <literal>Lua</literal> shell and is
       indicated by the <literal>/ &gt;</literal> prompt.
     </para>
 
-    <!--para>
+<!--para>
       Perhaps most importantly, you can pass a <literal>Lua</literal>
       script to the shell on startup. This allows you to perform tasks
       using a script file without even opening the &workbench;.

@@ -388,6 +387,6 @@
       </para-->
 
   </section>
-  
+
 </chapter>
 <!-- end GRT Shell -->


Modified: trunk/workbench/images.xml
===================================================================
--- trunk/workbench/images.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/images.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 6, Lines Added: 26, Lines Deleted: 23; 3844 bytes

@@ -10,9 +10,12 @@
   <title>Creating Images</title>
 
   <para>
-    Images only exist on the EER Diagram canvas;
-    you can only add them from the EER Diagram window.
-    <remark>Doesn't currently work.</remark>
+    Images only exist on the EER Diagram canvas; you can only add them
+    from the EER Diagram window.
+
+    <remark>
+      Doesn't currently work.
+    </remark>
   </para>
 
   <section id="wb-using-image-tool">

@@ -21,10 +24,10 @@
 
     <para>
       Images can be added to an EER Diagram using the
-      <literal>Image</literal> tool on the vertical toolbar. To add an image
-      make sure that the <literal>EER Diagram</literal> tab is selected,
-      and right click the image icon on the vertical toolbar. The image
-      icon is the icon just above the table icon.
+      <literal>Image</literal> tool on the vertical toolbar. To add an
+      image make sure that the <literal>EER Diagram</literal> tab is
+      selected, and right click the image icon on the vertical toolbar.
+      The image icon is the icon just above the table icon.
     </para>
 
     <para>

@@ -34,11 +37,11 @@
     </para>
 
     <para>
-      Create a image by clicking anywhere on the EER Diagram canvas. This
-      opens a file open dialog box. Select the desired image, and close the
-      dialog box to create an image on the canvas.
-      To revert to the default mouse pointer, click the arrow icon at
-      the top of the vertical toolbar.
+      Create a image by clicking anywhere on the EER Diagram canvas.
+      This opens a file open dialog box. Select the desired image, and
+      close the dialog box to create an image on the canvas. To revert
+      to the default mouse pointer, click the arrow icon at the top of
+      the vertical toolbar.
     </para>
 
     <para>

@@ -81,23 +84,23 @@
 
       These menu options function in exactly the same way as they do for
       other objects on an EER diagram. However, images are not database
-      objects so there is no confirmation dialog box when they are deleted.
+      objects so there is no confirmation dialog box when they are
+      deleted.
     </para>
 
   </section>
 
-
   <section id="wb-image-editor">
 
     <title>The Image Editor</title>
 
     <para>
-      You can invoke the image editor by double clicking a image object on
-      an EER Diagram canvas. Doing this opens the image editor docked at
-      the bottom of the application. Double clicking the image editor tab
-      undocks the editor. Double click the title bar to redock it. Any number of images
-      may be open at the same time. Each additional image appears as a
-      tab at the top of the image editor,
+      You can invoke the image editor by double clicking a image object
+      on an EER Diagram canvas. Doing this opens the image editor docked
+      at the bottom of the application. Double clicking the image editor
+      tab undocks the editor. Double click the title bar to redock it.
+      Any number of images may be open at the same time. Each additional
+      image appears as a tab at the top of the image editor,
     </para>
 
     <section id="wb-images-image-tab">

@@ -105,8 +108,8 @@
       <title>The <literal>Image </literal>Tab</title>
 
       <para>
-        From the <literal>Image</literal> tab of the image editor you can
-        perform the following tasks:
+        From the <literal>Image</literal> tab of the image editor you
+        can perform the following tasks:
 
         <itemizedlist>
 

@@ -129,7 +132,7 @@
 
     </section>
 
-    <!--section id="wb-modifying-image">
+<!--section id="wb-modifying-image">
 
       <title>Modifying a Image using the Properties Palette</title>
 


Modified: trunk/workbench/initial-startup.xml
===================================================================
--- trunk/workbench/initial-startup.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/initial-startup.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 22; 1114 bytes

@@ -8,42 +8,45 @@
 <chapter id="wb-initial-startup">
 
   <title>&workbench; Initial Start-up</title>
-  
+
   <section id="wb-activation">
+
     <title>Activation Procedure (Commercial Version)</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
+
   <section id="wb-startup-windows">
+
     <title>Start-up &ndash; Windows</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
+
   <section id="wb-startup-unix">
+
     <title>Start-up &ndash; Unix</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
+
   <section id="wb-startup-osx">
+
     <title>Start-up &ndash; Mac OS X</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
+
   <section id="wb-startup-options">
+
     <title>Start-up Options</title>
-    
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
- 
 
 </chapter>


Modified: trunk/workbench/layers.xml
===================================================================
--- trunk/workbench/layers.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/layers.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 3, Lines Added: 18, Lines Deleted: 18; 2668 bytes

@@ -112,9 +112,9 @@
     <para>
       Since layers are not schema objects, no confirmation dialog box
       opens when you delete a layer regardless of how you have
-      configured &workbench;. Deleting a layer does 
-      <emphasis role="bold">not</emphasis> delete schema
-      objects from the catalog.
+      configured &workbench;. Deleting a layer does
+      <emphasis role="bold">not</emphasis> delete schema objects from
+      the catalog.
     </para>
 
     <section id="wb-adding-objects-layer">

@@ -140,7 +140,7 @@
         As a visual cue that the object is being "locked", the outline
         of the layer is highlighted as the object is dragged over it.
       </para>
-    
+
     </section>
 
   </section>

@@ -155,28 +155,28 @@
       properties accessible from the <literal>Properties</literal>
       palette apply to the appearance of a layer on the EER Diagram
       canvas.
-    </para>    
-    
+    </para>
+
     <para>
-      In some circumstances you may want to make a layer invisible.
-      To do this, select the layer and, in the 
-      <literal>Properties</literal> palette, set the 
+      In some circumstances you may want to make a layer invisible. To
+      do this, select the layer and, in the
+      <literal>Properties</literal> palette, set the
       <literal>visible</literal> property to <literal>False</literal>.
       To locate an invisible object, open the <literal>Layers</literal>
-      palette and select the object by double clicking it.
-      Once an object is selected you can reset the
-      <literal>visible</literal> property from the 
-      <literal>Properties</literal> palette.
-    </para>    
+      palette and select the object by double clicking it. Once an
+      object is selected you can reset the <literal>visible</literal>
+      property from the <literal>Properties</literal> palette.
+    </para>
 
     <para>
       For a list of the properties accessible through the
-      <literal>Properties</literal> palette see      
+      <literal>Properties</literal> palette see
       <xref linkend="wb-properties-palette"/>. In addition to the
-      properties listed there, a layer also has a <literal>description</literal>
-      property. Use this property to document the purpose of the layer.
+      properties listed there, a layer also has a
+      <literal>description</literal> property. Use this property to
+      document the purpose of the layer.
     </para>
 
   </section>
-  
+
 </chapter>


Modified: trunk/workbench/mysql-enterprise.xml
===================================================================
--- trunk/workbench/mysql-enterprise.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/mysql-enterprise.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 729 bytes

@@ -33,8 +33,8 @@
 
       <listitem>
         <para>
-          The MySQL Enterprise Monitor &ndash; An automated
-          virtual DBA assistant that monitors all your MySQL Servers
+          The MySQL Enterprise Monitor &ndash; An automated virtual DBA
+          assistant that monitors all your MySQL Servers
           around-the-clock, identifies exceptions to MySQL best
           practices, and provides expert advice on fixing any problems
           discovered


Modified: trunk/workbench/news-workbench-core.xml
===================================================================
--- trunk/workbench/news-workbench-core.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/news-workbench-core.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 23, Lines Deleted: 27; 2053 bytes

@@ -12,38 +12,34 @@
 Do not add changelog entries to this file - use the changelog XML in mysqldoc/dynamic-docs/changelog/workbench.xml.
 
 -->
+<section  id="changes-5.0.x">
 
-  <section  id="changes-5.0.x">
+  <title>Changes in Release 5.0</title>
 
-    <title>Changes in Release 5.0</title>
-    
-    <remark role="dynamic-dependency-list"/> 
-    
-    <section id="wb-news-5-0-15">
-      
-      <title condition="dynamic:changelog:vertitle" role="5.0.15beta:workbench:all"/>
-      
-      <para condition="dynamic:changelog:entrylist" role="5.0.15beta:workbench:all"/>
-      
-    </section>
-    
-    
-    <section id="wb-news-5-0-14a">
-      
-      <title condition="dynamic:changelog:vertitle" role="5.0.14abeta:workbench:all"/>
-      
-      <para condition="dynamic:changelog:entrylist" role="5.0.14abeta:workbench:all"/>
-      
-    </section>
-      
-    <section id="wb-news-5-0-14">
+  <remark role="dynamic-dependency-list"/>
 
-      <title condition="dynamic:changelog:vertitle" role="5.0.14beta:workbench:all"/>
+  <section id="wb-news-5-0-15">
 
-      <para condition="dynamic:changelog:entrylist" role="5.0.14beta:workbench:all"/>
-      
-    </section>
+    <title condition="dynamic:changelog:vertitle" role="5.0.15rc:workbench:all"/>
 
+    <para condition="dynamic:changelog:entrylist" role="5.0.15rc:workbench:all"/>
 
   </section>
 
+  <section id="wb-news-5-0-14a">
+
+    <title condition="dynamic:changelog:vertitle" role="5.0.14abeta:workbench:all"/>
+
+    <para condition="dynamic:changelog:entrylist" role="5.0.14abeta:workbench:all"/>
+
+  </section>
+
+  <section id="wb-news-5-0-14">
+
+    <title condition="dynamic:changelog:vertitle" role="5.0.14beta:workbench:all"/>
+
+    <para condition="dynamic:changelog:entrylist" role="5.0.14beta:workbench:all"/>
+
+  </section>
+
+</section>


Modified: trunk/workbench/notes.xml
===================================================================
--- trunk/workbench/notes.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/notes.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 4, Lines Added: 27, Lines Deleted: 25; 3714 bytes

@@ -10,10 +10,9 @@
   <title>Creating Notes</title>
 
   <para>
-    You can add notes to a database only from
-    the <literal>Model Notes</literal> section of the
-    <literal>MySQL Model</literal> page.  Notes are typically
-    used to help document the design process.
+    You can add notes to a database only from the <literal>Model
+    Notes</literal> section of the <literal>MySQL Model</literal> page.
+    Notes are typically used to help document the design process.
   </para>
 
   <section id="wb-notes-physical-schemata">

@@ -22,10 +21,10 @@
 
     <para>
       Double clicking the <literal>Add Note</literal> icon in the
-      <literal>Model Notes</literal> section of the
-      <literal>MySQL Model</literal> page adds a note with the default name
-      of <literal>note1</literal>. If a note with this name already
-      exists, the new note is named <literal>note2</literal>.
+      <literal>Model Notes</literal> section of the <literal>MySQL
+      Model</literal> page adds a note with the default name of
+      <literal>note1</literal>. If a note with this name already exists,
+      the new note is named <literal>note2</literal>.
     </para>
 
     <para>

@@ -48,19 +47,22 @@
 
         <listitem>
           <para>
-            <guimenu>Cut '<replaceable>note_name</replaceable>'</guimenu>
+            <guimenu>Cut
+            '<replaceable>note_name</replaceable>'</guimenu>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <guimenu>Copy '<replaceable>note_name</replaceable>'</guimenu>
+            <guimenu>Copy
+            '<replaceable>note_name</replaceable>'</guimenu>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <guimenu>Delete '<replaceable>note_name</replaceable>'</guimenu>
+            <guimenu>Delete
+            '<replaceable>note_name</replaceable>'</guimenu>
           </para>
         </listitem>
 

@@ -74,36 +76,36 @@
     </para>
 
     <para>
-      The cut and copy options
-      are useful for copying notes between different schemata.
+      The cut and copy options are useful for copying notes between
+      different schemata.
     </para>
-      
+
     <para>
-      Notes can only be added on the <literal>MySQL Model</literal> page.
+      Notes can only be added on the <literal>MySQL Model</literal>
+      page.
     </para>
 
-  </section>  
+  </section>
 
   <section id="wb-note-editor">
 
     <title>The Note Editor</title>
 
     <para>
-      You can invoke the note editor by double clicking a note object in the
-      <literal>Model Note</literal> section on the <literal>MySQL
+      You can invoke the note editor by double clicking a note object in
+      the <literal>Model Note</literal> section on the <literal>MySQL
       Model</literal> page. Doing this opens the note editor docked at
       the bottom of the application. Double clicking the note tab
-      undocks the editor. Double click the title bar to redock it. Any number of notes
-      may be open at the same time. Each additional note appears as a
-      tab at the top of the note editor.
+      undocks the editor. Double click the title bar to redock it. Any
+      number of notes may be open at the same time. Each additional note
+      appears as a tab at the top of the note editor.
     </para>
-    
+
     <para>
-      Using the editor you can change the name of a note 
-      or its contents.
+      Using the editor you can change the name of a note or its
+      contents.
     </para>
 
-
   </section>
 
 </chapter>


Modified: trunk/workbench/plugins.xml
===================================================================
--- trunk/workbench/plugins.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/plugins.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 6, Lines Added: 32, Lines Deleted: 32; 4915 bytes

@@ -24,8 +24,8 @@
       The best way to learn about plugins is to examine one. An example
       Lua plugin is located in the <filename>C:\Program
       Files\MySQL\MySQL Workbench
-      <replaceable>version</replaceable>\modules</filename>
-      directory. In that directory you can find the
+      <replaceable>version</replaceable>\modules</filename> directory.
+      In that directory you can find the
       <filename>catalog_utils.grt.lua</filename> Lua file. This is the
       plugin for copying SQL to the clipboard.
     </para>

@@ -59,9 +59,8 @@
 
       </itemizedlist>
 
-      Open the
-      <filename>catalog_utils.grt.lua</filename> file in a text editor.
-      and you can see that it has the required
+      Open the <filename>catalog_utils.grt.lua</filename> file in a text
+      editor. and you can see that it has the required
       <literal>objectPluginInput()</literal> and
       <literal>getPluginInfo()</literal> functions, a helper function
       called <literal>objectPluginInput()</literal> and the function

@@ -83,14 +82,14 @@
       </para>
 
       <para>
-        Notice that the <literal>getPluginInfo</literal> function
-        makes use of the <literal>grtV</literal> module by invoking its
+        Notice that the <literal>getPluginInfo</literal> function makes
+        use of the <literal>grtV</literal> module by invoking its
         <literal>getObj</literal> function. The <literal>grtV</literal>
         module is a built-in Lua module that assists with working from
         the GRT shell. To find out more about the
-        <command>grtV</command> module, type <command>? grtV</command> in
-        the GRT shell console window. You should see something similar
-        to the following:
+        <command>grtV</command> module, type <command>? grtV</command>
+        in the GRT shell console window. You should see something
+        similar to the following:
       </para>
 
 <programlisting>

@@ -133,23 +132,25 @@
   {name="rdbmsManagement", owner=app})
   Create a new object from the struct "db.mgmt.Management"
 </programlisting>
-      
+
       <para>
-        The <literal>grtV.newObj</literal> function is used 
-        by both the <literal>objectPluginInput</literal> and the <literal>getPluginInfo</literal>
-        functions of the <filename>catalog_utils.grt.lua</filename> module.
-        A <literal>structName</literal> is the first parameter for
-        the <literal>grtV.newObj</literal> function. 
-        In the case of the the <literal>objectPluginInput</literal> function
-        in <filename>catalog_utils.grt.lua</filename> module, the
+        The <literal>grtV.newObj</literal> function is used by both the
+        <literal>objectPluginInput</literal> and the
+        <literal>getPluginInfo</literal> functions of the
+        <filename>catalog_utils.grt.lua</filename> module. A
+        <literal>structName</literal> is the first parameter for the
+        <literal>grtV.newObj</literal> function. In the case of the the
+        <literal>objectPluginInput</literal> function in
+        <filename>catalog_utils.grt.lua</filename> module, the
         <literal>structName</literal> is
-        <literal>app.PluginObjectInput</literal>.
-        To find out more about this struct, locate it
-        in the <literal>Structs</literal> window.
+        <literal>app.PluginObjectInput</literal>. To find out more about
+        this struct, locate it in the <literal>Structs</literal> window.
       </para>
-      
+
       <para>
-        <remark>[PL]Expand</remark>
+        <remark>
+          [PL]Expand
+        </remark>
       </para>
 
     </section>

@@ -162,12 +163,11 @@
 
     <para>
       Plugins can be accessed by calling them from the GRT Shell. For
-      more information on this topic see <xref linkend="wb-grt-shell-window"/>.
-      You can also add entries to the <filename>main_menu.xml</filename>
-      file, found in the <filename>C:\Program Files\MySQL\MySQL
-      Workbench
-      <replaceable>version</replaceable>\data</filename>
-      directory.
+      more information on this topic see
+      <xref linkend="wb-grt-shell-window"/>. You can also add entries to
+      the <filename>main_menu.xml</filename> file, found in the
+      <filename>C:\Program Files\MySQL\MySQL Workbench
+      <replaceable>version</replaceable>\data</filename> directory.
     </para>
 
     <para>

@@ -191,9 +191,9 @@
 </programlisting>
 
     <para>
-      Use this entry as a guideline for creating
-      submenus under the <guimenu>Plugins</guimenu> top
-      level menu entry.
+      Use this entry as a guideline for creating submenus under the
+      <guimenu>Plugins</guimenu> top level menu entry.
+
       <remark>
         [PL] Have above explained.
       </remark>


Modified: trunk/workbench/printing.xml
===================================================================
--- trunk/workbench/printing.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/printing.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 36, Lines Deleted: 45; 3720 bytes

@@ -8,91 +8,82 @@
 <chapter id="wb-printing">
 
   <title>Printing (Commercial Version)</title>
-  
+
   <para>
-   The printing options are used to create printouts
-   of your EER Diagrams and are found under the 
-    <guimenu>File</guimenu> menu. For creating 
-    <emphasis>documentation</emphasis> of
-    your models see <xref linkend="wb-reporting"/>.
+    The printing options are used to create printouts of your EER
+    Diagrams and are found under the <guimenu>File</guimenu> menu. For
+    creating <emphasis>documentation</emphasis> of your models see
+    <xref linkend="wb-reporting"/>.
   </para>
-  
+
   <note>
     <para>
-      The printing options apply to the commercial versions
-      of &workbench; only.
+      The printing options apply to the commercial versions of
+      &workbench; only.
     </para>
   </note>
-  
+
   <section id="wb-printing-options">
-    
+
     <title>Printing Options</title>
-    
+
     <para>
-      The printing menu options are grayed if
-      an EER Diagram is not
+      The printing menu options are grayed if an EER Diagram is not
       active. The menu options are as follows:
-      
+
       <itemizedlist>
-        
+
         <listitem>
           <para>
             <guimenu>Page Setup ...</guimenu>
           </para>
-          
+
           <para>
-            Use this option to choose the paper size, orientation, and margins.
+            Use this option to choose the paper size, orientation, and
+            margins.
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             <guimenu>Print</guimenu>
           </para>
-          
+
           <para>
-            Use this option to send your EER Diagram
-            directly to the printer. This option generates
-            a preview before printing. From the preview you
-            can adjust the scale of the view and also
-            choose a multi-page view. Clicking the
-            printer icon at the top left of this
-            window, prints the currently selected EER Diagram.
-            Close the print preview window if you need to
-            adjust the placement of objects on the
-            EER Diagram canvas.
+            Use this option to send your EER Diagram directly to the
+            printer. This option generates a preview before printing.
+            From the preview you can adjust the scale of the view and
+            also choose a multi-page view. Clicking the printer icon at
+            the top left of this window, prints the currently selected
+            EER Diagram. Close the print preview window if you need to
+            adjust the placement of objects on the EER Diagram canvas.
           </para>
-          
         </listitem>
-        
+
         <listitem>
           <para>
             <guimenu>Print to PDF ...</guimenu>
           </para>
-          
+
           <para>
-            Use this option to create a PDF file of your
-            EER Diagram.
+            Use this option to create a PDF file of your EER Diagram.
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             <guimenu>Print to PS ...</guimenu>
           </para>
-          
+
           <para>
-            Use this option to create a PostScript file of your
-            EER Diagram.
+            Use this option to create a PostScript file of your EER
+            Diagram.
           </para>
-          
         </listitem>
-        
+
       </itemizedlist>
-      
-      
     </para>
-    
+
   </section>
-  
+
 </chapter>


Modified: trunk/workbench/reference.xml
===================================================================
--- trunk/workbench/reference.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/reference.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 29, Lines Added: 157, Lines Deleted: 154; 22996 bytes

@@ -22,8 +22,8 @@
 
     <para>
       The &workbench; application is composed of a number of different
-      windows some of which can be detached from the main window.
-      Others cannot be detached but can be docked a various locations.
+      windows some of which can be detached from the main window. Others
+      cannot be detached but can be docked a various locations.
     </para>
 
     <section id="wb-application-layout">

@@ -58,14 +58,14 @@
         <literal>Properties</literal> and <literal>History</literal>
         windows are tabbed and docked on the lower right hand side.
       </para>
-      
+
       <para>
         The windows on the right cannot be detached from the main window
         but they may be docked at any position. You also have the option
-        of autohiding these windows by clicking the push pin icon
-        on the window title bar. Clicking this push pin creates a vertical
-        tab on the right side of the main window. Mouse over this tab
-        to display the window.
+        of autohiding these windows by clicking the push pin icon on the
+        window title bar. Clicking this push pin creates a vertical tab
+        on the right side of the main window. Mouse over this tab to
+        display the window.
       </para>
 
       <para>

@@ -84,13 +84,12 @@
       <title>Docking and Undocking Windows</title>
 
       <para>
-        Of the windows shown in the default view of &workbench; only 
-        EER diagrams and the <literal>MySQL Model</literal>
-        page may be undocked. To detach one of these widows
-        double click the desired tab. Doing this immediately undocks  a
-        window. Redock a window by double clicking the title bar.
-        Doiong this docks the window at its previous location
-        in the main application window .
+        Of the windows shown in the default view of &workbench; only EER
+        diagrams and the <literal>MySQL Model</literal> page may be
+        undocked. To detach one of these widows double click the desired
+        tab. Doing this immediately undocks a window. Redock a window by
+        double clicking the title bar. Doiong this docks the window at
+        its previous location in the main application window .
       </para>
 
       <para>

@@ -128,10 +127,9 @@
         under the <guimenu>View</guimenu>, <guimenu>Windows</guimenu>
         menu option; it will reappear at its last location. For more
         information about the <guilabel>Windows</guilabel> menu options
-        see <xref linkend="wb-view-menu"/>.
-        To reopen the <literal>MySQL Model</literal> window
-        use the <guilabel>Overview</guilabel> option
-        found under the <guimenu>View</guimenu> menu.
+        see <xref linkend="wb-view-menu"/>. To reopen the <literal>MySQL
+        Model</literal> window use the <guilabel>Overview</guilabel>
+        option found under the <guimenu>View</guimenu> menu.
       </para>
 
     </section>

@@ -356,41 +354,41 @@
           <listitem>
             <para>
               <guimenu>Select All</guimenu> (Keyboard shortcut,
-              <keycap>Ctrl</keycap> <keycap>A</keycap>) &ndash;
-              Select all the objects on the active EER diagram.
+              <keycap>Ctrl</keycap> <keycap>A</keycap>) &ndash; Select
+              all the objects on the active EER diagram.
             </para>
           </listitem>
 
           <listitem>
             <para>
               <guimenu>Similar Figures</guimenu> (Objects of the same
-              type) &ndash; Use this option to find objects similar
-              to the currently selected object.
+              type) &ndash; Use this option to find objects similar to
+              the currently selected object.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <guimenu>Connected Figures</guimenu> &ndash; Use this option
-              to find all the objects connected to the currently selected
-              object.
+              <guimenu>Connected Figures</guimenu> &ndash; Use this
+              option to find all the objects connected to the currently
+              selected object.
             </para>
           </listitem>
 
         </itemizedlist>
 
         These menu items are only active when an <guilabel>EER
-        Diagram</guilabel> tab is selected.
-        The <guimenu>Similar Figures</guimenu> and the 
-        <guimenu>Connected Figures</guimenu> menu options are
-        disabled if no object is currently selected on an EER diagram.       
+        Diagram</guilabel> tab is selected. The <guimenu>Similar
+        Figures</guimenu> and the <guimenu>Connected Figures</guimenu>
+        menu options are disabled if no object is currently selected on
+        an EER diagram.
       </para>
-      
+
       <para>
-        When multiple objects have been selected using one of these
-        menu options, you can navigate between selected
-        items by choosing the <guimenu>Go to Next Selected</guimenu> or
-        <guimenu>Go to previous Selected</guimenu> menu options.
+        When multiple objects have been selected using one of these menu
+        options, you can navigate between selected items by choosing the
+        <guimenu>Go to Next Selected</guimenu> or <guimenu>Go to
+        previous Selected</guimenu> menu options.
       </para>
 
       <para>

@@ -1552,8 +1550,8 @@
 
         <para>
           Use the model tab to set the default value for various object
-          names and the primary key data type. A listing of those
-          items with their default values follows:
+          names and the primary key data type. A listing of those items
+          with their default values follows:
 
           <itemizedlist>
 

@@ -1588,12 +1586,12 @@
             </listitem>
 
           </itemizedlist>
-          
+
           The <literal>Primary Key Column Name</literal> is the default
           primary key column name when using the table editor. Likewise
-          with the default primary key data type.
-          The remaining items are the default names used when using
-          the relationship tools on an EER diagram.
+          with the default primary key data type. The remaining items
+          are the default names used when using the relationship tools
+          on an EER diagram.
         </para>
 
         <para>

@@ -1733,7 +1731,10 @@
             <listitem>
               <para>
                 Note Figure Text
-                <remark>[PL]Is this the final name?</remark>
+
+                <remark>
+                  [PL]Is this the final name?
+                </remark>
               </para>
             </listitem>
 

@@ -1775,10 +1776,10 @@
 
           </itemizedlist>
         </para>
-        
+
         <para>
-          Choose from the drop down list of fonts and font sizes.
-          You may also check the <literal>Bold</literal> and
+          Choose from the drop down list of fonts and font sizes. You
+          may also check the <literal>Bold</literal> and
           <literal>Italic</literal> check boxes.
         </para>
 

@@ -2110,7 +2111,7 @@
               <guimenu>Learn How To Code For Workbench</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               <guimenu>Discuss Workbench Topics</guimenu>

@@ -2180,8 +2181,8 @@
 
           <listitem>
             <para>
-              <guimenu>System Info</guimenu> &ndash; information
-              about your system, useful when reporting a bug.
+              <guimenu>System Info</guimenu> &ndash; information about
+              your system, useful when reporting a bug.
             </para>
           </listitem>
 

@@ -2204,17 +2205,18 @@
         Use these menu options to go online and learn more about
         &workbench;.
       </para>
-      
+
       <section id="wb-system-info">
-        
+
         <title>System Info</title>
-        
+
         <para>
-          Use the <guimenu>System Info</guimenu> menu option
-          to determine information about your system. This option is especially
-          useful for determining your rendering mode. Sample output follows.
+          Use the <guimenu>System Info</guimenu> menu option to
+          determine information about your system. This option is
+          especially useful for determining your rendering mode. Sample
+          output follows.
         </para>
-        
+
 <programlisting>
   Adapter String: VirtualBox Video Adapter
   BIOS String: Version 0xB0C2 or later

@@ -2234,8 +2236,7 @@
 </programlisting>
 
       </section>
-      
-      
+
     </section>
 
   </section>

@@ -2469,11 +2470,11 @@
         <guibutton>+</guibutton> button on the top right of the
         <literal>Physical Schemata</literal> panel. To remove a schema,
         click its tab and use the <guibutton>-</guibutton> button found
-        to the immediate left of the <guibutton>+</guibutton> button.
-        To the left of these buttons are three buttons that control the
-        way database object icons are displayed. The left-most button
-        displays database objects as large icons, the next button to the right
-        displays small icons in multiple rows, and the last button 
+        to the immediate left of the <guibutton>+</guibutton> button. To
+        the left of these buttons are three buttons that control the way
+        database object icons are displayed. The left-most button
+        displays database objects as large icons, the next button to the
+        right displays small icons in multiple rows, and the last button
         displays small icons in a single list.
       </para>
 

@@ -2660,12 +2661,12 @@
         </para>
 
         <para>
-           All roles that have been defined are
-          listed under <literal>Roles</literal> on the left side of the
-          role editor. Double clicking a role object opens the role editor docked at
+          All roles that have been defined are listed under
+          <literal>Roles</literal> on the left side of the role editor.
+          Double clicking a role object opens the role editor docked at
           the bottom of the screen.
         </para>
-        
+
         <figure>
           <title>Role editor</title>
           <mediaobject>

@@ -2681,9 +2682,9 @@
         <para>
           Select the role that you wish to add objects to. You may drag
           and drop objects from the <literal>Physical Schemata</literal>
-          or from the <literal>Catalog</literal> panel 
-          to the <literal>Objects</literal> section of the role
-          editor. To assign privileges to a role select a role from the
+          or from the <literal>Catalog</literal> panel to the
+          <literal>Objects</literal> section of the role editor. To
+          assign privileges to a role select a role from the
           <literal>Roles</literal> section and then select an object in
           the <literal>Objects</literal> section. In the
           <literal>Privileges</literal> section check the rights you

@@ -2708,20 +2709,18 @@
         </para>
 
         <para>
-          In the <literal>User Editor</literal>, set the user's
-          name using the <guilabel>Name</guilabel> text
-          box and set the password using the
-          <guilabel>Password</guilabel> text box. Assign one role or a
-          number of roles to the user by selecting the desired roles
-          from the text area on the right and then clicking the
-          <guibutton>&lt;</guibutton> button. Roles may be revoked by
-          moving them in the opposite direction.
+          In the <literal>User Editor</literal>, set the user's name
+          using the <guilabel>Name</guilabel> text box and set the
+          password using the <guilabel>Password</guilabel> text box.
+          Assign one role or a number of roles to the user by selecting
+          the desired roles from the text area on the right and then
+          clicking the <guibutton>&lt;</guibutton> button. Roles may be
+          revoked by moving them in the opposite direction.
         </para>
 
         <para>
           Right clicking a user opens a pop-up menu. These options
-          function as described in
-          <xref linkend="wb-adding-roles"/>.
+          function as described in <xref linkend="wb-adding-roles"/>.
         </para>
 
       </section>

@@ -2806,10 +2805,9 @@
         key associated with the tool. Mousing over a tool displays a
         description of the tool and its shortcut key.
       </para>
-      
+
       <para>
-        A more detailed description of each of these tools
-        follows.
+        A more detailed description of each of these tools follows.
       </para>
 
       <section id="wb-standard-mouse-pointer">

@@ -2883,8 +2881,8 @@
             The delete action of the <literal>eraser</literal> tool is
             controlled by the general option setting for deletion. Be
             sure that you understand the available options described in
-            <xref linkend="wb-options-general"/> before using the
-            eraser tool
+            <xref linkend="wb-options-general"/> before using the eraser
+            tool
           </para>
         </note>
 

@@ -2927,10 +2925,10 @@
         </para>
 
         <para>
-          To change the size of a layer, first select it by clicking on it.
-           When a layer is selected small rectangles appear at each corner
-           and in the middle of each side. Adjust the size by dragging
-           any one of these rectangles.
+          To change the size of a layer, first select it by clicking on
+          it. When a layer is selected small rectangles appear at each
+          corner and in the middle of each side. Adjust the size by
+          dragging any one of these rectangles.
         </para>
 
         <para>

@@ -2942,7 +2940,8 @@
 
         <para>
           From the keyboard, use the <keycap>L</keycap> key to activate
-          this tool. For more information about layers see <xref
+          this tool. For more information about layers see
+          <xref
             linkend="wb-layers"/>.
         </para>
 

@@ -2955,22 +2954,25 @@
         <para>
           The text tool is the square icon with a capital
           <literal>N</literal> in the top left corner. Use this tool to
-          place text objects on the EER diagram canvas. Click the tool and then
-          click the desired location on the canvas. Once a text object has been
-          dropped on the canvas, the mouse pointer reverts to its
-          default.
-          <remark>[PL]Still awaiting confirmation of the name of this object.</remark>
+          place text objects on the EER diagram canvas. Click the tool
+          and then click the desired location on the canvas. Once a text
+          object has been dropped on the canvas, the mouse pointer
+          reverts to its default.
+
+          <remark>
+            [PL]Still awaiting confirmation of the name of this object.
+          </remark>
         </para>
 
         <para>
-          To add text to a text object, right click the text object and choose
-          either of the pop-up menu options, <guimenu>Edit Note
+          To add text to a text object, right click the text object and
+          choose either of the pop-up menu options, <guimenu>Edit Note
           ...</guimenu> or <guimenu>Edit in New Window ...</guimenu>.
         </para>
 
         <para>
-          You can manipulate the properties of a text object by selecting it
-          and then changing its properties in the
+          You can manipulate the properties of a text object by
+          selecting it and then changing its properties in the
           <literal>Properties</literal> panel.
         </para>
 

@@ -2994,7 +2996,8 @@
 
         <para>
           From the keyboard, use the <keycap>I</keycap> key to activate
-          this tool. For more information about images see <xref
+          this tool. For more information about images see
+          <xref
             linkend="wb-images"/>.
         </para>
 

@@ -3163,9 +3166,10 @@
             </listitem>
 
           </itemizedlist>
-          
-          These tools appear at the bottom of the vertical tool bar. Mouse over
-          each tool to see a text hint that describes its function.
+
+          These tools appear at the bottom of the vertical tool bar.
+          Mouse over each tool to see a text hint that describes its
+          function.
         </para>
 
         <para>

@@ -3229,14 +3233,17 @@
       Navigator</literal> palette choose the <guimenu>View</guimenu>,
       <guimenu>Windows</guimenu> menu options and then <guimenu>Model
       Navigator</guimenu>.
-      <remark>[PL]Still awaiting confirmation re docking behaviour</remark>
+
+      <remark>
+        [PL]Still awaiting confirmation re docking behaviour
+      </remark>
     </para>
-    
+
     <para>
-      You can autohide this window by clicking the push pin
-      icon on the title bar. Doing this displays a vertical
-      tab on the right side of the application. 
-      Mouse over this tab to view the <literal>Model Navigator</literal>.
+      You can autohide this window by clicking the push pin icon on the
+      title bar. Doing this displays a vertical tab on the right side of
+      the application. Mouse over this tab to view the <literal>Model
+      Navigator</literal>.
     </para>
 
   </section>

@@ -3298,14 +3305,13 @@
         This palette is principally used to drag and drop objects onto
         an EER diagram canvas.
       </para>
-      
+
       <para>
-        You can autohide this window by clicking the push pin
-        icon on the title bar. Doing this displays a vertical
-        tab on the right side of the application. 
-        Mouse over this tab to view its contents. Autohiding
-        a window when it is a tabbed window, autohides all
-        the tabbed windows at that location.
+        You can autohide this window by clicking the push pin icon on
+        the title bar. Doing this displays a vertical tab on the right
+        side of the application. Mouse over this tab to view its
+        contents. Autohiding a window when it is a tabbed window,
+        autohides all the tabbed windows at that location.
       </para>
 
     </section>

@@ -3319,53 +3325,50 @@
         placed on an EER diagram. If a layer or figure is currently
         selected, an <literal>X</literal> appears beside the name of the
         object and its properties are displayed in the
-        <literal>Properties</literal> palette. This can be especially useful
-        in determining which objects are selected when you have selected
-        multiple objects using the various options under
-        the <guimenu>Select</guimenu> menu option. For more
-        information on this topic see <xref linkend="wb-edit-menu"/>.
+        <literal>Properties</literal> palette. This can be especially
+        useful in determining which objects are selected when you have
+        selected multiple objects using the various options under the
+        <guimenu>Select</guimenu> menu option. For more information on
+        this topic see <xref linkend="wb-edit-menu"/>.
       </para>
 
       <para>
-        Selecting an object in the <literal>Layers</literal>
-        palette also adjusts the view port to the area
-        of the canvas where the object is located.
+        Selecting an object in the <literal>Layers</literal> palette
+        also adjusts the view port to the area of the canvas where the
+        object is located.
       </para>
-      
+
       <para>
-        You can autohide this window by clicking the push pin
-        icon on the title bar. Doing this displays a vertical
-        tab on the right side of the application. 
-        Mouse over this tab to view its contents. Autohiding
-        a window when it is a tabbed window, autohides all
-        the tabbed windows at that location.
+        You can autohide this window by clicking the push pin icon on
+        the title bar. Doing this displays a vertical tab on the right
+        side of the application. Mouse over this tab to view its
+        contents. Autohiding a window when it is a tabbed window,
+        autohides all the tabbed windows at that location.
       </para>
-      
-      
+
       <section id="wb-invisible-objects-layers">
-        
-        <title>Finding Invisible Objects Using the Layers Palette</title>       
-        
+
+        <title>Finding Invisible Objects Using the Layers Palette</title>
+
         <para>
-          In some circumstances you may want to make an object
-          on an EER diagram invisible.
-          To do this, select the object and, in the 
-          <literal>Properties</literal> palette, set the 
-          <literal>visible</literal> property to <literal>False</literal>.
+          In some circumstances you may want to make an object on an EER
+          diagram invisible. To do this, select the object and, in the
+          <literal>Properties</literal> palette, set the
+          <literal>visible</literal> property to
+          <literal>False</literal>.
         </para>
-        
+
         <para>
-          The <literal>Layer</literal> palette provides an
-          easy way to locate an invisible object.
-          Open the <literal>Layers</literal>
-          palette and select the object by double clicking it.
-          Once an object is selected you can reset the
-          <literal>visible</literal> property from the 
+          The <literal>Layer</literal> palette provides an easy way to
+          locate an invisible object. Open the <literal>Layers</literal>
+          palette and select the object by double clicking it. Once an
+          object is selected you can reset the
+          <literal>visible</literal> property from the
           <literal>Properties</literal> palette.
         </para>
-        
-      </section>      
 
+      </section>
+
     </section>
 
   </section>

@@ -3403,9 +3406,9 @@
               object. The color of the object is displayed here as is
               its hexadecimal value. Change the color of the object by
               changing this value. Only characters that are legal for
-              hexadecimal values may be entered. You can also
-              change the color by clicking the <guibutton>...</guibutton>
-              button. This opens a color changer dialog box.
+              hexadecimal values may be entered. You can also change the
+              color by clicking the <guibutton>...</guibutton> button.
+              This opens a color changer dialog box.
             </para>
           </listitem>
 

@@ -3552,10 +3555,10 @@
         to copy. Select non-contiguous entries by using the
         <keycap>Ctrl</keycap> key.
       </para>
-      
+
       <para>
-        Only actions that alter the MySQL model or change an EER diagram are
-        captured by the <literal>History</literal> palette.
+        Only actions that alter the MySQL model or change an EER diagram
+        are captured by the <literal>History</literal> palette.
       </para>
 
     </section>


Modified: trunk/workbench/reverse-engineering.xml
===================================================================
--- trunk/workbench/reverse-engineering.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/reverse-engineering.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 4, Lines Added: 14, Lines Deleted: 17; 2523 bytes

@@ -104,16 +104,14 @@
       the connection dialog window. You may choose to create a new
       connection or simply locate the server you wish to connect to and
       enter your credentials. Instructions for connecting to a server
-      are described in detail in
-      <xref linkend="wb-connection-wizard"/>.
+      are described in detail in <xref linkend="wb-connection-wizard"/>.
     </para>
 
     <para>
-      After confirmation that you have successfully connected
-     to a MySQL server, clicking <guibutton>Next</guibutton>
-      shows the schemata available
-      on the selected MySQL server. 
-      
+      After confirmation that you have successfully connected to a MySQL
+      server, clicking <guibutton>Next</guibutton> shows the schemata
+      available on the selected MySQL server.
+
       <figure>
         <title>Selecting schemata</title>
         <mediaobject>

@@ -124,14 +122,13 @@
             <phrase lang="en">Selecting schemata</phrase>
           </textobject>
         </mediaobject>
-      </figure>      
-      
-      Clicking
-      <guibutton>Cancel</guibutton> returns you to the previous screen.
-      For any of these screens, you can use the <keycap>Enter</keycap>
-      key instead of the <guibutton>Next</guibutton> button and the
-      <keycap>Esc</keycap> key instead of the
-      <guibutton>Cancel</guibutton> button.
+      </figure>
+
+      Clicking <guibutton>Cancel</guibutton> returns you to the previous
+      screen. For any of these screens, you can use the
+      <keycap>Enter</keycap> key instead of the
+      <guibutton>Next</guibutton> button and the <keycap>Esc</keycap>
+      key instead of the <guibutton>Cancel</guibutton> button.
     </para>
 
     <para>

@@ -139,7 +136,7 @@
       select contiguous schemata press the <keycap>Shift</keycap> key
       and click the schemata you wish to select. Non-contiguous schemata
       are selected using the <keycap>Ctrl</keycap> key.
-    </para>      
+    </para>
 
     <para>
       The subsequent screen shows a progress bar; reverse engineering

@@ -158,7 +155,7 @@
       this button if you do not want to import all the objects of a
       specific type.
     </para>
-    
+
     <figure id="wb-schemata-objects">
       <title>Select objects</title>
       <mediaobject>


Modified: trunk/workbench/server-connection-wizard.xml
===================================================================
--- trunk/workbench/server-connection-wizard.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/server-connection-wizard.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 2, Lines Added: 131, Lines Deleted: 131; 10350 bytes

@@ -10,158 +10,159 @@
   <title>Server Connections (Commercial Version)</title>
 
   <para>
-    The <literal>Connections</literal> dialog window is used 
-    with all  the menu options found under the <guimenu>Database</guimenu>
-    menu option. These options are <guimenu>Reverse Engineer ...</guimenu>,
-    <guimenu>Forward Engineer ...</guimenu>, <guimenu>Synchronize ...</guimenu>,
-    and <guimenu>Generate Catalog Diff Report</guimenu>.
-    Use this dialog window to open an ad hoc connection to a server, to open an existing 
-    stored connection, or to create new connections. 
+    The <literal>Connections</literal> dialog window is used with all
+    the menu options found under the <guimenu>Database</guimenu> menu
+    option. These options are <guimenu>Reverse Engineer ...</guimenu>,
+    <guimenu>Forward Engineer ...</guimenu>, <guimenu>Synchronize
+    ...</guimenu>, and <guimenu>Generate Catalog Diff Report</guimenu>.
+    Use this dialog window to open an ad hoc connection to a server, to
+    open an existing stored connection, or to create new connections.
   </para>
-  
+
   <section id="wb-server-connection-window">
-    
+
     <title>Server Connection Window</title>
 
-  <para>
-    In the first window of the server connection wizard
-    you define the properties of the connection.
-  </para>
-  
+    <para>
+      In the first window of the server connection wizard you define the
+      properties of the connection.
+    </para>
+
     <figure id="wb-connection-wizard1">
-    <title>Connect to a server window</title>
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="images/published/wb-connection-wizard1.png" format="PNG" lang="en"/>
-      </imageobject>
-      <textobject>
-        <phrase lang="en">Connect to a server window</phrase>
-      </textobject>
-    </mediaobject>
-  </figure>
-    
+      <title>Connect to a server window</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/published/wb-connection-wizard1.png" format="PNG" lang="en"/>
+        </imageobject>
+        <textobject>
+          <phrase lang="en">Connect to a server window</phrase>
+        </textobject>
+      </mediaobject>
+    </figure>
+
     <note>
       <para>
-        The title of the window shown in <xref linkend="wb-connection-wizard1"/>
-        varies depending upon the operation you are performing.
+        The title of the window shown in
+        <xref linkend="wb-connection-wizard1"/> varies depending upon
+        the operation you are performing.
       </para>
     </note>
 
-  <para>
-    You may choose a stored connection from the drop-down list box to the left
-    of the <guilabel>Stored Connection:</guilabel> label or select
-    <literal>&lt;New Connection&gt;</literal> to create a new
-    connection. The <guibutton>+</guibutton> button to the right of the
-    list box is used when creating a new connection. Click it to open a
-    dialog box to input the name of the new connection. If you wish to
-    delete a connection, use the <guibutton>-</guibutton> button. The
-    <guibutton>C</guibutton> button clears all the data related to a
-    connection.
-  </para>
+    <para>
+      You may choose a stored connection from the drop-down list box to
+      the left of the <guilabel>Stored Connection:</guilabel> label or
+      select <literal>&lt;New Connection&gt;</literal> to create a new
+      connection. The <guibutton>+</guibutton> button to the right of
+      the list box is used when creating a new connection. Click it to
+      open a dialog box to input the name of the new connection. If you
+      wish to delete a connection, use the <guibutton>-</guibutton>
+      button. The <guibutton>C</guibutton> button clears all the data
+      related to a connection.
+    </para>
 
-  <para>
-    Use the <guilabel>Database System</guilabel> list box to select the type
-    of RDBMS server you wish to connect to and select a driver from the
-    <guilabel>Driver</guilabel> list box.
+    <para>
+      Use the <guilabel>Database System</guilabel> list box to select
+      the type of RDBMS server you wish to connect to and select a
+      driver from the <guilabel>Driver</guilabel> list box.
 
-    <remark>
-      [PL]Note other options in the future
-    </remark>
-  </para>
+      <remark>
+        [PL]Note other options in the future
+      </remark>
+    </para>
 
-  <para>
-    When you select a connection profile from the <guilabel>Stored
-    Connection</guilabel> list box or when you create a new connection,
-    the <literal>Parameters</literal> tab displays the following fields:
-  </para>
+    <para>
+      When you select a connection profile from the <guilabel>Stored
+      Connection</guilabel> list box or when you create a new
+      connection, the <literal>Parameters</literal> tab displays the
+      following fields:
+    </para>
 
-  <itemizedlist>
+    <itemizedlist>
 
-    <listitem>
-      <para>
-        <guilabel>Hostname</guilabel>: The host name or IP address of
-        the MySQL server
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Hostname</guilabel>: The host name or IP address of
+          the MySQL server
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Port</guilabel>: The TCP/IP port on which the MySQL
-        server is listening
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Port</guilabel>: The TCP/IP port on which the MySQL
+          server is listening
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Username</guilabel>: The username used to connect to the
-        MySQL server.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Username</guilabel>: The username used to connect to
+          the MySQL server.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Password</guilabel>: The password used to connect to the
-        MySQL server. Note: For security reasons passwords are not stored in the
-        connection profile.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Password</guilabel>: The password used to connect to
+          the MySQL server. Note: For security reasons passwords are not
+          stored in the connection profile.
+        </para>
+      </listitem>
 
-  </itemizedlist>
+    </itemizedlist>
 
+    <para>
+      When you create a new connection or select a connection from the
+      <literal>Stored Connection</literal> list box, the
+      <literal>Advanced</literal> tab displays the following checkboxes:
+    </para>
 
-  <para>
-    When you create a new connection or select a connection from the
-    <literal>Stored Connection</literal> list box, the
-    <literal>Advanced</literal> tab displays the following checkboxes:
-  </para>
+    <itemizedlist>
 
-  <itemizedlist>
+      <listitem>
+        <para>
+          <guilabel>Use compressed protocol</guilabel>: If checked, the
+          communication between the application and the MySQL server
+          will be compressed, which may increase transfer rates. This
+          corresponds to starting a MySQL command-line tool with the
+          <literal>--compress</literal> option.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Use compressed protocol</guilabel>: If checked, the
-        communication between the application and the MySQL server will
-        be compressed, which may increase transfer rates. This
-        corresponds to starting a MySQL command-line tool with the
-        <literal>--compress</literal> option.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Use SSL if available</guilabel>: This option turns
+          on SSL encryption.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Use SSL if available</guilabel>: This option turns on SSL
-        encryption.
-      </para>
-    </listitem>
+      <listitem>
+        <para>
+          <guilabel>Socket name</guilabel>: Use this option to connect
+          to a named pipe.
+        </para>
+      </listitem>
 
-    <listitem>
-      <para>
-        <guilabel>Socket name</guilabel>: Use this option to connect to
-        a named pipe.
-      </para>
-    </listitem>
+    </itemizedlist>
 
-  </itemizedlist>  
-  
-  <para>
-    To edit an existing connection profile, click on its name and change
-    the values that appear in the <literal> Parameters</literal> and
-    <literal>Advanced</literal> tabs, then click on the <guibutton>Apply
-      Changes</guibutton> button to save your changes.
-  </para>
-    
+    <para>
+      To edit an existing connection profile, click on its name and
+      change the values that appear in the <literal>
+      Parameters</literal> and <literal>Advanced</literal> tabs, then
+      click on the <guibutton>Apply Changes</guibutton> button to save
+      your changes.
+    </para>
+
   </section>
-  
+
   <section id="wb-connection-confirmation">
-    
+
     <title>Connection Confirmation</title>
-    
+
     <para>
-      The next window confirms that a connection has been
-      established and that the various schemata have been 
-      identified.
+      The next window confirms that a connection has been established
+      and that the various schemata have been identified.
     </para>
-    
+
     <figure id="wb-connection-wizard2">
       <title>Connection confirmation</title>
       <mediaobject>

@@ -173,19 +174,18 @@
         </textobject>
       </mediaobject>
     </figure>
-    
+
     <para>
-      If there are errors connecting to the MySQL server,
-      click the <guibutton>Advanced</guibutton> button to view
-      the details.
+      If there are errors connecting to the MySQL server, click the
+      <guibutton>Advanced</guibutton> button to view the details.
     </para>
-    
+
     <para>
-      Subsequent screens vary depending upon the
-      type of operation you are performing.      
+      Subsequent screens vary depending upon the type of operation you
+      are performing.
     </para>
-    
-  </section>  
-  
+
+  </section>
+
 </chapter>
 <!-- END CONNECTIONS -->


Modified: trunk/workbench/stored-procedures.xml
===================================================================
--- trunk/workbench/stored-procedures.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/stored-procedures.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 11, Lines Added: 79, Lines Deleted: 74; 11041 bytes

@@ -11,10 +11,10 @@
 
   <para>
     You can add routine groups to a database either from the
-    <literal>Physical Schemata</literal> section of the
-    <literal>MySQL Model</literal> page or from an EER Diagram. Routines
-    may only be added from the <literal>Physical Schemata</literal>
-    section of the <literal>MySQL Model</literal> page
+    <literal>Physical Schemata</literal> section of the <literal>MySQL
+    Model</literal> page or from an EER Diagram. Routines may only be
+    added from the <literal>Physical Schemata</literal> section of the
+    <literal>MySQL Model</literal> page
   </para>
 
 <!--start routines here-->

@@ -30,9 +30,9 @@
       <para>
         Double clicking the <literal>Add Routine</literal> icon in the
         <literal>Physical Schemata</literal> section of the
-        <literal>MySQL Model</literal> page adds a routine with the default
-        name of <literal>routine1</literal>. If a routine with this name
-        already exists, the new routine is named
+        <literal>MySQL Model</literal> page adds a routine with the
+        default name of <literal>routine1</literal>. If a routine with
+        this name already exists, the new routine is named
         <literal>routine2</literal>.
       </para>
 

@@ -47,49 +47,52 @@
         options:
 
         <itemizedlist>
-          
+
           <listitem>
             <para>
               <guimenu>Rename</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Cut '<replaceable>routine_name</replaceable>'</guimenu>
+              <guimenu>Cut
+              '<replaceable>routine_name</replaceable>'</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Copy  '<replaceable>routine_name</replaceable>'</guimenu>
+              <guimenu>Copy
+              '<replaceable>routine_name</replaceable>'</guimenu>
             </para>
-          </listitem>          
-          
+          </listitem>
+
           <listitem>
             <para>
               <guimenu>Edit Routine...</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               <guimenu>Edit in New Window</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               <guimenu>Copy SQL to Clipboard</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Delete '<replaceable>routine_name</replaceable>'</guimenu>
+              <guimenu>Delete
+              '<replaceable>routine_name</replaceable>'</guimenu>
             </para>
           </listitem>
-          
+
         </itemizedlist>
       </para>
 

@@ -99,14 +102,14 @@
       </para>
 
       <para>
-        The cut and paste options
-        are useful for copying routines between different schemata.
+        The cut and paste options are useful for copying routines
+        between different schemata.
       </para>
 
       <para>
-        The action of the delete option varies
-        depending upon the way you have configured &workbench;. For more
-        information see <xref linkend="wb-options-general"/>.
+        The action of the delete option varies depending upon the way
+        you have configured &workbench;. For more information see
+        <xref linkend="wb-options-general"/>.
       </para>
 
     </section>

@@ -122,10 +125,10 @@
         in the <literal>Physical Schemata</literal> section on the
         <literal>MySQL Model</literal> page. Doing this opens the
         routine editor docked at the bottom of the application. Double
-        clicking the routine tab undocks the editor. Double click the title bar to redock
-        it. Any number of routines may be open at the same time. Each
-        additional routine appears as a tab at the top of the routine
-        editor,
+        clicking the routine tab undocks the editor. Double click the
+        title bar to redock it. Any number of routines may be open at
+        the same time. Each additional routine appears as a tab at the
+        top of the routine editor,
       </para>
 
       <para>

@@ -142,8 +145,8 @@
         <title>The <literal>Routine </literal>Tab</title>
 
         <para>
-          From the <literal>Routine</literal> tab of the routine editor you
-          can perform the following tasks:
+          From the <literal>Routine</literal> tab of the routine editor
+          you can perform the following tasks:
 
           <itemizedlist>
 

@@ -197,16 +200,17 @@
       <para>
         Double clicking the <literal>Add Routine Group</literal> icon in
         the <literal>Physical Schemata</literal> section of the
-        <literal>MySQL Model</literal> page adds a routine with the default
-        name of <literal>routines1</literal>. If a routine group with this name
-        already exists, the new routine group is named
+        <literal>MySQL Model</literal> page adds a routine with the
+        default name of <literal>routines1</literal>. If a routine group
+        with this name already exists, the new routine group is named
         <literal>routines2</literal>.
       </para>
 
       <para>
-        Adding a new routine group automatically opens the routine groups editor
-        docked at the bottom of the application. Using the routine groups
-        editor is described in <xref linkend="wb-routine-groups-editor"/>.
+        Adding a new routine group automatically opens the routine
+        groups editor docked at the bottom of the application. Using the
+        routine groups editor is described in
+        <xref linkend="wb-routine-groups-editor"/>.
       </para>
 
       <para>

@@ -214,68 +218,70 @@
         following options:
 
         <itemizedlist>
-          
+
           <listitem>
             <para>
               <guimenu>Rename</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Cut '<replaceable>routine_group_name</replaceable>'</guimenu>
+              <guimenu>Cut
+              '<replaceable>routine_group_name</replaceable>'</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Copy  '<replaceable>routine_group_name</replaceable>'</guimenu>
+              <guimenu>Copy
+              '<replaceable>routine_group_name</replaceable>'</guimenu>
             </para>
-          </listitem>          
-          
+          </listitem>
+
           <listitem>
             <para>
               <guimenu>Edit Routine...</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               <guimenu>Edit in New Window</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
               <guimenu>Copy SQL to Clipboard</guimenu>
             </para>
           </listitem>
-          
+
           <listitem>
             <para>
-              <guimenu>Delete '<replaceable>routine_group_name</replaceable>'</guimenu>
+              <guimenu>Delete
+              '<replaceable>routine_group_name</replaceable>'</guimenu>
             </para>
           </listitem>
-          
+
         </itemizedlist>
-        
       </para>
 
       <para>
         The <guimenu>Edit Routine Group...</guimenu> option opens the
-        routine group editor. Using the routine group editor is described in
-        <xref linkend="wb-routine-groups-editor"/>.
+        routine group editor. Using the routine group editor is
+        described in <xref linkend="wb-routine-groups-editor"/>.
       </para>
 
       <para>
-        The cut and paste options
-        are useful for copying routine groups between different schemata.
+        The cut and paste options are useful for copying routine groups
+        between different schemata.
       </para>
 
       <para>
         Deleting a routine group from the <literal>MySQL Model</literal>
-        page removes the group but does not remove any routines contained in
-        that group.
+        page removes the group but does not remove any routines
+        contained in that group.
       </para>
 
       <para>

@@ -310,13 +316,13 @@
       <para>
         Choosing the <literal>Routine Group</literal> tool changes the
         contents of the toolbar that appears immediately below the menu
-        bar. When the <literal>Routine Groups</literal> pointer is active,
-        this toolbar contains a drop down list box of schemata and a drop
-        down color chart. Use these list boxes to select the appropriate
-        schema and color accent for the new routine group. Make sure
-        that you associate the new routine group with a database. The
-        color of your routine group can easily be changed later using
-        the <literal>Properties</literal> palette.
+        bar. When the <literal>Routine Groups</literal> pointer is
+        active, this toolbar contains a drop down list box of schemata
+        and a drop down color chart. Use these list boxes to select the
+        appropriate schema and color accent for the new routine group.
+        Make sure that you associate the new routine group with a
+        database. The color of your routine group can easily be changed
+        later using the <literal>Properties</literal> palette.
       </para>
 
       <para>

@@ -327,15 +333,14 @@
         toolbar.
       </para>
 
-      <para>        
-          Right clicking a routine group opens a pop-up menu. 
-          With the exception of the delete option and rename options
-          these menu options function as described in
-        <xref linkend="wb-routine-groups-physical-schemata"/>. 
-          There is no rename option and the
-          behavior of the delete option is determined by your
-          &workbench; options settings. For more information
-          see <xref linkend="wb-options-general"/>.
+      <para>
+        Right clicking a routine group opens a pop-up menu. With the
+        exception of the delete option and rename options these menu
+        options function as described in
+        <xref linkend="wb-routine-groups-physical-schemata"/>. There is
+        no rename option and the behavior of the delete option is
+        determined by your &workbench; options settings. For more
+        information see <xref linkend="wb-options-general"/>.
       </para>
 
     </section>

@@ -426,11 +431,11 @@
         </para>
 
         <para>
-          For a list of the properties accessible through
-          the <literal>Properties</literal> palette see
+          For a list of the properties accessible through the
+          <literal>Properties</literal> palette see
           <xref linkend="wb-properties-palette"/>.
         </para>
-        
+
       </section>
 
     </section>


Modified: trunk/workbench/tables.xml
===================================================================
--- trunk/workbench/tables.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/tables.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 13, Lines Added: 67, Lines Deleted: 67; 8958 bytes

@@ -153,27 +153,25 @@
       <literal>table1</literal>. To revert to the default mouse pointer,
       click the arrow icon at the top of the vertical toolbar.
     </para>
-    
+
     <figure>
       <title>A table on an EER diagram</title>
       <mediaobject>
-      <imageobject>
-      <imagedata fileref="images/published/wb-table-eer-view.png" lang="en" format="PNG"/>
-      </imageobject>
-      <textobject>
-        <phrase lang="en">A table on an EER diagram</phrase>
-      </textobject>
+        <imageobject>
+          <imagedata fileref="images/published/wb-table-eer-view.png" lang="en" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase lang="en">A table on an EER diagram</phrase>
+        </textobject>
       </mediaobject>
     </figure>
-    
+
     <para>
-      As shown in the preceding diagram the
-      primary key is indicated by a key icon and indexed
-      fields are indicated by a different colored diamond icon.
-      Click the arrow to the right of the
-      table name to toggle the display of the
-      fields. Toggle the display
-      of indexes and triggers in the same way.
+      As shown in the preceding diagram the primary key is indicated by
+      a key icon and indexed fields are indicated by a different colored
+      diamond icon. Click the arrow to the right of the table name to
+      toggle the display of the fields. Toggle the display of indexes
+      and triggers in the same way.
     </para>
 
     <para>

@@ -273,8 +271,8 @@
       <para>
         Double clicking the title bar undocks the editor. Do the same to
         redock it. The &table_editor; is shown in the following figure.
-        </para>
-        
+      </para>
+
       <figure id="wb-table-editor-image">
         <title>The table editor</title>
         <mediaobject>

@@ -285,11 +283,11 @@
             <phrase lang="en">The table editor</phrase>
           </textobject>
         </mediaobject>
-      </figure>      
-        
-        <para>
-        The &table_editor; consists of a work space divided
-        into the following tabs:
+      </figure>
+
+      <para>
+        The &table_editor; consists of a work space divided into the
+        following tabs:
       </para>
 
       <itemizedlist>

@@ -349,11 +347,11 @@
             INSERT statements
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <guilabel>Privileges:</guilabel> Use this tab to 
-            set privileges on the table
+            <guilabel>Privileges:</guilabel> Use this tab to set
+            privileges on the table
           </para>
         </listitem>
 

@@ -395,17 +393,17 @@
         default value, and other properties of your table's columns.
       </para>
 
-     <figure>
-      <title>The columns tab</title>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/published/wb-table-editor-columns.png" lang="en" format="PNG"/>
-        </imageobject>
-        <textobject>
-          <phrase lang="en">The columns tab</phrase>
-        </textobject>
-      </mediaobject>
-    </figure>
+      <figure>
+        <title>The columns tab</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/published/wb-table-editor-columns.png" lang="en" format="PNG"/>
+          </imageobject>
+          <textobject>
+            <phrase lang="en">The columns tab</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
 
       <para>
         To add a column simply click the <literal>Column Name</literal>

@@ -465,16 +463,16 @@
 
       <para>
         To modify the flags on a column (<literal>PRIMARY KEY</literal>,
-        <literal>UNSIGNED</literal>, <literal>ZEROFILL</literal>)
-        check the desired value in the <guilabel>Flags</guilabel> frame.
-        Note that values only display in the flags frame when a column
-        is selected.The <literal>ZEROFILL</literal> option only
-        appears if the column type is numeric. 
+        <literal>UNSIGNED</literal>, <literal>ZEROFILL</literal>) check
+        the desired value in the <guilabel>Flags</guilabel> frame. Note
+        that values only display in the flags frame when a column is
+        selected.The <literal>ZEROFILL</literal> option only appears if
+        the column type is numeric.
       </para>
-      
+
       <para>
-        You can also add column comments to the 
-        <literal>Column Comment</literal> text area.
+        You can also add column comments to the <literal>Column
+        Comment</literal> text area.
       </para>
 
       <para>

@@ -482,9 +480,10 @@
         the column is a member of the primary key. If the icon is a
         small key, that column belongs to the primary key, otherwise the
         icon is a blue diamond. To add or remove a column from the
-        primary key, double click on the icon. You can also add a primary
-        key by checking the <literal>PRIMARY KEY</literal> checkbox in the 
-        <literal>Column Details</literal> section of the table editor.
+        primary key, double click on the icon. You can also add a
+        primary key by checking the <literal>PRIMARY KEY</literal>
+        checkbox in the <literal>Column Details</literal> section of the
+        table editor.
       </para>
 
     </section>

@@ -514,8 +513,8 @@
       </figure>
 
       <para>
-        Select an index by right clicking it. Doing this
-        displays information about the index in the <guilabel>Index
+        Select an index by right clicking it. Doing this displays
+        information about the index in the <guilabel>Index
         Columns</guilabel> section.
       </para>
 

@@ -527,14 +526,14 @@
         Columns</guilabel> list. You can remove a column from the index
         by removing the check mark from the appropriate column.
       </para>
-      
+
       <para>
         You can also specify the order of an index by choosing
-        <literal>ASC</literal> or <literal>DESC</literal> under the 
-        <literal>Order</literal> column. Create an index prefix by specifying a numeric
-        value under the <literal>Length</literal> column. You cannot enter a
-        prefix  value for fields that have a data type that does not support 
-        prefixing.
+        <literal>ASC</literal> or <literal>DESC</literal> under the
+        <literal>Order</literal> column. Create an index prefix by
+        specifying a numeric value under the <literal>Length</literal>
+        column. You cannot enter a prefix value for fields that have a
+        data type that does not support prefixing.
       </para>
 
       <para>

@@ -558,12 +557,12 @@
       </para>
 
       <para>
-        To add a foreign key, click the last row in the <literal>Foreign Key
-          Name</literal> list. Enter a name for the foreign key and select the column or
-        columns that you wish to index by checking the column name in
-        the <guilabel>Column</guilabel> list. You can remove a column
-        from the index by removing the check mark from the appropriate
-        column.
+        To add a foreign key, click the last row in the <literal>Foreign
+        Key Name</literal> list. Enter a name for the foreign key and
+        select the column or columns that you wish to index by checking
+        the column name in the <guilabel>Column</guilabel> list. You can
+        remove a column from the index by removing the check mark from
+        the appropriate column.
       </para>
 
       <para>

@@ -778,8 +777,8 @@
 
       <para>
         To set the row format, choose the desired row format from the
-        drop-down list. See <xref linkend="myisam-table-formats"/>
-         for more information about the different row formats that are
+        drop-down list. See <xref linkend="myisam-table-formats"/> for
+        more information about the different row formats that are
         available. This only applies to MyISAM tables.
       </para>
 

@@ -831,8 +830,9 @@
         When you expect a table to be particularly large, use the
         <guilabel>Avg. Row</guilabel>, <guilabel>Min. Rows</guilabel>,
         and <guilabel>Max. Rows</guilabel> options to enable the MySQL
-        server to better accommodate your data. See <xref linkend="create-table"/>
-        for more information on how to use these options.
+        server to better accommodate your data. See
+        <xref linkend="create-table"/> for more information on how to
+        use these options.
       </para>
 
       <para>

@@ -892,8 +892,8 @@
 
       <para>
         Any records you add will be inserted when you forward engineer
-        the database (if you choose the <literal>Generate INSERT statements for
-        tables</literal> option).
+        the database (if you choose the <literal>Generate INSERT
+        statements for tables</literal> option).
       </para>
 
     </section>


Modified: trunk/workbench/text-objects.xml
===================================================================
--- trunk/workbench/text-objects.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/text-objects.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 70, Lines Deleted: 69; 7304 bytes

@@ -10,107 +10,108 @@
   <title>Creating Text Objects</title>
 
   <para>
-   Text objects are applicable to an EER diagram only.
-   They can be used for documentation purposes, for example,
-   to explain a grouping of schema objects. They are also
-   useful for creating titles for an EER diagram should you decide to
-   export a diagram as a PDF or PNG file.
+    Text objects are applicable to an EER diagram only. They can be used
+    for documentation purposes, for example, to explain a grouping of
+    schema objects. They are also useful for creating titles for an EER
+    diagram should you decide to export a diagram as a PDF or PNG file.
   </para>
 
   <section id="wb-using-text-object-tool">
-    
+
     <title>Adding Text Objects to an EER Diagram</title>
-    
+
     <para>
       Text objects can be added to an EER Diagram using the
-      <literal>Text Object</literal> tool on the vertical toolbar. To do this
-      make sure that the <literal>EER Diagram</literal> tab is selected,
-      and right click the text object icon on the vertical toolbar. The text
-      object icon is the rectangular icon found below the label icon.
+      <literal>Text Object</literal> tool on the vertical toolbar. To do
+      this make sure that the <literal>EER Diagram</literal> tab is
+      selected, and right click the text object icon on the vertical
+      toolbar. The text object icon is the rectangular icon found below
+      the label icon.
     </para>
-    
+
     <para>
       Clicking the mouse on this icon changes the mouse pointer to a
-      text object pointer. You can also change the mouse pointer to a text object
-      pointer by pressing the <keycap>N</keycap> key.
-      <remark>[PL]This should change</remark>
+      text object pointer. You can also change the mouse pointer to a
+      text object pointer by pressing the <keycap>N</keycap> key.
+
+      <remark>
+        [PL]This should change
+      </remark>
     </para>
-    
+
     <para>
-      Choosing the <literal>Text Object</literal> tool changes the contents of
-      the toolbar that appears immediately below the menu bar. When the
-      <literal>Text Object</literal> pointer is active, this toolbar contains a drop
-      down color chart. Use this list box to select the color accent for
-      the new text object. The color of your text object can easily be changed later
-      using the <literal>Properties</literal> palette.
+      Choosing the <literal>Text Object</literal> tool changes the
+      contents of the toolbar that appears immediately below the menu
+      bar. When the <literal>Text Object</literal> pointer is active,
+      this toolbar contains a drop down color chart. Use this list box
+      to select the color accent for the new text object. The color of
+      your text object can easily be changed later using the
+      <literal>Properties</literal> palette.
     </para>
-    
+
     <para>
-      Create a text object by clicking anywhere on the EER Diagram canvas. This
-      creates a new text object with the default name <literal>text1</literal>.
-      To revert to the default mouse pointer, click the arrow icon at
-      the top of the vertical toolbar.
+      Create a text object by clicking anywhere on the EER Diagram
+      canvas. This creates a new text object with the default name
+      <literal>text1</literal>. To revert to the default mouse pointer,
+      click the arrow icon at the top of the vertical toolbar.
     </para>
-    
+
     <para>
-      Right clicking a text object opens a pop-up menu.
-      These menu options are identical to the options for
-      other objects. However, since a text object is not a database object,
-      there is no confirmation dialog box when you delete a
-      text object.
-    </para>    
-    
+      Right clicking a text object opens a pop-up menu. These menu
+      options are identical to the options for other objects. However,
+      since a text object is not a database object, there is no
+      confirmation dialog box when you delete a text object.
+    </para>
+
   </section>
-  
+
   <section id="wb-text-object-editor">
-    
+
     <title>The Text Object Editor</title>
-    
+
     <para>
-      You can invoke the text object editor by double clicking a text object on
-      the EER Diagram canvas. Doing this opens the editor docked at
-      the bottom of the application. Double clicking the text object table
-      undocks the editor. Double click the title bar to redock it. Any number of text objects
-      may be open at the same time. Each additional text objects appears as a
-      tab at the top of the text editor editor,
+      You can invoke the text object editor by double clicking a text
+      object on the EER Diagram canvas. Doing this opens the editor
+      docked at the bottom of the application. Double clicking the text
+      object table undocks the editor. Double click the title bar to
+      redock it. Any number of text objects may be open at the same
+      time. Each additional text objects appears as a tab at the top of
+      the text editor editor,
     </para>
-    
+
     <para>
-      Using the editor you can change the name of a text object 
-      or its contents.
+      Using the editor you can change the name of a text object or its
+      contents.
     </para>
-    
-   
+
     <section id="wb-modifying-text-object">
-      
+
       <title>Modifying a Text Object Using the <literal>Properties</literal> Palette</title>
-      
+
       <para>
-        When you select a text object on the EER Diagram canvas, its properties
-        are displayed in the <literal>Properties</literal> palette. Most
-        of the properties accessible from the
+        When you select a text object on the EER Diagram canvas, its
+        properties are displayed in the <literal>Properties</literal>
+        palette. Most of the properties accessible from the
         <literal>Properties</literal> palette apply to the appearance of
         a view on the EER Diagram canvas.
       </para>
-      
+
       <para>
-        For a list of the properties accessible through
-        the <literal>Properties</literal> palette see
+        For a list of the properties accessible through the
+        <literal>Properties</literal> palette see
         <xref linkend="wb-properties-palette"/>.
-      </para>      
-      
+      </para>
+
       <para>
-        There is no property in the <literal>Properties</literal> palette
-        for changing the font used by a text object.        
-        To change the font used by a text object choose
-        the <literal>Fonts</literal> tab of the &workbench; options
-        window. For more information see <xref linkend="wb-options-fonts"/>.
+        There is no property in the <literal>Properties</literal>
+        palette for changing the font used by a text object. To change
+        the font used by a text object choose the
+        <literal>Fonts</literal> tab of the &workbench; options window.
+        For more information see <xref linkend="wb-options-fonts"/>.
       </para>
-      
-      
+
     </section>
-    
-  </section>    
-    
 
+  </section>
+
 </chapter>


Modified: trunk/workbench/tutorial.xml
===================================================================
--- trunk/workbench/tutorial.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/tutorial.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 6, Lines Added: 30, Lines Deleted: 33; 5037 bytes

@@ -11,28 +11,25 @@
 
   <para>
     This chapter contains three short tutorials intended to familiarize
-    you with the basics of &workbench;. These tutorials show how 
-    &workbench; can be used both to design and to document 
-    databases.
+    you with the basics of &workbench;. These tutorials show how
+    &workbench; can be used both to design and to document databases.
   </para>
 
   <para>
     Creating a database from scratch is the focus of
     <xref linkend="wb-default-schema"/> and exploring the graphic design
     capabilities of &workbench; is touched upon in
-    <xref linkend="wb-basic-modeling"/>. Both these tutorials
-    show the database design capabilities of &workbench;
+    <xref linkend="wb-basic-modeling"/>. Both these tutorials show the
+    database design capabilities of &workbench;
   </para>
 
   <para>
     Importing an SQL data definition script is probably the quickest way
-    to familiarize yourself with &workbench; &mdash; this tutorial
-    makes use of the <literal>sakila</literal> database and
-    emphasizes the use of &workbench; as a documentation tool.
-    Examples taken from the sakila database are used throughout 
-    the documentation so doing
-    this tutorial can be very helpful in understanding
-    &workbench;.
+    to familiarize yourself with &workbench; &mdash; this tutorial makes
+    use of the <literal>sakila</literal> database and emphasizes the use
+    of &workbench; as a documentation tool. Examples taken from the
+    sakila database are used throughout the documentation so doing this
+    tutorial can be very helpful in understanding &workbench;.
   </para>
 
   <section id="wb-importing-sql-script">

@@ -102,11 +99,11 @@
       <title>Adding an EER Diagram</title>
 
       <para>
-        To create an EER diagram for the
-        <literal>sakila</literal> database, first add an EER diagram by
-        double clicking the <literal>Add Diagram</literal> icon in the
-        <guilabel>EER Diagrams</guilabel> panel. This should create
-        and open a new <literal>EER Diagram</literal>.
+        To create an EER diagram for the <literal>sakila</literal>
+        database, first add an EER diagram by double clicking the
+        <literal>Add Diagram</literal> icon in the <guilabel>EER
+        Diagrams</guilabel> panel. This should create and open a new
+        <literal>EER Diagram</literal>.
       </para>
 
       <para>

@@ -149,19 +146,20 @@
         the <literal>country</literal> table onto the canvas and
         immediately you should see the relationship between the
         <literal>country</literal> table and the <literal>city</literal>
-        table. ( See <xref linkend="wb-sakila-eer-image"/> to view a
-        PNG file of all the relationships in the <literal>sakila</literal>
+        table. ( See <xref linkend="wb-sakila-eer-image"/> to view a PNG
+        file of all the relationships in the <literal>sakila</literal>
         database.)
       </para>
 
       <para>
-        Choose the <literal>Properties</literal> tab of the panel on the lower right and
-        then click one of the tables on the canvas. This displays the
-        properties of the table in the <literal>Properties</literal>
-        window. While a table is selected you can use the
-        <literal>Properties</literal> window to change a table's
-        properties. For example, entering <literal>#FF0000</literal> for
-        the color value will change the color accent to red.
+        Choose the <literal>Properties</literal> tab of the panel on the
+        lower right and then click one of the tables on the canvas. This
+        displays the properties of the table in the
+        <literal>Properties</literal> window. While a table is selected
+        you can use the <literal>Properties</literal> window to change a
+        table's properties. For example, entering
+        <literal>#FF0000</literal> for the color value will change the
+        color accent to red.
       </para>
 
       <para>

@@ -181,8 +179,8 @@
         <keycap>Ctrl</keycap> <keycap>S</keycap>.
       </para>
 
-    </section>   
-    
+    </section>
+
   </section>
 
   <section id="wb-default-schema">

@@ -310,10 +308,9 @@
         </textobject>
       </mediaobject>
     </figure>
-    
+
     <para>
-      From an EER diagram page you can graphically design
-      a database.
+      From an EER diagram page you can graphically design a database.
     </para>
 
     <section id="wb-basic-add-table">

@@ -417,8 +414,8 @@
       <para>
         Experiment with the other tools on the vertical toolbar. Delete
         a relationship by selecting the eraser tool and clicking on the
-        line joining two tables. Create a view, add a text object, or add a
-        layer.
+        line joining two tables. Create a view, add a text object, or
+        add a layer.
       </para>
 
       <para>


Modified: trunk/workbench/upgrading.xml
===================================================================
--- trunk/workbench/upgrading.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/upgrading.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 37, Lines Deleted: 29; 1470 bytes

@@ -8,52 +8,60 @@
 <chapter id="wb-upgrading">
 
   <title>Upgrading &workbench;</title>
+
   <note>
-  <para>
-    Currently, only manual upgrades are available
-    and only for Windows.
-  </para>
+    <para>
+      Currently, only manual upgrades are available and only for
+      Windows.
+    </para>
   </note>
-  
+
   <section id="wb-automatic-upgrade">
-    <title> Automatic Update</title>
-    <para>
-      
-    </para>
+
+    <title>Automatic Update</title>
+
+    <para></para>
+
   </section>
+
   <section id="wb-upgrading-windows">
+
     <title>Upgrading – Windows</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
+
   <section id="wb-upgrading-unix">
+
     <title>Upgrading – Unix</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
     <section id="wb-rpm-upgrade">
+
       <title>RPM Upgrade</title>
-      <para>
-        
-      </para>
+
+      <para></para>
+
     </section>
-    
+
     <section id="wb-tarball-upgrade">
+
       <title>Tarball Upgrade</title>
-      <para>
-        
-      </para>
+
+      <para></para>
+
     </section>
+
   </section>
-  
+
   <section id="wb-upgrading-osx">
+
     <title>Upgrading – Mac OS X</title>
-    <para>
-      
-    </para>
+
+    <para></para>
+
   </section>
-  
-  
+
 </chapter>


Modified: trunk/workbench/validation-plugins.xml
===================================================================
--- trunk/workbench/validation-plugins.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/validation-plugins.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 7, Lines Added: 156, Lines Deleted: 100; 10645 bytes

@@ -8,36 +8,36 @@
 <chapter id="wb-validation-plugins">
 
   <title>MySQL Workbench Schema Validation Plugins (Commercial Version)</title>
-  
+
   <para>
-   &workbench; provides validation modules so that you can
-   test your models before implementing them.  
+    &workbench; provides validation modules so that you can test your
+    models before implementing them.
   </para>
-  
 
   <para>
     The validation plugins are accessed from the
     <guimenu>Model</guimenu> menu option. One plugin performs general
     validation for any Relational Database Management System (RDMS) and
-    the other is MySQL-specific. Beneath these menu items are a number of specific 
-    validation tests. Running any one of these tests opens an output window
-    docked at the bottom of the application. Warning messages are displayed
-    on the left side of this window and the tests performed are displayed on the right.    
+    the other is MySQL-specific. Beneath these menu items are a number
+    of specific validation tests. Running any one of these tests opens
+    an output window docked at the bottom of the application. Warning
+    messages are displayed on the left side of this window and the tests
+    performed are displayed on the right.
   </para>
-  
-  <para>  
-    The tasks performed by the validation modules are outlined in
-    what follows.
+
+  <para>
+    The tasks performed by the validation modules are outlined in what
+    follows.
   </para>
 
-  
   <section id="wb-general-validation">
 
     <title>General Validation</title>
 
     <para>
-      The types of validation and examples
-      that violate validation are listed in what follows:
+      The types of validation and examples that violate validation are
+      listed in what follows:
+
       <itemizedlist>
 
         <listitem>

@@ -47,28 +47,41 @@
             <itemizedlist>
 
               <listitem>
-                <para>A table with no columns</para>
+                <para>
+                  A table with no columns
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>A routine or view with no SQL code defined</para>
-                </listitem>
-        
+                <para>
+                  A routine or view with no SQL code defined
+                </para>
+              </listitem>
+
               <listitem>
-                <para>A routine group containing no routines</para>
+                <para>
+                  A routine group containing no routines
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>A table, view, or routine not referenced by at least one role</para>
+                <para>
+                  A table, view, or routine not referenced by at least
+                  one role
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>A user with no privileges</para>
+                <para>
+                  A user with no privileges
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>Objects such as tables that do not appear on at least
-                one EER Diagram</para>
+                <para>
+                  Objects such as tables that do not appear on at least
+                  one EER Diagram
+                </para>
               </listitem>
 
             </itemizedlist>

@@ -82,15 +95,23 @@
             <itemizedlist>
 
               <listitem>
-                <para>A table with no primary key</para>
+                <para>
+                  A table with no primary key
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>A primary key that does not use an integer-based data type</para>
+                <para>
+                  A primary key that does not use an integer-based data
+                  type
+                </para>
               </listitem>
-              
+
               <listitem>
-                <para>A foreign key that refers to a column with a different data type</para>
+                <para>
+                  A foreign key that refers to a column with a different
+                  data type
+                </para>
               </listitem>
 
             </itemizedlist>

@@ -105,19 +126,22 @@
             <itemizedlist>
 
               <listitem>
-                <para>Duplicate object names</para>
+                <para>
+                  Duplicate object names
+                </para>
               </listitem>
-              
-              
+
               <listitem>
-                <para>Duplicate role or user names</para>
+                <para>
+                  Duplicate role or user names
+                </para>
               </listitem>
-              
-              
+
               <listitem>
-                <para>Duplicate index or routine names</para>
+                <para>
+                  Duplicate index or routine names
+                </para>
               </listitem>
-             
 
             </itemizedlist>
           </para>

@@ -130,7 +154,10 @@
             <itemizedlist>
 
               <listitem>
-                <para>Use of the same column with columns of differing data types</para>
+                <para>
+                  Use of the same column with columns of differing data
+                  types
+                </para>
               </listitem>
 
             </itemizedlist>

@@ -144,19 +171,24 @@
             <itemizedlist>
 
               <listitem>
-                <para>A foreign key that refers to a column other than the primary key in the source table</para>
-              </listitem>              
-              
-              
+                <para>
+                  A foreign key that refers to a column other than the
+                  primary key in the source table
+                </para>
+              </listitem>
+
               <listitem>
-                <para>Any object that is object is either read- or write-only by role definition</para>
+                <para>
+                  Any object that is object is either read- or
+                  write-only by role definition
+                </para>
               </listitem>
-              
-              
+
               <listitem>
-                <para>Placeholder objects left over from reverse engineering </para>
+                <para>
+                  Placeholder objects left over from reverse engineering
+                </para>
               </listitem>
-              
 
             </itemizedlist>
           </para>

@@ -172,63 +204,87 @@
     <title>MySQL-Specific Validation</title>
 
     <para>
-      The types of MySQL-specific validation and examples
-      that violate validation are listed in the following.
-      
+      The types of MySQL-specific validation and examples that violate
+      validation are listed in the following.
+
       <itemizedlist>
-        
+
         <listitem>
-          <para><emphasis role="bold">Integrity Violation</emphasis>
-          <itemizedlist>
-            
-            <listitem>
-              <para>An object name longer than the maximum allowed</para>
-            </listitem>
-            
-            <listitem>
-              <para>A foreign key defined for an engine type that doesn't support foreign keys (not yet implemented)</para>
-            </listitem>
-            
-            <listitem>
-              <para>A view or routine that references a non-existent table (not yet implemented)</para>
-            </listitem>
-            
-            <listitem>
-              <para>A default value that does not match a column's data type</para>
-            </listitem>
-            
-            <listitem>
-              <para>An invalid partitioning scheme</para>
-            </listitem>
-            
-          </itemizedlist>
-            
-            
+          <para>
+            <emphasis role="bold">Integrity Violation</emphasis>
+
+            <itemizedlist>
+
+              <listitem>
+                <para>
+                  An object name longer than the maximum allowed
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  A foreign key defined for an engine type that doesn't
+                  support foreign keys (not yet implemented)
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  A view or routine that references a non-existent table
+                  (not yet implemented)
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  A default value that does not match a column's data
+                  type
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  An invalid partitioning scheme
+                </para>
+              </listitem>
+
+            </itemizedlist>
           </para>
         </listitem>
-        
+
         <listitem>
-          <para><emphasis role="bold">Syntax Violation</emphasis>
-          <itemizedlist>
-            <listitem>
-              <para>A routine, trigger, or view with incorrect SQL syntax</para>
-            </listitem>
-            
-            <listitem>
-              <para>A reserved keyword used as an identifier</para>
-            </listitem>
-            
-            <listitem>
-              <para>Use of an invalid character</para>
-            </listitem>
-          </itemizedlist>
-            
-            <remark>One item missing - duplicate identifiers validation</remark>
+          <para>
+            <emphasis role="bold">Syntax Violation</emphasis>
+
+            <itemizedlist>
+
+              <listitem>
+                <para>
+                  A routine, trigger, or view with incorrect SQL syntax
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  A reserved keyword used as an identifier
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  Use of an invalid character
+                </para>
+              </listitem>
+
+            </itemizedlist>
+
+            <remark>
+              One item missing - duplicate identifiers validation
+            </remark>
           </para>
         </listitem>
+
       </itemizedlist>
-      
-      
     </para>
 
   </section>


Modified: trunk/workbench/views.xml
===================================================================
--- trunk/workbench/views.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/views.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 7, Lines Added: 52, Lines Deleted: 53; 6986 bytes

@@ -11,8 +11,8 @@
 
   <para>
     You can add views to a database either from the <literal>Physical
-    Schemata</literal> section of the <literal>MySQL Model</literal> page
-    or from the EER Diagram.
+    Schemata</literal> section of the <literal>MySQL Model</literal>
+    page or from the EER Diagram.
   </para>
 
   <section id="wb-views-physical-schemata">

@@ -21,10 +21,10 @@
 
     <para>
       Double clicking the <literal>Add View</literal> icon in the
-      <literal>Physical Schemata</literal> section of the
-      <literal>MySQL Model</literal> page adds a view with the default name
-      of <literal>view1</literal>. If a view with this name already
-      exists, the new view is named <literal>view2</literal>.
+      <literal>Physical Schemata</literal> section of the <literal>MySQL
+      Model</literal> page adds a view with the default name of
+      <literal>view1</literal>. If a view with this name already exists,
+      the new view is named <literal>view2</literal>.
     </para>
 
     <para>

@@ -36,79 +36,80 @@
     <para>
       Right clicking a table opens a pop-up menu with the following
       options:
-      
+
       <itemizedlist>
-        
+
         <listitem>
           <para>
             <guimenu>Rename</guimenu>
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <guimenu>Cut '<replaceable>view_name</replaceable>'</guimenu>
+            <guimenu>Cut
+            '<replaceable>view_name</replaceable>'</guimenu>
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <guimenu>Copy  '<replaceable>view_name</replaceable>'</guimenu>
+            <guimenu>Copy
+            '<replaceable>view_name</replaceable>'</guimenu>
           </para>
         </listitem>
-        
-        
+
         <listitem>
           <para>
             <guimenu>Edit View...</guimenu>
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             <guimenu>Edit in New Window</guimenu>
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             <guimenu>Copy SQL to Clipboard</guimenu>
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
-            <guimenu>Delete '<replaceable>view_name</replaceable>'</guimenu>
+            <guimenu>Delete
+            '<replaceable>view_name</replaceable>'</guimenu>
           </para>
         </listitem>
-        
+
       </itemizedlist>
     </para>
-    
+
     <para>
-      If the table editor is not open the
-      <guimenu>Edit View ...</guimenu> option opens it.
-      If it is already open, the selected table replaces the previous one.
-      <guimenu>Edit in New Window</guimenu>  opens a new 
-      view editor tab.
+      If the table editor is not open the <guimenu>Edit View
+      ...</guimenu> option opens it. If it is already open, the selected
+      table replaces the previous one. <guimenu>Edit in New
+      Window</guimenu> opens a new view editor tab.
     </para>
-    
+
     <para>
-      The cut and copy options
-      are useful for copying views between different schemata
-      and <guimenu>Copy  SQL to Clipboard</guimenu>
-      copies the <literal>CREATE VIEW</literal> statement to
-      the clipboard.
+      The cut and copy options are useful for copying views between
+      different schemata and <guimenu>Copy SQL to Clipboard</guimenu>
+      copies the <literal>CREATE VIEW</literal> statement to the
+      clipboard.
     </para>
-    
+
     <warning>
       <para>
-        Use the <guimenu>Delete '<replaceable>view_name</replaceable>'</guimenu>
-        to remove a view from the database. There will be <emphasis role="bold">no</emphasis>
-        confirmation dialog box.
+        Use the <guimenu>Delete
+        '<replaceable>view_name</replaceable>'</guimenu> to remove a
+        view from the database. There will be
+        <emphasis role="bold">no</emphasis> confirmation dialog box.
       </para>
     </warning>
-   
+
     <para>
       Any views added to the <literal>Physical Schemata</literal> also
       show up in the <literal>Catalog</literal> palette on the right

@@ -138,13 +139,13 @@
 
     <para>
       Choosing the <literal>View</literal> tool changes the contents of
-      the toolbar that appears immediately below the menu bar.
-      When the <literal>Views</literal> pointer is active, this toolbar
-      contains a drop down list box of schemata and a drop down color
-      chart. Use these list boxes to select the appropriate schema and
-      color accent for the new view. Make sure that you associate the
-      new view with a database. The color of your view can easily be
-      changed later using the <literal>Properties</literal> palette.
+      the toolbar that appears immediately below the menu bar. When the
+      <literal>Views</literal> pointer is active, this toolbar contains
+      a drop down list box of schemata and a drop down color chart. Use
+      these list boxes to select the appropriate schema and color accent
+      for the new view. Make sure that you associate the new view with a
+      database. The color of your view can easily be changed later using
+      the <literal>Properties</literal> palette.
     </para>
 
     <para>

@@ -155,13 +156,11 @@
     </para>
 
     <para>
-      Right clicking a view opens a pop-up menu. 
-      With the exception of the delete option,
-      these menu options function as described in
-      <xref linkend="wb-views-physical-schemata"/>. 
-      The behavior of the delete option is determined by your
-      &workbench; options settings. For more information
-      see <xref linkend="wb-options-general"/>.
+      Right clicking a view opens a pop-up menu. With the exception of
+      the delete option, these menu options function as described in
+      <xref linkend="wb-views-physical-schemata"/>. The behavior of the
+      delete option is determined by your &workbench; options settings.
+      For more information see <xref linkend="wb-options-general"/>.
     </para>
 
   </section>

@@ -184,7 +183,7 @@
     <para>
       There are two tabs at the bottom of the view editor, the
       <guilabel>View</guilabel> and the <guilabel>Privileges</guilabel>
-      tabs. Navigate between different tabs using the mouse or from the 
+      tabs. Navigate between different tabs using the mouse or from the
       keyboard by pressing <keycap>Ctrl</keycap> + <keycap>Alt</keycap>
       + <keycap>Tab</keycap>.
     </para>

@@ -251,8 +250,8 @@
       </para>
 
       <para>
-        For a list of the properties accessible through
-        the <literal>Properties</literal> palette see
+        For a list of the properties accessible through the
+        <literal>Properties</literal> palette see
         <xref linkend="wb-properties-palette"/>.
       </para>
 


Modified: trunk/workbench/workbench.xml
===================================================================
--- trunk/workbench/workbench.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/workbench.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 12; 2621 bytes

@@ -49,12 +49,12 @@
 
   <xi:include href="installing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-  <!--xi:include href="upgrading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
+<!--xi:include href="upgrading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
 
-  <!--xi:include href="initial-startup.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
+<!--xi:include href="initial-startup.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
 
   <xi:include href="tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <xi:include href="documenting-database.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="reference.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

@@ -66,11 +66,11 @@
   <xi:include href="views.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="stored-procedures.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <xi:include href="layers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="notes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <xi:include href="text-objects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="images.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

@@ -78,21 +78,21 @@
   <xi:include href="reverse-engineering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="forward-engineering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <xi:include href="server-connection-wizard.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="printing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <xi:include href="grt-shell.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
-  <!--xi:include href="writing-scripts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
 
-  <!--xi:include href="expanding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
+<!--xi:include href="writing-scripts.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
 
-  <xi:include href="plugins.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>  
-  
+<!--xi:include href="expanding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/-->
+
+  <xi:include href="plugins.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
   <xi:include href="validation-plugins.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  
+
   <xi:include href="change-history.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 </book>


Modified: trunk/workbench/writing-scripts.xml
===================================================================
--- trunk/workbench/writing-scripts.xml	2008-03-17 16:13:20 UTC (rev 10275)
+++ trunk/workbench/writing-scripts.xml	2008-03-17 16:57:55 UTC (rev 10276)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 3; 571 bytes

@@ -8,10 +8,11 @@
 <appendix id="wb-writing-scripts">
 
   <title>Writing Scripts</title>
-  
+
   <para>
-    <remark>http://forge.mysql.com/wiki/MySQL_Workbench_Scripting
-      Doesn't work yet
+    <remark>
+      http://forge.mysql.com/wiki/MySQL_Workbench_Scripting Doesn't work
+      yet
     </remark>
   </para>
 


Thread
svn commit - mysqldoc@docsrva: r10276 - in trunk: . dynamic-docs/changelog falcon gui-common guibook migration-toolkit quick-guides refman-4.1 refman-...mcbrown17 Mar