List:Commits« Previous MessageNext Message »
From:paul.dubois Date:March 31 2011 4:05pm
Subject:svn commit - mysqldoc@oter02: r25650 - in trunk: . dynamic-docs/changelog workbench
View as plain text  
Author: pd221994
Date: 2011-03-31 18:05:00 +0200 (Thu, 31 Mar 2011)
New Revision: 25650

Log:
 r46530@dhcp-adc-twvpn-1-vpnpool-10-154-9-32:  paul | 2011-03-31 11:01:54 -0500
 Workbench general revisions


Modified:
   svk:merge
   trunk/dynamic-docs/changelog/workbench.xml
   trunk/workbench/data-modeling-tutorial.xml
   trunk/workbench/data-modeling.xml
   trunk/workbench/dbdoc-templates.xml
   trunk/workbench/documenting-sakila.xml
   trunk/workbench/eer-diagram-editor.xml
   trunk/workbench/extending.xml
   trunk/workbench/foreign-key-relationships.xml
   trunk/workbench/forward-engineering.xml
   trunk/workbench/images.xml
   trunk/workbench/keys.xml
   trunk/workbench/menus.xml
   trunk/workbench/model-editor.xml
   trunk/workbench/notes.xml
   trunk/workbench/preferences.xml
   trunk/workbench/reporting.xml
   trunk/workbench/reverse-engineering.xml
   trunk/workbench/sql-development.xml
   trunk/workbench/stored-procedures.xml
   trunk/workbench/table-editor.xml
   trunk/workbench/text-objects.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


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


Modified: trunk/dynamic-docs/changelog/workbench.xml
===================================================================
--- trunk/dynamic-docs/changelog/workbench.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/dynamic-docs/changelog/workbench.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 10, Lines Added: 10, Lines Deleted: 10; 3784 bytes

@@ -6938,7 +6938,7 @@
     <message>
 
       <para>
-        If a Workbench model file was double clicked, &workbench;
+        If a Workbench model file was double-clicked, &workbench;
         crashed on launch. However, if &workbench; was started using its
         application icon, and then the same model file loaded from
         within &workbench;, no problems were encountered.

@@ -11745,7 +11745,7 @@
 
       <para>
         In the EER Diagram view, layer objects did not respond to edit
