backports from HEAD

backports from HEAD

11 files changed, 608 insertions, 580 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 96a6b65..e698b1c 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,60 @@
+2006-04-09 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goseditmainmenu.xml:
+	* gospanel.xml:
+	cleaning up terminology for the panel menubar	
+	* gospanel.xml:
+	documenting launcher replaceable command parameters. Fixes #307978
+	* user-guide.xml:	
+	added appendix section 'Joining the GNOME Project'
+
+2006-04-08 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* gosoverview.xml:
+	updated section on the Filechooser, following review by GTK team
+	
+2006-04-07 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* gosoverview.xml:
+	updated section on detachable toolbars
+	* goscustdesk.xml:
+	added info on Editable menu accelerators option
+
+2006-04-03 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* figures/naut_spatial_icon_view.png 
+	* figures/naut_spatial_list_view.png 
+	* figures/naut_spatial_view.png
+	scaled down to 75%
+	* gosnautilus.xml:
+	new section on item properties window: basic intro & links in and out	
+
+2006-04-01 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	added note about Ignore Host List in Network Proxy prefs, reformatted list
+	
+2006-03-29 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	rewritten Keyboard Layout Options.
+	
+2006-03-26 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	rewritten Keyboard Shortcuts Preferences. Fixes #329073
+	
+2006-03-25 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goscustdesk.xml:
+	rewritten Keyboard Layouts Preferences & Typing Break sections
+	
+2006-03-17 Joachim Noreiko <jnoreiko@yahoo.com>
+
+	* goseditmainmenu.xml:
+	rewritten section on editing menus
+	removed old sections that depend on obsolete apps:/// URI, eg 'To Add a Menu'
+
 2006-03-13  Brent Smith  <gnome@nextreality.net>
 
 	* user-guide.pdf:
diff --git a/gnome2-user-guide/C/figures/naut_spatial_icon_view.png b/gnome2-user-guide/C/figures/naut_spatial_icon_view.png
index 5262486..3f8e2af 100644
--- a/gnome2-user-guide/C/figures/naut_spatial_icon_view.png
+++ b/gnome2-user-guide/C/figures/naut_spatial_icon_view.png
diff --git a/gnome2-user-guide/C/figures/naut_spatial_list_view.png b/gnome2-user-guide/C/figures/naut_spatial_list_view.png
index c755813..18c38d6 100644
--- a/gnome2-user-guide/C/figures/naut_spatial_list_view.png
+++ b/gnome2-user-guide/C/figures/naut_spatial_list_view.png
diff --git a/gnome2-user-guide/C/figures/naut_spatial_view.png b/gnome2-user-guide/C/figures/naut_spatial_view.png
index 665556f..3f588e7 100644
--- a/gnome2-user-guide/C/figures/naut_spatial_view.png
+++ b/gnome2-user-guide/C/figures/naut_spatial_view.png
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 7ebc396..1716594 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -1078,8 +1078,10 @@ after a keypress before the pointer moves. </para>
 see the <ulink type="help" url="ghelp:gnome-access-guide?index"><citetitle>GNOME Desktop Accessibility Guide</citetitle></ulink>.</para>
     </sect2>
   </sect1>
-  <sect1 id="goscustperiph-2">
+  <sect1 id="prefs-keyboard">
     <title>Keyboard Preferences</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustperiph-2"/>       
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Keyboard</secondary>
@@ -1091,6 +1093,9 @@ general preferences</secondary>
     </indexterm>
     <para>Use the <application>Keyboard</application> preference tool to modify the autorepeat preferences for
 your keyboard, and to configure typing break settings. </para>
+    <!--
+    adds no information until each tab can be briefly summarized.
+    
     <para>You can set the preferences for the <application>Keyboard</application>
 preference tool in the following functional areas:</para>
     <itemizedlist>
@@ -1115,6 +1120,8 @@ preference tool in the following functional areas:</para>
         </para>
       </listitem>
     </itemizedlist>
+    -->
+    <para>To open the <link linkend="prefs-keyboard-a11y"><application>Keyboard <emphasis>Accessibility</emphasis></application> preference tool</link>, click the <guibutton>Accessibility</guibutton> button.</para>    
     <sect2 id="goscustdesk-40">
       <title>Keyboard Preferences</title>
       <para>Use the <guilabel>Keyboard</guilabel> tabbed section to set general
@@ -1212,11 +1219,125 @@ test area to test the effect of your settings.</para>
         </tgroup>
       </table>
     </sect2>
+    <sect2 id="prefs-keyboard-layouts">
+      <title>Keyboard Layouts Preferences</title>
+      <!-- preserve id for backwards compatibility: 2.12 -->
+      <anchor id="goscustdesk-100"/>         
+      <para>Use the <guilabel>Layouts</guilabel> tabbed section to set your keyboard's language, and also the make and model of keyboard you are using.</para>
+      <para>This will allow GNOME to make use of special media keys on your keyboard, and to show the correct characters for your keyboard's language.</para>
+      
+      <variablelist>
+	      <varlistentry>
+	        <term><guilabel>Keyboard model</guilabel></term>
+	        <listitem><para>Use the browse button (labelled with an ellipsis, <guibutton>...</guibutton>) to choose another keyboard make and model.</para></listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><guilabel>Selected Layouts</guilabel></term>
+	        <listitem><para>You can switch between selected layouts to change the characters your keyboard produces when you type. To add a layout, click <guibutton>Add</guibutton>. You can have up to four layouts. To remove a layout, select it and press <guibutton>Remove</guibutton>.</para>
+	        <para>To switch between keyboard layouts, use the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application> panel applet</ulink>. <!-- better link to the specific page, but not yet suitable for a direct link: ghelp:gswitchit?gswitchit-applet-switching --></para>
+	        </listitem>
+	      </varlistentry>
+	      <varlistentry>
+	        <term><guilabel>Separate group for each window</guilabel></term>
+	        <listitem><para>
+	        When this option is selected, each window has its own keyboard layout. Changing to a different layout will only affect the current window.</para>
+	        <para>This allows you to to type with a Russian keyboard layout in a word processor, then switch to your web browser and type with an English keyboard layout, for example. </para></listitem>
+        </varlistentry>
+      </variablelist>
+      
+      <para>Click <guibutton>Reset to Defaults</guibutton> to restore all keyboard layout settings to their initial state for your system and locale.</para>
+    </sect2>
+    
+    
+    <sect2 id="prefs-keyboard-layoutoptions"> 
+      <title>Keyboard Layout Options</title>
+      <!-- preserve id for backwards compatibility: 2.12 -->
+      <anchor id="goscustdesk-101"/>
+      <para>The <guilabel>Layout Options</guilabel> tabbed section has options for the behaviour of keyboard modifier keys and certain shortcut options.</para>
+      <para>Expand each group label to show the available options. A label in boldface indicates that the options in the group have been changed from the default setting.</para>
+      <note><para>The options shown in this tabbed section depend on the X windowing system you are using. Not all the following options might be listed on your system, and not all the options shown might work on your system.</para></note>
+
+      <!-- the options of mystery!!!       
+           for future reference, these are in
+           /etc/X11/xkb/rules/xorg.xml
+      -->
+      <variablelist>
+        <varlistentry>
+                <term><guilabel>Adding the EuroSign to certain keys</guilabel></term>
+                <listitem>
+                  <para>Use these options to add the Euro currency symbol to a key as a third-level character. To access this symbol, you must assign a <guilabel>third level chooser</guilabel>.</para>
+                </listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Alt/Win key behavior</guilabel></term>
+                <listitem><para>
+                  This group of options allows you to assign the behaviour of Unix modifier keys Super, Meta, and Hyper to the <keycap>Alt</keycap> and <keycap>Windows</keycap> keys on your keyboard.
+                </para></listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>CapsLock key behavior</guilabel></term>
+                <listitem><para>
+                  This group has several options for the <keycap>Caps Lock</keycap> key.
+                </para></listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Compose key position</guilabel></term>
+                <listitem>
+                  <para>The Compose key allows you to combine two keypresses to make a single character. This is used to create an accented character that might not be on your keyboard layout. For example, press the Compose key, then <keycap>'</keycap>, then <keycap>e</keycap> to obtain e-acute character. <!-- Translators: feel free to use an example suitable to your locale --></para>
+                </listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Control key position</guilabel></term>
+                <listitem><para>
+                  Use this group of options to set the location of the <keycap>Ctrl</keycap> key to match the layout on older keyboards.
+                </para></listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Group Shift/Lock behavior</guilabel></term>
+                <listitem><para>
+                  Select keys or key combinations to switch your keyboard layout when pressed.
+ 
+                </para></listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Miscellaneous compatibility options</guilabel></term>
+                <listitem>
+                  <variablelist>
+	                  <varlistentry>
+	                    <term><guilabel>Shift with numpad keys works as in MS Windows.</guilabel></term>
+                    	<listitem>
+                    	  <para>With this option selected, using <keycap>Shift</keycap> with keys on the numerical pad when <keycap>NumLock</keycap> is off extends the current selection.</para>
+                    	  <para>With this option unselected, use <keycap>Shift</keycap> with keys on the numerical pad to obtain the reverse of the current behaviour for that key. For example, when <keycap>NumLock</keycap> is off, the <keycap>8</keycap> key acts as an up-arrow. Press <keycombo><keycap>Shift</keycap><keycap>8</keycap></keycombo> to type an '8'.</para></listitem>
+                    	</varlistentry>
+                    	<varlistentry><term><guilabel>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</guilabel></term>
+	<listitem><para>Select this option to have certain keyboard shortcuts passed to the X windowing system instead of being handled by GNOME.</para></listitem>
+</varlistentry>
+                    </variablelist>
+                </listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Third level choosers</guilabel></term>
+                <listitem>
+                  <para>A <firstterm>third level</firstterm> key allows you to obtain a third character from a key, in the same way that pressing <keycap>Shift</keycap> with a key produces a different character to pressing the key alone.</para>
+                  <para>Use this group to select a key you want to act as a third level modifier key.</para>
+                  <para>Pressing the third-level key and <keycap>Shift</keycap> produces a fourth character from a key.</para>
+                  <para>The third and fourth level characters for your keyboard layout are shown in the <ulink type="help" url="ghelp:gswitchit"><application>Keyboard Indicator</application></ulink> Layout View Window.</para>
+                  <!-- better link, pending CVS commit of gswitchit docs: "ghelp:gswitchit?layout-view" -->
+                </listitem>
+        </varlistentry>
+        <varlistentry>
+                <term><guilabel>Use keyboard LED to show alternative group.</guilabel></term>
+                <listitem>
+                  <para>Use this option to specify that one of the light indicators on your keyboard should indicate when an alternative keyboard layout is in use.</para>
+                  <note><para>The selected keyboard light will no longer indicate its standard function. For example, the Caps Lock light will not react to the <keycap>Caps Lock key</keycap>.</para></note>
+                </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect2>
+
     <sect2 id="goscustdesk-86">
       <title>Typing Break Preferences</title>
