Further updates for GNOME 2.4.

1 files changed, 66 insertions, 82 deletions

diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index 2c0e2ff..edb6d36 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -418,14 +418,14 @@ file icon to create the following visual effect: </para>
                       <imagedata fileref="figures/naut_sampleemblem2_icon.png" format="PNG"/>
                     </imageobject>
                     <textobject>
-                      <phrase>File icon with preview text in the icon.</phrase>
+                      <phrase>Text file icon.</phrase>
                     </textobject>
                   </mediaobject>
                 </screenshot>
               </entry>
               <entry valign="top">
                 <para>Icon that represents the file.
-This icon contains a preview of the contents of the file.</para>
+This icon mioght contain a preview of the contents of the file.</para>
               </entry>
             </row>
             <row>
@@ -1082,10 +1082,10 @@ table lists the special URI locations that you can use with the file manager:</p
           <thead>
             <row rowsep="1">
               <entry valign="top">
-                <para>URI</para>
+                <para>URI Location</para>
               </entry>
               <entry valign="top">
-                <para>Location</para>
+                <para>Description</para>
               </entry>
             </row>
           </thead>
@@ -1093,37 +1093,14 @@ table lists the special URI locations that you can use with the file manager:</p
             <row>
               <entry colname="colspec0" valign="top">
                 <para>
-                  <command>all-applications:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>all-applications:///</guilabel> location in a file manager window.
-Double-click on an application to start the application.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
-                  <command>all-preferences:///</command>
-                </para>
-              </entry>
-              <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>all-preferences:///</guilabel> location in a file manager window.
-Double-click on a preference tool to start the preference tool.</para>
-              </entry>
-            </row>
-            <row>
-              <entry colname="colspec0" valign="top">
-                <para>
                   <command>applications:///</command>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>Applications</guilabel> location in a file manager window. Double-click
-on an application to start the application.</para>
+                <para>Displays
+a list of the applications in your desktop environment. The applications are
+the same as the applications in the <guimenu>Applications</guimenu> menu.
+To open an application, double-click on the application.</para>
               </entry>
             </row>
             <row>
@@ -1133,8 +1110,9 @@ on an application to start the application.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>burn:///</guilabel> location in a file manager window. Use this location to write
-CDs.</para>
+                <para>Copy files and folders that you
+want to write to a CD to this location. You can write the contents of this
+location to a CD.</para>
               </entry>
             </row>
             <row>
@@ -1144,8 +1122,9 @@ CDs.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>fonts:///</guilabel> location in a file manager window. Enables you to preview your
-fonts and add fonts to your system.</para>
+                <para>Displays all the fonts that are
+available in your desktop environment. To preview a font, double-click on
+the font. You can also use this location to add fonts to your desktop environment.</para>
               </entry>
             </row>
             <row>
@@ -1155,8 +1134,10 @@ fonts and add fonts to your system.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>network:///</guilabel> location in a file manager window. Enables you to add and access
-network servers.</para>
+                <para>Displays network servers, if
+your desktop environment is configured to access servers on a network. To
+access a network server, double-click on the network server. You can also
+use this location to add network servers to your desktop environment.</para>
               </entry>
             </row>
             <row>
@@ -1166,8 +1147,9 @@ network servers.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>nfs:///</guilabel>
-location in a file manager window. Enables you to browse NFS servers.</para>
+                <para>Displays NFS network servers,
+if your desktop environment is configured to access NFS servers. To access
+an NFS network server, double-click on the NFS network server.</para>
               </entry>
             </row>
             <row>
@@ -1177,9 +1159,10 @@ location in a file manager window. Enables you to browse NFS servers.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>Desktop Preferences</guilabel> location in a file manager window.
- Double-click on a preference tool to start the preference tool.</para>
+                <para>Displays
+a list of the preference tools in your desktop environment. The preference
+tools are the same as the preference tools in the <guimenu>Desktop Preferences</guimenu> menu. To open a preference tool, double-click on the preference
+tool.</para>
               </entry>
             </row>
             <row>
@@ -1189,9 +1172,8 @@ the <guilabel>Desktop Preferences</guilabel> location in a file manager window.
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>server-settings:///</guilabel> location in a file manager window.
-Enables you to modify server settings.</para>
+                <para>Displays
+a list of applications that you can use to configure your system as a server.</para>
               </entry>
             </row>
             <row>
@@ -1201,9 +1183,9 @@ Enables you to modify server settings.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>smb:///</guilabel>
-location in a file manager window. Enables you to browse shares on Windows
-servers.</para>
+                <para>Displays Windows servers, if
+your desktop environment is configured to access Windows servers. To open
+a Windows server, double-click on the Windows server.</para>
               </entry>
             </row>
             <row>
@@ -1213,10 +1195,10 @@ servers.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>start-here:///</guilabel> location in a file manager window.
-Enables you to access your applications, preference tools, server settings,
-and system settings from one location.</para>
+                <para>Displays
+a list of applications and preference tools in your desktop environment. Also
+displays applications that you can use to configure your system as a server,
+and to modify your system settings.</para>
               </entry>
             </row>
             <row>
@@ -1226,9 +1208,8 @@ and system settings from one location.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens
-the <guilabel>system-settings:///</guilabel> location in a file manager window.
-Enables you to modify system settings.</para>
+                <para>Displays
+a list of applications that you can use to modify your system settings.</para>
               </entry>
             </row>
             <row>
