Updated User Guide for GNOME 2.2.1.

1 files changed, 77 insertions, 101 deletions

diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index fe7719a..5d4f18f 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <chapter id="gosnautilus-1">
   <title>Nautilus File Manager</title>
   <highlights>
@@ -122,8 +121,8 @@ field: Enables you to specify a file, folder, or URL that you want to display.</
 size of items in the view pane.</para>
                 </listitem>
                 <listitem>
-                  <para><guilabel>View as</guilabel> drop-down list box: Enables you
-to choose how to display items in your view pane.</para>
+                  <para><guilabel>View as</guilabel> drop-down list: Enables you to
+choose how to display items in your view pane.</para>
                 </listitem>
               </itemizedlist>
             </entry>
@@ -142,7 +141,7 @@ to choose how to display items in your view pane.</para>
                   <para>Displays information about the current file or folder. </para>
                 </listitem>
               </itemizedlist>
-              <para>The side pane contains a drop-down list box that enables
+              <para>The side pane contains a drop-down list that enables
 you to choose what to display in the side pane. You can choose from the following
 options:</para>
               <itemizedlist>
@@ -642,9 +641,8 @@ Files</guimenuitem></menuchoice>.</para>
       </indexterm>
       <para>The <guilabel>Tree</guilabel> displays a hierarchical representation of your file system.
 The <guilabel>Tree</guilabel> provides a convenient way to navigate your file
-system. To display the <guilabel>Tree</guilabel> in the side pane, choose <guimenuitem>Tree</guimenuitem> from the drop-down list box at the top of the side pane. </para>
-      <para>In the <guilabel>Tree</guilabel>, folders are represented
-as follows:</para>
+system. To display the <guilabel>Tree</guilabel> in the side pane, choose <guimenuitem>Tree</guimenuitem> from the drop-down list at the top of the side pane. </para>
+      <para>In the <guilabel>Tree</guilabel>, folders are represented as follows:</para>
       <informaltable frame="topbot">
         <tgroup cols="2" colsep="0" rowsep="0">
           <colspec colwidth="50*"/>
@@ -704,7 +702,7 @@ perform with the <guilabel>Tree</guilabel>, and how to perform the tasks.</para>
               </entry>
               <entry valign="top">
                 <para>Choose <guilabel>Tree</guilabel> from the drop-down
-list box at the top of the side pane.</para>
+list at the top of the side pane.</para>
               </entry>
             </row>
             <row>
@@ -712,8 +710,8 @@ list box at the top of the side pane.</para>
                 <para>Close the <guilabel>Tree</guilabel>.</para>
               </entry>
               <entry valign="top">
-                <para>Choose another item from the drop-down list box
-at the top of the side pane.</para>
+                <para>Choose another item from the drop-down list at the
+top of the side pane.</para>
               </entry>
             </row>
             <row>
@@ -802,7 +800,7 @@ pane:</para>
             <para>Plain text files</para>
           </listitem>
           <listitem>
-            <para>Portable Network Graphics (PNG) files</para>
+            <para>PNG files</para>
           </listitem>
           <listitem>
             <para>Joint Photographic Experts Group (JPEG) files</para>
@@ -848,9 +846,7 @@ the default action for a file, perform the following steps:</para>
 an action on. Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Open With</guimenuitem></menuchoice>. The <guisubmenu>Open With</guisubmenu>
 submenu opens. The items in this submenu correspond to the contents of the
 following parts of the <application>File Types and Programs</application>
-preference tool:<itemizedlist><listitem><para><guilabel>Default action</guilabel> drop-down list box in
-the <guilabel>Edit file type</guilabel> dialog</para></listitem><listitem><para><guilabel>Viewer component</guilabel> drop-down list box in
-the <guilabel>Edit file type</guilabel> dialog</para></listitem></itemizedlist></para>
+preference tool:<itemizedlist><listitem><para><guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para></listitem><listitem><para><guilabel>Viewer component</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog</para></listitem></itemizedlist></para>
           </listitem>
           <listitem>
             <para>Choose an action from the <guisubmenu>Open With</guisubmenu>
@@ -882,7 +878,7 @@ shows the side pane when a text file is displayed in the view pane.</para>
           </screenshot>
         </figure>
         <para>The buttons represent any actions that are defined in the <application>File Types and Programs</application> preference tool. The actions are defined
-in the <guilabel>Default action</guilabel> drop-down list box in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application> preference tool. Click on a button to execute an action. For
+in the <guilabel>Default action</guilabel> drop-down list in the <guilabel>Edit file type</guilabel> dialog in the <application>File Types and Programs</application> preference tool. Click on a button to execute an action. For
 example, if an action defined for plain text documents is to open the file
 in <application>gedit</application>. If this action is defined, an <guibutton>Open with gedit</guibutton> button is displayed in the side pane. To open
 the file in the <application>gedit</application> application, click on the <guibutton>Open with gedit</guibutton> button.</para>
