svn commit - mysqldoc@docsrva: r9654 - trunk/workbench

[plavin]

Author: plavin
Date: 2008-01-29 17:09:55 +0100 (Tue, 29 Jan 2008)
New Revision: 9654

Log:
Update section on advanced options, changes noticed while reviewing remarks


Modified:
   trunk/workbench/foreign-key-relationships.xml
   trunk/workbench/reference.xml


Modified: trunk/workbench/foreign-key-relationships.xml
===================================================================
--- trunk/workbench/foreign-key-relationships.xml	2008-01-29 12:36:32 UTC (rev 9653)
+++ trunk/workbench/foreign-key-relationships.xml	2008-01-29 16:09:55 UTC (rev 9654)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 2; 1249 bytes

@@ -91,7 +91,7 @@
       Create or drag and drop the tables that you wish to connect.
       Ensure that there is a primary key in the table that will be on
       the <quote>one</quote> side of the relationship. Click on the
-      appropriate tool for the type of relationship you wish create. If
+      appropriate tool for the type of relationship you wish to create. If
       you are creating a one-to-many relationship first click on the
       table that is on the <quote>many</quote> side of the relationship
       and then on the table containing the referenced key.

@@ -108,7 +108,8 @@
     <para>
       Use the <guimenu>Model</guimenu>, <guimenu>Menu
Options</guimenu>
       menu item to set a project-specific default name for the foreign
-      key column. To change the global default see
+      key column (see <xref linkend="wb-relationship-notation-menu"/>).
+      To change the global default see
       <xref linkend="wb-options-model"/>.
     </para>
 


Modified: trunk/workbench/reference.xml
===================================================================
--- trunk/workbench/reference.xml	2008-01-29 12:36:32 UTC (rev 9653)
+++ trunk/workbench/reference.xml	2008-01-29 16:09:55 UTC (rev 9654)
Changed blocks: 4, Lines Added: 192, Lines Deleted: 10; 6772 bytes

@@ -1179,7 +1179,8 @@
           The object notation style that you choose persists for the
           duration of your &workbench; session and is saved along with
           your model. When &workbench; is restarted, the object notation
-          reverts to the default.
+          reverts to the default. To change the default object notation
+          see <xref linkend="wb-options-advanced"/>.
         </para>
 
       </section>

@@ -1244,7 +1245,8 @@
           the duration of your &workbench; session and is saved along
           with your model. When &workbench; is restarted, the
           relationship notation reverts to the default, the
-          <literal>Crow's Feet</literal> style.
+          <literal>Crow's Feet</literal> style.  To change the default
relationship notation
+          see <xref linkend="wb-options-advanced"/>.
         </para>
 
       </section>

@@ -1662,14 +1664,194 @@
 
         <para>
           Use this tab for setting the defaults for various application
-          objects. For instance, you can set the default rule for a
-          foreign key's <literal>On Delete</literal> event .
-
-          <remark>
-            Need a list of the values that can be used here? Check the
-            source code?
-          </remark>
+          objects.  The defaults that you can set are as follows:
+          
+          <itemizedlist>
+            
+            <listitem>
+              <para>
+                <literal>DefaultConnectionNotation</literal>
+              </para>
+            </listitem>
+            
+            <listitem>
+              <para>
+                <literal>DefaultFigureNotation</literal>
+              </para>
+            </listitem>
+            
+            <listitem>
+              <para>
+                <literal>FKDeleteRule</literal>
+              </para>
+            </listitem> 
+            
+            <listitem>  
+            <para>
+              <literal>FKUpdateRule</literal>
+              </para>
+            </listitem> 
+            
+            <listitem>
+              <para>
+                <literal>workbench.model.layer:Color</literal>
+              </para>
+            </listitem> 
+            
+            <listitem>
+              <para>
+                <literal>workbench.model.NoteFigure:Color</literal>
+              </para>
+            </listitem> 
+            
+            <listitem>
+              <para>
+               
<literal>workbench.physical.RoutineGroupFigure:Color</literal>
+              </para>
+            </listitem>
+            
+            <listitem>
+              <para>
+                <literal>workbench.physical.TableFigure:Color</literal>
+              </para>
+            </listitem> 
+                      
+              <listitem>
+                <para>
+                  <literal>workbench.physical.ViewFigure:Color</literal>
+                </para>
+              </listitem> 
+                
+          </itemizedlist>         
+          
         </para>
+         
+        <para>
+          Legitimate values for connection notation are:
+          
+          <itemizedlist>
+            
+            <listitem>
+              <para>
+                <literal>classic</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>idef1x</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>crowsfoot</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>uml</literal>
+              </para>
+            </listitem>
+            
+          </itemizedlist>
+          
+          For more information about these notation styles
+          see <xref linkend="wb-relationship-notation-menu"/>.
+        </para>
+        
+        <para>
+          Legitimate values for object notation are:
+          
+          <itemizedlist>
+            
+            <listitem>
+              <para>
+                <literal>workbench/default</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>workbench/simple</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>workbench/pkonly</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>idef1x</literal>
+              </para>
+            </listitem>
+            
+            <listitem>
+              <para>
+                <literal>classic</literal>
+              </para>
+            </listitem>
+            
+          </itemizedlist>
+          
+          For more information about these notation styles
+          see <xref linkend="wb-object-notation-menu"/>.
+        </para>
+        
+        <para>
+          Legitimate values for the foreign key delete or update rules are:
+          
+          <itemizedlist>
+            
+            <listitem>
+              <para>
+                <literal>RESTRICT</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>CASCADE</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>SET NULL</literal>
+              </para>
+            </listitem>
+            
+            
+            <listitem>
+              <para>
+                <literal>NO ACTION</literal>
+              </para>
+            </listitem>
+            
+          </itemizedlist>
+          
+          For more information about these actions
+          see <xref linkend="wb-table-editor-foreign-keys"/>.
+        </para>
+        
+        <para>
+          Use the remaining options to set the color
+          of various objects. Use hexadecimal values
+          preceded by the &lsquo;<literal>#</literal>&rsquo;
+          character.
+        </para>
 
       </section>
 

@@ -2468,7 +2650,7 @@
         <para>
           To write text in a note, right click the note and choose
           either of the pop-up menu options, <guimenu>Edit Note
-          ...</guimenu> or <guimenu>Edit Note in New Window</guimenu>.
+          ...</guimenu> or <guimenu>Edit in New Window ...</guimenu>.
 
           <remark>
             Bug to be fixed before more description