@@ -1238,8 +1219,10 @@ Enables you to modify system settings.</para>
                 </para>
               </entry>
               <entry colname="colspec1" valign="top">
-                <para>Opens the <guilabel>themes:///</guilabel> location in a file manager window. Enables you to preview your
-themes and add themes to your system.</para>
+                <para>Displays all the themes that
+are available in your desktop environment. To preview a theme, double-click
+on the theme. You can also use this location to add themes to your desktop
+environment.</para>
               </entry>
             </row>
           </tbody>
@@ -1793,6 +1776,11 @@ file or folder in the view pane, then choose <guimenuitem>Move to Trash</guimenu
       </orderedlist>
       <para>Alternatively, you can drag the file or folder from the view pane to
 the <guilabel>Trash</guilabel> object on the desktop.</para>
+      <note>
+        <para>When you move a file or folder from a removable media to <guilabel>Trash</guilabel>, the file or folder is stored in a <guilabel>Trash</guilabel>
+location on the removable media. To remove the file or folder permanently
+from the removable media, you must empty <guilabel>Trash</guilabel>.</para>
+      </note>
     </sect2>
     <sect2 id="gosnautilus-443">
       <title>To Delete a File or Folder</title>
@@ -1840,6 +1828,10 @@ file or folder is added to the current folder. </para>
 press-and-hold <keycombo><keycap>Ctrl</keycap><keycap>Shift</keycap></keycombo>. Drag the item
 to the location where you want to place the link.</para>
       <para>By default, the file manager adds an emblem to symbolic links.</para>
+      <note>
+        <para>The permissions of a symbolic link are determined by the file
+or folder to which a symbolic link points.</para>
+      </note>
     </sect2>
     <sect2 id="gosnautilus-476">
       <title>To View the Properties of a File or Folder</title>
@@ -3785,35 +3777,18 @@ tab to the side pane again, choose the tab from the popup menu again.</para>
       <primary>removable media</primary>
       <secondary>introduction</secondary>
     </indexterm>
-    <para>The file manager can support the following removable media:</para>
+    <para>The file manager supports all removable media that have
+the following characteristics: </para>
     <itemizedlist>
       <listitem>
-        <para>Audio CD</para>
-      </listitem>
-      <listitem>
-        <para>Camera</para>
-      </listitem>
-      <listitem>
-        <para>CD-ROM</para>
+        <para>The removable media has an entry in the <filename>/etc/fstab</filename> file. The <filename>/etc/fstab</filename> file describes the file
+systems that the computer uses.</para>
       </listitem>
       <listitem>
-        <para>Floppy diskette</para>
-      </listitem>
-      <listitem>
-        <para>Iomega Jaz disk</para>
-      </listitem>
-      <listitem>
-        <para>Iomega Zip disk</para>
-      </listitem>
-      <listitem>
-        <para>Memory Stick</para>
+        <para>The <literal>user</literal> option is specified in the entry
+for the removable media in the <filename>/etc/fstab</filename> file.</para>
       </listitem>
     </itemizedlist>
-    <note>
-      <para>For the file manager to recognize removable media, you must have
-an appropriate entry for the media in the <filename>/etc/fstab</filename>
-file.</para>
-    </note>
     <sect2 id="gosnautilus-462">
       <title>To Mount Media</title>
       <indexterm>
@@ -3830,6 +3805,9 @@ is detected. </para>
       <para>If your system is not configured to mount the device automatically,
 you must mount the device manually. Right-click on the desktop, then choose <menuchoice><guimenu>Disks</guimenu><guimenuitem><replaceable>device-name</replaceable></guimenuitem></menuchoice>. For example, to mount a floppy diskette, choose <menuchoice><guimenu>Disks</guimenu><guimenuitem>Floppy</guimenuitem></menuchoice>.
 An object that represents the media is added to the desktop. </para>
+      <note>
+        <para>You cannot change the name of a removable media object.</para>
+      </note>
     </sect2>
     <sect2 id="gosnautilus-461">
       <title>To Display Media Contents</title>
@@ -3944,7 +3922,8 @@ read diskettes with this file system type.</para>
                       </listitem>
                       <listitem>
                         <para><guilabel>DOS (FAT)</guilabel>: Select this option to format
-a diskette for use on Windows  systems. </para>
+a diskette for use on Windows  systems.  Most UNIX-based systems can read
+diskettes with this file system type.</para>
                       </listitem>
                     </itemizedlist>
                   </entry>
@@ -3968,7 +3947,9 @@ a diskette for use on Windows  systems. </para>
                   <entry colname="colspec1" valign="top">
                     <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>
+blocks. </para>
+                    <para>Select this option if the diskette has been formatted
+before.</para>
                   </entry>
                 </row>
                 <row>
@@ -3981,6 +3962,8 @@ blocks. This option works only on diskettes that have previously been formatted.
                     <para>Select this option to create the file system
 on the diskette and format the diskette. A standard format does not check
 for bad blocks. </para>
+                    <para>Select this option if the diskette has not been
+formatted before.</para>
                   </entry>
                 </row>
                 <row>
@@ -3992,6 +3975,7 @@ for bad blocks. </para>
                   <entry colname="colspec1">
                     <para>Select this option to create the file system
 on the diskette, check for bad blocks, and format the diskette.</para>
+                    <para>Select this option if you want to verify that the diskette has not been damaged.</para>
                   </entry>
                 </row>
               </tbody>