@@ -924,7 +920,7 @@ Here</guilabel> location enables you to access the following functions:</para>
           </para>
           <para>Double-click on <guilabel>Applications</guilabel> to access your key
 GNOME applications. You can also access the <guimenu>Applications</guimenu>
-menu through the <guimenu>GNOME Menu</guimenu> and the Menu Panel.</para>
+menu through the <guimenu>Main Menu</guimenu> and the Menu Panel.</para>
         </listitem>
         <listitem>
           <para>
@@ -986,8 +982,9 @@ loading the FTP site, choose <menuchoice><guimenu>View</guimenu><guimenuitem>Sto
       </indexterm>
       <para>The file manager maintains a history list of
 files, folders, and FTP sites. You can use the history list to navigate to
-files, folders, and FTP sites that you have recently visited. The following
-sections describe how to navigate your history list.</para>
+files, folders, and FTP sites that you have recently visited. Your history
+list contains the last ten items that you viewed. The following sections describe
+how to navigate your history list.</para>
       <para>To clear your history list choose <menuchoice><guimenu>Go</guimenu><guimenuitem>Clear History</guimenuitem></menuchoice>.</para>
       <sect3 id="gosnautilus-77">
         <title>To Navigate Your History List Using the Go Menu</title>
@@ -1025,11 +1022,10 @@ on the item.</para>
           <primary>file manager</primary>
           <secondary>History</secondary>
         </indexterm>
-        <para>To display the <guilabel>History</guilabel> list in the side pane, choose <guilabel>History</guilabel> from the drop-down list box at the top of the side pane.
-The <guilabel>History</guilabel> list in the side pane displays a list of
-your previously-viewed items.</para>
-        <para>To display an item from your history list in the view pane, click on
-the item in the <guilabel>History</guilabel> list.</para>
+        <para>To display the <guilabel>History</guilabel> list in the side pane, choose <guilabel>History</guilabel> from the drop-down list at the top of the side pane. The <guilabel>History</guilabel> list in the side pane displays a list of your previously-viewed
+items.</para>
+        <para>To display an item from your history list in the view pane,
+click on the item in the <guilabel>History</guilabel> list.</para>
       </sect3>
     </sect2>
     <sect2 id="gosnautilus-36">
@@ -1187,11 +1183,13 @@ shows the mouse pointers that appear when you drag-and-drop.</para>
             </row>
             <row>
               <entry colname="colspec0" valign="top">
-                <para>Link to an item</para>
+                <para>Create a symbolic link to
+an item</para>
               </entry>
               <entry colname="colspec2" valign="top">
-                <para>Grab the item, then press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>. Drag the item to the location where
-you want the link to reside.</para>
+                <para>Grab the
+item, then press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>.
+Drag the item to the location where you want the symbolic link to reside.</para>
               </entry>
               <entry colname="colspec1" valign="top">
                 <screenshot>
@@ -1200,7 +1198,7 @@ you want the link to reside.</para>
                       <imagedata fileref="figures/link_pointer.png" format="PNG"/>
                     </imageobject>
                     <textobject>
-                      <phrase>Link pointer.</phrase>
+                      <phrase>Symbolic link pointer.</phrase>
                     </textobject>
                   </mediaobject>
                 </screenshot>
@@ -1589,8 +1587,8 @@ perform the following steps:</para>
           <para>Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Properties</guimenuitem></menuchoice>. A properties dialog is displayed.</para>
         </listitem>
         <listitem>
-          <para>Click on the <guilabel>Permissions</guilabel> tab. In the <guilabel>Permissions</guilabel> tabbed section, use the drop-down list boxes and check
-boxes to change the permissions for the file or folder.</para>
+          <para>Click on the <guilabel>Permissions</guilabel> tab. In the <guilabel>Permissions</guilabel> tabbed section, use the drop-down lists and check boxes
+to change the permissions for the file or folder.</para>
         </listitem>
         <listitem>
           <para>Click <guibutton>Close</guibutton> to close the properties
@@ -1626,11 +1624,9 @@ dialog.</para>
           <para>Desktop background objects</para>
         </listitem>
       </itemizedlist>
-      <para>When you move an item to <guilabel>Trash</guilabel>, the item is stored
-in your <filename>/.Trash</filename> directory. If you need to retrieve a
-file from <guilabel>Trash</guilabel>, you can display <guilabel>Trash</guilabel>
-and move the file out of <guilabel>Trash</guilabel>.</para>
-      <para>When you empty <guilabel>Trash</guilabel>, you delete the contents of <guilabel>Trash</guilabel> permanently. </para>
+      <para>If you need to retrieve a file from <guilabel>Trash</guilabel>, you
+can display <guilabel>Trash</guilabel> and move the file out of <guilabel>Trash</guilabel>. When you empty <guilabel>Trash</guilabel>, you delete the
+contents of <guilabel>Trash</guilabel> permanently. </para>
       <sect3 id="gosnautilus-107">
         <title>To Display Trash</title>
         <indexterm>
