2.0.1 updates.

1 files changed, 86 insertions, 119 deletions

diff --git a/gnome2-user-guide/C/gosmetacity.xml b/gnome2-user-guide/C/gosmetacity.xml
index 6b8c067..7d1dab0 100644
--- a/gnome2-user-guide/C/gosmetacity.xml
+++ b/gnome2-user-guide/C/gosmetacity.xml
@@ -39,27 +39,25 @@ visual representation of your windows and workspaces, as show in <xref linkend="
 </mediaobject>
 </screenshot>
 </figure>
-<para>By default, your desktop contains four workspaces. You can add more
-workspaces at any time. To add workspaces to your desktop, right-click on
-the <application>Workspace Switcher</application> applet, then choose <guimenuitem>
-Preferences</guimenuitem> from the applet popup menu. The <guilabel>Workspace
-Switcher Preferences</guilabel> dialog is displayed. Use the <guilabel>Number
-of workspaces</guilabel> spin box to specify the number of workspaces you
-require.</para>
+<para>You can add workspaces at any time. To add workspaces to your desktop,
+right-click on the <application>Workspace Switcher</application> applet, then
+choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Workspace Switcher
+Preferences</guilabel> dialog is displayed. Use the <guilabel>Number of workspaces
+</guilabel> spin box to specify the number of workspaces you require.</para>
 <sect2 id="gosmetacity-15">
 <title>Window Manager Behavior</title>
 <indexterm><primary>windows</primary><secondary>window managers</secondary>
 </indexterm><para>A window manager controls how windows appear and behave
 on your desktop. The window manager manages where your windows are located,
-which window has focus, and the style of the frame on the windows. The window
+which window has focus, and the theme of the frame on the windows. The window
 frame contains buttons that enable you to perform standard actions such as
 moving, closing, and resizing windows.</para>
-<para>You can configure window manager settings in the <application>Window
-Behavior</application> preference tool. This manual describes the functions
-that are associated with the default configuration of the <application>Window
-Behavior</application> window manager. The default configuration is specified
-in the <application>Metacity</application> preference tools. This manual also
-describes the default functions of the Crux theme.</para>
+<para>You can configure some window manager settings in the <application>
+Window Focus</application> preference tool. This manual describes the functions
+that are associated with the default configuration of the <application>Metacity
+</application> window manager. The default configuration is specified in the <application>
+Window Focus</application> preference tool. This manual also describes the
+default functions of the Crux theme.</para>
 </sect2>
 </sect1>
 <sect1 id="gosmetacity-713">
@@ -70,29 +68,14 @@ describes the default functions of the Crux theme.</para>
 <listitem><para>Application windows </para>
 <para>When you start an application, an application window opens. The window
 manager applies a frame to the application window. By default, the top edge
-of the application window contains a titlebar with buttons that you can use
-to work with the window. The buttons in an application window frame enable
-you to perform actions such as open the <guimenu>Window Menu</guimenu>, or
-close the window. The <guimenu>Window Menu</guimenu> provides a number of
-actions that you can perform on the window. </para>
-<para>The following figure shows a typical application window. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/gedit_window.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows application window in Crux window frame style.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+of the application window contains a titlebar. The titlebar contains buttons
+that you can use to work with the window. The buttons in an application window
+frame enable you to perform actions such as open the <guimenu>Window Menu
+</guimenu>, or close the window. The <guimenu>Window Menu</guimenu> provides
+a number of actions that you can perform on the window. </para></listitem>
 <listitem><para>Dialog windows</para>
 <para>A dialog window is a popup window in which you enter information or
-commands. The dialog appears within a window frame. The frame of a dialog
-window contains buttons that enable you to open the <guimenu>Window Menu</guimenu>,
-or to close the dialog window.</para>
+commands. The dialog appears within a window frame. </para>
 <para>You can use the top edge of the frame to work with the window. For example,
 you can use the titlebar to move the dialog around the desktop. The frame
 also contains buttons that enable you to do the following:</para>
@@ -103,27 +86,14 @@ also contains buttons that enable you to do the following:</para>
 <para>Typically, you open a dialog window from an application window. When
 you open a dialog window, the window is usually raised and has focus. Some
 dialog windows do not allow you to use the application until you close the
