Updates to Nautilus User Manual, including two new screenshots.

2001-05-03  Dan Mueth  <dan@eazel.com>

        Updates to Nautilus User Manual, including two new screenshots.

        * help/nautilus-user-manual/C/Makefile.am:
        * help/nautilus-user-manual/C/figures/help_num.png:
        * help/nautilus-user-manual/C/figures/news_num.png:
        * help/nautilus-user-manual/C/nautilus-user-manual.sgml:

5 files changed, 930 insertions, 194 deletions

diff --git a/help/nautilus-user-manual/C/Makefile.am b/help/nautilus-user-manual/C/Makefile.am
index 888d4d51b..7549cb179 100644
--- a/help/nautilus-user-manual/C/Makefile.am
+++ b/help/nautilus-user-manual/C/Makefile.am
@@ -4,6 +4,8 @@ figs = \
 	figures/home_folder_num.png		\
 	figures/sidebar_num.png			\
 	figures/nautilus_window_full_num.png	\
+	figures/news_num.png			\
+	figures/help_num.png			\
 	figures/locationbar_nqr.png		\
 	figures/full-1.png		\
 	figures/full-2.png		\
diff --git a/help/nautilus-user-manual/C/figures/help_num.png b/help/nautilus-user-manual/C/figures/help_num.png
new file mode 100644
index 000000000..cce218d75
--- /dev/null
+++ b/help/nautilus-user-manual/C/figures/help_num.png
diff --git a/help/nautilus-user-manual/C/figures/news_num.png b/help/nautilus-user-manual/C/figures/news_num.png
new file mode 100644
index 000000000..7148a5be2
--- /dev/null
+++ b/help/nautilus-user-manual/C/figures/news_num.png
diff --git a/help/nautilus-user-manual/C/nautilus-user-manual.sgml b/help/nautilus-user-manual/C/nautilus-user-manual.sgml
index 6d488aba4..186635c4e 100644
--- a/help/nautilus-user-manual/C/nautilus-user-manual.sgml
+++ b/help/nautilus-user-manual/C/nautilus-user-manual.sgml
@@ -764,7 +764,7 @@
    </para>
 
    <para>
-    <emphasis role="bold">Previewing Files in Icon View</emphasis role="bold">
+    <emphasis role="bold">Previewing Files in Icon View</emphasis>
    </para>
 
    <para>
@@ -1263,15 +1263,6 @@
 
    </orderedlist>
 
-   <figure id="prefmenu1">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
    <para>
     <emphasis role="bold">Editing Your Bookmarks</emphasis>
    </para>
@@ -1311,6 +1302,224 @@
 
   </sect1>
 
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Reading the News -->
+  <sect1 id="news">
+   <title>Reading the News</title>
+
+   <para>
+    The News sidebar in Nautilus allows you to see the latest news
+    headlines from each of your favorite news sources.
+   </para>
+
+   <para>
+    To view the current news headlines for each news site:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the News sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      News.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the News sidebar by clicking on the News sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open or close the news items for each site by clicking on the
+      arrows to the left of each news source.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      To read any of the articles, simply click on its title.  To go
+      to the web page for a particular news source, click on the icon
+      representing the source.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <figure id="newssidebar">
+    <title>The News Sidebar</title>
+    <screenshot>
+     <screeninfo>Screenshot of News Sidebar</screeninfo>
+     <graphic format="png" fileref="figures/news_num">
+     </graphic>
+    </screenshot>
+   </figure>
+
+   <para>
+    If new articles appear since you have last checked your news
+    sites, a small logo of a newspaper with a red exclamation mark is
+    displayed to show you that there is unread news.  This icon is
+    also displayed beside any headlines which are appeared while
+    Nautilus was running and which have not been read.
+   </para>
+
+   <para>
+    Nautilus allows you to choose the news sites you would like to
+    track from a long list of possible news sources.  You can also add
+    news sites which are not on this list.
+   </para>
+
+   <para>
+    To change which news sites are displayed:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the News sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      News.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the News sidebar by clicking on the News sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Click on the Select Sites button.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check the buttons for any sites you would like to start
+      tracking, and uncheck the buttons for any sites you would like
+      to stop tracking.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If you would like to track the news from a site which is not
+      listed, choose Edit.  Enter the name and RSS URL for the site
+      and then click Add New Site.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Click Done.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+  </sect1>
+
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Keeping Notes -->
+  <sect1 id="notes">
+   <title>Keeping Notes</title>
+
+   <para>
+    Nautilus allows you to keep a note in each folder on your
+    computer. You can use this to keep track of what the folder is
+    used for, details about the files in the folder, or other
+    information.  A small note icon will appear in the Note sidebar
+    tab for folders with Notes so that you can easily identify which
+    folders have notes.
+   </para>
+
+   <para>
+    To edit the note for a given folder:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the Notes sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      Notes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the Notes sidebar by clicking on the Notes sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Edit the note by clicking in the note area and then entering and
+      deleting text.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+  </sect1>
+
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Reading Help Documents -->
+  <sect1 id="help">
+   <title>Reading Help Documents</title>
+
+   <para>
+    Nautilus has a Help sidebar which acts as a help browser for
+    various types of documentation on your system including GNOME
+    documents, manual pages, and info pages.  The GNOME help documents
+    are sorted into categories by their topic.  The manual and info
+    pages are show in their own sections.
+   </para>
+
+   <para>
+    To read help documents:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the Help sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      Help.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the Help sidebar by clicking on the Help sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Browse the various categories and documents.  To read a
+      particular document or section of a document, simply select its
+      title and the document will be shown in the main panel.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <figure id="helpsidebar">
+    <title>The Help Sidebar</title>
+    <screenshot>
+     <screeninfo>Screenshot of Help Sidebar</screeninfo>
+     <graphic format="png" fileref="figures/help_num">
+     </graphic>
+    </screenshot>
+   </figure>
+
+  </sect1>
+
  </chapter>
 
  <!--  CHAPTER 3: SEARCHING YOUR COMPUTER AND THE INTERNET  -->