@@ -1692,7 +1688,7 @@ the following steps:</para>
         </listitem>
         <listitem>
           <para>Choose <guilabel>Notes</guilabel> from the drop-down list
-box at the top of the side pane.</para>
+at the top of the side pane.</para>
         </listitem>
         <listitem>
           <para>Type the note in the side pane. </para>
@@ -1963,10 +1959,10 @@ shows a folder displayed in list view.</para>
       </itemizedlist>
       <para>Use the <guilabel>View</guilabel> menu to choose how to display a file
 or folder. You can also use the <guilabel>View as</guilabel> drop-down list
-box to choose how to display a file or folder. When you display a folder,
-you can specify how you want to arrange or sort items in the folder. You can
-modify the size of the items in the view pane. The following sections describe
-how to work with icon view, list view, and views of files.</para>
+to choose how to display a file or folder. When you display a folder, you
+can specify how you want to arrange or sort items in the folder. You can modify
+the size of the items in the view pane. The following sections describe how
+to work with icon view, list view, and views of files.</para>
       <sect3 id="gosnautilus-100">
         <title>To Choose a View in Which to Display a File or Folder</title>
         <indexterm>
@@ -1980,8 +1976,8 @@ the contents of a file or folder from the <guilabel>View</guilabel> menu. </para
 that you want to use from the <guilabel>Open with Other Viewer</guilabel>
 dialog, then click on the <guibutton>Choose</guibutton> button. </para>
         <para>You can also choose the type of view from the <guilabel>View as</guilabel>
-drop-down list box. The <guilabel>View as</guilabel> drop-down list box is
-located at the right side of the location bar.</para>
+drop-down list. The <guilabel>View as</guilabel> drop-down list is located
+at the right side of the location bar.</para>
         <para>You can display different folders in different views. <application>Nautilus</application> remembers the view that you choose for a particular
 folder. The next time that you display the folder, <application>Nautilus</application>
 displays the folder in that view. To return the view for the folder to the
@@ -2077,9 +2073,10 @@ sorted by the total size of the items in the folder.</para>
                 <entry colname="colspec7" valign="top">
                   <para>Select this option to sort the
 items alphabetically by object type. The items are sorted alphabetically by
-the description of their <firstterm>Multipurpose Internet Mail Extension</firstterm>
-(MIME) type in the <application>File Types and Programs</application> preference
-tool.</para>
+the description of their <firstterm>MIME type</firstterm> in the <application>File Types and Programs</application> preference tool. The MIME type identifies
+the format of a file, and enables applications to read the file. For example,
+an email application can use the <literal>image/png</literal> MIME type to
+detect that a PNG file is attached to an email.</para>
                 </entry>
               </row>
               <row>
@@ -2575,9 +2572,7 @@ files when you sort a folder.</para>
                 <entry colname="colspec1">
                   <para>Select this option
 if you want to reverse the order by which items are sorted in this view. If
-you select this option, the order of the characteristic you select in <guilabel>Arrange Items</guilabel> is reversed. For example, if you select <guilabel>By Name</guilabel> from the <guilabel>Arrange Items</guilabel> drop-down list
-box. You can select the <guilabel>Sort in reverse</guilabel> option to sort
-the items in reverse alphabetical order.</para>
+you select this option, the order of the characteristic you select in the <guilabel>Arrange Items</guilabel> drop-down list is reversed. For example, if you select <guilabel>By Name</guilabel>, the items are sorted in reverse alphabetical order.</para>
                 </entry>
               </row>
               <row>
@@ -2811,10 +2806,10 @@ information is displayed in icon captions. </para>
 Click on the <guilabel>Files and Folders</guilabel> tab in the <guilabel>File Management Preferences</guilabel> dialog to display the <guilabel>Files
 and Folders</guilabel> tabbed section. </para>
         <para>Select the items of information that you want to display
-in the icon caption from the three drop-down list boxes. Select the first
-item from the first drop-down list box, select the second item from the second
-drop-down list box, and so on. The following table describes the items of
-information that you can select:</para>
+in the icon caption from the three drop-down lists. Select the first item
+from the first drop-down list, select the second item from the second drop-down
+list, and so on. The following table describes the items of information that
+you can select:</para>
         <informaltable frame="topbot">
           <tgroup cols="2" colsep="0" rowsep="0">
             <colspec colname="colspec0" colwidth="35.09*"/>