-        commands (either double clicking or using the <guimenu>Edit
+        commands (either double-clicking or using the <guimenu>Edit
         Layer</guimenu> context-sensitive menu option).
       </para>
 

@@ -12265,7 +12265,7 @@
 
       <para>
         In the SQL Editor, right-clicking a row in the results editor
-        (after double clicking a table), and selecting delete from the
+        (after double-clicking a table), and selecting delete from the
         context-sensitive menu, did not have any effect.
       </para>
 

@@ -16315,7 +16315,7 @@
     <message>
 
       <para>
-        Double clicking on any main tab, just below the main menu
+        Double-clicking on any main tab, just below the main menu
         toolbar, caused &workbench; to generate an exception.
       </para>
 

@@ -21684,7 +21684,7 @@
 
       <para>
         The Column Editor has been updated to remove the feature whereby
-        a column could be toggled to a primary key by double clicking
+        a column could be toggled to a primary key by double-clicking
         it. Primary key status can now only be set by selecting the
         appropriate check box in the adjacent <guilabel>Column
         Details</guilabel> frame.

@@ -22251,7 +22251,7 @@
         In the Physical Schemata pane if more schema were added than
         could fit within the pane, then these schema could not be
         viewed, as there was no ability to scroll the pane. Further,
-        double clicking the schema in the Catalog pane did not locate
+        double-clicking the schema in the Catalog pane did not locate
         the schema in the Physical Schemata pane.
       </para>
 

@@ -29415,7 +29415,7 @@
     <message>
 
       <para>
-        When double clicking on the row in a column as a primary key,
+        When double-clicking on the row in a column as a primary key,
         the primary key property would be toggled. The editor will now
         permit you to edit the value when you click on a data row on the
         table.

@@ -31085,7 +31085,7 @@
         imported from a MySQL <literal>CREATE</literal> script. This was
         not true but did highlight the fact that the method for adding a
         primary key was not obvious. Now, in addition to adding a
-        primary key by double clicking the icon to the left of a column
+        primary key by double-clicking the icon to the left of a column
         in the table editor view, you can also add a primary key by
         checking the <literal>PRIMARY KEY</literal> check box in the
         <literal>Column Details</literal> section of the table editor.

@@ -31578,7 +31578,7 @@
     <message>
 
       <para>
-        Double clicking the Catalog title bar undocked the GRT Tree
+        Double-clicking the Catalog title bar undocked the GRT Tree
         window.
       </para>
 

@@ -31873,7 +31873,7 @@
     <message>
 
       <para>
-        Double clicking a column-heading separator in Find results
+        Double-clicking a column-heading separator in Find results
         caused a crash.
       </para>
 


Modified: trunk/workbench/data-modeling-tutorial.xml
===================================================================
--- trunk/workbench/data-modeling-tutorial.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/data-modeling-tutorial.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 687 bytes

@@ -51,7 +51,7 @@
       is the script that contains the data definition statements for the
       <literal>sakila</literal> database. The file filter for the file
       open dialog window defaults to <literal>*.sql</literal> so you
-      should only be able to view files with the <literal>sql</literal>
+      should be able to view only files with the <literal>sql</literal>
       extension.
     </para>
 


Modified: trunk/workbench/data-modeling.xml
===================================================================
--- trunk/workbench/data-modeling.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/data-modeling.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 7, Lines Added: 33, Lines Deleted: 38; 5510 bytes

@@ -11,33 +11,32 @@
 
   <para>
     &workbench; provides extensive capabilities for creating and
-    manipulating database models. Some of these capabilities are listed
-    here:
+    manipulating database models, including these:
   </para>
 
   <itemizedlist>
 
     <listitem>
       <para>
-        Create and manipulate a model graphically.
+        Create and manipulate a model graphically
       </para>
     </listitem>
 
     <listitem>
       <para>
-        Reverse engineer a live database to a model.
+        Reverse engineer a live database to a model
       </para>
     </listitem>
 
     <listitem>
       <para>
-        Forward engineer a model to a script or live database.
+        Forward engineer a model to a script or live database
       </para>
     </listitem>
 
     <listitem>
       <para>
-        Create and edit tables and insert data.
+        Create and edit tables and insert data
       </para>
     </listitem>
 

@@ -45,15 +44,14 @@
 
   <para>
     This is not an exhaustive list. The following sections discuss these
-    and additional data modeling capablities.
+    and additional data-modeling capablities.
   </para>
 
   <para>
     The Home screen is the typical starting point for work with data
     modeling. In the Data Modeling section of the Workspace, you can use
     the action items there to create and manage models, forward and
-    reverse engineer, and compare and synchronize schemata. These action
-    items are listed here:
+    reverse engineer, and compare and synchronize schemata:
   </para>
 
   <itemizedlist>

@@ -66,12 +64,6 @@
 
     <listitem>
       <para>
-        Open an Existing EER Model (icon)
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
         Create new EER Model
       </para>
     </listitem>

@@ -105,17 +97,21 @@
     </para>
 
     <para>
-      <emphasis role="bold">Open an Existing EER Model (icon)</emphasis>
+      If you have already created one or more model files, each will
+      appear in this panel as an icon. Double-clicking the item of the
+      model you wish to load creates a new MySQL Model tab and displays
+      your model.
     </para>
 
     <para>
-      If you have already created one or more model files you can
-      double-click the item of the model you wish to load. A new MySQL
-      Model tab will be created, and your model displayed.
+      If you already have created a connection to a database, it will
+      appear in this panel as an icon. Double-clicking the icon directly
+      launches an SQL Editor tab, and connects you to the database as
+      defined by the connection.
     </para>
 
     <para>
-      You can read more about modeling in
+      To read more about modeling, see
       <xref linkend="wb-model-editor"/>.
     </para>
 

@@ -126,12 +122,12 @@
     <title>Create new EER Model</title>
 
     <para>
-      Clicking this action item will launch a new MySQL Model tab, with
-      a blank model ready for you to work on.
+      Clicking this action item launches a new MySQL Model tab, with a
+      blank model ready for you to work on.
     </para>
 
     <para>
-      You can read more about modeling in
+      To read more about modeling, see
       <xref linkend="wb-model-editor"/>.
     </para>
 

@@ -142,13 +138,13 @@
     <title>Create EER Model from Existing Database</title>
 
     <para>
-      The purpose of this action item is to enable you to create an EER
-      Model from an existing live database. Clicking this action item
-      launches the Reverse Engineer Database. This is a multi-stage
-      wizard that enables you to select a connection to a live server,
-      and select the schema and objects you wish to reverse engineer
-      into your new model. This is a convenient way to see how an
-      existing database is structured.
+      This action item enables you to create an EER Model from an
+      existing live database. Clicking this action item launches the
+      Reverse Engineer Database. This is a multi-stage wizard that
+      enables you to select a connection to a live server, and select
+      the schema and objects you wish to reverse engineer into your new
+      model. This is a convenient way to see how an existing database is
+      structured.
     </para>
 
     <para>

@@ -163,14 +159,13 @@
     <title>Create EER Model from SQL Script</title>
 
     <para>
-      The purpose of this action item is to enable you to create a model
-      from an SQL Create script. Such a script may have been created by
-      hand or may be as a result of reverse engineering an existing
-      database to generate the script, which may then be modified
-      according to requirements. Clicking this action item launches the
-      Reverse Engineer SQL Script wizard. This is a multi-stage wizard
-      that enables you to select the script you want to create your
-      model from.
+      This action item enables you to create a model from an SQL Create
+      script. Such a script may have been created by hand or as a result
+      of reverse engineering an existing database. The script may then
+      be modified according to requirements. Clicking this action item
+      launches the Reverse Engineer SQL Script wizard. This is a
+      multi-stage wizard that enables you to select the script you want
+      to create your model from.
     </para>
 
     <para>


Modified: trunk/workbench/dbdoc-templates.xml
===================================================================
--- trunk/workbench/dbdoc-templates.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/dbdoc-templates.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 769 bytes

@@ -254,7 +254,7 @@
   <para>
     The tree structure of the data dictionaries is important when it
     comes to evaluation of variables. As variables are defined in data
-    dictionaries, their associated value only has meaning when that
+    dictionaries, their associated value has meaning only when that
     particular data dictionary is active, and that means when the
     section associated with that data dictionary is active. When a
     variable lookup occurs, the system will check the data dictionary


Modified: trunk/workbench/documenting-sakila.xml
===================================================================
--- trunk/workbench/documenting-sakila.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/documenting-sakila.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 695 bytes

@@ -52,7 +52,7 @@
     <para>
       The object notation style used in
       <xref linkend="wb-sakila-eer-image"/> is <literal>Workbench (PKs
-      only)</literal>. This notation only shows primary keys and no
+      only)</literal>. This notation shows only primary keys and no
       other columns so it is especially useful where space is at a
       premium. The relationship notation is the default, Crow's Foot.
     </para>