-dialog. </para>
-<para>The following figure shows a typical dialog window. </para>
-<screenshot>
-<mediaobject>
-  <imageobject>
-    <imagedata fileref="figures/gedit_pref_dialog.png" format="PNG"/>
-  </imageobject>
-  <textobject>
-	<phrase>Shows dialog window in Crux window frame style.
-</phrase>
-  </textobject>
-</mediaobject>
-</screenshot>
-</listitem>
+dialog. </para></listitem>
 </itemizedlist>
 <sect2 id="gosmetacity-16">
 <title>Window Frames</title>
 <indexterm><primary>windows</primary><secondary>frames</secondary></indexterm>
 <para>A window frame is a border around a window. The window frame contains
-a titlebar. The titlebar normally contains buttons that you can use to work
-with the window.</para>
+a titlebar. The titlebar contains buttons that you can use to work with the
+window.</para>
 <sect3 id="gosmetacity-10">
 <title>Themes</title>
 <indexterm><primary>windows</primary><secondary>themes</secondary></indexterm>
@@ -138,9 +108,8 @@ are associated with the Crux theme. </para>
 <title>Control Elements</title>
 <indexterm><primary>windows</primary><secondary>frame control elements</secondary>
 </indexterm><para>You can use the window frame to perform various actions
-with the window. In particular, the titlebar contains various active control
-elements. The following figure shows the titlebar of an application window:
-</para>
+with the window. In particular, the titlebar contains various buttons. The
+following figure shows the titlebar of an application window:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -201,7 +170,8 @@ in the window contents, then drag the window to the new location.</para></listit
 <listitem><para>To resize a window, press-and-hold <keycap>Alt</keycap>, 
 then middle-click near the corner you want to resize. To resize the window,
 drag from the corner on which you middle-clicked.</para></listitem>
-<listitem><para>To open the <guimenu>Window Menu</guimenu>, press-and-hold <keycap>Alt</keycap>, then right-click in the window contents.</para></listitem>
+<listitem><para>To open the <guimenu>Window Menu</guimenu>, press-and-hold <keycap>
+Alt</keycap>, then right-click in the window contents.</para></listitem>
 </itemizedlist></entry></row>
 </tbody>
 </tgroup>
@@ -228,6 +198,7 @@ that you can use to work with windows and workspaces.</para>
 </mediaobject>
 </screenshot>
 <indexterm><primary>windows</primary><secondary>Window Menu</secondary></indexterm>
+<indexterm><primary>menus</primary><secondary>Window Menu</secondary></indexterm>
 <para>The <guimenu>Window Menu</guimenu> is a menu of commands that you can
 use to perform actions on your windows. To open the <guimenu>Window Menu</guimenu>
 perform one of the following actions:</para>
@@ -273,8 +244,8 @@ the window.</para></entry></row>
 or <guimenuitem>Only on This Workspace</guimenuitem></para></entry><entry
 colname="COLSPEC3"><para>Puts the window on all of your workspaces. If the
 window is already on all of your workspaces, choose <guimenuitem>Only on This
-Workspace</guimenuitem>  to put on the current workspace only.</para></entry>
-</row>
+Workspace</guimenuitem>  to put the window on the current workspace only.
+</para></entry></row>
 <row><entry colname="COLSPEC2"><para><guimenuitem>Move to <replaceable>workspace_name
 </replaceable></guimenuitem> or <guimenuitem>Only on <replaceable>workspace_name
 </replaceable></guimenuitem></para></entry><entry colname="COLSPEC3"><para>
@@ -359,7 +330,7 @@ valign="top"><para>The window has focus.</para></entry><entry valign="top"><para
 gedit</guilabel></para></entry></row>
 <row><entry valign="top"><para>Square brackets around window title.</para></entry>
 <entry valign="top"><para>The window is minimized.</para></entry><entry valign="top"><para><guilabel>
-Dictionary</guilabel></para></entry></row>
+[Dictionary]</guilabel></para></entry></row>
 <row><entry valign="top"><para>Button is not pressed in, no square brackets
 around title.</para></entry><entry valign="top"><para>The window is displayed
 on the desktop, and is not minimized.</para></entry><entry valign="top"><para><guilabel>
