Update for Location bar button, remove 'Always use text entry location

  * gosnautilus.xml: Update for Location bar button,
    remove 'Always use text entry location bar' pref. #34884

2 files changed, 133 insertions, 195 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 2994b05..fe4dbee 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -3,8 +3,8 @@
 	* goseditmainmenu.xml:
 	* gospanel.xml:
 	  Better titles for sections: Using the Panels, Using the Main Menubar. #389035
-
-Using the Panels
+  * gosnautilus.xml: Update for Location bar button, 
+    remove 'Always use text entry location bar' pref. #348841
 
 2006-12-23  Joachim Noreiko  <jnoreiko@yahoo.com>
 
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index d2bf19c..42c9d57 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -581,67 +581,72 @@ statusbar again, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Statusba
         </listitem>
       </itemizedlist>
     </sect2>
-<sect2 id="nautilus-location-bar">
+    <sect2 id="nautilus-location-bar">
       <title>Using the Location Bar</title>
       <indexterm>
         <primary>file manager</primary>
         <secondary>window components, showing
 and hiding</secondary>
       </indexterm>
-<para>Depending on your selection, the location bar can show either a location field, a button bar, or a search field. Each is useful in different situations and as you become experienced working with the <application>Nautilus</application> file manager you will become proficient at switching between them.</para>
-<itemizedlist>
+      <para>The file browser's location bar can show either a location field, a button bar, or a search field. Each is useful in different situations. </para>
+
+
+    <itemizedlist>
       <listitem>
-                      <para><guilabel>Location field</guilabel></para>
-                      <para>By pressing <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo> or <keycap>Leading Slash (/)</keycap> or choosing <menuchoice><guimenu>Go</guimenu><guimenuitem>Location</guimenuitem></menuchoice> the <guilabel>Location :</guilabel> field will appear and allow you to type the location you wish to browse to manually. To make the location field disappear hit the <keycap>Esc</keycap> key. The location field is particularly useful for jumping to a known folder very quickly.</para>
-                    <figure id="gosnautilus-FIG-902">
-                    <title>The location bar.</title>
-                      <screenshot>
-                        <mediaobject>
-                          <imageobject>
-                            <imagedata fileref="figures/naut_go_to_location.png" format="PNG"/>
-                          </imageobject>
-                          <textobject>
-                            <phrase>The location bar.</phrase>
-                          </textobject>
-                        </mediaobject>
-                      </screenshot>
-                    </figure>
-                    </listitem>
-                    <listitem>
-                      <para><guilabel>Button bar</guilabel></para>
-                      <para>By default the button bar is shown. Each button represents a folder, by clicking on them you can change your location. You can also drag buttons, for example to another location, in order to copy a folder. The button bar is excellent for jumping quickly between frequently accessed folders.</para>
-                    <figure id="gosnautilus-FIG-903">
-                    <title>The button bar.</title>
-                      <screenshot>
-                        <mediaobject>
-                          <imageobject>
-                            <imagedata fileref="figures/naut_button_bar.png" format="PNG"/>
-                          </imageobject>
-                          <textobject>
-                            <phrase>The button bar.</phrase>
-                          </textobject>
-                        </mediaobject>
-                      </screenshot>
-                    </figure>
-                    </listitem>
-                    <listitem>
-                      <para><guilabel>Search bar</guilabel></para>
-                      <para>By pressing <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> or selecting the <guibutton>Search</guibutton> toolbar button the search bar appears. For more information on searching see <xref linkend="nautilus-searching" />. The search bar is excellent for locating files of folders when you are not sure of their exact location.</para>
-                    <figure id="gosnautilus-FIG-904">
-                    <title>The button bar.</title>
-                      <screenshot>
-                        <mediaobject>
-                          <imageobject>
-                            <imagedata fileref="figures/naut_search_bar.png" format="PNG"/>
-                          </imageobject>
-                          <textobject>
-                            <phrase>The search bar.</phrase>
-                          </textobject>
-                        </mediaobject>
-                      </screenshot>
-                    </figure>
-                    </listitem>
-</itemizedlist><para>If you prefer the location field over the button bar you can choose for this to be shown by default. See <xref linkend="gosnautilus-56" /> for instructions on how to do this.</para>
+        <para><guilabel>Button bar</guilabel></para>
+        <para>By default the button bar is shown. Each button represents a folder, by clicking on them you can change your location. You can also drag buttons, for example to another location, in order to copy a folder. The button bar is excellent for jumping quickly between frequently accessed folders.</para>
+      <figure id="gosnautilus-FIG-903">
+      <title>The button bar.</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/naut_button_bar.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase>The button bar.</phrase>
+            </textobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+      </listitem>    
+      <listitem>
+        <para><guilabel>Text Location Bar</guilabel></para>
+        <para>The text location bar shows the current location as a text path, for example: '/home/user/Documents'. The location field is particularly useful for jumping to a known folder very quickly.</para>
+        <para>To go to a new location, type a new path or edit the current one, then press <keycap>Enter</keycap>. The path field automatically completes what you are typing when there is only one possibility. To accept the suggested completion, press <keycap>Tab</keycap>.</para>
+      <para>To always use the text location bar, click on the toggle button at the left of the location bar.</para>
+      <para>To quickly switch to the text location bar while using the button bar, press <keycombo><keycap>Ctrl</keycap><keycap>L</keycap></keycombo>, choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Location</guimenuitem></menuchoice>, or press <keycap>Leading Slash (/)</keycap> to type a path from the root directory. The location bar shows the location buttons again after you press <keycap>Enter</keycap> or cancel with <keycap>Escape</keycap>.</para>
+      <figure id="gosnautilus-FIG-902">
+      <title>The location bar.</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/naut_go_to_location.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase>The location bar.</phrase>
+            </textobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+      </listitem>
+      <listitem>
+        <para><guilabel>Search bar</guilabel></para>
+        <para>By pressing <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> or selecting the <guibutton>Search</guibutton> toolbar button the search bar appears. For more information on searching see <xref linkend="nautilus-searching" />. The search bar is excellent for locating files of folders when you are not sure of their exact location.</para>
+      <figure id="gosnautilus-FIG-904">
+      <title>The button bar.</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/naut_search_bar.png" format="PNG"/>
+            </imageobject>
+            <textobject>
+              <phrase>The search bar.</phrase>
+            </textobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+      </listitem>
+</itemizedlist>
     </sect2>
     <sect2 id="gosnautilus-499">
       <title>Displaying Your Home Folder</title>
