Fixed validation errors.

2000-11-01  Aaron Weber  <aaron@helixcode.com>

	* C/config-prefs.sgml: Fixed validation errors.

	* C/apx-gloss.sgml: Fixed HTML, style stuff.

	* C/usage-mail.sgml: Stylistic overhaul.

	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
	folder navigation tips.

2000-10-31  Aaron Weber  <aaron@helixcode.com>

	* C/preface.sgml: Minor stylistic revisions.

2000-10-30  Aaron Weber  <aaron@helixcode.com>

	* COPYING-DOCS: New file. This is the official place to put the
	FDL now.

svn path=/trunk/; revision=6334

8 files changed, 610 insertions, 217 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 24203f64a6..f04b381d19 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -158,10 +158,10 @@
   <glossterm>HTML</glossterm>
   <glossdef>
    <para>
-    Hyper-text Markup Language(<acronym>HTML</acronym>) is the layout
-    language which all web pages are written in.  HTML can be used
-    inside of e-mails to insert images, justify text different ways,
-    and even include web pages inside the e-mail itself.
+    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language
+    for describing page layout in electronic documents like web pages,
+    help files, and email messages.  HTML can be used in email and
+    news posts to insert images and apply text treatments.
    </para>
   </glossdef>
  </glossentry>
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 6139b9a01d..27c1ac57db 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -624,6 +624,9 @@
                    <listitem><para>
                     <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
                  </para></listitem>
+             </itemizedlist>
+         </para>
+       </sect2>
       </sect1>
     
 
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 392a0bbfc1..d9649f1adc 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -19,6 +19,35 @@
 	you'd rather deal with your email preferences later, click
 	<guibutton>Cancel</guibutton>.
       </para>
