rewrote section on Bookmarks to work for spatial mode

1 files changed, 19 insertions, 10 deletions

diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index bad3a9c..97c0bcb 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -2645,25 +2645,33 @@ in the side pane.</para>
         <primary>file manager</primary>
         <secondary>bookmarks</secondary>
       </indexterm>
-      <para>To access an item in your bookmarks, choose the item from
-the <guimenu>Bookmarks</guimenu> menu. You can add your favorite locations
-to your <guimenu>Bookmarks</guimenu> menu. You can add bookmarks to files
-and folders in your file system, to FTP sites, or to URI locations.</para>
+      <para>You can keep a list of <firstterm>bookmarks</firstterm> in <application>Nautilus</application>: folders and other locations that you frequently need to open.</para>
+      <para>Your bookmarks are listed in the following places:</para>
+      <itemizedlist>
+    	  <listitem><para>The <guimenu>Places</guimenu> menu on the top panel.</para></listitem>
+    	  <listitem><para>The <guimenu>Places</guimenu> menu in a folder window.</para></listitem>
+    	  <listitem><para>The <guimenu>Bookmarks</guimenu> menu in a <application>Nautilus</application> browser window.</para></listitem>
+    	  <listitem><para>The side pane in the <link linkend="filechooser-open"><guilabel>Open File</guilabel> dialog</link>. This allows you to quickly open a file that is in one of your bookmarked locations.</para></listitem>
+    	  <listitem><para>The list of commonly used locations in the <link linkend="filechooser-save"> <guilabel>Save File</guilabel> dialog</link>. This allows you to quickly save a file to a location you have in your bookmarks.</para></listitem>
+      </itemizedlist>
+      
+      <para>To open an item that is in your bookmarks, choose the item from a menu.</para>
+
       <sect3 id="gosnautilus-40">
-        <title>To Add a Bookmark</title>
-        <para>To add a bookmark, display the item that you want to bookmark in the
-view pane, then choose <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice>.</para>
+        <title>Adding a Bookmark</title>
+        <para>To add a bookmark, open the folder or location that you want to bookmark, then choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice>.</para>
+        <para>If you are using a <application>Nautilus</application> browser window, choose <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Add Bookmark</guimenuitem></menuchoice>.</para>
       </sect3>
       <sect3 id="gosnautilus-41">
         <title>To Edit a Bookmark</title>
         <para>To edit your bookmarks perform the following steps:</para>
         <orderedlist>
           <listitem>
-            <para>Choose <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks</guimenuitem></menuchoice>. An <guilabel>Edit Bookmarks</guilabel>
+            <para>Choose <menuchoice><guimenu>Places</guimenu><guimenuitem>Edit Bookmarks</guimenuitem></menuchoice>, or in a browser window, <menuchoice><guimenu>Bookmarks</guimenu><guimenuitem>Edit Bookmarks</guimenuitem></menuchoice>. An <guilabel>Edit Bookmarks</guilabel>
 dialog is displayed. </para>
           </listitem>
           <listitem>
-            <para>To edit a bookmark, select the bookmark on the left side of
+            <para>Select the bookmark on the left side of
 the <guilabel>Edit Bookmarks</guilabel> dialog. Edit the details for the bookmark
 on the right side of the <guilabel>Edit Bookmarks</guilabel> dialog, as follows:</para>
             <informaltable frame="topbot">
@@ -2689,7 +2697,7 @@ on the right side of the <guilabel>Edit Bookmarks</guilabel> dialog, as follows:
                     </entry>
                     <entry valign="top">
                       <para>Use this text box to specify the name that identifies the
-bookmark in the <guimenu>Bookmarks</guimenu> menu.</para>
+bookmark in the menus.</para>
                     </entry>
                   </row>
                   <row>
@@ -2700,6 +2708,7 @@ bookmark in the <guimenu>Bookmarks</guimenu> menu.</para>
                     </entry>
                     <entry valign="top">
                       <para>Use this field to specify the location of the bookmark.</para>
+                      <para>Folders on your system use the <uri>file:///</uri> URI.</para>
                     </entry>
                   </row>
                 </tbody>