Modified: trunk/workbench/eer-diagram-editor.xml
===================================================================
--- trunk/workbench/eer-diagram-editor.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/eer-diagram-editor.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 665 bytes

@@ -158,8 +158,8 @@
 
       <para>
         The layer tool is used to organize the objects on an EER Diagram
-        canvas. It is useful for grouping together similar objects. You
-        may, for instance, use it to group all your views together.
+        canvas. It is useful for grouping similar objects. For example,
+        you may use it to group all your views.
       </para>
 
       <para>


Modified: trunk/workbench/extending.xml
===================================================================
--- trunk/workbench/extending.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/extending.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 995 bytes

@@ -80,7 +80,7 @@
       Python data types. Lists and dicts are kept in their internal
       representation, but can however generally be treated as Python
       lists and dicts, and accessed in the usual way. Objects contain
-      data fields and methods, but the GRT only recognizes objects from
+      data fields and methods, but the GRT recognizes only objects from
       a pre-registered class hierarchy.
     </para>
 

@@ -391,7 +391,7 @@
       <listitem>
         <para>
           <emphasis role="bold">plugin_name</emphasis>: A unique name
-          for the plugin. It may only contain alphanumeric characters,
+          for the plugin. It may contain only alphanumeric characters,
           dots, and underscores.
         </para>
       </listitem>


Modified: trunk/workbench/foreign-key-relationships.xml
===================================================================
--- trunk/workbench/foreign-key-relationships.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/foreign-key-relationships.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 711 bytes

@@ -170,7 +170,7 @@
       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 permits, <literal>Classic</literal> for instance, the
+      style permits, <literal>Classic</literal> for example, the
       cardinality indicators can also be repositioned.
     </para>
 


Modified: trunk/workbench/forward-engineering.xml
===================================================================
--- trunk/workbench/forward-engineering.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/forward-engineering.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 942 bytes