-      <para>Use the <guilabel>Typing Break</guilabel> tabbed section to set typing
-break preferences. To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
-click on the <guibutton>Accessibility</guibutton> button.</para>
+      <para>Configure the Typing Break Preferences to make GNOME remind you to rest after you have been using the keyboard and mouse for a long time. During a Typing Break, the screen will be locked.</para>
       <para><xref linkend="goscustdesk-TBL-87"/> lists the typing break preferences
  that you can modify.</para>
       <table frame="topbot" id="goscustdesk-TBL-87">
@@ -1282,27 +1403,12 @@ typing breaks.</para>
           </tbody>
         </tgroup>
       </table>
-    </sect2>
-    <sect2 id="goscustdesk-100">
-      <title>Keyboard Layout Preferences</title>
-      <para>Use the <guilabel>Layouts</guilabel> tabbed section to set your keyboard
-layout. Select your keyboard model from the drop-down list. Use the navigational
-buttons to add or remove a selected layout from the list of available layouts. </para>
-      <para>You can choose different layouts to suit different locales. For more
-information on keyboard layouts, see the <citetitle>Keyboard Layout Switcher</citetitle> manual.</para>
-      <para>To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
-click on the <guibutton>Accessibility</guibutton> button.</para>
-    </sect2>
-    <sect2 id="goscustdesk-101">
-      <title>Keyboard Layout Options</title>
-      <para>Use the <guilabel>Layout Options</guilabel> tabbed section to set your
-keyboard layout options. Select an option from the list of available layout
-options and click <guibutton>Add</guibutton> to select an option. Use <guibutton>Remove</guibutton> to remove a selected option. </para>
-      <para>For more information on the layout options, see the <citetitle>Keyboard
-Layout Switcher</citetitle> manual.</para>
-      <para>To start the <application>Keyboard</application> <emphasis>accessibility</emphasis> preference tool, that is, <application>AccessX</application>,
-click on the <guibutton>Accessibility</guibutton> button.</para>
-    </sect2>
+      <note><para>
+        If you stop using the keyboard and mouse for a length of time equal to the <guilabel>Break interval</guilabel> setting, the current work interval will be reset.
+      </para></note>
+    </sect2>    
+    
+    
   </sect1>
   <sect1 id="prefs-keyboard-shortcuts">
     <title>Keyboard Shortcuts Preferences</title>
@@ -1322,68 +1428,36 @@ keys</primary>
       <primary>keyboard shortcuts</primary>
       <secondary>configuring</secondary>
     </indexterm>
+    <para>Use the <application>Keyboard Shortcuts</application> preference tool to customize the default keyboard shortcuts to your requirements.</para>    
+    
     <para>A <firstterm>keyboard shortcut</firstterm> is a key or combination of
-keys that provides an alternative to standard ways of performing an action. </para>
-    <para>Use the <application>Keyboard Shortcuts</application> preference tool to display the default keyboard
-shortcuts. You can customize the default keyboard shortcuts to your requirements. </para>
-    <para><xref linkend="goscustdesk-TBL-5"/>
-lists the keyboard shortcut settings that you can customize.</para>
-    <table frame="topbot" id="goscustdesk-TBL-5">
-      <title>Keyboard Shortcuts Preferences</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec0" colwidth="36.11*"/>
-        <colspec colname="colspec1" colwidth="63.89*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Dialog Element</para>
-            </entry>
-            <entry>
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guilabel>Text editing shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>Select
-one of the following settings:</para>
-              <itemizedlist>
-                <listitem>
-                  <para><guilabel>GNOME Default</guilabel>: Use this setting for standard
-shortcut keys.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>Emacs</guilabel>: Use this setting for <application>Emacs</application> shortcut keys.</para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" valign="top">
-              <para>
-                <guilabel>Desktop shortcuts</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" valign="top">
-              <para>This
-table lists actions and the shortcut keys that are associated with each action. </para>
-              <para>To change the shortcut keys for an action, click on the action
-to select the action, then click on the shortcut for the action. Press the
-keys that you want to associate with the action.</para>
-              <para>To disable the
-shortcut keys for an action, click on the action to select the action, then
-click on the shortcut for the action. Press the <keycap>Backspace</keycap> key.</para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+keys that provides an alternative to standard ways of performing an action. For more on keyboard shortcuts, and a list of the default shortcuts in GNOME, see <xref linkend="keyboard-skills"/>.</para>
+
+    <para>To edit a keyboard shortcut, perform the following steps:</para>
+    <orderedlist>
+	    <listitem><para>
+	    Click the action in the list. If you are using the the keyboard, use the arrow keys to select the shortcut and press <keycap>Return</keycap>.</para></listitem>
+	    <listitem>
+	      <para>Press the new key or key combination you want to assign to the action.</para>
+	      <para>To clear a shortcut, press <keycap>Escape</keycap>. The action is now marked as <guilabel>Disabled</guilabel>.</para>
+	    </listitem>
+    </orderedlist>
+    
+    <para>To cancel assigning a shortcut, click elsewhere in the window or press <keycap>Escape</keycap>.</para>
+    
+    <para>The shortcuts you can customize are grouped as follows:</para>
+    
+    <variablelist>
+    	<varlistentry><term>Desktop</term>
+    	  <listitem><para>These are general shortcuts for the whole desktop, such as logging out, <link linkend="lock-screen">locking the screen</link>, opening the <link linkend="menubar">panel menubar</link>, or launching a web browser.</para></listitem>
+    	</varlistentry>
+    	<varlistentry><term>Sound</term>
+    	  <listitem><para>Shortcuts for controlling your music player and the system volume.</para></listitem>
+    	</varlistentry>
+    	<varlistentry><term>Window Management</term>
+    	  <listitem><para>Shortcuts for working with windows and workspaces, such as such as maximizing or moving the current window, and switching to another workspace. For more information on these kinds of actions, see <xref linkend="windows-manipulating"/> and <xref linkend="overview-workspaces"/>.</para></listitem>
+    	</varlistentry>    	
+    </variablelist>
   </sect1>  
   <sect1 id="prefs-menustoolbars">
     <title>Menus &amp; Toolbars Preferences</title>