+
+<!--  
+
+
+
+Before you get it, though, you should decide where you want to
+	keep it.  Your options will vary a little depending on your
+	network setup, but they come down to storing the mail on your
+	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
+	storing it on the network (using <glossterm
+	linkend="imap">IMAP</glossterm>).  If you store your mail on
+	your local hard disk, you can read it whether you're online or
+	not, but you can only read it from one computer.  If you store
+	it on the network, you can only read it when you're online,
+	but you can access it from almost any computer with a network
+	connection, even if it doesn't have
+	<application>Evolution</application>.
+
+
+        If you choose POP, you'll be putting mail in the
+        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
+        folder.  If you choose IMAP, it's the
+        <guilabel>Inbox</guilabel> of a folder with the same name as
+        your mail server.  That's so you can maintain several distinct
+        IMAP servers if you want.  See <xref
+        linkend="config-prefs-mail"> for more information about mail
+        servers.
+-->
+
       <para>
          The setup assistant (sometimes called a
 	 <glossterm>Druid</glossterm>, by analogy with the "Wizards"
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index d760d5b00a..2987dd7988 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -15,10 +15,11 @@
         <application>Evolution</application>'s goal is to make the
         tasks of storing, organizing, and retrieving information
         easier, so you can work and communicate with others.  That is,
-        it's a more evolved <glossterm linkend="groupware">groupware</glossterm> program,
-        an integral part of the Internet-connected desktop. On the
-        inside, it's a powerful database; on the outside, it's a tool
-        to help you get your work done.
+        it's a highly evolved <glossterm
+        linkend="groupware">groupware</glossterm> program, an integral
+        part of the Internet-connected desktop. On the inside, it's a
+        powerful database; on the outside, it's a tool to help you get
+        your work done.
       </para>
       <para>
         Because it's part of the GNOME project,
@@ -58,15 +59,15 @@
         power and flexibility of the GNOME desktop environment.
       </para>
       <para>
-        The developers of <application>Evolution</application> had
-        four major goals for their project:
+        The <application>Evolution</application> project has four
+        central goals:
 
         <itemizedlist>
 	  <listitem>
 	    <para>
              The application must be <emphasis>both powerful and easy
              to use</emphasis>. That means a familiar and intuitive
-             interface that users could customize to their liking, and
+             interface that users can customize to their liking, and
              the development of shortcuts for complex tasks.
             </para>
 	  </listitem>
@@ -74,10 +75,10 @@
 	    <para>
               <application>Evolution</application> must meet and
               exceed the standards set by other groupware products.
-              It must include support for most major network
-              <glossterm linkend="protocol">protocols</glossterm> so
-              that it can integrate seamlessly with existing hardware
-              and network environments.
+              It must include support for major network <glossterm
+              linkend="protocol">protocols</glossterm> so that it can
+              integrate seamlessly with existing hardware and network
+              environments.
             </para>
 	  </listitem>
 	  <listitem>
@@ -95,8 +96,8 @@
 	    <para>
                Data must be safe: <application>Evolution</application>
                must not lose mail, corrupt mailbox files or other
-               data, execute arbitrary scripts, or delete files from
-               your hard disk.
+               data, execute arbitrary <glossterm linkend="script">scripts</glossterm>,
+               or delete files from your hard disk.
             </para>
           </listitem>
 	</itemizedlist>
@@ -123,7 +124,7 @@
       <para>
         This version of the <application>Evolution</application>
         User's Guide is a <emphasis>draft</emphasis>. It describes
-        version 0.5.1 of the software.  It is missing huge
+        version 0.6 of the software.  It is missing huge
         chunks of information, and many of the features it describes
         are unimplemented.  All the content is subject to change,
         especially if you help.  Please send comments on the guide to
@@ -172,7 +173,7 @@
             in</userinput></member> <member><computeroutput>Text
             output from a computer</computeroutput></member>
             <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in <xref linkend="apx-gloss">.</member>
+            that are defined in the <xref linkend="apx-gloss">.</member>
 	  </simplelist>
         </para>
       </formalpara>
@@ -296,7 +297,7 @@
     <sect2 id="quickref-mail">
       <title>Mail Tasks</title>
       <para>
-        Here are the most frequent email tasks:
+        Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:
          <variablelist>
 	  <varlistentry>
 	    <term>Check Mail</term>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 864a46ff38..6aafdaa492 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -96,33 +96,32 @@
          bar.  The most frequently used ones, like
          <guimenuitem>Reply</guimenuitem> and
          <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar.
+         the toolbar, and almost all of them are duplicated in the
+         right-click menu and as keyboard shortcuts, which tend to be
+         faster once you get the hang of them.  You can choose
+         whichever way you like best; the idea is that the software
+         should work the way you want, rather than making you work the
+         way the it does.
        </para>
-       <para>
-         While you're there, have a look at the items items the bottom
-         of the list, which are shortcuts for simple filter and
-         vFolder creation.  You can learn more about filters and
-         vFolders in <xref linkend="usage-mail-organize">; a
-         comprehensive description of this menu (and all the others)
-         is in <xref linkend="menuref">.
-      </para>
 
       <sect3 id="usage-mail-listorder">
 	<title>Sorting the message list</title>
 	<para>
-          You can also select the order in which messages appear in
-          that list.  To sort by sender, subject, or date, click on the
-          bars with those labels at the top of the message list.  If
-          you click twice, you'll sort them in reverse order.
+          One of the ways <application>Evolution</application> lets
+          you choose the way you work is the way it lets you sort your
+          message lists.  To sort by sender, subject, or date, click
+          on the bars with those labels at the top of the message
+          list.  If you click twice, you'll sort them in reverse
+          order.
         </para>
 	<para>
-          Aside from sorting the messages, you can opt to have the
-          messages threaded. Select <menuchoice>
-          <guimenu>View</guimenu> <guimenuitem>Threaded</guimenuitem>
-          </menuchoice> to turn the threaded view on or off.  If the
-          option selected, <application>Evolution</application> will
-          attempt to associate related messages by using the
-          <systemitem>References</systemitem>,
+          You can also choose a threaded message view. Select
+          <menuchoice> <guimenu>View</guimenu>
+          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
+          the threaded view on or off.  If the option selected,
+          <application>Evolution</application> will attempt to
+          associate related messages by using message ID numbers and
+          the <systemitem>References</systemitem>,
           <systemitem>In-Reply-To</systemitem>, and
           <systemitem>Subject</systemitem> message headers.  Messages
           which are related are then placed next to each other, so
@@ -133,11 +132,12 @@
       <sect3 id="usage-mail-getnsend-delete">
         <title>Deleting Mail</title>
         <para>
-          To delete a message, select it in the the <interface>message
-          list</interface> by clicking on it once.  Then click on the
-          <guibutton>Delete</guibutton> button in the tool bar.  The
-          message now has a line through it, because you've marked it
-          for deletion. 
+          Once you've read your mail, you may want to get rid of
+          it. To mark a message for deletion, select it in the the
+          <interface>message list</interface> by clicking on it once.
+          Then click on the <guibutton>Delete</guibutton> button in
+          the tool bar.  The message now has a line through it,
+          because you've marked it for deletion.
         </para>
         <para>
           If you really want to get rid of it, choose
@@ -157,65 +157,37 @@
       <para>
 	Now that you've had a look around the
 	<interface>Inbox</interface>, it's time to check for new mail.
-	Before you get it, though, you should decide where you want to
-	keep it.  Your options will vary a little depending on your
-	network setup, but they come down to storing the mail on your
-	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
-	storing it on the network (using <glossterm
-	linkend="imap">IMAP</glossterm>).  If you store your mail on
-	your local hard disk, you can read it whether you're online or
-	not, but you can only read it from one computer.  If you store
-	it on the network, you can only read it when you're online,
-	but you can access it from almost any computer with a network
-	connection, even if it doesn't have
-	<application>Evolution</application>.
-      </para>
-      <para>
-        If you choose POP, you'll be putting mail in the
-        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
-        folder.  If you choose IMAP, it's the
-        <guilabel>Inbox</guilabel> of a folder with the same name as
-        your mail server.  That's so you can maintain several distinct
-        IMAP servers if you want.  See <xref
-        linkend="config-prefs-mail"> for more information about mail
-        servers.
-      </para>
-      <para>
-        Regardless of where you keep your mail, you can click
-	<guibutton>Get mail</guibutton> in the toolbar to check your
-	mail.  The first time you do that, the <interface>mail setup
-	assistant</interface> will ask you for the information it
-	needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information).  If
-	you're checking mail over a network (instead of from local
-	<systemitem><filename>mbox</filename></systemitem> files),
-	you'll need to enter your email password.  Type it in, click
-	<guibutton>OK</guibutton> and
-	<application>Evolution</application> will download your mail.
-	New mail will appear in your <interface>Inbox</interface>.
+	Click <guibutton>Get mail</guibutton> in the toolbar to check
+	your mail.  If it's the first time you've done so, the
+	<interface>mail setup assistant</interface> will ask you for
+	the information it needs to check your mail (see <xref
+	linkend="config-setupassist"> for more information). 
+     </para>
+     <para>
+        Then, you need to enter your email
+        password. <application>Evolution</application> will remember
+        the password until you quit the application or until you
+        select <menuchoice> <guimenu>Settings</guimenu>
+        <guimenuitem>Forget Passwords</guimenuitem> </menuchoice>.
       </para>
       <para>