@@ -286,7 +286,7 @@
 
     <para>
       The first page to be displayed is Catalog Validation (validation
-      is only available in the Standard Edition).
+      is available only in the Standard Edition).
     </para>
 
     <figure id="wb-forward-engineer-to-database-wizard-catalog">

@@ -507,7 +507,7 @@
       For convenience, the wizard provides three additional buttons to
       enable synchronization directions to be applied to a group of
       selected changes. The <guibutton>Update Model</guibutton> button
-      causes the selected changes to only be applied to the model
+      causes the selected changes to be applied only to the model
       itself.
     </para>
 


Modified: trunk/workbench/images.xml
===================================================================
--- trunk/workbench/images.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/images.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 484 bytes

@@ -10,7 +10,7 @@
   <title>Creating Images</title>
 
   <para>
-    Images only exist on the EER Diagram canvas; you can only add them
+    Images exist only on the EER Diagram canvas; you can add them only
     from the EER Diagram window.
 
     <remark>


Modified: trunk/workbench/keys.xml
===================================================================
--- trunk/workbench/keys.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/keys.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 553 bytes

@@ -293,7 +293,7 @@
         <row>
           <entry>Model Options</entry>
           <entry>Model, EER Diagram</entry>
-          <entry>Command+Alternate+, (Shorcut only available on Mac OS X)</entry>
+          <entry>Command+Alternate+, (Shorcut available only on Mac OS X)</entry>
         </row>
       </tbody>
     </tgroup>


Modified: trunk/workbench/menus.xml
===================================================================
--- trunk/workbench/menus.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/menus.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 14, Lines Added: 95, Lines Deleted: 65; 13759 bytes

@@ -11,7 +11,7 @@
 
   <para>
     Some menu options are not available in the OSS version of this
-    application, and are only available in the Standard Edition. This is
+    application, and are available only in the Standard Edition. This is
     indicated where applicable.
   </para>
 

@@ -45,55 +45,81 @@
 
     <para>
       Use the <guimenu>Save Model</guimenu> or <guimenu>Save Model
-      As</guimenu> menu options to save a model. When you save a model
+      As</guimenu> menu options to save a model. When you save a model,
       its name appears in the title bar of the application. If you have
       made changes to a project and have not saved those changes, an
       asterisk appears in the title bar following the model name. When
-      you save a model it is saved as a MySQL Workbench file with the
+      you save a model, it is saved as a MySQL Workbench file with the
       extension <literal>mwb</literal>.
     </para>
 
     <para>
       Use the <guimenu>Import</guimenu> menu option to import a MySQL
-      data definition (DDL) script file, one created by issuing the
-      command <command>mysqldump <option>--no-data</option></command>,
-      for example. If the script does not contain a <command>CREATE
-      <replaceable>db_name</replaceable>;</command> statement, the
-      schema objects will be copied to the default schema,
-      <literal>mydb</literal>. If the script creates a database, a new
-      tab bearing the database name is added to the <literal>Physical
-      Schemata</literal> section of the <literal>MySQL Model</literal>
-      page. If the script contains data, it will be ignored. For details
-      about importing a DDL script, see
+      data definition (DDL) script file. For example, this might be a
+      file created by issuing the command <command>mysqldump
+      <option>--no-data</option></command>. &workbench; handles the
+      script as follows:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
+        <para>
+          If the script does not contain a <command>CREATE
+          <replaceable>db_name</replaceable>;</command> statement, the
+          schema objects are copied to the default schema,
+          <literal>mydb</literal>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          If the script creates a database, a new tab bearing the
+          database name is added to the <literal>Physical
+          Schemata</literal> section of the <literal>MySQL
+          Model</literal> page.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          If the script contains data, the data is ignored.
+        </para>
+      </listitem>
+
+    </itemizedlist>
+
+    <para>
+      For details about importing a DDL script, see
       <xref linkend="wb-reverse-engineer-create-script"/>.
     </para>
 
     <para>
-      Under the <guisubmenu>Import</guisubmenu> menu option you can also
+      Under the <guimenu>Import</guimenu> menu option, you can also
       import <literal>DBDesigner4</literal> files.
     </para>
 
     <para>
       There are variety of options under the <guimenu>Export</guimenu>
       menu item. You may generate the SQL statements necessary to create