@@ -1402,83 +1476,63 @@ click on the shortcut for the action. Press the <keycap>Backspace</keycap> key.<
 customizing appearance</secondary>
     </indexterm>
     <para>You can use the <application>Menus &amp; Toolbars</application> preference tool to customize the appearance
-of menus, menubars, and toolbars for GNOME-compliant applications.</para>
-    <para><xref linkend="goscustuserinter-TBL-8"/> lists the menu and toolbar preferences that
-you can modify for GNOME-compliant applications.</para>
-    <table frame="topbot" id="goscustuserinter-TBL-8">
-      <title>Menu and Toolbar Preferences</title>
-      <tgroup cols="2" colsep="1" rowsep="1">
-        <colspec colname="colspec0" colwidth="18.86*"/>
-        <colspec colname="colspec1" colwidth="47.14*"/>
-        <thead>
-          <row>
-            <entry colsep="0" rowsep="1">
-              <para>Dialog Element</para>
-            </entry>
-            <entry colsep="0" rowsep="1">
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-              <para>
-                <guilabel>Show icons in menus</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>Select this option to display an icon beside
-each item in a menu. Some menu items do not have an icon.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-              <para>
-                <guilabel>Detachable toolbars</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>Select this option if you want to move toolbars
-from application windows to any location on the screen. If you select this
-option, handles are displayed on the left side of the toolbars in your applications.
-To move a toolbar, click-and-hold on the handle, then drag the toolbar to
-the new location.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec0" colsep="0" rowsep="0" valign="top">
-              <para>
-                <guilabel>Toolbar button labels</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec1" colsep="0" rowsep="0" valign="top">
-              <para>Choose one of the following options to specify
-what to display on the toolbars in your GNOME-compliant applications:</para>
-              <itemizedlist>
-                <listitem>
-                  <para><guilabel>Text Below Icons</guilabel>: Select this option
-to display toolbars with text as well as an icon on each button. </para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>Text Beside Icons</guilabel>: Select this option
-to display toolbars with an icon only on each button, and with text on the
-most important buttons.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>Icons Only</guilabel>: Select this option to display
-toolbars with an icon only on each button.</para>
-                </listitem>
-                <listitem>
-                  <para><guilabel>Text Only</guilabel>: Select this option to display
-toolbars with text only on each button.</para>
-                </listitem>
-              </itemizedlist>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+of menus, menubars, and toolbars for applications that are part of GNOME.</para>
+    <para>As you make changes to the settings, the preview display in the window updates. This allows you to see the changes if no application windows are currently open.</para>
+    <variablelist>
+     	<varlistentry>
+    	  <term><guilabel>Show icons in menus</guilabel></term>
+    	  <listitem>
+    	    <para>Select this option to display an icon beside
+    items in application menus and the panel menu. Not all menu items have an icon.</para>
+    	  </listitem>
+    	</varlistentry>
+    	<varlistentry>
+    	  <term><guilabel>Editable menu accelerators</guilabel></term>
+	      <listitem><para>Selecting this option allows you to define new keyboard shortcuts for menu items.</para>
+	      <para>To change an application shortcut key, open the menu, and with the mouse pointer on the menu item you wish to change, press the new combination of keys. To remove a shortcut key, press <keycap>Backspace</keycap> or <keycap>Delete</keycap>.</para>
+	      <warning>
+	        <para>When using this feature, you will not be warned if assigning a new shortcut key to a command also removes it from another command.</para>
+	        <para>There is no way to restore the original, default keyboard shortcut for a comamnd.</para>
+	        <para>This feature does not maintain shortcuts that are normally common to all applications, such as <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> for Copy. This may lead to inconsistencies in your GNOME applications.</para>
+	      </warning>
+	      </listitem>
+      </varlistentry>
+     	<varlistentry>
+    	  <term><guilabel>Detachable toolbars</guilabel></term>
+    	  <listitem>
+    	    <para>Selecting this option allows you to move toolbars
+    from application windows to any location on the screen. A handle is displayed on the left side of the toolbars in your applications.
+    To move a toolbar, click-and-hold on the handle, then drag the toolbar to
+    the new location.</para>
+    	  </listitem>
+    	</varlistentry>
+     	<varlistentry>
+    	  <term><guilabel>Toolbar button labels</guilabel></term>
+    	  <listitem>
+    	    <para>Choose one of the following options to specify
+    what to display on the toolbars in your GNOME-compliant applications:</para>
+                  <itemizedlist>
+                    <listitem>
+                      <para><guilabel>Text Below Icons</guilabel>: Select this option
+    to display toolbars with text as well as an icon on each button. </para>
+                    </listitem>
+                    <listitem>
+                      <para><guilabel>Text Beside Icons</guilabel>: Select this option
+    to display toolbars with an icon only on each button, and with text on the
+    most important buttons.</para>
+                    </listitem>
+                    <listitem>
+                      <para><guilabel>Icons Only</guilabel>: Select this option to display
+    toolbars with an icon only on each button.</para>
+                    </listitem>
+                    <listitem>
+                      <para><guilabel>Text Only</guilabel>: Select this option to display
+    toolbars with text only on each button.</para>
+                    </listitem>
+                  </itemizedlist>
+    	  </listitem>
+    	</varlistentry>
+    </variablelist>
   </sect1>
   <sect1 id="prefs-mouse">
     <title>Mouse Preferences</title>
@@ -1679,8 +1733,10 @@ action.</para>
     <title>Multimedia Systems Selector</title>
     <para>See the <ulink type="help" url="ghelp:gstreamer-properties">GStreamer Properties Manual</ulink>.</para>
   </sect1>
-  <sect1 id="goscustdesk-50">
+  <sect1 id="prefs-networkproxy">
     <title>Network Proxy Preferences</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-50"/>       
     <indexterm>
       <primary>preference
 tools</primary>
@@ -1699,135 +1755,53 @@ tools</primary>
       <secondary>setting preferences</secondary>
     </indexterm>
     <para>The <application>Network Proxy</application>
-preference tool enables you to configure how your system connects to the Internet.
-You can configure the GNOME Desktop to connect to a <firstterm>proxy server</firstterm>, and specify the details of the proxy server. A proxy server
+preference tool enables you to configure how your system connects to the Internet.</para>
+    <para>You can configure the GNOME Desktop to connect to a <firstterm>proxy server</firstterm>, and specify the details of the proxy server. A proxy server
 is a server that intercepts requests to another server, and fulfills the request
 itself, if it can. You can enter the Domain Name Service (DNS) name or the
 Internet Protocol (IP) address of the proxy server. A <firstterm>DNS name</firstterm> is a unique alphabetic identifier for a computer on a network.
 An <firstterm>IP address</firstterm> is a unique numeric identifier for a
 computer on a network. </para>