@@ -374,13 +345,12 @@ Gnome-terminal (3)</guilabel></para></entry></row>
 <sect3 id="gosmetacity-708">
 <title>Grouping Buttons</title>
 <indexterm><primary>Window List applet</primary><secondary>grouping buttons
-</secondary></indexterm><para>If the space on a panel is limited, <application>
-Window List</application> can group the buttons that represent windows in
-the same class under one window list button. The <guibutton>GNOME Terminal
-</guibutton> button in <xref linkend="gosmetacity-FIG-8"/> is an example of
-a button that represents a group of buttons. The following figure shows an
-example of <application>Window List</application> with a button group open:
-</para>
+</secondary></indexterm><para><application>Window List</application> can group
+the buttons that represent windows in the same class under one window list
+button. The <guibutton>Gnome-terminal</guibutton> button in <xref linkend="gosmetacity-FIG-8"/>
+is an example of a button that represents a group of buttons. The following
+figure shows an example of <application>Window List</application> with a button
+group open:</para>
 <screenshot>
 <mediaobject>
   <imageobject>
@@ -491,10 +461,11 @@ Action</para></entry></row>
 <tbody>
 <row><entry valign="top"><para>Mouse</para></entry><entry valign="top"><para>
 Click on the window, if the window is visible. </para></entry></row>
-<row><entry colname="COLSPEC0" valign="top"><para>Shortcut key</para></entry>
-<entry colname="COLSPEC1" valign="top"><para>Switch between the windows that
-are open with a shortcut key. To give focus to a window, release the keys.
-The default shortcut key to switch between windows is <keycombo><keycap>Alt</keycap><keycap>Tab</keycap></keycombo>. </para></entry></row>
+<row><entry colname="COLSPEC0" valign="top"><para>Shortcut keys</para></entry>
+<entry colname="COLSPEC1" valign="top"><para>Use shortcut keys to switch between
+the windows that are open. To give focus to a window, release the keys. The
+default shortcut keys to switch between windows are <keycombo><keycap>Alt</keycap><keycap>
+Tab</keycap></keycombo>. </para></entry></row>
 <row><entry colname="COLSPEC0" valign="top"><para><application>Window List
 </application></para></entry><entry colname="COLSPEC1" valign="top"><para>
 Click on the button that represents the window in <application>Window List
@@ -568,8 +539,8 @@ window in <application>Window List</application>.</para>
 <sect2 id="gosmetacity-32">
 <title>To Close a Window</title>
 <indexterm><primary>windows</primary><secondary>closing</secondary></indexterm>
-<indexterm><primary>closing</primary><secondary>windows</secondary></indexterm>
-<para>To close a window perform one of the following actions: </para>
+<indexterm><primary>closing windows</primary></indexterm><para>To close a
+window perform one of the following actions: </para>
 <itemizedlist>
 <listitem><para>Click on the <guibutton>Close Window</guibutton> button on
 the window frame.</para></listitem>
@@ -588,24 +559,22 @@ data.</para>
 <indexterm><primary>resizing windows</primary></indexterm><para>To resize
 a window perform one of the following actions:</para>
 <itemizedlist>
-<listitem><para>To resize a window vertically and horizontally point to a
-corner of the window. The mouse pointer changes to indicate that you can resize
-the window. Grab the corner and drag the window to the new size.</para></listitem>
-<listitem><para>To resize a window vertically or horizontally, right-click
-on the button that represents the window in <application>Window List</application>.
-Choose <guimenuitem>Move</guimenuitem> from the <guimenu>Window Menu</guimenu>.
-Use the arrow keys to resize the window.</para></listitem>
+<listitem><para>Point to a corner of the window. The mouse pointer changes
+to indicate that you can resize the window. Grab the corner and drag the window
+to the new size.</para></listitem>
+<listitem><para>Right-click on the button that represents the window in <application>
+Window List</application>. Choose <guimenuitem>Resize</guimenuitem> from the <guimenu>
+Window Menu</guimenu>. Use the arrow keys to resize the window.</para></listitem>
+<listitem><para>Press-and-hold <keycap>Alt</keycap>, then middle-click near
+the corner that you want to resize. The mouse pointer changes to indicate
+that you can resize from the corner. To resize the window, drag from the corner
+on which you middle-clicked.</para></listitem>
 <listitem><para>To resize a window horizontally point to one of the vertical
 edges of the window. The mouse pointer changes to indicate that you can resize
 the window. Grab the edge and drag the window to the new size.</para></listitem>
 <listitem><para>To resize a window vertically point to the bottom edge of
 the window. The mouse pointer changes to indicate that you can resize the
 window. Grab the edge and drag the window to the new size.</para></listitem>