-      a new database or alter an existing one. These menu items are
-      discussed in detail in
+      a new database or alter an existing one. For more information
+      about these menu items, see
       <xref linkend="wb-forward-engineering-sql-scripts"/>.
     </para>
 
     <para>
-      Using the <guimenu>Export</guimenu> menu item you can also export
-      an EER diagram as a PNG, SVG, PDF or Postscript file. For an
+      Using the <guimenu>Export</guimenu> menu item, you can also export
+      an EER diagram as a PNG, SVG, PDF, or Postscript file. For an
       example of a PNG file, see <xref linkend="wb-sakila-eer-image"/>.
     </para>
 
     <para>
       The <guimenu>Page Setup</guimenu> menu item enables you to set the
-      paper size, orientation and margins for printing purposes.
+      paper size, orientation, and margins for printing purposes.
     </para>
 
     <para>
-      The print options are only enabled if the <guilabel>EER
+      The print options are enabled only if the <guilabel>EER
       Diagrams</guilabel> tab is selected. You have the choice of
       printing your model directly to your printer, printing it as a PDF
       file, or creating a PostScript file. For more information, see

@@ -102,7 +128,7 @@
 
     <note>
       <para>
-        The printing options are only available in commercial versions
+        The printing options are available only in commercial versions
         of &workbench;.
       </para>
     </note>

@@ -116,46 +142,46 @@
 
       <listitem>
         <para>
-          <literal>Name</literal>: Defaults to <literal>MySQL
-          Model</literal>
+          <literal>Name</literal>: The model name (default is
+          <literal>MySQL Model</literal>)
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Version</literal>: The project version number.
+          <literal>Version</literal>: The project version number
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Author</literal>: The project author.
+          <literal>Author</literal>: The project author
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Project</literal>: The project name.
+          <literal>Project</literal>: The project name
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Created</literal>: Not editable, determined by the
-          MWB file attributes.
+          <literal>Created</literal>: Not editable; determined by the
+          MWB file attributes
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Last Changed</literal>: Not editable, determined by
-          the MWB file attributes.
+          <literal>Last Changed</literal>: Not editable; determined by
+          the MWB file attributes
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal>Description</literal>: A description of your project.
+          <literal>Description</literal>: A description of your project
         </para>
       </listitem>
 

@@ -168,8 +194,14 @@
     <title>The Edit Menu</title>
 
     <para>
-      Under this menu item find the options for cutting, copying, and
-      pasting. These actions can also be performed using the
+      This menu enables you to make changes to objects. The text
+      description for several of the menu items changes to reflect the
+      name of the currently selected object.
+    </para>
+
+    <para>
+      This menu item has options for cutting, copying, and pasting.
+      These actions can also be performed using the
       <keycap>Ctrl</keycap> <keycap>X</keycap>, <keycap>Ctrl</keycap>
       <keycap>C</keycap>, and <keycap>Ctrl</keycap> <keycap>V</keycap>
       key combinations. Undo a deletion using the <guimenu>Undo Delete

@@ -183,30 +215,29 @@
     <para>
       Also find a <guimenu>Delete
       '<replaceable>object_name</replaceable>'</guimenu> menu item for
-      removing the currently selected object. The text description for
-      this menu item changes to reflect the name of the currently
-      selected object. The keyboard command for this action is
-      <keycap>Ctrl</keycap> <keycap>Delete</keycap>. You can also right
-      click an object and choose the delete option from the pop-up menu.
+      removing the currently selected object. The keyboard command for
+      this action is <keycap>Ctrl</keycap> <keycap>Delete</keycap>. You
+      can also right click an object and choose the delete option from
+      the pop-up menu.
     </para>
 
     <para>
       The <guimenu>Delete
       '<replaceable>object_name</replaceable>'</guimenu> menu item
-      behaves differently depending upon circumstances. For instance, if
+      behaves differently depending upon circumstances. For example, if
       an <guilabel>EER Diagram</guilabel> is active and a table on the
       canvas is the currently selected object, a dialog box may open
       asking whether you want to remove the table from the canvas only
-      or from the database as well. For setting the default behavior
-      when deleting from an EER Diagram, see
+      or from the database as well. For information about setting the
+      default behavior when deleting from an EER Diagram, see
       <xref linkend="wb-preferences-model"/>.
     </para>
 
     <warning>
       <para>
         If the <literal>MySQL Model</literal> page is active, the