-    <para><xref linkend="goscustdesk-TBL-52"/> lists the Internet connection preferences
-that you can modify.</para>
-    <table frame="topbot" id="goscustdesk-TBL-52">
-      <title>Internet Connection Preferences</title>
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colname="colspec2" colwidth="35.09*"/>
-        <colspec colname="colspec3" colwidth="64.91*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Dialog Element</para>
-            </entry>
-            <entry>
-              <para>Description</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Direct internet
-connection</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select this option if you want to connect directly to the Internet, without
-a proxy server.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2">
-              <para>
-                <guilabel>Manual proxy configuration</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select
-this option if you want to connect to the Internet through a proxy server,
-and you want to configure the proxy server manually.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>HTTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a HTTP service. Enter
-the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Secure HTTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter
-the DNS name, or the IP address of the proxy server to use when you request
-a Secure HTTP service. Enter the port number of the Secure HTTP service on
-the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>FTP proxy</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the proxy server to use when you request a FTP service. Enter the
-port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
-spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Socks host</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the DNS name, or the IP
-address of the Socks host to use. Enter the port number for the Socks protocol
-on the proxy server in the <guilabel>Port</guilabel> spin box.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Automatic proxy
-configuration</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Select this option if you want to connect to the Internet through a proxy
-server, and you want to configure the proxy server automatically.</para>
-            </entry>
-          </row>
-          <row>
-            <entry colname="colspec2" valign="top">
-              <para>
-                <guilabel>Autoconfiguration
-URL</guilabel>
-              </para>
-            </entry>
-            <entry colname="colspec3" valign="top">
-              <para>Enter the URL that contains the information required to configure the proxy
-server automatically. </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
+    
+    <variablelist>
+      <varlistentry><term><guilabel>Direct internet
+    connection</guilabel></term><listitem><para>Select this option if you want to connect to the Internet without
+    a proxy server.</para></listitem></varlistentry>
+      <varlistentry><term><guilabel>Manual proxy configuration</guilabel></term><listitem><para>Select
+    this option if you want to connect to the Internet through a proxy server,
+    and you want to configure the proxy server manually.</para>
+      <variablelist>
+        <varlistentry><term><guilabel>HTTP proxy</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the proxy server to use when you request a HTTP service. Enter
+        the port number of the HTTP service on the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>Secure HTTP proxy</guilabel></term><listitem><para>Enter
+        the DNS name, or the IP address of the proxy server to use when you request
+        a Secure HTTP service. Enter the port number of the Secure HTTP service on
+        the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>FTP proxy</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the proxy server to use when you request a FTP service. Enter the
+        port number of the FTP service on the proxy server in the <guilabel>Port</guilabel>
+        spin box.</para></listitem></varlistentry>
+        <varlistentry><term><guilabel>Socks host</guilabel></term><listitem><para>Enter the DNS name, or the IP
+        address of the Socks host to use. Enter the port number for the Socks protocol
+        on the proxy server in the <guilabel>Port</guilabel> spin box.</para></listitem></varlistentry>
+      </variablelist>
+      </listitem></varlistentry>
+      <varlistentry><term><guilabel>Automatic proxy
+      configuration</guilabel></term><listitem><para>Select this option if you want to connect to the Internet through a proxy
+      server, and you want to configure the proxy server automatically.</para></listitem></varlistentry>
+      <varlistentry><term><guilabel>Autoconfiguration
+      URL</guilabel></term><listitem><para>Enter the URL that contains the information required to configure the proxy
+    server automatically. </para></listitem></varlistentry>
+    </variablelist>
+    
+    <para>Set which hosts should not use the proxy in the <guilabel>Ignore Host List</guilabel> in the <guilabel>Advanced Configuration</guilabel> tabbed section. When you access these hosts, you will connect to the Internet directly without a proxy.</para>
+    
   </sect1>
-  <sect1 id="goscustdoc-2">
+  <sect1 id="prefs-preferredapps">
     <title>Preferred Applications</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goscustdesk-2"/>       
     <indexterm>
       <primary>preference tools</primary>
       <secondary>Preferred Applications</secondary>
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index 547278c..9e1a9c0 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -1,5 +1,5 @@
 <chapter id="menubar">
-  <title>Menubar</title>
+  <title>Panel Menubar</title>
   
   <!-- preserve id for backwards compatibility: 2.12 -->
   <anchor id="goseditmainmenu-1"/><!-- Working With Menus -->
@@ -10,7 +10,7 @@
   <anchor id="menus-introduction"/><!-- Introduction to Menus --> 
         
   <highlights>
-    <para>This chapter describes how to use the GNOME Desktop Menubar.</para>
+    <para>This chapter describes how to use the GNOME Panel Menubar.</para>
   </highlights>
   <indexterm>
     <primary>menus</primary>
@@ -26,9 +26,9 @@
     <secondary>introduction</secondary>
   </indexterm>  
 
-  <para>The menubar at the top of the GNOME Desktop, in the <link linkend="top-panel">Top Edge Panel</link>, is your main point of access to GNOME. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>Desktop</guimenu> to customize your system, get help with GNOME, and log out of GNOME or shut down your computer.</para>
+  <para>The panel menubar is your main point of access to GNOME. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>Desktop</guimenu> to customize your system, get help with GNOME, and log out of GNOME or shut down your computer.</para>
   <para>The following sections describe these three menus.</para>
-  <tip><para>The menubar is in fact a panel object: you can move the menubar to another panel, or have more than one instance of the menubar in your panels. For more on this, see <xref linkend="panel-menus"/>.</para></tip>
+  <tip><para>By default, the panel menubar is on the <link linkend="top-panel">Top Edge Panel</link>. But like any other panel object, you can move the menubar to another panel, or have more than one instance of the menubar in your panels. For more on this, see <xref linkend="panel-menus"/>.</para></tip>
 
   <section id="applications-menu">
     <title>Applications Menu</title>
@@ -88,242 +88,33 @@
      </itemizedlist>
      
      <para>For more on logging out and shutting down, see <xref linkend="shutdown"/>.</para> 
-     
 
-  <!-- translators: rest of this file is still being worked on and will change a lot -->
   </section>    
-  <section id="goseditmainmenu-54">
-    <title>Customizing Your Menus</title>
+  <section id="menu-editor">
+    <title>Customizing the Panel Menubar</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="goseditmainmenu-54"/>          
     <indexterm>
       <primary>menus</primary>
       <secondary>customizing</secondary>
     </indexterm>
+
     <para>You can modify the contents of the following menus:</para>
     <itemizedlist>
       <listitem>
         <para><guimenu>Applications</guimenu> menu</para>
       </listitem>
       <listitem>
-        <para><guimenu>Desktop Preferences</guimenu> menu</para>
-      </listitem>
-    </itemizedlist>
-    <para>You use the following GNOME Desktop components to customize menus:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Menus on panels</para>
+        <para><menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> submenu</para>
       </listitem>
       <listitem>
-        <para><application>Nautilus</application> file manager</para>
-      </listitem>
+        <para><menuchoice><guimenu>Desktop</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu</para>
+      </listitem>      
     </itemizedlist>