@@ -3477,146 +3482,79 @@ for items beside the icon rather than under the icon.</para>
       </indexterm>
       <para>To set your preferences for
 files and folders, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. Click on the <guilabel>Behavior</guilabel>
-tab to display the <guilabel>Behavior</guilabel> tabbed section.</para>
-      <para><xref linkend="gosnautilus-TBL-37"/> lists the preferences that you can
-modify for files and folders. </para>
-      <table frame="topbot" id="gosnautilus-TBL-37">
-        <title>File and Folder Behavior Preferences</title>
-        <tgroup cols="2" colsep="0" rowsep="0">
-          <colspec colname="colspec6" colwidth="35.09*"/>
-          <colspec colname="colspec7" colwidth="64.91*"/>
-          <thead>
-            <row rowsep="1">
-              <entry>
-                <para>Option</para>
-              </entry>
-              <entry>
-                <para>Description </para>
-              </entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry valign="top">
-                <para>
-                  <guilabel>Single click to activate items</guilabel>
-                </para>
-              </entry>
-              <entry valign="top">
-                <para>Select this option to perform the default action
-for an item when you click on the item. When this option is selected, and
-you point to an item, the title of the item is underlined. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec6" valign="top">
-                <para>
-                  <guilabel>Double click to
-activate items</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7" valign="top">
-                <para>Select this option to perform the default action for an item when you double-click
-on the item.</para>
-              </entry>
-            </row>
-
-            <row>
-              <entry colname="colspec6" valign="top">
-                <para>
-                  <guilabel>Always open in browser
-windows</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7" valign="top">
-                <para>Select this option to use nautilus in browser mode
-rather than spatial mode. Selecting this lets you browse your files and folders in the same window, otherwise you will navigate your files and folders as objects.</para>
-              </entry>
-            </row>
+tab to display the <guilabel>Behavior</guilabel> tabbed section. You can set the following preferences:</para>
 