-        selected object will be deleted from the catalog and there will
-        be <emphasis>no confirmation dialog box</emphasis>.
+        selected object is deleted from the catalog and there will be
+        <emphasis>no confirmation dialog box</emphasis>.
       </para>
     </warning>
 

@@ -214,10 +245,10 @@
       Choose <guimenu>Edit Selected</guimenu> to edit the currently
       selected object. You can also perform edits in a new window by
       selecting <guimenu>Edit Selected in New Window</guimenu>. The
-      keyboard shortcut for <guimenu>Edit Selected</guimenu> is
+      keyboard shortcuts for <guimenu>Edit Selected</guimenu> and
+      <guimenu>Edit Selected in New Window</guimenu> are
       <keycap>Ctrl</keycap> <keycap>E</keycap> and <keycap>Ctrl</keycap>
-      <keycap>Shift</keycap> <keycap>E</keycap> for <guimenu>Edit
-      Selected in New Window</guimenu>.
+      <keycap>Shift</keycap> <keycap>E</keycap>, respectively.
     </para>
 
     <para>

@@ -229,7 +260,7 @@
       <listitem>
         <para>
           <guimenu>Select All</guimenu> (Keyboard shortcut,
-          <keycap>Ctrl</keycap> <keycap>A</keycap>): Select all the
+          <keycap>Ctrl</keycap> <keycap>A</keycap>): Selects all the
           objects on the active EER diagram.
         </para>
       </listitem>

@@ -237,22 +268,21 @@
       <listitem>
         <para>
           <guimenu>Similar Figures</guimenu> (Objects of the same type):
-          Use this option to find objects similar to the currently
-          selected object.
+          Finds objects similar to the currently selected object.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <guimenu>Connected Figures</guimenu>: Use this option to find
-          all the objects connected to the currently selected object.
+          <guimenu>Connected Figures</guimenu>: Finds all the objects
+          connected to the currently selected object.
         </para>
       </listitem>
 
     </itemizedlist>
 
     <para>
-      These menu items are only active when an <guilabel>EER
+      These menu items are active only 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

@@ -318,7 +348,7 @@
         <listitem>
           <para>
             <guimenu>Search and Replace</guimenu>: Displays the Search
-            and Replace dialog. This is currently only for use with the
+            and Replace dialog. This is currently for use only with the
             SQL Editor, to enable you to quickly search and replace
             script code items.
           </para>

@@ -351,20 +381,20 @@
 
         <listitem>
           <para>
-            Entire Model: Search the entire model.
+            Entire Model: Searches the entire model.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Current View: Search the current view only. This may be the
-            <literal>MySQL Model</literal> page.
+            Current View: Searches the current view only. This may be
+            the <literal>MySQL Model</literal> page.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            All Views: Search the <literal>MySQL Model Page</literal>
+            All Views: Searches the <literal>MySQL Model Page</literal>
             and all EER diagrams.
 
             <remark>

@@ -376,14 +406,14 @@
 
         <listitem>
           <para>
-            Database Objects: Search database objects only.
+            Database Objects: Searches database objects only.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Selected Figures: Search the currently selected objects.
-            This feature only works for EER diagrams.
+            Selected Figures: Searches the currently selected objects.
+            This feature works only for EER diagrams.
           </para>
         </listitem>
 

@@ -444,10 +474,10 @@
       </para>
 
       <para>
-        Use this window to navigate to objects. For example, double
-        clicking the <literal>Description</literal> of an object located
-        on an EER diagram navigates to the specific diagram and selects
-        the object. Notice that the properties of the object are
+        Use this window to navigate to objects. For example,
+        double-clicking the <literal>Description</literal> of an object
+        located on an EER diagram navigates to the specific diagram and
+        selects the object. Notice that the properties of the object are
         displayed in the <literal>Properties</literal> palette.
       </para>
 

@@ -650,7 +680,7 @@
 
     <para>
       The <literal>Arrange</literal> menu option applies only to objects
-      on an EER diagram canvas and is only visible if an EER diagram
+      on an EER diagram canvas and is visible only if an EER diagram
       view is active. The options under this menu item are as follows:
     </para>
 


Modified: trunk/workbench/model-editor.xml
===================================================================
--- trunk/workbench/model-editor.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/model-editor.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 4, Lines Added: 15, Lines Deleted: 11; 2316 bytes

@@ -10,13 +10,10 @@
   <title>Model Editor</title>
 
   <para>