-    <para>When you use panels to customize your menus, you use the menu item popup
-menu. For more information, see <xref linkend="menubar"/>.</para>
-    <para>When you use the file manager to customize your menus, you must access the <guimenu>Applications</guimenu> menu or the <guimenu>Desktop Preferences</guimenu>
-menu from within the file manager. To access the <guimenu>Applications</guimenu>
-menu or the <guimenu>Desktop Preferences</guimenu> menu, open a file manager
-window. </para>
-    <para>To access menus
-in the file manager, access one of the following URIs in the file manager:</para>
-    <informaltable frame="topbot">
-      <tgroup cols="2" colsep="0" rowsep="0">
-        <colspec colwidth="50*"/>
-        <colspec colwidth="50*"/>
-        <thead>
-          <row rowsep="1">
-            <entry>
-              <para>Menu</para>
-            </entry>
-            <entry>
-              <para>Enter this URI</para>
-            </entry>
-          </row>
-        </thead>
-        <tbody>
-          <row>
-            <entry valign="top">
-              <para><guimenu>Applications</guimenu> menu</para>
-            </entry>
-            <entry valign="top">
-              <para>
-                <command>applications:///</command>
-              </para>
-            </entry>
-          </row>
-          <row>
-            <entry valign="top">
-              <para><guimenu>Desktop Preferences</guimenu> menu</para>
-            </entry>
-            <entry valign="top">
-              <para>
-                <command>preferences:///</command>
-              </para>
-            </entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-    <para>For more information on the file manager, see <citetitle>Nautilus File
-Manager</citetitle>.</para>
-    <section id="goseditmainmenu-61">
-      <title>To Add a Menu</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>adding</secondary>
-      </indexterm>
-      <para>To add a menu, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>In a file manager window, access the location where you want
-to add the menu. For example, if you want to add a menu to the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> URI.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Folder</guimenuitem></menuchoice>. An untitled folder
-is added to the menu. The name of the folder is selected.</para>
-        </listitem>
-        <listitem>
-          <para>Type a name for the folder, then press <keycap>Return</keycap>. </para>
-        </listitem>
-      </orderedlist>
-      <para>The next time that you log out then log in again, the menu is in the
-assigned location.</para>
-    </section>
-    <section id="goseditmainmenu-55">
-      <title>To Add a Launcher to a Menu</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>adding launchers to</secondary>
-      </indexterm>
-      <para>To add a launcher to a menu, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Right-click on any item in the menu to which you want to add
-the launcher.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Add new item to this menu</guimenuitem></menuchoice>. A <guilabel>Create Launcher</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Enter the properties of the launcher in the <guilabel>Create
-Launcher</guilabel> dialog. For more information on the elements in the <guilabel>Create Launcher</guilabel> dialog, see <emphasis>Working With Panels</emphasis>.</para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>OK</guibutton>.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="goseditmainmenu-63">
-      <title>To Add a Launcher to an Empty Menu</title>
-      <para>To add a launcher to an empty menu, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>In a file manager window, access the menu where you want to
-add the launcher. </para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Create Launcher</guimenuitem></menuchoice>. A <guilabel>Create
-Launcher</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Enter the properties of the launcher in the <guilabel>Create
-Launcher</guilabel> dialog. For more information on the elements in the <guilabel>Create Launcher</guilabel> dialog, see <emphasis>Working With Panels</emphasis>.</para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>OK</guibutton>.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="goseditmainmenu-56">
-      <title>To Copy a Launcher to a Menu</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>copying launchers to</secondary>
-      </indexterm>
-      <para>To copy an existing launcher to a menu, perform the following
-steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>In a file manager window, access the location from which you
-want to copy the launcher.  For example, if you want to copy a launcher from
-the <guimenu>Applications</guimenu> menu, enter <command>applications:///</command> URI.</para>
-        </listitem>
-        <listitem>
-          <para>Select the launcher that you want to copy, then choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy File</guimenuitem></menuchoice>.</para>
-        </listitem>
-        <listitem>
-          <para>In a file manager  window, access the location to which you
-want to copy the launcher.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste Files</guimenuitem></menuchoice>. The launcher is added to the new location.</para>
-        </listitem>
-      </orderedlist>
-      <para>Alternatively, you can drag the launcher from one location to another.</para>
-      <para>The next time that you log out then log in again, the launcher is in
-the new menu location.</para>
-    </section>
-    <section id="goseditmainmenu-62">
-      <title>To Edit the Properties of a Menu</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>editing properties</secondary>
-      </indexterm>
-      <para>To edit the properties of a menu, perform the following
-steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Right-click on any item in the menu that you want to edit.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>Entire menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A <guilabel>Launcher Properties</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Modify the properties of the menu in the <guilabel>Launcher
-Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <emphasis>Working With Panels</emphasis>.</para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>OK</guibutton>.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="goseditmainmenu-57">
-      <title>To Edit a Menu Item</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>editing menu items</secondary>
-      </indexterm>
-      <para>To edit a menu item, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Right-click on the item that you want to edit.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <guimenuitem>Properties</guimenuitem>. A <guilabel>Launcher Properties</guilabel> dialog is displayed.</para>
-        </listitem>
-        <listitem>
-          <para>Modify the properties of the launcher in the <guilabel>Launcher
-Properties</guilabel> dialog. For more information on the elements in the <guilabel>Launcher Properties</guilabel> dialog, see <emphasis>Working With Panels</emphasis>.</para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>OK</guibutton>.</para>
-        </listitem>
-      </orderedlist>
-    </section>
-    <section id="goseditmainmenu-58">
-      <title>To Delete an Item from a Menu</title>
-      <indexterm>
-        <primary>menus</primary>
-        <secondary>deleting menu items</secondary>
-      </indexterm>
-      <para>To delete an item from a menu, use the menu item popup menu.
-To delete an item from a menu, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Right-click on the item that you want to delete.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <guimenuitem>Remove this item</guimenuitem>. </para>
-        </listitem>
-      </orderedlist>
-    </section>
+    
+    <para>To edit the items in these menus, right-click on the panel menubar, and choose <guimenuitem>Edit Menus</guimenuitem>. The <guilabel>Edit Menus</guilabel> window opens.</para>
+    <para>The <guilabel>Edit Menus</guilabel> window lists the menus in the left pane. Click on the expander arrows to show or hide submenus. Choose a menu in the left pane to see its items listed in the right pane.</para>
+    <para>To remove an item from a menu, deselect the check box beside the item in the list. The item can be added back to the menu by selecting the check box once again.</para>
+
   </section>
 </chapter>
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index 510f038..4d9f450 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -367,7 +367,7 @@ If want to close all folders on the screen, choose <menuchoice><guimenu>File</gu
         </screenshot>
       </figure>
       <note>
-        <para>In other distributions of the GNOME Desktop, the <guibutton>Home</guibutton> toolbar button might have another designation, for example, <guibutton>Documents</guibutton>.</para>
+        <para>In some distributions of the GNOME Desktop, the <guibutton>Home</guibutton> toolbar button might have another designation, for example, <guibutton>Documents</guibutton>.</para>
       </note>
       <sect3 id="gosnautilus-493">
         <title>The File Browser Window Components</title>
@@ -2159,7 +2159,7 @@ on a file or folder perform the following steps:</para>
           <para>Select the file or folder that you want to change. </para>
         </listitem>
         <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. The <link linkend="nautilus-properties">properties window</link> for the item is displayed.</para>
         </listitem>
         <listitem>
           <para>Click on the <guilabel>Permissions</guilabel> tab. In the <guilabel>Permissions</guilabel> tabbed section, use the drop-down lists and check boxes
@@ -2290,8 +2290,10 @@ folders in the following ways:</para>
           <para>From <guilabel>Notes</guilabel> in the side pane</para>
         </listitem>
       </itemizedlist>
-      <sect3 id="gosnautilus-472">
+      <sect3 id="nautilus-notes">
         <title>To Add a Note Using the Properties Dialog</title>
+        <!-- preserve id for backwards compatibility: 2.12 -->
+        <anchor id="gosnautilus-472"/>           
         <indexterm>
           <primary>notes</primary>
           <secondary>adding to files and folders</secondary>
@@ -2308,7 +2310,7 @@ to a file or folder, perform the following steps:</para>
             <para>Select the file or folder to which you want to add a note. </para>
           </listitem>
           <listitem>