@@ -1365,15 +1574,6 @@
 
    </orderedlist>
 
-   <figure id="prefmenu5">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
  </chapter>
 
  <!--  CHAPTER 4: MANAGING YOUR FILES AND FOLDERS  -->
@@ -1407,6 +1607,10 @@
    <title>Moving and Copying Files and Folders</title>
 
    <para>
+    <emphasis role="bold">Using Two Windows</emphasis>
+   </para>
+
+   <para>
     The easiest way to move a file or folder is to work with two
     Nautilus windows.
    </para>
@@ -1427,15 +1631,14 @@
     <listitem>
      <para>
       In one window, locate the file or folder you want to move. In
-      the other window, locate the destination
-      folder.
+      the other window, locate the destination folder.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Using the left mouse button, click the file or folder you want
-      to move and drag it to the other window.
+      to move and drag it into the folder in the other Nautilus window.
      </para>
     </listitem>
 
@@ -1485,6 +1688,91 @@
 
    </orderedlist>
 
+
+   <para>
+    <emphasis role="bold">Using Cut, Copy, and Paste</emphasis>
+   </para>
+
+   <para>
+    You can also move and copy files using the Cut, Copy, and
+    Paste features.
+   </para>
+
+   <para>
+    To move a file or folder to a new location, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select the file or folder by clicking it with the left mouse
+      button.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and choose Cut File. (Note that the file or
+      folder is not removed until you Paste it somewhere.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the folder you would like to move the item into.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and select Paste File.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <para>
+    Tip: You can select multiple files by holding down the Shift
+    button while clicking on them.  Or, you can click on the
+    background of the main panel and hold down the mouse button while
+    dragging the selection box over multiple files or folders.
+   </para>
+
+   <para>
+    To copy a file or folder to a new folder while retaining the
+    original, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select the file or folder by clicking it with the left mouse
+      button.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and choose Copy File.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the folder you would like to copy the item into.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and select Paste File.
+    </para>
+    </listitem>
+
+   </orderedlist>
+
   </sect1>
 
   <!--  Managing Your Files and Folders: Creating New Folders  -->
@@ -1696,14 +1984,18 @@
    <title>Deleting Files and Folders</title>
 
    <para>
-    To delete an item, do this:
+    <emphasis role="bold">Using Trash</emphasis>
+   </para>
+
+   <para>
+    To move an item to the trash, do this:
    </para>
 
    <orderedlist>
 
     <listitem>
      <para>
-      Click the icon of the item you want to delete.
+      Click the icon of the item you want to move to the Trash.
      </para>
     </listitem>
 
@@ -1729,6 +2021,37 @@
     and drag the item to the Trash icon on the desktop.
    </para>
 
+   <para>
+    <emphasis role="bold">Using Delete (Advanced)</emphasis>
+   </para>
+
+   <para>
+    If your user level is Advanced, you can delete items without
+    moving them to the Trash folder.  Note that this will permanently
+    delete your file and it cannot be retrieved from the Trash.
+   </para>
+
+   <para>
+    To permanently delete a file or folder, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Click the icon of the item you want to delete.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the File menu and choose Delete. The Delete menu item will
+      only be present if your user level is Advanced.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
   </sect1>
 
   <!--  Managing Your Files and Folders: Changing File Permissions  -->
@@ -1861,7 +2184,7 @@
    </itemizedlist>
 
    <para>
-    To change your user level, open the preferences menu and choose
+    To change your user level, open the Preferences menu and choose
     the level you want.
    </para>
 
@@ -1902,20 +2225,6 @@
    </para>
 
    <para>
-    To open the Preferences dialog box use the preferences menu,
-    shown here.
-   </para>
-
-   <figure id="prefmenu7">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
-   <para>
     To customize preferences:
    </para>
 
@@ -1923,7 +2232,7 @@
 
     <listitem>
      <para>
-      Open the preferences menu and choose Preferences.
+      Open the Preferences menu and choose Edit Preferences.
      </para>
     </listitem>
 
@@ -2005,40 +2314,32 @@
 
     <listitem>
      <para>
-      Open the preferences menu (shown below) and choose Preferences.
+      Open the Preferences menu and choose Edit Preferences.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In the left column of the Preferences dialog box, click
-      Appearance.
+      Windows &amp; Desktop.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In the Views section, deselect any bars you want hidden in new
-      windows.
+      In the Opening New Windows section, deselect any bars you want
+      hidden in new windows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Click OK to close the window.
+      Click OK to close the Preferences dialog box.
      </para>
     </listitem>
 
    </orderedlist>
 
-   <figure id="prefmenu8">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
   </sect1>
 
   <!--  Customizing Nautilus: Choosing File Layouts -->
@@ -2046,7 +2347,7 @@
    <title>Choosing File Layouts</title>
 
    <para>
-    <guimenu>File Layout in Icon View</guimenu>
+    <emphasis role="bold">File Layout in Icon View</emphasis>
    </para>
 
    <para>
@@ -2111,7 +2412,7 @@
    </informaltable>
 
    <para>
-    <guimenu>File Layout in List View</guimenu>
+    <emphasis>File Layout in List View</emphasis>
    </para>
 
    <para>
@@ -2138,14 +2439,21 @@
    </para>
 
    <para>
-    <guimenu>Choosing a New Theme</guimenu>
+    <emphasis role="bold">Choosing a New Theme</emphasis>
    </para>
 
    <orderedlist>
 
     <listitem>
      <para>
-      Open the Edit menu and choose Nautilus Themes.
+      Open the Preferences menu and choose Edit Preferences.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the Appearances item from the left side of the
+      Preferences dialog box.
      </para>
     </listitem>
 
@@ -2158,14 +2466,14 @@
 
     <listitem>
      <para>
-      When you're finished, click Done.
+      When you're finished, click OK.
      </para>
     </listitem>
 
    </orderedlist>
 
    <para>
-    <guimenu>Changing Backgrounds</guimenu>
+    <emphasis role="bold">Changing Backgrounds</emphasis>
    </para>
 
    <orderedlist>
@@ -2206,7 +2514,7 @@
    </para>
 
    <para>
-    <guimenu>Adding and Removing Custom Backgrounds</guimenu>
+    <emphasis role="bold">Adding and Removing Custom Backgrounds</emphasis>
    </para>
 
    <para>
@@ -2216,8 +2524,8 @@
    </para>
 
    <para>
-    Any image file can be a background. To add a background to the
-    customization choices:
+    Any image file can be used as a background. To add a background to
+    the customization choices:
    </para>
 
    <orderedlist>
@@ -2364,7 +2672,7 @@
    </para>
 
    <para>
-    <guimenu>Customizing Icon Captions</guimenu>
+    <emphasis role="bold">Customizing Icon Captions</emphasis>
    </para>
 
    <para>
@@ -2378,7 +2686,14 @@
 
     <listitem>
      <para>
-      Open the Edit menu and choose Icon Captions.
+      Open the Preferences menu and choose Edit Preferences.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select Icon Captions in the left side of the Preferences dialog
+      box.
      </para>
     </listitem>
 
@@ -2398,8 +2713,7 @@
 
     <listitem>
      <para>
-      When you are done customizing icon captions, close the dialog
-      box.
+      When you are done customizing icon captions, click OK.
      </para>
     </listitem>
 
@@ -2411,7 +2725,7 @@
    </para>
 
    <para>
-    <guimenu>Customizing Icons</guimenu>
+    <emphasis role="bold">Customizing Icons</emphasis>
    </para>
 
    <para>
@@ -2435,7 +2749,8 @@
 
     <listitem>
      <para>
-      In the Properties dialog box, click Select Custom Icon.
+      In the Basic tab of the Properties dialog box, click Select
+      Custom Icon.
      </para>
     </listitem>
 
@@ -2462,8 +2777,8 @@
 
     <listitem>
      <para>
-      If you have a tab (Tree, Notes, History, or Help) open in the
-      sidebar, put it away so that you can see the icon you want
+      If you have a tab (Tree, Notes, History, Help, or News) open in
+      the sidebar, put it away so that you can see the icon you want
       to customize. (To put away a tab, click it.)
      </para>
     </listitem>
@@ -2500,7 +2815,7 @@
    </para>
 
    <para>
-    <guimenu>Adding Emblems to Icons</guimenu>
+    <emphasis role="bold">Adding Emblems to Icons</emphasis>
    </para>
 
    <para>
@@ -2533,7 +2848,8 @@
     <listitem>
      <para>
       Select an emblem and drag it to the icon you want to
-      customize. To remove emblems, drag the Erase emblem to the icon.
+      customize. To remove all emblems from an icon, drag the Erase
+      emblem to the icon.
      </para>
     </listitem>
 
@@ -2554,15 +2870,14 @@
     <para>
      Use emblems to organize your files.
     </para>
+    <para>
+     Attach Oh No or Urgent emblems to the files that need immediate
+     attention; then open the View menu and choose Lay Out Items By
+     Emblems. The files with emblems are displayed at the top in icon view
+     and first in list view.
+    </para>
    </tip>
 
-   <para>
-    Attach Oh No! or Urgent emblems to the files that need immediate
-    attention; then open the View menu and choose Lay Out Items By
-    Emblems. The files with emblems are displayed at the top in icon view
-    and first in list view.
-   </para>
-
 <!--
    <para>
     If you use emblems, you can also <link
@@ -2640,6 +2955,47 @@
 
   </sect1>
 
+
+  <!-- Customizing Nautilus: Using Scripts  -->
+  <sect1 id="usingscripts">
+   <title>Using Scripts</title>
+
+   <para>
+    Nautilus allows you to perform custom operations on selected files
+    through its script feature.
+   </para>
+
+   <para>
+    To use a script, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select one or more files or folders.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the File menu, select the Scripts submenu, and choose the
+      script you would like to execute on the files from the list.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <para>
+    You can write scripts in any language you choose.  They should
+    accept file names as parameters, as they will typically operate on
+    the selected files.  Merely place your executable file in your
+    Nautilus/scripts folder under your home folder and the scripts
+    will appear under the Scripts submenu of the File menu.
+   </para>
+
+  </sect1>
+
  </chapter>
 
 
@@ -2745,13 +3101,12 @@
 
    <listitem>
     <para>
-     Open the File menu and choose
-     <menuchoice><guimenu>Open With</guimenu> <guisubmenu>Other
+     Open the File menu and choose <menuchoice><guimenu>Open
+     With</guimenu> <guisubmenu>Other
      Application</guisubmenu></menuchoice>. A dialog box opens that
      lists all the applications currently able to open this particular
-     type of file. Some applications in the list are tagged "in the
-     menu" for this file type; others are tagged "not in the
-     menu."
+     type of file. Some applications in the list are tagged "in menu"
+     for this file type; others are tagged "not in menu."
     </para>
    </listitem>
 
@@ -3147,7 +3502,7 @@
   </itemizedlist>
 
   <para>
-   <guimenu>Registering with Eazel</guimenu>
+   <emphasis role="bold">Registering with Eazel</emphasis>
   </para>
 
   <para>
@@ -3188,19 +3543,19 @@
      </row>
      <row> 
       <entry>Ctrl-X</entry>
-      <entry>Cut Text</entry>
+      <entry>Cut (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-C</entry>
-      <entry>Copy Text</entry>
+      <entry>Copy (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-V</entry>
-      <entry>Paste Text</entry>
+      <entry>Paste (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-A</entry>
-      <entry>Select All (select all files, etc.)</entry>
+      <entry>Select All (Text or Files)</entry>
      </row>
      <row>
       <entry>Ctrl-N</entry>
@@ -3211,6 +3566,10 @@
       <entry>Open</entry>
      </row>
      <row>
+      <entry>Shift-Ctrl-O</entry>
+      <entry>Open in New Window</entry>
+     </row>
+     <row>
       <entry>Ctrl-W</entry>
       <entry>Close Window</entry>
      </row>
@@ -3223,16 +3582,20 @@
       <entry>Show Properties</entry>
      </row>
      <row>
-      <entry>Ctrl-T</entry>
-      <entry>Move to Trash</entry>
-     </row>
-     <row>
       <entry>Ctrl-D</entry>
       <entry>Duplicate</entry>
      </row>
      <row>
-      <entry>Ctrl-L</entry>
-      <entry>Create Link</entry>
+      <entry>Ctrl-M</entry>
+      <entry>Make Link</entry>
+     </row>
+     <row>
+      <entry>F2</entry>
+      <entry>Rename</entry>
+     </row>
+     <row>
+      <entry>Ctrl-T</entry>
+      <entry>Move to Trash</entry>
      </row>
      <row>
       <entry>Ctrl-F</entry>
@@ -3259,6 +3622,10 @@
       <entry>Home</entry>
      </row>
      <row>
+      <entry>Ctrl-L</entry>
+      <entry>Location</entry>
+     </row>
+     <row>
       <entry>Ctrl-R</entry>
       <entry>Refresh</entry>
      </row>
@@ -3350,7 +3717,7 @@
    <para>
     This program is free software; you can redistribute it and/or
     modify it under the terms of the <ulink type="help"
-    url="gnome-help:gnugpl"> <citetitle>GNU General Public
+    url="gnome-help:gpl"> <citetitle>GNU General Public
     License</citetitle></ulink> as published by the Free Software
     Foundation; either version 2 of the License, or (at your option)
     any later version.
@@ -3372,7 +3739,7 @@
    <para>
     Permission is granted to copy, distribute and/or modify this
     document under the terms of the <ulink type="help"
-    url="gnome-help:gnufdl"> <citetitle>GNU Free Documentation
+    url="gnome-help:fdl"> <citetitle>GNU Free Documentation
     License</citetitle></ulink>, Version 1.1 or any later version
     published by the Free Software Foundation with no Invariant
     Sections, no Front-Cover Texts, and no Back-Cover Texts.
diff --git a/help/nautilus-user-manual/C/nautilus-user-manual.xml b/help/nautilus-user-manual/C/nautilus-user-manual.xml
index 6d488aba4..186635c4e 100644
--- a/help/nautilus-user-manual/C/nautilus-user-manual.xml
+++ b/help/nautilus-user-manual/C/nautilus-user-manual.xml
@@ -764,7 +764,7 @@
    </para>
 
    <para>
-    <emphasis role="bold">Previewing Files in Icon View</emphasis role="bold">
+    <emphasis role="bold">Previewing Files in Icon View</emphasis>
    </para>
 
    <para>
@@ -1263,15 +1263,6 @@
 
    </orderedlist>
 
-   <figure id="prefmenu1">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
    <para>
     <emphasis role="bold">Editing Your Bookmarks</emphasis>
    </para>
@@ -1311,6 +1302,224 @@
 
   </sect1>
 
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Reading the News -->
+  <sect1 id="news">
+   <title>Reading the News</title>
+
+   <para>
+    The News sidebar in Nautilus allows you to see the latest news
+    headlines from each of your favorite news sources.
+   </para>
+
+   <para>
+    To view the current news headlines for each news site:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the News sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      News.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the News sidebar by clicking on the News sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open or close the news items for each site by clicking on the
+      arrows to the left of each news source.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      To read any of the articles, simply click on its title.  To go
+      to the web page for a particular news source, click on the icon
+      representing the source.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <figure id="newssidebar">
+    <title>The News Sidebar</title>
+    <screenshot>
+     <screeninfo>Screenshot of News Sidebar</screeninfo>
+     <graphic format="png" fileref="figures/news_num">
+     </graphic>
+    </screenshot>
+   </figure>
+
+   <para>
+    If new articles appear since you have last checked your news
+    sites, a small logo of a newspaper with a red exclamation mark is
+    displayed to show you that there is unread news.  This icon is
+    also displayed beside any headlines which are appeared while
+    Nautilus was running and which have not been read.
+   </para>
+
+   <para>
+    Nautilus allows you to choose the news sites you would like to
+    track from a long list of possible news sources.  You can also add
+    news sites which are not on this list.
+   </para>
+
+   <para>
+    To change which news sites are displayed:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the News sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      News.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the News sidebar by clicking on the News sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Click on the Select Sites button.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Check the buttons for any sites you would like to start
+      tracking, and uncheck the buttons for any sites you would like
+      to stop tracking.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      If you would like to track the news from a site which is not
+      listed, choose Edit.  Enter the name and RSS URL for the site
+      and then click Add New Site.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Click Done.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+  </sect1>
+
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Keeping Notes -->
+  <sect1 id="notes">
+   <title>Keeping Notes</title>
+
+   <para>
+    Nautilus allows you to keep a note in each folder on your
+    computer. You can use this to keep track of what the folder is
+    used for, details about the files in the folder, or other
+    information.  A small note icon will appear in the Note sidebar
+    tab for folders with Notes so that you can easily identify which
+    folders have notes.
+   </para>
+
+   <para>
+    To edit the note for a given folder:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the Notes sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      Notes.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the Notes sidebar by clicking on the Notes sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Edit the note by clicking in the note area and then entering and
+      deleting text.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+  </sect1>
+
+  <!-- NAVIGATING YOUR COMPUTER AND THE INTERNET: Reading Help Documents -->
+  <sect1 id="help">
+   <title>Reading Help Documents</title>
+
+   <para>
+    Nautilus has a Help sidebar which acts as a help browser for
+    various types of documentation on your system including GNOME
+    documents, manual pages, and info pages.  The GNOME help documents
+    are sorted into categories by their topic.  The manual and info
+    pages are show in their own sections.
+   </para>
+
+   <para>
+    To read help documents:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Make sure the Help sidebar tab is visible.  If it is not
+      visible, right-click on the background of the sidebar and select
+      Help.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show the Help sidebar by clicking on the Help sidebar tab.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Browse the various categories and documents.  To read a
+      particular document or section of a document, simply select its
+      title and the document will be shown in the main panel.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <figure id="helpsidebar">
+    <title>The Help Sidebar</title>
+    <screenshot>
+     <screeninfo>Screenshot of Help Sidebar</screeninfo>
+     <graphic format="png" fileref="figures/help_num">
+     </graphic>
+    </screenshot>
+   </figure>
+
+  </sect1>
+
  </chapter>
 
  <!--  CHAPTER 3: SEARCHING YOUR COMPUTER AND THE INTERNET  -->
@@ -1365,15 +1574,6 @@
 
    </orderedlist>
 
-   <figure id="prefmenu5">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
  </chapter>
 
  <!--  CHAPTER 4: MANAGING YOUR FILES AND FOLDERS  -->
@@ -1407,6 +1607,10 @@
    <title>Moving and Copying Files and Folders</title>
 
    <para>
+    <emphasis role="bold">Using Two Windows</emphasis>
+   </para>
+
+   <para>
     The easiest way to move a file or folder is to work with two
     Nautilus windows.
    </para>
@@ -1427,15 +1631,14 @@
     <listitem>
      <para>
       In one window, locate the file or folder you want to move. In
-      the other window, locate the destination
-      folder.
+      the other window, locate the destination folder.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Using the left mouse button, click the file or folder you want
-      to move and drag it to the other window.
+      to move and drag it into the folder in the other Nautilus window.
      </para>
     </listitem>
 
@@ -1485,6 +1688,91 @@
 
    </orderedlist>
 
+
+   <para>
+    <emphasis role="bold">Using Cut, Copy, and Paste</emphasis>
+   </para>
+
+   <para>
+    You can also move and copy files using the Cut, Copy, and
+    Paste features.
+   </para>
+
+   <para>
+    To move a file or folder to a new location, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select the file or folder by clicking it with the left mouse
+      button.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and choose Cut File. (Note that the file or
+      folder is not removed until you Paste it somewhere.)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the folder you would like to move the item into.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and select Paste File.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <para>
+    Tip: You can select multiple files by holding down the Shift
+    button while clicking on them.  Or, you can click on the
+    background of the main panel and hold down the mouse button while
+    dragging the selection box over multiple files or folders.
+   </para>
+
+   <para>
+    To copy a file or folder to a new folder while retaining the
+    original, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select the file or folder by clicking it with the left mouse
+      button.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and choose Copy File.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the folder you would like to copy the item into.
+    </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the Edit menu and select Paste File.
+    </para>
+    </listitem>
+
+   </orderedlist>
+
   </sect1>
 
   <!--  Managing Your Files and Folders: Creating New Folders  -->
@@ -1696,14 +1984,18 @@
    <title>Deleting Files and Folders</title>
 
    <para>
-    To delete an item, do this:
+    <emphasis role="bold">Using Trash</emphasis>
+   </para>
+
+   <para>
+    To move an item to the trash, do this:
    </para>
 
    <orderedlist>
 
     <listitem>
      <para>
-      Click the icon of the item you want to delete.
+      Click the icon of the item you want to move to the Trash.
      </para>
     </listitem>
 
@@ -1729,6 +2021,37 @@
     and drag the item to the Trash icon on the desktop.
    </para>
 
+   <para>
+    <emphasis role="bold">Using Delete (Advanced)</emphasis>
+   </para>
+
+   <para>
+    If your user level is Advanced, you can delete items without
+    moving them to the Trash folder.  Note that this will permanently
+    delete your file and it cannot be retrieved from the Trash.
+   </para>
+
+   <para>
+    To permanently delete a file or folder, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Click the icon of the item you want to delete.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the File menu and choose Delete. The Delete menu item will
+      only be present if your user level is Advanced.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
   </sect1>
 
   <!--  Managing Your Files and Folders: Changing File Permissions  -->
@@ -1861,7 +2184,7 @@
    </itemizedlist>
 
    <para>
-    To change your user level, open the preferences menu and choose
+    To change your user level, open the Preferences menu and choose
     the level you want.
    </para>
 
@@ -1902,20 +2225,6 @@
    </para>
 
    <para>
-    To open the Preferences dialog box use the preferences menu,
-    shown here.
-   </para>
-
-   <figure id="prefmenu7">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
-
-   <para>
     To customize preferences:
    </para>
 
@@ -1923,7 +2232,7 @@
 
     <listitem>
      <para>
-      Open the preferences menu and choose Preferences.
+      Open the Preferences menu and choose Edit Preferences.
      </para>
     </listitem>
 
@@ -2005,40 +2314,32 @@
 
     <listitem>
      <para>
-      Open the preferences menu (shown below) and choose Preferences.
+      Open the Preferences menu and choose Edit Preferences.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In the left column of the Preferences dialog box, click
-      Appearance.
+      Windows &amp; Desktop.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In the Views section, deselect any bars you want hidden in new
-      windows.
+      In the Opening New Windows section, deselect any bars you want
+      hidden in new windows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Click OK to close the window.
+      Click OK to close the Preferences dialog box.
      </para>
     </listitem>
 
    </orderedlist>
 
-   <figure id="prefmenu8">
-    <title>The Preferences Menu</title>
-    <screenshot>
-     <screeninfo>Screenshot of Preferences Menu</screeninfo>
-     <graphic format="png" fileref="figures/preferences_menu_num">
-     </graphic>
-    </screenshot>
-   </figure>
   </sect1>
 
   <!--  Customizing Nautilus: Choosing File Layouts -->
@@ -2046,7 +2347,7 @@
    <title>Choosing File Layouts</title>
 
    <para>
-    <guimenu>File Layout in Icon View</guimenu>
+    <emphasis role="bold">File Layout in Icon View</emphasis>
    </para>
 
    <para>
@@ -2111,7 +2412,7 @@
    </informaltable>
 
    <para>
-    <guimenu>File Layout in List View</guimenu>
+    <emphasis>File Layout in List View</emphasis>
    </para>
 
    <para>
@@ -2138,14 +2439,21 @@
    </para>
 
    <para>
-    <guimenu>Choosing a New Theme</guimenu>
+    <emphasis role="bold">Choosing a New Theme</emphasis>
    </para>
 
    <orderedlist>
 
     <listitem>
      <para>
-      Open the Edit menu and choose Nautilus Themes.
+      Open the Preferences menu and choose Edit Preferences.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select the Appearances item from the left side of the
+      Preferences dialog box.
      </para>
     </listitem>
 
@@ -2158,14 +2466,14 @@
 
     <listitem>
      <para>
-      When you're finished, click Done.
+      When you're finished, click OK.
      </para>
     </listitem>
 
    </orderedlist>
 
    <para>
-    <guimenu>Changing Backgrounds</guimenu>
+    <emphasis role="bold">Changing Backgrounds</emphasis>
    </para>
 
    <orderedlist>
@@ -2206,7 +2514,7 @@
    </para>
 
    <para>
-    <guimenu>Adding and Removing Custom Backgrounds</guimenu>
+    <emphasis role="bold">Adding and Removing Custom Backgrounds</emphasis>
    </para>
 
    <para>
@@ -2216,8 +2524,8 @@
    </para>
 
    <para>
-    Any image file can be a background. To add a background to the
-    customization choices:
+    Any image file can be used as a background. To add a background to
+    the customization choices:
    </para>
 
    <orderedlist>
@@ -2364,7 +2672,7 @@
    </para>
 
    <para>
-    <guimenu>Customizing Icon Captions</guimenu>
+    <emphasis role="bold">Customizing Icon Captions</emphasis>
    </para>
 
    <para>
@@ -2378,7 +2686,14 @@
 
     <listitem>
      <para>
-      Open the Edit menu and choose Icon Captions.
+      Open the Preferences menu and choose Edit Preferences.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Select Icon Captions in the left side of the Preferences dialog
+      box.
      </para>
     </listitem>
 
@@ -2398,8 +2713,7 @@
 
     <listitem>
      <para>
-      When you are done customizing icon captions, close the dialog
-      box.
+      When you are done customizing icon captions, click OK.
      </para>
     </listitem>
 
@@ -2411,7 +2725,7 @@
    </para>
 
    <para>
-    <guimenu>Customizing Icons</guimenu>
+    <emphasis role="bold">Customizing Icons</emphasis>
    </para>
 
    <para>
@@ -2435,7 +2749,8 @@
 
     <listitem>
      <para>
-      In the Properties dialog box, click Select Custom Icon.
+      In the Basic tab of the Properties dialog box, click Select
+      Custom Icon.
      </para>
     </listitem>
 
@@ -2462,8 +2777,8 @@
 
     <listitem>
      <para>
-      If you have a tab (Tree, Notes, History, or Help) open in the
-      sidebar, put it away so that you can see the icon you want
+      If you have a tab (Tree, Notes, History, Help, or News) open in
+      the sidebar, put it away so that you can see the icon you want
       to customize. (To put away a tab, click it.)
      </para>
     </listitem>
@@ -2500,7 +2815,7 @@
    </para>
 
    <para>
-    <guimenu>Adding Emblems to Icons</guimenu>
+    <emphasis role="bold">Adding Emblems to Icons</emphasis>
    </para>
 
    <para>
@@ -2533,7 +2848,8 @@
     <listitem>
      <para>
       Select an emblem and drag it to the icon you want to
-      customize. To remove emblems, drag the Erase emblem to the icon.
+      customize. To remove all emblems from an icon, drag the Erase
+      emblem to the icon.
      </para>
     </listitem>
 
@@ -2554,15 +2870,14 @@
     <para>
      Use emblems to organize your files.
     </para>
+    <para>
+     Attach Oh No or Urgent emblems to the files that need immediate
+     attention; then open the View menu and choose Lay Out Items By
+     Emblems. The files with emblems are displayed at the top in icon view
+     and first in list view.
+    </para>
    </tip>
 
-   <para>
-    Attach Oh No! or Urgent emblems to the files that need immediate
-    attention; then open the View menu and choose Lay Out Items By
-    Emblems. The files with emblems are displayed at the top in icon view
-    and first in list view.
-   </para>
-
 <!--
    <para>
     If you use emblems, you can also <link
@@ -2640,6 +2955,47 @@
 
   </sect1>
 
+
+  <!-- Customizing Nautilus: Using Scripts  -->
+  <sect1 id="usingscripts">
+   <title>Using Scripts</title>
+
+   <para>
+    Nautilus allows you to perform custom operations on selected files
+    through its script feature.
+   </para>
+
+   <para>
+    To use a script, do this:
+   </para>
+
+   <orderedlist>
+
+    <listitem>
+     <para>
+      Select one or more files or folders.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Open the File menu, select the Scripts submenu, and choose the
+      script you would like to execute on the files from the list.
+     </para>
+    </listitem>
+
+   </orderedlist>
+
+   <para>
+    You can write scripts in any language you choose.  They should
+    accept file names as parameters, as they will typically operate on
+    the selected files.  Merely place your executable file in your
+    Nautilus/scripts folder under your home folder and the scripts
+    will appear under the Scripts submenu of the File menu.
+   </para>
+
+  </sect1>
+
  </chapter>
 
 
@@ -2745,13 +3101,12 @@
 
    <listitem>
     <para>
-     Open the File menu and choose
-     <menuchoice><guimenu>Open With</guimenu> <guisubmenu>Other
+     Open the File menu and choose <menuchoice><guimenu>Open
+     With</guimenu> <guisubmenu>Other
      Application</guisubmenu></menuchoice>. A dialog box opens that
      lists all the applications currently able to open this particular
-     type of file. Some applications in the list are tagged "in the
-     menu" for this file type; others are tagged "not in the
-     menu."
+     type of file. Some applications in the list are tagged "in menu"
+     for this file type; others are tagged "not in menu."
     </para>
    </listitem>
 
@@ -3147,7 +3502,7 @@
   </itemizedlist>
 
   <para>
-   <guimenu>Registering with Eazel</guimenu>
+   <emphasis role="bold">Registering with Eazel</emphasis>
   </para>
 
   <para>
@@ -3188,19 +3543,19 @@
      </row>
      <row> 
       <entry>Ctrl-X</entry>
-      <entry>Cut Text</entry>
+      <entry>Cut (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-C</entry>
-      <entry>Copy Text</entry>
+      <entry>Copy (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-V</entry>
-      <entry>Paste Text</entry>
+      <entry>Paste (Text or File)</entry>
      </row>
      <row>
       <entry>Ctrl-A</entry>
-      <entry>Select All (select all files, etc.)</entry>
+      <entry>Select All (Text or Files)</entry>
      </row>
      <row>
       <entry>Ctrl-N</entry>
@@ -3211,6 +3566,10 @@
       <entry>Open</entry>
      </row>
      <row>
+      <entry>Shift-Ctrl-O</entry>
+      <entry>Open in New Window</entry>
+     </row>
+     <row>
       <entry>Ctrl-W</entry>
       <entry>Close Window</entry>
      </row>
@@ -3223,16 +3582,20 @@
       <entry>Show Properties</entry>
      </row>
      <row>
-      <entry>Ctrl-T</entry>
-      <entry>Move to Trash</entry>
-     </row>
-     <row>
       <entry>Ctrl-D</entry>
       <entry>Duplicate</entry>
      </row>
      <row>
-      <entry>Ctrl-L</entry>
-      <entry>Create Link</entry>
+      <entry>Ctrl-M</entry>
+      <entry>Make Link</entry>
+     </row>
+     <row>
+      <entry>F2</entry>
+      <entry>Rename</entry>
+     </row>
+     <row>
+      <entry>Ctrl-T</entry>
+      <entry>Move to Trash</entry>
      </row>
      <row>
       <entry>Ctrl-F</entry>
@@ -3259,6 +3622,10 @@
       <entry>Home</entry>
      </row>
      <row>
+      <entry>Ctrl-L</entry>
+      <entry>Location</entry>
+     </row>
+     <row>
       <entry>Ctrl-R</entry>
       <entry>Refresh</entry>
      </row>
@@ -3350,7 +3717,7 @@
    <para>
     This program is free software; you can redistribute it and/or
     modify it under the terms of the <ulink type="help"
-    url="gnome-help:gnugpl"> <citetitle>GNU General Public
+    url="gnome-help:gpl"> <citetitle>GNU General Public
     License</citetitle></ulink> as published by the Free Software
     Foundation; either version 2 of the License, or (at your option)
     any later version.
@@ -3372,7 +3739,7 @@
    <para>
     Permission is granted to copy, distribute and/or modify this
     document under the terms of the <ulink type="help"
-    url="gnome-help:gnufdl"> <citetitle>GNU Free Documentation
+    url="gnome-help:fdl"> <citetitle>GNU Free Documentation
     License</citetitle></ulink>, Version 1.1 or any later version
     published by the Free Software Foundation with no Invariant
     Sections, no Front-Cover Texts, and no Back-Cover Texts.