-    When the Model Editor is executed from the Home Screen, the MySQL
-    Model page is displayed. The MySQL Model page has three main panels:
-    Description Editor, User Types List/History panel, and the main
-    panel - the Model Overview panel. The Description Editor and User
-    Types List/History panel are contained within the Sidebar. The
-    Sidebar is located on the left by default, but can be relocated to
-    the right using a setting in the Workbench Preferences dialog.
+    When the Model Editor is executed from the Home Screen, &workbench;
+    displays the MySQL Model page. The MySQL Model page has three main
+    panels, as shown in the following screenshort: Description Editor,
+    User Types List/History panel, and Model Overview.
   </para>
 
   <figure id="wb-mysql-model-page-image">

@@ -32,9 +29,16 @@
   </figure>
 
   <para>
-    The sections within the Model Overview panel are:
+    The Description Editor and User Types List/History panel are
+    contained within the Sidebar. The Sidebar is located on the left by
+    default, but can be relocated to the right using a setting in the
+    Workbench Preferences dialog.
   </para>
 
+  <para>
+    The Model Overview panel has several sections:
+  </para>
+
   <itemizedlist>
 
     <listitem>

@@ -70,8 +74,8 @@
   </itemizedlist>
 
   <para>
-    For each of these sections objects can be added to a project by
-    clicking the appropriate add object icon. You may also rename, edit,
+    For each of these sections, objects can be added to a project by
+    clicking the appropriate add-object icon. You may also rename, edit,
     cut, copy, or delete objects on this page by right-clicking. Doing
     this opens a pop-up menu.
   </para>

@@ -730,7 +734,7 @@
           object shows up on the canvas. Use
           <literal>&lsquo;1&rsquo;</literal> for true and
           <literal>&lsquo;0&rsquo;</literal> for false. It is currently
-          only used for relationships.
+          used only for relationships.
         </para>
       </listitem>
 


Modified: trunk/workbench/notes.xml
===================================================================
--- trunk/workbench/notes.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/notes.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 434 bytes

@@ -79,7 +79,7 @@
     </para>
 
     <para>
-      Notes can only be added on the <literal>MySQL Model</literal>
+      Notes can be added only on the <literal>MySQL Model</literal>
       page.
     </para>
 


Modified: trunk/workbench/preferences.xml
===================================================================
--- trunk/workbench/preferences.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/preferences.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 613 bytes

@@ -790,7 +790,7 @@
 
     <note>
       <para>
-        On Windows, the default font for the editor only supports
+        On Windows, the default font for the editor supports only
         <literal>latin-1</literal> characters. If you need to use
         characters not supported by the <literal>latin-1</literal>
         character set, you must change the font here.


Modified: trunk/workbench/reporting.xml
===================================================================
--- trunk/workbench/reporting.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/reporting.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 633 bytes

@@ -84,7 +84,7 @@
     style. The <literal>HTML Detailed Frames</literal> template offers
     the <literal>Vibrant</literal> style, and also the more subdued
     <literal>Coated</literal> style. The <literal>Text Basic</literal>
-    template only offers the <literal>Fixed Size Font</literal> style.
+    template offers only the <literal>Fixed Size Font</literal> style.
   </para>
 
   <para>


Modified: trunk/workbench/reverse-engineering.xml
===================================================================
--- trunk/workbench/reverse-engineering.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/reverse-engineering.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1248 bytes

@@ -14,8 +14,8 @@
     create script or you can connect to a live MySQL server and import a
     single database or a number of databases. Reverse engineering using
     a MySQL DDL script applies to all versions of &workbench;; reverse
-    engineering a database directly from a MySQL server applies to
-    commercial versions of &workbench; only.
+    engineering a database directly from a MySQL server applies only to
+    commercial versions of &workbench;.
   </para>
 
   <section id="wb-reverse-engineer-create-script">

@@ -37,7 +37,7 @@
       <option>--no-data </option> &gt;
       <replaceable>script_file.sql</replaceable></userinput> command.
       Using the <option>--no-data</option> option ensures that the
-      script contains DDL statements only. However, if you are working
+      script contains only DDL statements. However, if you are working
       with a script that also contains DML statements you need not
       remove them; they will be ignored.
     </para>


Modified: trunk/workbench/sql-development.xml
===================================================================
--- trunk/workbench/sql-development.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/sql-development.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 6; 470 bytes