-            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
+            <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. The <link linkend="nautilus-properties">properties window</link> for the item is displayed.</para>
           </listitem>
           <listitem>
             <para>Click on the <guilabel>Notes</guilabel> tab. In the <guilabel>Notes</guilabel> tabbed section, type the note.</para>
@@ -2544,6 +2546,48 @@ foldername</programlisting>
       </sect3>
   </sect2>
   </sect1>
+  <!-- ====================================================== File properties -->    
+
+  <sect1 id="nautilus-properties">
+    <title>Item Properties</title>
+    <!-- preserve id for backwards compatibility: 2.12 -->
+    <anchor id="gosnautilus-51"/><!-- was: changing icon, but linked to from the GUI -->
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>properties</secondary>
+    </indexterm>    
+    <indexterm>
+      <primary>file manager</primary>
+      <secondary>file properties</secondary>
+    </indexterm>
+    <para>
+      The <guilabel>Item Properties</guilabel> window shows more information about any file, folder, or other item in the file manager. With this window, you can also do the following:</para> 
+    <itemizedlist>
+      <listitem><para>Change the icon for an item: see <xref linkend="nautilus-icon"/>.</para></listitem>
+      <listitem><para>Add or remove emblems for an item: see <xref linkend="nautilus-emblems"/>.</para></listitem>
+      <listitem><para>Change the UNIX file permissions for an item: see <xref linkend="nautilus-permissions"/>.</para></listitem>
+      <listitem><para>Choose which application is used to open an item, and others of the same type.</para></listitem>
+      <listitem><para>Add notes to an item: see <xref linkend="nautilus-notes"/>.</para></listitem>
+    </itemizedlist>
+    <para>To open the item properties window, perform the following steps:</para>
+    <orderedlist>
+	    <listitem><para>Select the item whose properties you want to examine or change. If you select more than one item, the properties window will show the properties that are in common to all items.</para></listitem>
+	    <listitem>
+	      <para>Do one of the following:</para>
+  	      <itemizedlist>
+        	  <listitem><para>Choose <menuchoice>
+  <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>.</para></listitem>
+            <listitem><para>Right-click on the selected item and choose <guimenuitem>Properties</guimenuitem>.</para></listitem>
+            <listitem><para>Press <keycombo><keycap>Alt</keycap><keycap>Return</keycap></keycombo>.</para></listitem>
+          </itemizedlist>
+	    </listitem>
+    </orderedlist>
+      
+ 
+
+  </sect1>  
+
+  
   
   <!-- ====================================================== Appearance -->  
   <sect1 id="gosnautilus-203">
@@ -2582,7 +2626,7 @@ of files and folders</secondary>
         </mediaobject>
       </screenshot>
       
-      <para>Notice how the file on the left is distinguished from the file on the right by the addition of the <guilabel>Important (!)</guilabel> icon. See <xref linkend="gosnautilus-112"/> for more on adding emblems.</para>
+      <para>Notice how the file on the left is distinguished from the file on the right by the addition of the <guilabel>Important (!)</guilabel> emblem to its icon. See <xref linkend="nautilus-emblems"/> for more on adding emblems.</para>
       <para>The file manager automatically applies emblems for the following types of files:</para>
       <itemizedlist>
         <listitem>
@@ -2672,8 +2716,45 @@ link</para>
         </tgroup>
       </informaltable>
     </sect2>
-    <sect2 id="gosnautilus-112">
+    <sect2 id="nautilus-icon">
+      <title>Changing the Icon for a File or Folder</title> 
+      <indexterm>
+        <primary>file manager</primary>
+        <secondary>icons</secondary>
+        <tertiary>changing</tertiary>
+      </indexterm>
+      <para>To change the icon that represents an
+individual file or folder, perform the following steps:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select the file or folder that you want to change.</para>
+        </listitem>
+        <listitem>
+          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. The <link linkend="nautilus-properties">properties window</link> for the is displayed. </para>
+        </listitem>
+        <listitem>
+          <para>On the <guilabel>Basic</guilabel> tabbed section, click on
+the current <guibutton>Icon</guibutton>. A <guilabel>Select custom 
+icon</guilabel> dialog is displayed. </para>
+        </listitem>
+        <listitem>
+          <para>Use the <guilabel>Select custom icon</guilabel> dialog to choose
+the icon to represent the file or folder. </para>
+        </listitem>
+        <listitem>
+          <para>Click <guibutton>Close</guibutton> to close the properties
+dialog.</para>
+        </listitem>
+      </orderedlist>
+      <para>To restore an icon from a custom icon to the default icon,
+Select the file or folder that you want to change, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>.
+click on the <guibutton>Icon</guibutton> button, in the <guilabel>Select custom 
+icon</guilabel> dialog click <guibutton>Revert</guibutton>.</para>
+    </sect2>
+    <sect2 id="nautilus-emblems">
       <title>Adding an Emblem to a File or Folder</title>
+      <!-- preserve id for backwards compatibility: 2.12 -->
+      <anchor id="gosnautilus-112"/>       
       <indexterm>
         <primary>emblems</primary>
         <secondary>adding to file</secondary>
@@ -2689,7 +2770,7 @@ steps: </para>
           <para>Select the item to which you want to add an emblem.</para>
         </listitem>
         <listitem>
-          <para>Right-click on the item, then choose <guimenuitem>Properties</guimenuitem>. A properties dialog is displayed.</para>
+          <para>Right-click on the item, then choose <guimenuitem>Properties</guimenuitem>. The <link linkend="nautilus-properties">properties window</link> for the item is displayed.</para>
         </listitem>
         <listitem>
           <para>Click on the <guilabel>Emblems</guilabel> tab to display the <guilabel>Emblems</guilabel> tabbed section.</para>
@@ -2735,42 +2816,6 @@ New Emblem</guilabel> dialog.</para>
         </listitem>
       </orderedlist>
     </sect2>
-    <sect2 id="gosnautilus-51">
-      <title>Changing the Icon for a File or Folder</title>
-      <indexterm>
-        <primary>file manager</primary>
-        <secondary>icons</secondary>
-        <tertiary>changing</tertiary>
-      </indexterm>
-      <para>To change the icon that represents an
-individual file or folder, perform the following steps:</para>
-      <orderedlist>
-        <listitem>
-          <para>Select the file or folder that you want to change.</para>
-        </listitem>
-        <listitem>
-          <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed. </para>
-        </listitem>
-        <listitem>
-          <para>On the <guilabel>Basic</guilabel> tabbed section, click on
-the current <guibutton>Icon</guibutton>. A <guilabel>Select custom 
-icon</guilabel> dialog is displayed. </para>
-        </listitem>
-        <listitem>
-          <para>Use the <guilabel>Select custom icon</guilabel> dialog to choose
-the icon to represent the file or folder. </para>
-        </listitem>
-        <listitem>
-          <para>Click <guibutton>Close</guibutton> to close the properties
-dialog.</para>
-        </listitem>
-      </orderedlist>
-      <para>To restore an icon from a custom icon to the default icon,
-Select the file or folder that you want to change, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>.
-click on the <guibutton>Icon</guibutton> button, in the <guilabel>Select custom 
-icon</guilabel> dialog click <guibutton>Revert</guibutton>.</para>
-    </sect2>
-    
     <sect2 id="nautilus-backgrounds-and-emblems">
       <title>Changing Backgrounds</title>
     <!-- preserve id for backwards compatibility: 2.12 -->
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index 0e4d67d..e796ae8 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -74,7 +74,7 @@
       <term>Workspaces</term>
       <listitem><para>You can subdivide your desktop into separate
       <firstterm>workspaces</firstterm>.  Each workspace can contain
-      separate windows, allowing you to group related tasks together.
+      several windows, allowing you to group related tasks together.
       For more information on working with workspaces, see
       <xref linkend="overview-workspaces"/>.</para></listitem>
     </varlistentry>