-        Once you've entered your password,
-        <application>Evolution</application> will hold it in memory so
-        that you don't have to retype it every time you want to check
-        mail.  It will only remember the password until you quit the
-        application; each time you run
-        <application>Evolution</application>, you need to re-enter
-        your password.  If you'd like
-        <application>Evolution</application> to forget your password
-        sooner, select
-        <menuchoice><guimenu>Settings</guimenu><guimenuitem>Forget
-        Passwords</guimenuitem></menuchoice>, and it will do so
-        immediately.
+        Once it's validated the password,
+	<application>Evolution</application> will check your mail.
+	New mail will appear in the local <interface>Inbox</interface>
+	if you're using a <glossterm>POP</glossterm> account, and in
+	your <glossterm>IMAP</glossterm> folders if you use IMAP.
       </para>
-      <para>
-	If you get an error message instead of mail, you probably
-	need to change your network settings.  To learn how to
-	do that, have a look at <xref
-	linkend="config-prefs-mail-network">, or ask your system
-	administrator.
+   
+     <note id="badmailsettings">
+     <title>Can't Check Mail?</title> 
+     <para>
+	If you get an error message instead of mail, you probably need
+	to change your network settings.  To learn how to do that,
+	have a look at <xref linkend="config-prefs-mail-network">, or
+	ask your system administrator.
       </para>
-      
+    </note>
+
       <sect3 id="usage-mail-getnsend-get-news">
          <title>Using Evolution for News </title>
        <para>