-            <row>
-              <entry colname="colspec6" valign="top">
-                <para>
-                  <guilabel>Always use text entry location bar.</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7" valign="top">
-                <para>Select this option to force <application>Nautilus</application> to use the Location bar in location field mode instead of the button bar mode by default. For more on using the location bar see <xref linkend="nautilus-location-bar"/>.</para></entry>
-            </row>
-
-            <row>
-              <entry colname="colspec6">
-                <para>
-                  <guilabel>Run executable text files when they are clicked</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7">
-                <para>Select this option to run an text executable file when you choose
-the file. An executable text file is a text file that can execute, that
-is, a shell script.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec6">
-                <para>
-                  <guilabel>View executable text files when
-they are clicked</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7">
-                <para>Select this option to display the contents of an executable text file when you
-choose the executable text file.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec6" valign="top">
-                <para>
-                  <guilabel>Ask each time</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7" valign="top">
-                <para>Select
-this option to display a dialog when you choose an executable text file. The dialog
-asks whether you want to execute the file or display the file. </para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec6">
-                <para>
-                  <guilabel>Ask before emptying the Trash
-or deleting files</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7">
-                <para>Select this option to display a confirmation message before <guilabel>Trash</guilabel> is emptied, or files are deleted. Leave this selected unless you have good reason not to.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec6" valign="top">
-                <para>
-                  <guilabel>Include a Delete
-command that bypasses Trash</guilabel>
-                </para>
-              </entry>
-              <entry colname="colspec7">
-                <para>Select this option to add a <guimenuitem>Delete</guimenuitem> menu item to
-the following menus:</para>
-                <itemizedlist>
-                  <listitem>
-                    <para>The <guimenu>Edit</guimenu> menu.</para>
-                  </listitem>
-                  <listitem>
-                    <para>The popup menu that is displayed when you right-click on a
-file, folder, or desktop  object. </para>
-                  </listitem>
-                </itemizedlist>
-                <para>When you select an item then choose the <guimenuitem>Delete</guimenuitem> menu item, the item is deleted from your file system
-immediately. There is no way to recover a deleted file. Do not select this unless you have good reason to.</para>
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
+      <variablelist>
+       	<varlistentry>
+      	  <term><guilabel>Single click to activate items</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to perform the default action
+      for an item when you click on the item. When this option is selected, and
+      you point to an item, the title of the item is underlined. </para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Double click to activate items</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to perform the default action for an item when you double-click
+      on the item.</para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Always open in browser windows</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to use nautilus in browser mode
+      rather than spatial mode. Selecting this lets you browse your files and folders in the same window, otherwise you will navigate your files and folders as objects.</para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Run executable text files when they are clicked</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to run an text executable file when you choose
+      the file. An executable text file is a text file that can execute, that
+      is, a shell script.</para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>View executable text files when they are clicked</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to display the contents of an executable text file when you
+      choose the executable text file.</para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Ask each time</guilabel></term>
+      	  <listitem>
+      	    <para>Select
+      this option to display a dialog when you choose an executable text file. The dialog
+      asks whether you want to execute the file or display the file. </para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Ask before emptying the Trash or deleting files</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to display a confirmation message before <guilabel>Trash</guilabel> is emptied, or files are deleted. Leave this selected unless you have good reason not to.</para>
+      	  </listitem>
+      	</varlistentry>
+       	<varlistentry>
+      	  <term><guilabel>Include a Delete command that bypasses Trash</guilabel></term>
+      	  <listitem>
+      	    <para>Select this option to add a <guimenuitem>Delete</guimenuitem> menu item to
+      the following menus:</para>
+                      <itemizedlist>
+                        <listitem>
+                          <para>The <guimenu>Edit</guimenu> menu.</para>
+                        </listitem>
+                        <listitem>
+                          <para>The popup menu that is displayed when you right-click on a
+      file, folder, or desktop  object. </para>
+                        </listitem>
+                      </itemizedlist>
+                      <para>When you select an item then choose the <guimenuitem>Delete</guimenuitem> menu item, the item is deleted from your file system
+      immediately. There is no way to recover a deleted file. Do not select this unless you have good reason to.</para>
+      	  </listitem>
+      	</varlistentry>
+      </variablelist>
     </sect2>
     <sect2 id="gosnautilus-439">
       <title>Display Preferences</title>