@@ -465,11 +465,8 @@ specify the number of workspaces that you require.</para>
   A toolbar contains buttons for the most commonly-used commands. A <firstterm>statusbar</firstterm> is a bar at the bottom of a window that provides information
   about the current state of what you are viewing in the window. GNOME-compliant
   applications might also contains other bars. For example, <application>Nautilus</application> contains a location bar.</para>
-          <para>Some of the bars in GNOME-compliant applications are detachable. That
-  is, the bar has a handle that you can grab then drag the bar to another location.
-  You can drag the bar to snap to another side of the window, or to another
-  part of the screen. For example, you can detach the menubar, toolbar, and
-  location bar in the file manager. </para>
+          <para>You can choose to make the toolbars in GNOME-compliant applications <firstterm>detachable</firstterm>. That
+  is, the toolbar can be removed from within the window and placed anywhere on the screen. When this option is enabled, each toolbar has a handle that you can grab then drag the bar to another location.  You can drag the bar to snap to another side of the window, or to another part of the screen.</para>
         </listitem>
         <listitem>
           <para>Default shortcut keys</para>
@@ -479,11 +476,9 @@ specify the number of workspaces that you require.</para>
         </listitem>
         <listitem>
           <para>Drag-and-drop</para>
-          <para>GNOME-compliant applications use the same protocol to implement drag-and-drop
-  operations. Therefore, GNOME-compliant applications provide consistent feedback
-  when you drag-and-drop items.</para>
-          <para>The use of the same protocol also enables GNOME-compliant applications
-  to interoperate in a sophisticated manner. For example, GNOME-compliant applications
+          <para>GNOME-compliant applications provide consistent feedback
+  when you drag-and-drop items, and interoperate in a sophisticated manner.</para>
+          <para>For example, GNOME-compliant applications
   recognize the format of the items that you drag. When you drag a HTML file
   from a <application>Nautilus</application> window to a web browser, the file
   is displayed in HTML format in the browser. However, when you drag the HTML
@@ -518,7 +513,7 @@ specify the number of workspaces that you require.</para>
       </itemizedlist>
       
       <para>The lower part of the <guilabel>Open File</guilabel> dialog may contain further options specific to the current application.</para>
-      
+              
       <section id="filechooser-open-filter">
         <title>Filtering the File List</title>
         <para>You can restrict the file list to show only files on certain types. To do this, choose a file type from the drop-down list beneath the file list pane. The list of file types depends on the application you are currently using. For example, a graphics application will list different image file formats, and a text editor will list different types of text file.</para>
@@ -529,18 +524,31 @@ specify the number of workspaces that you require.</para>
           <para>If you know the name of the file you want to open, begin typing it: the file list will jump to show you files whose names begin with the characters you type. Arrow keys will now select from only these files. The characters you have typed appear in a pop-up window at the base of the file list.</para>
           <para>To cancel find-as-you-type, press <keycap>Esc</keycap>.</para>    
       </section>
+      
+      <section id="filechooser-open-folder">
+        <title>Choosing a folder</title> 
+        <para>You might sometimes need to choose a folder to work with rather than open a file. For example, if you use <ulink type="help" url="ghelp:file-roller"><application>Archive Manager</application></ulink> to extract files from an archive, you need to choose a folder to place the files into. In this case, the files in the current location are greyed out, and pressing <guibutton>Open</guibutton> when a folder is selected will choose that folder.</para>
+      </section>      
+           
       <section id="filechooser-open-location">
         <title>Open Location</title>
-        <para>To enter the full path to a file you want to open, press <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo> or right-click in the right-hand pane and choose <guimenuitem>Open Location</guimenuitem>. This opens the <guilabel>Open Location</guilabel> dialog.</para>
+        <para>You can type a full or relative path to the file you want to open. Begin typing a full path starting with <filename>/</filename> to open the <guilabel>Open Location</guilabel> dialog. Otherwise, to open the <guilabel>Open Location</guilabel> dialog either press <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo> or right-click in the right-hand pane and choose <guimenuitem>Open Location</guimenuitem>.</para>
         <para>Type a path from the current location, or an absolute path beginning with <filename>/</filename> or <filename>~/</filename>. The <guilabel>Location</guilabel> field has the following features to simplify the typing of a full filename:</para>
         <itemizedlist>
 	        <listitem><para>A drop-down of possible file and folder names is displayed once you begin typing. Use <keycap>down arrow</keycap> and <keycap>up arrow</keycap> and <keycap>Return</keycap> to choose from the list.</para></listitem>
 	        <listitem><para>If the part of the name typed uniquely identifies a file or folder, the name is auto-completed. Press <keycap>Tab</keycap> to accept the suggested text. For example, if you type "Do", and the only object in the folder beginning with "Do" is <filename>Documents</filename>, then the entire name appears in the field.</para></listitem>
         </itemizedlist>
       </section>
+      
+      <section id="filechooser-open-remote">
+        <title>Opening Remote Locations</title>
+        <para>You can open files in remote locations by choosing the location from the left panel, or by typing a path to a remote location into the <guilabel>Open Location</guilabel> dialog.</para>
+        <para>If you require a password to access the remote location, you will be asked for it when you open it.</para>
+      </section> 
+                   
       <section id="filechooser-open-bookmarks">
         <title>Adding and Removing Bookmarks</title>
-        <para>To add the current location to the bookmarks list, press <guibutton>Add</guibutton>, or right-click a folder in the file list and choose <guimenuitem>Add to Bookmarks</guimenuitem>.</para>
+        <para>To add the current location to the bookmarks list, press <guibutton>Add</guibutton>, or right-click a folder in the file list and choose <guimenuitem>Add to Bookmarks</guimenuitem>. You can add any folder that is listed in the current location by dragging it to the bookmarks list.</para>
         <para>To remove a bookmark from the list, select it and press <guibutton>Remove</guibutton>.</para>
         <note><para>Changes you make to the bookmarks list also affect the <guimenu>Places</guimenu> menu. For more on bookmarks, see <xref linkend="nautilus-bookmarks"/>.</para></note>
       </section>      
@@ -553,11 +561,18 @@ specify the number of workspaces that you require.</para>
       <title>Saving a File</title>
         <para>The first time you save your work in an application, the <guilabel>Save File</guilabel> dialog will ask you for a location and name for the new file. Subsequent saving updates this file. To save to a new file, choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save As</guimenuitem></menuchoice>.</para>
         <para>You can enter a filename and choose a location to save in from the drop-down list of bookmarks and commonly-used locations.</para>
+                          
         <section id="filechooser-save-expanded">
           <title>Saving in another location</title>
           <para>To save the file in a location not listed in the drop-down list, click the <guilabel>Browse for other folders</guilabel> expansion label. This shows a file browser similar to the one in the <guilabel>Open File</guilabel> dialog.</para>
           <tip><para>The expanded <guilabel>Save File</guilabel> dialog has the same features as the <link linkend="filechooser-open"><guilabel>Open File</guilabel> dialog</link>, such as filtering, find-as-you-type, and adding and removing bookmarks.</para></tip>
-        </section>          
+        </section>   
+        
+        <section id="filechooser-save-overwrite">
+          <title>Replacing an existing file</title>
+          <para>If you type in the name of an existing file, you will be asked whether you wish to replace the existing file with your current work. You can also do this by choosing the file you want to overwrite in the browser.</para>
+        </section>         
+               
         <section id="filechooser-save-path">
           <title>Typing a Path</title>
           <para>To specify a path to save a file, type it into the <guilabel>Name</guilabel> field. A drop-down of possible file and folder names is displayed once you begin typing. Use <keycap>down arrow</keycap> and <keycap>up arrow</keycap> and <keycap>Return</keycap> to choose from the list. If only one file or folder matches the partial name you have typed, press <keycap>Tab</keycap> to complete the name.</para>       
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index f5e3841..262f8e5 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -76,7 +76,7 @@ these panels.</para>
       <variablelist>
       	<varlistentry>
       		<term><application>Menu Bar</application> applet</term>