-<listitem><para>To resize a window, press-and-hold <keycap>Alt</keycap>, 
-then middle-click near the corner you want to resize. The mouse pointer changes
-to indicate that you can resize from the corner. To resize the window, drag
-from the corner on which you middle-clicked.</para>
-<para></para></listitem>
 </itemizedlist>
 <note><para>You cannot resize some dialog windows. Also, some application
 windows have a minimum size below which you cannot reduce the window.</para>
@@ -619,8 +588,8 @@ perform one of the following actions: </para>
 <itemizedlist>
 <listitem><para>Grab the titlebar of the window and drag the window to the
 new location. </para></listitem>
-<listitem><para>Press-and-hold <keycap>Alt</keycap> then drag the window to
-the new location. </para></listitem>
+<listitem><para>Press-and-hold <keycap>Alt</keycap>, then drag the window
+to the new location. </para></listitem>
 <listitem><para>Open the <guimenu>Window Menu</guimenu>, then choose <guimenuitem>
 Move</guimenuitem>. Use the arrow keys to move the window to the new location.
 </para></listitem>
@@ -634,7 +603,7 @@ to the new location.</para></listitem>
 <title>To Shade a Window</title>
 <indexterm><primary>windows</primary><secondary>shading</secondary></indexterm>
 <indexterm><primary>shading windows</primary></indexterm><para>You can shade
-and unshade windows as follows:</para>
+and unshade windows, as follows:</para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="24.94*"/><colspec
 colwidth="75.06*"/>
@@ -662,10 +631,10 @@ Unshade</guimenuitem>.</para></listitem>
 </sect2>
 <sect2 id="gosmetacity-38">
 <title>To Put a Window on All Workspaces</title>
-<indexterm><primary>windows</primary><secondary>put on all workspaces</secondary>
-</indexterm><para>To put a window in all workspaces, open the <guimenu>Window
-Menu</guimenu>. Choose <guimenuitem>Put on All Workspaces</guimenuitem>. To
-set the window to appear only in the current workspace, choose <guimenuitem>
+<indexterm><primary>windows</primary><secondary>putting on all workspaces
+</secondary></indexterm><para>To put a window in all workspaces, open the <guimenu>
+Window Menu</guimenu>. Choose <guimenuitem>Put on All Workspaces</guimenuitem>.
+To set the window to appear only in the current workspace, choose <guimenuitem>
 Only on This Workspace</guimenuitem>.</para>
 </sect2>
 <sect2 id="gosmetacity-46">
@@ -675,8 +644,8 @@ Only on This Workspace</guimenuitem>.</para>
 moving windows to </secondary></indexterm><para>You can move a window to another
 workspace in either of the following ways:</para>
 <itemizedlist>
-<listitem><para>Use <application>Workpsace Switcher</application></para>
-<para>In the <application>Workpsace Switcher</application> display, drag the
+<listitem><para>Use <application>Workspace Switcher</application></para>
+<para>In the <application>Workspace Switcher</application> display, drag the
 window to the workspace you require.</para></listitem>
 <listitem><para>Use the <guimenu>Window Menu</guimenu></para>
 <para>Open the <guimenu>Window Menu</guimenu>. To move the window to the next
@@ -698,18 +667,21 @@ ways: </para>
 <listitem><para>Use <application>Workspace Switcher</application></para>
 <para>Click on the workspace that you want to switch to in <application>Workspace
 Switcher</application>.</para></listitem>