@@ -2894,7 +2889,7 @@ the owner of the item.</para>
                 </entry>
                 <entry colname="colspec1" valign="top">
                   <para>Choose this option to display
-the group to which the owner of the item belongs.</para>
+the group to which the item belongs.</para>
                 </entry>
               </row>
               <row>
@@ -3215,13 +3210,25 @@ tab to the side pane again, choose the tab from the popup menu again.</para>
 removable media:</para>
     <itemizedlist>
       <listitem>
+        <para>Audio CD</para>
+      </listitem>
+      <listitem>
+        <para>Camera</para>
+      </listitem>
+      <listitem>
         <para>CD-ROM</para>
       </listitem>
       <listitem>
+        <para>Floppy diskette</para>
+      </listitem>
+      <listitem>
+        <para>Iomega Jaz disk</para>
+      </listitem>
+      <listitem>
         <para>Iomega Zip disk</para>
       </listitem>
       <listitem>
-        <para>Floppy diskette</para>
+        <para>Memory Stick</para>
       </listitem>
     </itemizedlist>
     <note>
@@ -3300,10 +3307,10 @@ For information on how to mount media, see <xref linkend="gosnautilus-462"/>.</p
         </listitem>
         <listitem>
           <para>Right-click on the object that represents the diskette on
-the desktop background, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Floppy formatter</guilabel> dialog is displayed. </para>
+the desktop background, then choose <guimenuitem>Format</guimenuitem>. A <guilabel>Format a Floppy</guilabel> dialog is displayed. </para>
         </listitem>
         <listitem>
-          <para>Select your format options in the <guilabel>Floppy formatter</guilabel> dialog. The following table describes the elements on the dialog:</para>
+          <para>Select your format options in the <guilabel>Format a Floppy</guilabel> dialog. The following table describes the elements on the dialog:</para>
           <informaltable frame="topbot">
             <tgroup cols="2" colsep="0" rowsep="0">
               <colspec colname="colspec0" colwidth="34.54*"/>
@@ -3320,78 +3327,47 @@ the desktop background, then choose <guimenuitem>Format</guimenuitem>. A <guilab
               </thead>
               <tbody>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <para>
                       <guilabel>Floppy device</guilabel>
                     </para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Displays the name of the floppy device.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Displays
+the name of the floppy device.</para>
                   </entry>
                 </row>
                 <row>
-                  <entry colname="colspec0">
+                  <entry colname="colspec0" valign="top">
                     <para>
-                      <guilabel>Floppy density</guilabel>
+                      <guilabel>File system type</guilabel>
                     </para>
                   </entry>
-                  <entry colname="colspec1">
-                    <para>Select the density that you want for the diskette.</para>
+                  <entry colname="colspec1" valign="top">
+                    <para>Select
+the type of file system in which you want to format the diskette.</para>
                   </entry>
                 </row>
                 <row>
                   <entry valign="top">
                     <para>
-                      <guilabel>File system type</guilabel>
+                      <guilabel>Floppy density</guilabel>
                     </para>
                   </entry>
                   <entry valign="top">
-                    <para>Select the type of file system in which you want
-to format the diskette.</para>
+                    <para>Select the density that you want for the diskette.</para>
                   </entry>
                 </row>
                 <row>
                   <entry colname="colspec0" valign="top">
                     <para>
-                      <guilabel>Volume name</guilabel>
+                      <guilabel>Quick format</guilabel>
                     </para>
                   </entry>
                   <entry colname="colspec1" valign="top">
-                    <para>Type a name for the diskette
-in the text box.</para>
-                  </entry>
-                </row>
-                <row>
-                  <entry colname="colspec0">
-                    <para>
-                      <guilabel>Quick</guilabel>
-                    </para>
-                  </entry>
-                  <entry colname="colspec1">
-                    <para>Select this option to create only the file
-system on the diskette. </para>
-                  </entry>
-                </row>
-                <row>
-                  <entry colname="colspec0">
-                    <para>
-                      <guilabel>Standard</guilabel>
-                    </para>
-                  </entry>
-                  <entry colname="colspec1">
-                    <para>Select this option to create the file system
-on the diskette, and add a low-level format. </para>
-                  </entry>
-                </row>
-                <row>
-                  <entry colname="colspec0">
-                    <para>
-                      <guilabel>Thorough</guilabel>
-                    </para>
-                  </entry>
-                  <entry colname="colspec1">
-                    <para>Select this option to create the file system
-on the diskette, add a low-level format, and perform a check for bad blocks. </para>
+                    <para>Select this option to create
+only the file system on the diskette. A quick format does not check for bad
+blocks. This option works only on diskettes that have previously been formatted.</para>
                   </entry>
                 </row>
               </tbody>