-      		<listitem><para>Contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>Desktop</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
+      		<listitem><para>The panel menubar contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>Desktop</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       	  <term><application>Web Browser Launcher</application></term>
@@ -743,7 +743,7 @@ control the volume of the speaker on your system.</para>
       <see>launchers</see>
     </indexterm>
     <para>A <firstterm>launcher</firstterm> is an object that performs a specific action when you open it.</para>
-    <para>You can find launchers in the panels, in the Main Menubar, and on the desktop. A launcher is represented by an icon in all of these locations.</para>
+    <para>You can find launchers in the panels, in the panel menubar, and on the desktop. A launcher is represented by an icon in all of these locations.</para>
     <para>You might use a launcher to do any of the following:</para>
     <itemizedlist>
       <listitem>
@@ -1165,10 +1165,148 @@ the GNOME website in your default browser.</para>
             </tbody>
           </tgroup>
         </informaltable>
+        
+        <para>The command can contain the following special codes which will be replaced with the value specified in the following table:</para>
+        <informaltable>
+          <tgroup cols="2" colsep="0" rowsep="0">
+            <colspec colname="colspec0" colwidth="47.36*"/>
+            <colspec colname="colspec1" colwidth="52.64*"/>
+            <thead>
+              <row rowsep="1">
+                <entry>
+                  <para>Code</para>
+                </entry>
+                <entry>
+                  <para>Meaning</para>
+                </entry>
+              </row>        
+            </thead>
+            <tbody>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%f</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A single file name, even if multiple files are selected. The system reading the desktop entry should recognize that the program in question cannot handle multiple file arguments, and it should should probably spawn and execute multiple copies of a program for each selected file if the program is not able to handle additional file arguments. If files are not on the local file system (i.e. are on HTTP or FTP locations), the files will be copied to the local file system and %f will be expanded to point at the temporary file. Used for programs that do not understand the URL syntax.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%F</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A list of files. Use for apps that can open several local files at once.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%u</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A single URL.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%U</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A list of URLs.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%d</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>Directory containing the file that would be passed in a %f field.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%D</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>List of directories containing the files that would be passed in to a %F field.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%n</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A single filename (without path).</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%N</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>A list of filenames (without paths).</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%i</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>The Icon field of the desktop entry expanded as two parameters, first --icon and then the contents of the Icon field. Should not expand as any parameters if the Icon field is empty or missing.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%c</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>The translated Name field associated with the desktop entry.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%k</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>The location of the desktop file as either a URI (if for example gotten from the vfolder system) or a local filename or empty if no location is known.</para>
+                </entry>
+              </row>
+              <row>
+                <entry valign="top">
+                  <para>
+                    <command>%v</command>
+                  </para>
+                </entry>
+                <entry valign="top">
+                  <para>The name of the Device entry in the desktop file.</para>                </entry>
+              </row>          
+            </tbody>  
+          </tgroup>                  
+        </informaltable>
+        <para>These are as defined by freedesktop.org's <ulink type="http" url="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-0.9.4.html">Desktop Entry Specification</ulink>.</para>
       </section>
     </section>    
-
-  
   </section>
   <section id="gospanel-557">
     <title>Buttons</title>
@@ -1770,7 +1908,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         <secondary>introduction</secondary>
       </indexterm>
       <para>The <guimenu>Main Menu</guimenu> provides access to
-  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Actions</guimenu> menu. You can access almost all of the standard applications,
+  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Desktop</guimenu> menu. You can access almost all of the standard applications,
   commands, and configuration options from the <guimenu>Main Menu</guimenu>. </para>
       <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels. Click
   on the <guimenu>Main Menu</guimenu> button to open the <guimenu>Main Menu</guimenu>.</para>
@@ -1782,7 +1920,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         </indexterm>
         <para>You can add as many <guimenu>Main Menu</guimenu> buttons
   as you want to your panels. To add a <guimenu>Main Menu</guimenu> to a panel,
-  right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Main Menu</guimenuitem></menuchoice>.</para>
+  right-click on any vacant space on the panel. Choose <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Main Menu</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
       </section>
     </section>
     <section id="goseditmainmenu-65">
@@ -1797,9 +1935,9 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <application>Menu Bar</application> provides access to the <guimenu>Applications</guimenu> and <guimenu>Actions</guimenu> menus. You can access
+      <para>The <application>Menu Bar</application> provides access to the panel menubar, which contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>Desktop</guimenu> menus. You can access
   almost all of the standard applications, commands, and configuration options
-  from the <application>Menu Bar</application>. For more on using the Menu Bar, see <xref linkend="menubar"/>.</para>
+  from the <application>Menu Bar</application>. For more on using the panel menubar, see <xref linkend="menubar"/>.</para>
       <section id="goseditmainmenu-66">
         <title>To Add a Menu Bar to a Panel</title>
         <indexterm>
@@ -1808,7 +1946,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         </indexterm>
         <para>You can add as many <application>Menu Bar</application>
   applets as you want to your panels. To add a <application>Menu Bar</application>
-  to a panel, right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to Panel</guimenu><guimenuitem>Menu Bar</guimenuitem></menuchoice>.</para>
+  to a panel, right-click on any vacant space on the panel. Choose <guimenuitem>Add to Panel</guimenuitem> and choose <guilabel>Menu Bar</guilabel> from the <link linkend="panels-addobject"><guilabel>Add to Panel</guilabel></link> dialog.</para>
       </section>
     </section>    
     
diff --git a/gnome2-user-guide/C/gostools.xml b/gnome2-user-guide/C/gostools.xml
index f2f5fbb..893676c 100644
--- a/gnome2-user-guide/C/gostools.xml
+++ b/gnome2-user-guide/C/gostools.xml
@@ -939,7 +939,7 @@ command.</para>
       <title>Mailing List</title>
 
       <para>For further information on <application>Yelp Help Browser</application> please subscribe to
-      the mailing list, <ulink type="http" url="http://mail.gnome.org/mailman/listinfo/gnome-doc-list">gnome-doc-devel-list@gnome.org</ulink>.</para>
+      the mailing list, <ulink type="http" url="http://mail.gnome.org/mailman/listinfo/gnome-doc-devel-list">gnome-doc-devel-list@gnome.org</ulink>.</para>
     </section>
   </section>
 
diff --git a/gnome2-user-guide/C/user-guide.xml b/gnome2-user-guide/C/user-guide.xml
index 492a8aa..d7df9d7 100644
--- a/gnome2-user-guide/C/user-guide.xml
+++ b/gnome2-user-guide/C/user-guide.xml
@@ -223,5 +223,13 @@
   <include href="gostools.xml" xmlns="http://www.w3.org/2001/XInclude" />       <!-- Tools & utilities -->
   <include href="goscustdesk.xml" xmlns="http://www.w3.org/2001/XInclude" />    <!-- Preferences -->
   <include href="glossary.xml" xmlns="http://www.w3.org/2001/XInclude" />       <!-- Glossary -->
+  
+  <appendix id="joingnome">
+    <title>Joining the GNOME Project</title>
+    <para>We hope you enjoy using GNOME and that you find working with GNOME productive. However, there is always room for improvement.</para>
+    <para>GNOME invites you to join our free software community if you have some spare time. There are many different fields. GNOME needs programmers, but it also needs translators, documentation writers, testers, artists, writers, and more.</para>
+    <para>For more information on joining GNOME, please visit <ulink type="http" url="http://live.gnome.org/JoinGnome">http://live.gnome.org/JoinGnome</ulink>.</para>
+    <para>For more information on giving feedback on GNOME, such as bug reports, suggestions, and corrections to documentation, see the section on <ulink type="help" url="ghelp:gnome-feedback">Reporting GNOME Bugs</ulink>.</para>
+  </appendix>
 
 </book>
\ No newline at end of file