-<listitem><para>Use a shortcut key</para>
+<listitem><para>Use shortcut keys</para>
 <para>The default shortcut keys to switch between the workspaces are as follows: 
 </para>
 <informaltable frame="topbot">
 <tgroup cols="2" colsep="0" rowsep="0"><colspec colwidth="50*"/><colspec colwidth="50*"/>
 <thead>
-<row><entry valign="top"><para>Shortcut Key</para></entry><entry valign="top"><para>
-Function</para></entry></row>
+<row><entry valign="top"><para>Default Shortcut Keys</para></entry><entry
+valign="top"><para>Function</para></entry></row>
 </thead>
 <tbody>
-<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>right arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects the workspace to the right. </para></entry></row>
-<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>left arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
+<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>right arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
+the workspace to the right. </para></entry></row>
+<row><entry valign="top"><para><keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap>
+<keycap>left arrow</keycap></keycombo></para></entry><entry valign="top"><para>Selects
 the workspace to the left. </para></entry></row>
 </tbody>
 </tgroup>
@@ -721,39 +693,34 @@ the workspace to the left. </para></entry></row>
 <title>To Add Workspaces</title>
 <indexterm><primary>workspaces</primary><secondary>adding</secondary></indexterm>
 <para>To add workspaces to your desktop, right-click on <application>Workspace
-Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Number of workspaces</guilabel> spin
-box to specify the number of workspaces you require. <application>Workspace
-Switcher</application> adds new workspaces at the end of the workspace list.
-</para>
+Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+The <guilabel>Workspace Switcher Preferences</guilabel> dialog is displayed.
+Use the <guilabel>Number of workspaces</guilabel> spin box to specify the
+number of workspaces you require. <application>Workspace Switcher</application>
+adds new workspaces at the end of the workspace list.</para>
 </sect2>
 <sect2 id="gosmetacity-51">
 <title>To Name Workspaces</title>
 <indexterm><primary>workspaces</primary><secondary>naming</secondary></indexterm>
 <para>The default names of your workspaces are <literal>Workspace 1</literal>, <literal>
-Workspace 2</literal>, <literal>Workspace 3</literal>, and so on. You can
-assign names to your workspaces in the <application>Workspaces</application>
-desktop preference tool. </para>
-<para>To assign names to your workspaces, right-click on <application>Workspace
-Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Workspaces</guilabel> list box to specify
-the names of your workspaces. Select a workspace, then type the new name for
-the workspace.</para>
+Workspace 2</literal>, <literal>Workspace 3</literal>, and so on. To assign
+names to your workspaces, right-click on <application>Workspace Switcher</application>,
+then choose <guimenuitem>Preferences</guimenuitem>. The <guilabel>Workspace
+Switcher Preferences</guilabel> dialog is displayed. Use the <guilabel>Workspaces
+</guilabel> list box to specify the names of your workspaces. Select a workspace,
+then type the new name for the workspace.</para>
 </sect2>
 <sect2 id="gosmetacity-52">
 <title>To Delete Workspaces</title>
-<indexterm><primary>workspaces</primary><secondary>delete</secondary></indexterm>
+<indexterm><primary>workspaces</primary><secondary>deleting</secondary></indexterm>
 <para>When you delete a workspace the windows in the workspace are moved to
 another workspace, and the empty workspace is deleted. </para>
 <para>To delete workspaces from your desktop, right-click on <application>
-Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>
-from the applet popup menu. The <guilabel>Workspace Switcher Preferences</guilabel>
-dialog is displayed. Use the <guilabel>Number of workspaces</guilabel> spin
-box to specify the number of workspaces you require. <application>Workspace
-Switcher</application> deletes workspaces from the end of the workspace list.
-</para>
+Workspace Switcher</application>, then choose <guimenuitem>Preferences</guimenuitem>.
+The <guilabel>Workspace Switcher Preferences</guilabel> dialog is displayed.
+Use the <guilabel>Number of workspaces</guilabel> spin box to specify the
+number of workspaces you require. <application>Workspace Switcher</application>
+deletes workspaces from the end of the workspace list.</para>
 </sect2>
 </sect1>
 </chapter>