@@ -223,23 +195,22 @@
          read them side by side.  If you want to do that, add a news
          source to your configuration (see <xref
          linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look exactly like an IMAP
-         folder, except that you can't delete messages from it.  When
-         you click <guibutton>Get Mail</guibutton>,
+         appear as a remote server, and will look quite similar to an
+         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
          <application>Evolution</application> will also check for news
-         messages.  If you prefer to use a different program, there's
-         always <application>Pan</application>.
+         messages.
        </para>
        </sect3>
 
       <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Attachments, HTML Mail, and Live Documents</title>
+	<title>Attachments and HTML Mail</title>
 	<para>
-	  If someone sends you a file attached to an email (an
-	  "attachment"), <application>Evolution</application> will
-	  display the file at the bottom of the message to which it's
-	  attached.  Text, HTML, and most images will be displayed in
-	  the message itself.  For other files,
+	  If someone sends you an <glossterm>attachment</glossterm>, a
+	  file attached to an email,
+	  <application>Evolution</application> will display the file
+	  at the bottom of the message to which it's attached.  Text,
+	  HTML, and most images will be displayed within the message
+	  itself.  For other files,
 	  <application>Evolution</application> will provide a link and
 	  icon at the end of the message.  Click on that, and
 	  <application>Evolution</application> will ask you where you
@@ -247,6 +218,12 @@
 	  saved the file, you can open, move, copy, or execute it just
 	  like any other, using <application>Nautilus</application> or
 	  your favorite shell or file manager.
+        </para>
+        <para>
+          As usual, there's a shortcut here: right-click on the link,
+	  and choose an application for the file: you can send an
+	  image straight to the <application>GIMP</application>, or a
+	  spredsheet straight to <application>Gnumeric</application>.
 	</para>
 
 	<para>
@@ -255,7 +232,6 @@
 	   formatting will display automatically, although you can
 	   turn it off if you prefer.
 	</para>
-
       </sect3>
     </sect2>
 
@@ -289,10 +265,10 @@
 	 Enter an address in the <guilabel>To:</guilabel> field, a
 	 subject in the <guilabel>Subject:</guilabel> and a message in
 	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.  That's easy.  It may even be
-	 too easy, which is why I like to queue my messages up to be
-	 sent a few minutes later.
+	 <guibutton>Send</guibutton>.  That's easy, although it can
+	 get a little more complicated if you want.
        </para>
+
       <sect3 id="usage-mail-getnsend-send-delay">
 	<title>Saving Messages for Later</title>
 	<para>
@@ -309,6 +285,11 @@
 	   send anything I'll regret the next day.
 	</para>
 	<para>
+	   To learn more about how you can specify message queue and
+	   filter behavior, see <xref linkend="config-prefs-mail">.
+	</para>
+
+	<para>
            You can also choose to save messages as drafts or as text
            files.  Choose
            <menuchoice>
@@ -322,23 +303,20 @@
           <guimenu>File</guimenu> <guimenuitem>Save In
           Folder</guimenuitem> </menuchoice>.
         </para>
-	<para>
-	   To learn more about how you can specify message queue and
-	   filter behavior, see <xref linkend="config-prefs-mail">.
-	</para>
-	
-	<para>
+      </sect3>
+      <sect3 id="usage-mail-getnsend-send-compose">
+        <title>Advanced Mail Composition</title>
+        <para>
 	  You can probably guess the purpose of the buttons labelled
 	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
 	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton> , but there's a bit more to
+	  and <guibutton>Redo</guibutton>, but there's a bit more to
 	  sending mail that's less obvious.  In the next few sections,
 	  you'll see how <application>Evolution</application> handles
 	  additional features, including large recipient lists,
 	  attachments, and forwarding.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-attach">
+      <sect4 id="usage-mail-getnsend-send-attach">
 	<title>Attachments</title>
 	<para>
 	    If you want to attach a file to your email message, you
@@ -353,58 +331,28 @@
 	<para>
             To see what files you've attached to the message you're
             composing, select <menuchoice> <guimenu>View</guimenu>
-            <guimenuitem>Show Attachments</guimenuitem> </menuchoice>.
+            <guimenuitem>Show Attachments</guimenuitem> </menuchoice>;
+            to hide them again, choose <guimenuitem>Hide
+            Attachments</guimenuitem>.
         </para>
 	<para>
             When you send the message, a copy of the attached file
 	    will go with it.  Be aware that big attachments can take a
 	    long time to download.
           </para>
-	</sect3>
-        <sect3 id="usage-mail-getnsend-send-to">
-	<title>Choosing Recipients</title>
-	<para>
-	  If you have created address cards in the contact manager,
-	  you can also enter nicknames or other portions of address
-	  data, and <application>Evolution</application> will complete
-	  the address for you. <!-- (INSERT description of UI for this
-	  feature, once it is decided upon). --> If you enter a name
-	  or nickname that can go with more than one card, Evolution
-	  will open a dialog box to ask you which person you meant.
-	  <!-- (NOT YET) Also, <application>Evolution</application>
-	  will add a domain to any unqualified addresses.  By default,
-	  this is your domain, but you can choose which one mail
-	  preferences dialog. -->
-        </para>
+	</sect4>
+        <sect4 id="usage-mail-getnsend-send-to-types">
+         <title>Types of Recipients</title>
         <para>
-          Alternately, you can click on the
-          <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-          <guibutton>Bcc:</guibutton> buttons to get a list of email
-          addresses.  Click the check-boxes next to the addresses, then
-          click <guibutton>OK</guibutton>, and the address will be
-          added to the appropriate form field.
-        </para>
-	<para>
-          For more information about using email together with the
-	  contact manager and the calendar, see <xref
-	  linkend="usage-contact-automate"> and <xref
-	  linkend="usage-calendar-apts">.
-	</para>
-
-	<sect4 id="usage-mail-getnsend-send-to-mult">
-	  <title>Multiple Recipients</title>
-	  <para>
 	    <application>Evolution</application>, like all email
 	    programs (at least, all the ones in current use)
 	    recognizes three types of addressee: primary recipients,
-	    secondary recipients, and hidden ("blind") recipients. The
-	    <guilabel>To:</guilabel> field is for the primary
-	    recipients of the message you are going to send.  
+	    secondary recipients, and hidden ("blind") recipients.
          </para>
          <para>
 	    The simplest way to direct a message is to put the email
             address or addresses in the <guilabel>To:</guilabel>
-            field, to denote primary recipients.  However, it is
+            field, which denotes primary recipients.  However, it's
             considered bad form to have more than a few email
             addresses in this section.  If you are sending mail to
             more than one or two people, consider the
@@ -455,24 +403,57 @@
 	    </example>
 	  </para>
 	</sect4>
-      </sect3>
 
-   <sect3 id="usage-mail-getnsend-send-reply">
+        <sect4 id="usage-mail-getnsend-send-to">
+	<title>Choosing Recipients Quickly</title>
+	<para>
+	  If you have created address cards in the contact manager,
+	  you can also enter nicknames or other portions of address
+	  data, and <application>Evolution</application> will complete
+	  the address for you. <!-- (INSERT description of UI for this
+	  feature, once it is decided upon). --> If you enter a name
+	  or nickname that can go with more than one card, Evolution
+	  will open a dialog box to ask you which person you meant.
+	  <!-- (NOT YET) Also, <application>Evolution</application>
+	  will add a domain to any unqualified addresses.  By default,
+	  this is your domain, but you can choose which one mail
+	  preferences dialog. -->
+          </para>
+	  <para>
+            Alternately, you can click on the
+            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
+            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
+            potentially a very long one &mdash; of the email addresses
+            in your contact manager.  Select addresses and click on
+            the arrows to move them into the appropriate address
+            columns.
+          </para>
+	  <para>
+            For more information about using email together with the
+	    contact manager and the calendar, see <xref
+	    linkend="usage-contact-automate"> and <xref
+	    linkend="usage-calendar-apts">.
+	  </para>
+        </sect4>
+      </sect3>
+      
+      <sect3 id="usage-mail-getnsend-send-reply">
 	<title>Replying to Messages</title>
 	<para>
-	   In order to reply to a message, click on it once in the
-	   message list to select it.  Then press the
-	   <guibutton>Reply</guibutton> button.  A window like the
-	   <interface>New Message</interface> window will appear, but
-	   the subject will already be present&mdash; the same subject
-	   as the message to which you are replying, but with Re:
-	   before it, to mark it as a reply.  In addition, the full
-	   text of the previous message is inserted into the new
-	   message, either in italics (for HTML display) or with the
-	   &gt; character (in plain text mode) before each line.  This
-	   indicates quoting.  You can intersperse your message with
-	   the quoted material as shown in <xref
-	   linkend="usage-mail-getnsend-reply-fig">
+	   To reply to a message, press the
+	   <guibutton>Reply</guibutton> button while it is selected,
+	   or choose <guimenuitem>Reply to Sender</guimenuitem> from
+	   the message's right-click menu.  That will open
+	   <interface>message composer</interface>.  The
+	   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>
+	   fields will already be filled, although you can alter them
+	   if you wish.  In addition, the full text of the old message
+	   is inserted into the new message, either in italics (for
+	   HTML display) or with the &gt; character (in plain text
+	   mode) before each line, to indicate that it's part of the
+	   previous message.  People often intersperse their message
+	   with the quoted material as shown in <xref
+	   linkend="usage-mail-getnsend-reply-fig">.
 
 <!-- note that this figure should have a reply mail ready to send,
 with quoted materials and the relevant replies interspersed-->
@@ -489,15 +470,14 @@ with quoted materials and the relevant replies interspersed-->
 	</para>
 
 	<para>
-	  If a message has several recipients, as in the case of
-	  mailing lists or messages that have been carbon copied, you
-	  may wish to click <guibutton>Reply to All</guibutton>
-	  instead of <guibutton>Reply</guibutton>.  If there are large
-	  numbers of people in the <guilabel>Cc:</guilabel> or
-	  <guilabel>To:</guilabel> fields, this can save substantial
-	  amounts of time.  But be careful, and always make sure you
-	  know who is getting a message: it could be a mailing list
-	  with thousands of subscribers.
+	  If you're reading a message with several recipients, you may
+	   wish to use <guibutton>Reply to All</guibutton> instead of
+	   <guibutton>Reply</guibutton>.  If there are large numbers
+	   of people in the <guilabel>Cc:</guilabel> or
+	   <guilabel>To:</guilabel> fields, this can save substantial
+	   amounts of time.  But be careful, and always make sure you
+	   know who is getting a message: one address could be a
+	   mailing list with thousands of subscribers.
 	  <example>
 	    <title>Using the Reply to All feature</title>
 	    <para>
@@ -552,7 +532,7 @@ with quoted materials and the relevant replies interspersed-->
 	    <varlistentry>
 	       <term><guimenuitem>Replace</guimenuitem></term>
 	       <listitem><para> 
-                 Find a word or phrase, replace it with
+                 Find a word or phrase, and replace it with
 	         something else.  
                </para></listitem>
 	    </varlistentry>
@@ -575,11 +555,13 @@ with quoted materials and the relevant replies interspersed-->
 	<para>
             You can't normally use text treatments or pictures in
             emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to convey their feelings.
-            However, most of the newer email programs can include and
-            display images and text treatments as well as basic
-            alignment and paragraph formatting.
+            too many exclamation points for emphasis or use <glossterm
+            linkend="emoticon">emoticons</glossterm> to convey their
+            feelings.  However, most of the newer email programs can
+            include and display images and text treatments as well as
+            basic alignment and paragraph formatting. They do this
+            with <glossterm linkend="html">HTML</glossterm>, just like
+            web sites do.
         </para>
 	<note>
 	  <title>HTML Mail is not a Default Setting</title>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 900f8a8866..c6a252ac78 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -50,11 +50,9 @@
 	The appearance of both <application>Evolution</application>
 	and <application>GNOME</application> is very easy to
 	customize, so your screen might not look like this picture.
-	You might configure <application>Evolution</application> to
-	start with a different view, without the <interface>shortcut
-	bar</interface>, or with the <link
-	linkend="usage-mainwindow-folderbar">folder bar</link>
-	instead.
+	You might decide to have <application>Evolution</application>
+	start with the calendar and a folder bar, or with the contact
+	manager occupying the entire window.
       </para>
     </note>
   </para>
@@ -70,10 +68,10 @@
         like <guilabel>Inbox</guilabel> and
         <guilabel>Contacts</guilabel> are the shortcuts, and you can
         select different groups of shortcuts by clicking the
-        rectangular category buttons.
+        rectangular group buttons.
     </para>
     <para>
-       The category buttons are <guibutton>Evolution
+       The shortcut group buttons are <guibutton>Evolution
        Shortcuts</guibutton> and <guibutton>Internet
        Directories</guibutton>.  When you click on them, they'll slide
        up and down to give you access to different sorts of shortcuts.
@@ -83,9 +81,12 @@
        Directories</guilabel>, it will slide up and you'll see buttons
        for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator might have added.
-       Internet directories behave a lot like the local contact
-       manager, which is covered in <xref linkend="usage-contact">.
+       others you or your system administrator might have added. You
+       can add more groups by right-clicking on the background of the
+       shortcut bar and selecting <guimenuitem>Menu
+       Group</guimenuitem>.  Internet directories behave a lot like
+       the local contact manager, which is covered in <xref
+       linkend="usage-contact">.
        </para>
     <para>
        Take a look at the <guilabel>Evolution Shortcuts</guilabel>
@@ -192,16 +193,6 @@
          empty space on the shortcut bar.  From the menu that appears,
          you can select icon sizes.
        </para>
-       <para>
-         You don't need the folder bar to move between folders. You
-         can use <menuchoice> <guimenu>File</guimenu> <guimenuitem>Go
-         to Folder...</guimenuitem> </menuchoice> to move to a
-         particular folder.  It's faster, however, to click on the
-         <guilabel>Inbox</guilabel> label just below the toolbar, to
-         the right of the shortcut bar, and select a folder from
-         there.  The <guilabel>Inbox</guilabel> label will change to
-         reflect your location in the folder tree.
-       </para>
     </tip>
   </sect1>
 
@@ -258,6 +249,16 @@
       </itemizedlist>
 
     </para>
+    <tip id="foldertips">
+    <title>Navigating without the Folder Bar</title>
+       <para>
+         You don't need the folder bar or the shortcut bar to move
+         around the main window. You can use <keycap>Tab</keycap> to
+         switch from one part of the window to another, and the folder
+         menu on the right side of the window just below the toolbar
+         to move about the folder tree.
+       </para>
+     </tip>
 
     <para>
        To create a new folder, select <menuchoice>
@@ -295,11 +296,11 @@
     <tip>
      <title>Context-Sensitive Help</title>
       <para>
-	GNOME 2.0 supports context-sensitive help, which means you can
-	almost always get help on an item by right-clicking it.  If
-	you're not sure what something is, or don't know what you can
-	do with it, choosing <guimenuitem>Help</guimenuitem> from the
-	right-click menu is a good way to find out.
+	GNOME 2.0 will support context-sensitive help, which means you
+	can almost always get help on an item by right-clicking it.
+	If you're not sure what something is, or don't know what you
+	can do with it, choosing <guimenuitem>Help</guimenuitem> from
+	the right-click menu is a good way to find out.
       </para>
     </tip>
 
diff --git a/doc/COPYING-DOCS b/doc/COPYING-DOCS
new file mode 100644
index 0000000000..b42936beb3
--- /dev/null
+++ b/doc/COPYING-DOCS
@@ -0,0 +1,355 @@
+		GNU Free Documentation License
+		   Version 1.1, March 2000
+
+ Copyright (C) 2000  Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document "free" in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially.  Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License.  The "Document", below, refers to any
+such manual or work.  Any member of the public is a licensee, and is
+addressed as "you".
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent.  A copy that is
+not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification.  Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols.  If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has less than five).
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section entitled "History", and its title, and add to
+   it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. In any section entitled "Acknowledgements" or "Dedications",
+   preserve the section's title, and preserve in the section all the
+   substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+   or to conflict in title with any Invariant Section.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled "History"
+in the various original documents, forming one section entitled
+"History"; likewise combine any sections entitled "Acknowledgements",
+and any sections entitled "Dedications".  You must delete all sections
+entitled "Endorsements."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation.  Such a compilation is called an "aggregate", and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License provided that you also include the
+original English version of this License.  In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.1
+      or any later version published by the Free Software Foundation;
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+      A copy of the license is included in the section entitled "GNU
+      Free Documentation License".
+
+If you have no Invariant Sections, write "with no Invariant Sections"
+instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of
+"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 24f5d8c955..3b2a5968d3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,25 @@
+
+2000-11-01  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Fixed validation errors.
+
+	* C/apx-gloss.sgml: Fixed HTML, style stuff.
+
+	* C/usage-mail.sgml: Stylistic overhaul.
+
+	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
+	folder navigation tips.	
+
+2000-10-31  Aaron Weber  <aaron@helixcode.com>
+
+	* C/preface.sgml: Minor stylistic revisions.
+
+2000-10-30  Aaron Weber  <aaron@helixcode.com>
+
+	* COPYING-DOCS: New file. This is the official place to put the
+	FDL now.
+	
+
 2000-11-01  Radek Doulik  <rodo@helixcode.com>
 
 	* Keybindings: added composer keybindings description