@@ -33,12 +33,6 @@
 
     <listitem>
       <para>
-        Open Connection to start Querying (icon)
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
         New Connection
       </para>
     </listitem>


Modified: trunk/workbench/stored-procedures.xml
===================================================================
--- trunk/workbench/stored-procedures.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/stored-procedures.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1192 bytes

@@ -13,7 +13,7 @@
     You can add Routine Groups to a database either from the
     <guilabel>Physical Schemata</guilabel> section of the
     <guilabel>MySQL Model</guilabel> page or from an EER Diagram.
-    Routines may only be added from the <guilabel>Physical
+    Routines may be added only from the <guilabel>Physical
     Schemata</guilabel> section of the <guilabel>MySQL Model</guilabel>
     page.
   </para>

@@ -231,7 +231,7 @@
 
         <note>
           <para>
-            Privileges are only available in the Standard Edition of
+            Privileges are available only in the Standard Edition of
             &workbench;.
           </para>
         </note>

@@ -472,7 +472,7 @@
 
           <note>
             <para>
-              Privileges are only available in the Standard Edition of
+              Privileges are available only in the Standard Edition of
               &workbench;.
             </para>
           </note>


Modified: trunk/workbench/table-editor.xml
===================================================================
--- trunk/workbench/table-editor.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/table-editor.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 5, Lines Added: 16, Lines Deleted: 13; 2988 bytes

@@ -111,8 +111,8 @@
 
       <listitem>
         <para>
-          <guilabel>Inserts:</guilabel> Use this tab for writing INSERT
-          statements
+          <guilabel>Inserts:</guilabel> Use this tab for writing
+          <literal>INSERT</literal> statements
         </para>
       </listitem>
 

@@ -660,7 +660,7 @@
       <literal>Pack None</literal>, and <literal>Pack All</literal>. You
       may also encrypt the definition of a table. The
       <literal>AUTO_INCREMENT</literal> and delayed key update behaviors
-      apply only to MyISAM tables.
+      apply only to <literal>MyISAM</literal> tables.
     </para>
 
     <para>

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

@@ -736,7 +736,7 @@
       configure a custom path to the table storage and data files. This
       option can help improve data integrity and server performance by
       locating different tables on different hard drives. This option is
-      only available for MyISAM tables.
+      available only for <literal>MyISAM</literal> tables.
     </para>
 
     <para>

@@ -745,18 +745,21 @@
 
     <para>
       The <literal>Merge Table</literal> Options section is used to
-      configure MERGE tables in MyISAM. To create a MERGE table, select
-      MERGE as your storage engine and then specify the tables you wish
-      to MERGE in the <guilabel>Union Tables</guilabel> dialog.
+      configure <literal>MERGE</literal> tables in
+      <literal>MyISAM</literal>. To create a <literal>MERGE</literal>
+      table, select <literal>MERGE</literal> as your storage engine and
+      then specify the tables you wish to <literal>MERGE</literal> in
+      the <guilabel>Union Tables</guilabel> dialog.
     </para>
 
     <para>
       You can also specify the action the server should take when users
-      attempt to perform INSERT statements on the merge table. See
-      <xref linkend="merge-storage-engine"/> for more information about
-      MERGE tables. Again, this only applies to MyISAM tables. You may
-      also select the <literal>Merge Method</literal> by selecting from
-      the list.
+      attempt to perform <literal>INSERT</literal> statements on the
+      merge table. See <xref linkend="merge-storage-engine"/> for more
+      information about <literal>MERGE</literal> tables. Again, this
+      applies only to <literal>MyISAM</literal> tables. You may also
+      select the <literal>Merge Method</literal> by selecting from the
+      list.
     </para>
 
   </section>


Modified: trunk/workbench/text-objects.xml
===================================================================
--- trunk/workbench/text-objects.xml	2011-03-31 16:04:52 UTC (rev 25649)
+++ trunk/workbench/text-objects.xml	2011-03-31 16:05:00 UTC (rev 25650)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 679 bytes

@@ -10,7 +10,7 @@
   <title>Creating Text Objects</title>
 
   <para>
-    Text objects are applicable to an EER diagram only. They can be used
+    Text objects are applicable only to an EER diagram. 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.


Thread
svn commit - mysqldoc@oter02: r25650 - in trunk: . dynamic-docs/changelog workbenchpaul.dubois31 Mar