wide variety of changes.

svn path=/trunk/; revision=24954

8 files changed, 113 insertions, 131 deletions

diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
index 25af814538..2c19dceef0 100644
--- a/help/C/config-prefs.xml
+++ b/help/C/config-prefs.xml
@@ -437,7 +437,7 @@ smtp.omniport.com:143
       <para>
         There are three sets of folder options. In the first,
         <guilabel>Default Folders</guilabel>, select which folders will be
-        your usual mail, address book, calendar, and tasks
+        your usual mail, contacts, calendar, and tasks
         folders. When you save a contact or appointment attached to an
         email, it will be stored in your default contact or calendar
         folder.
@@ -567,7 +567,7 @@ smtp.omniport.com:143
              patterns to confirm "live" addresses and invade your
              privacy. You may elect never to load images
              automatically, to load images only if the sender is in
-             your address book, or always load images.
+             your contacts, or always load images.
            </para>
            <para>
              If you have chosen not to load images automatically, you
@@ -593,7 +593,7 @@ smtp.omniport.com:143
            <para>
              Some people do not like HTML mail, and you can set
              Evolution to warn you. This warning will appear only
-             when you send HTML mail to people in your address book
+             when you send HTML mail to people in your contacts 
              who are listed as disliking HTML.
            </para>
          </listitem>
@@ -900,41 +900,41 @@ smtp.omniport.com:143
   <sect1 id="config-prefs-contact">
     <title>Directory Servers</title>
     <para>
-        Address book settings are limited to the usage and
+        Contacts settings are limited to the usage and
         configuration of directory servers (LDAP and
       Exchange). To learn how to set autocompletion options, see <xref
       linkend="config-prefs-folders" />.
-      Other address book controls are available in the address book
-      window itself.
+      Other contacts controls are available in the contacts tool.
     </para>
       
       <para>
-        To add a new address book, either local or remote, do the following:
+        To add a new group of contacts, either local or remote, do the following:
     </para>
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-              Open the address book by clicking the
+              Go to the contacts tool by clicking the
               <guilabel>Contacts</guilabel> button.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-              Right-click on the list of address books and select <guimenuitem>New Address</guimenuitem>
+              Right-click on the shortcut bar's list of contact groups,
+              and select <guimenuitem>New Contact Group</guimenuitem>.
 	    </para>
 	  </listitem>
           <listitem>
             <para>
-            Select a name and group for the address book. The name is
-              for display only. </para>
+              Select a name and location for the contact group. The name
+              is for display only. </para>
 
             </listitem>
 
             <listitem>
               <para>
-                Click <guilabel>Forward</guilabel>.  If the address book is stored locally,
-              in the <guilabel>On This Computer</guilabel> group, then
-              you don't have to provide any more information. Click
+                Click <guilabel>Forward</guilabel>.  If the contact
+              group is stored locally, then you don't have to
+              provide any more information. Click
               <guilabel>OK</guilabel> and you are done.
               </para>
             </listitem>
@@ -951,7 +951,7 @@ smtp.omniport.com:143
                   <term><guilabel>Server name</guilabel></term>
 		  <listitem>
 		    <para>
-		      Address of the server where the address book is located.
+		      Internet address of the contact server you'll be using.
 		    </para>
 		  </listitem>
 		</varlistentry>
diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index c39ec0f034..f442d31bf6 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -33,7 +33,7 @@ entity names correspond.  APX is for appendix.  -->
 
 <!-- STYLE RULES:
 * Use "guilabel" instead of "guibutton" everywhere.
-* "Address Book" is two words, used instead of "Contacts" where possible.
+* "Address Book" is two words, but it's better to use "Contacts", Contact, or Contact List
 * The "application" tag is not used around "Evolution."
 * Filenames use  command tags so they appear in the same font as commands 
 * There is one bar and it is the Shortcut Bar. The folder bar is dead. -->
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
index 3bd09b9d19..cb282c66ae 100644
--- a/help/C/menuref.xml
+++ b/help/C/menuref.xml
@@ -50,21 +50,6 @@
 	    </listitem>
 	  </varlistentry>
 -->
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
 
 	  <varlistentry>
 	    <term>Create a new email message:</term>
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
index 2f152a2320..24b4be595e 100644
--- a/help/C/usage-calendar.xml
+++ b/help/C/usage-calendar.xml
@@ -345,7 +345,7 @@
 	      attendee</guilabel> to enter the names and email
 	      addresses of people you will invite, or click the
 	      <guilabel>Invite Others</guilabel> to select them from
-	      your address book.
+	      your contacts.
 	    </para>
 	  </listitem>
 	  <listitem>
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
index d489ffb6e7..de49efdea7 100644
--- a/help/C/usage-contact.xml
+++ b/help/C/usage-contact.xml
@@ -6,10 +6,10 @@
   <title>Working with Your Contacts</title>
       <para>
         This chapter will show you how to use the
-        Evolution address book to organize
+        Evolution contacts tool to organize
         any amount of contact information, share addresses over a
         network, and several ways to save time with everyday tasks. To
-        learn about configuring the address book, see <xref
+        learn about configuring the contacts tool, see <xref
         linkend="config-prefs-contact"/>. You can import contacts from
         other contact management tools with the Import tool by
         selecting
@@ -18,7 +18,7 @@
       </para>
 
     <para>
-       The toolbar for the address book is quite simple.
+       The toolbar for the contacts tool has the following items:
        <itemizedlist>
 	<listitem><para>
 	  Click <guilabel>New Contact</guilabel> to create a new card, or double-click 
@@ -26,8 +26,9 @@
 	</para></listitem>
 
 	<listitem><para>
-           Click <guilabel>New List</guilabel> to create a new card, or double-click 
-           in a blank space in the contact list. 
+           Click <guilabel>New List</guilabel> to create a new
+        contacts list, which is a convenient handle for a group of
+        other contact cards.
 	</para></listitem>
 
 	<listitem><para> The <guiicon>printer</guiicon> icon sends one
@@ -48,6 +49,14 @@
        them more quickly, which is why there's a search feature.
     </para>
 
+    <para>
+      When you click on a card, the bottom portion of the page will
+      show more detailed information about the contact. There is also
+      a <guilabel>Map</guilabel> button, which you can click to bring
+      up a web page with a map of the contact's main postal address.
+    </para>
+
+
   <sect1 id="usage-contact-cards">
     <title>The Contact Editor</title>
     <para>
@@ -320,15 +329,16 @@
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
+    <title>Organizing your Contacts</title>
     <para>
-       Organizing your address book is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow Virtual Folders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category"/>.
+      Just as you can search mail, you can search contacts, although the
+      contacts tool does not use folders or virtual folders. You can,
+      however, create several contact groups, which are basically
+      the same thing as folders or or individual address books.
+      Contact groups may be on your own computer or on the
+      network. Within a given contact group, you can have several
+      categories of contacts. To learn about categories, read <xref
+      linkend="usage-contact-organize-group-category" />.
     </para>
 
 <!-- UNIMPLEMENTED FEATURE
@@ -343,45 +353,25 @@
 -->
 
     <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         Evolution offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way mail folders do.  For more
-         flexibility, you can also mark contacts as elements of
-         different categories.  To better integrate with email tools,
-         you can also create lists of contacts that you can send mail
-         to as a single person.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
+ 	<title>Contact Groups</title>
 	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
+           The simplest way to organize contacts is to create
+          additional groups of contacts.  If you've read <xref
 	   linkend="usage-mainwindow"/> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category"/>.
+	   can create a new folder by right-clicking in the shortcut
+        bar and choosing <guilabel>New Contact Group</guilabel>. For
+        contact groups on your computer, you only need a name. For
+        contacts on the network, you will need to provide more
+        information about the contacts server you are trying to access.
 	 </para>
 	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
+          To move a card from one group to another, just drag it there
+          from the main display of contacts. Note that you will not be
+          able to change the contents of most network contact groups.
          </para>
-      </sect3>
+      </sect2>
       
-      <sect3 id="usage-contact-organize-group-category">
+      <sect2 id="usage-contact-organize-group-category">
 	<title>Grouping with Categories</title>
 	<para>
            The other way to group cards is to mark them as belonging
@@ -412,12 +402,18 @@
          </para>
        -->
 
-      </sect3>
+      </sect2>
 
-      <sect3 id="usage-contact-organize-group-list">
+      <sect2 id="usage-contact-organize-group-list">
 	<title>Creating a List of Contacts</title>
 	<para>
-           To create a list of contacts:
+          A contact list is a set of contacts with a single nickname
+          that you create. When you send email to the nickname, it is sent to
+          every member of the list. This differs from a network
+          mailing list in that it exists only on your computer as a
+          convenience to you, rather than as an actual email address
+          managed by a mailing list application on a server. To
+          create a list of contacts:
 
          <orderedlist numeration="arabic">
 	    <listitem>
@@ -473,28 +469,26 @@
            To mail the list, open a new email and type the name you
            chose for the list. Ximian Evolution will address the
            message to the entire list when you send it. You can also
-           right-click on the list's address card in the address book
+           right-click on the list's address card in the contacts tool
            and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
         <para>
            Ximian Evolution cannot store contact lists on Exchange
            servers.
         </para>
-
-      </sect3>
     </sect2>
   </sect1>
   
   <sect1 id="usage-contact-sharing">
-    <title>LDAP: Shared Address Books on a Network</title>
+    <title>LDAP: Shared Contact Groups on a Network</title>
 
     <para>
       The <glossterm linkend="ldap">LDAP</glossterm> protocol was
       created to let users share contact information over a network by
-      sharing access to a central address book.  LDAP allows a company
-      to maintain a shared set of contact information for a company or
-      department.  Many companies keep a common LDAP address book for
-      all their employees or for client contacts.
+      sharing access to a central directory.  LDAP allows a company
+    to maintain a shared set of contact information.  Many companies
+    keep a common LDAP address book for all their employees or for
+    client contacts.
     </para>
 
     <para>
@@ -521,19 +515,21 @@
 	    <para>
               To prevent excess network traffic,
               Evolution will not normally
-              load the contents of LDAP folders immediately upon
+              load data from the LDAP server immediately upon
               opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
+              All</guilabel> before contacts will be loaded
               from the network. You can change this behavior in the
               <interface>Contact Preferences</interface> window.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-              You cannot add, delete, or alter cards on the LDAP
-              server. If you need to change information there, you
-              will need to speak to your system administrator
-	    </para>
+	      Depending on your server settings, you may not be able to edit
+	      all the fields in a contact stored on an LDAP server. Some
+  	      servers prohibit some or all changes, and others use a smaller
+	    set of fields than Evolution allows. Check with your system
+	    administrator if you need different settings.
+            </para>
 	  </listitem>
 	</itemizedlist>
     </para>
@@ -553,7 +549,7 @@
       As noted before, when you get information about a person in
       the mail or in a calendar entry, you can add it to an address
       card.  To do so, right click on any email address or email
-      message, and select <guimenuitem>Add Sender to Address Book</guimenuitem> from the menu that appears.
+      message, and select <guimenuitem>Add Sender to Contacts</guimenuitem> from the menu that appears.
        Evolution can also add cards from a
       hand-held device during HotSync operation.  For more
       information about that, see <xref linkend="usage-sync"/>.
@@ -562,19 +558,14 @@
   
 <!-- Unimplemented features:
       <para>
-         You can also use the address book to print postal addresses
+         You can also use the contacts tool to print postal addresses
 	 on mailing labels.  Future versions of
 	 Evolution will allow you to you
 	 export a group of cards to a spreadsheet, database, or word
 	 processor so you can print address labels or prepare large
 	 mailings.
-      </para>
-  <para>
-    Need a map or directions? Click <guilabel>MapIt</guilabel> from
-  within the address book, and Evolution
-  will map the address for you online.
-  </para>
-  -->
+      </para> -->
+
 </chapter> 
 
 
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 7573d3cbaa..506f241730 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -61,7 +61,7 @@
             <term>LDAP Data Interchange Format (LDIF):</term>
             <listitem>
               <para>
-                A standard data format for address book cards.
+                A standard data format for contact cards.
               </para>
             </listitem>
           </varlistentry>
@@ -331,8 +331,8 @@
     <sect1 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
       <para>
-	Ximian Evolution keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
+      Ximian Evolution, like most other mail systems, stores mail in
+        folders.  You start out with a
 	few mail folders, such as <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
 	but you can create as many as you like.  Create new folders by
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index 4f2d747663..7a608f206e 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -457,8 +457,7 @@
 	   button. There, click the <guilabel>HTML
            Mail</guilabel> tab and select one of the items there:
            <guilabel>Never load images off the net</guilabel>,
-           <guilabel>Load images if sender is in address
-           book</guilabel>, or <guilabel>Always load images off the
+           <guilabel>Load images in mail from contacts</guilabel>, or <guilabel>Always load images off the
            net.</guilabel>
       </para>
       <note id="http-proxy">
@@ -521,6 +520,7 @@
       <guilabel>Send</guilabel>.
     </para>
 
+
     <sect2 id="usage-mail-getnsend-send-charsets">
       <title>Unicode, ASCII, and Non-Latin Alphabets</title>
 
@@ -756,7 +756,7 @@
 
          <para>
            If you frequently write email to the same groups of people,
-           you can create address lists in the Contact Manager, and
+           you can create address lists in the contacts tool, and
            then send them mail as though they had a single address.
            To learn how to do that, read <xref
            linkend="usage-contact-organize-group-list"/>.
@@ -797,22 +797,30 @@
         <sect3 id="usage-mail-getnsend-send-to">
 	      <title>Choosing Recipients Quickly</title>
 	      <para>
-		If you have created address cards in the contact manager,
+		If you have created address cards in the contacts tool,
           you can also enter nicknames or other portions of address
           data, and Evolution will offer a
           drop down list of possible address completions from your
-          address book.  If you enter a name or nickname that can go
+          contacts.  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. 
 
           </para>
 
+	<para>
+	 If Evolution does not complete addresses automatically, select
+	  <menuchoice><guimenu>Tools</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
+          and click the <guilabel>Autocompletion</guilabel>
+          button. There, select the groups of contacts you want to use
+          for address autocompletion in the mailer.
+       </para>
+
           <para>
             Alternately, you can click on the
             <guilabel>To:</guilabel>, <guilabel>Cc:</guilabel>, or
             <guilabel>Bcc:</guilabel> 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
+            in your contacts.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
           </para>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
index a303cc11d8..33342cff12 100644
--- a/help/C/usage-mainwindow.xml
+++ b/help/C/usage-mainwindow.xml
@@ -595,14 +595,12 @@
            <varlistentry>
 	    <term>VCard (.vcf, .gcrd):</term>
 	    <listitem>
-	      <para>
-	         The address book format used by the GNOME, KDE, and
+	      <para>The contact format used by the GNOME, KDE, and
 	         many other contact management applications. You
 	         should be able to export to VCard format from any
-                address book application. Failing that, export to CSV
+                 address book or contact application. Failing that, export to CSV
                 format and use the <command>csv2vcard</command>
-              utility before importing.
-	      </para>
+              utility before importing.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -662,9 +660,9 @@
           elsewhere if you want.
         </para>
 	<para>
-          For mail, that's <filename>mbox</filename>, for calendar,
-          <filename>iCal</filename>, and for the address book, vCards
-          in a <filename>.db3</filename> database.
+          For mail, that's <filename>mbox</filename>, for the calendar,
+          <filename>iCal</filename>, and for the contacts, a database that
+	    exports to vCards.
         </para>
       </tip>
     </para>
@@ -889,7 +887,7 @@ standard mbox file format, which
         is a list of folders for the current Evolution tool.
     </para>
     <para>
-      The folder list organizes your mail, calendars, address books,
+      The folder list organizes your mail, calendars, contact lists,
       and task lists in a tree, similar to a <glossterm linkend="filetree">file
       tree</glossterm>.  Most people will find one to four 
       folders at the base of the tree, depending on the tool and their
@@ -904,7 +902,7 @@ standard mbox file format, which
     <para>
        If you get large volumes of mail, you'll want more folders than
        just your Inbox; you can also create multiple calendar, task,
-      or address book folders. 
+      or contacts folders. 
     </para>
     <para>
       To create a new folder:
@@ -1246,9 +1244,9 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
 
     </sect2>
     <sect2 id="basics-contacts">
-      <title>Introducing the Address Book</title>
+      <title>Introducing the Contacts Tool</title>
       <para>
-        The Ximian Evolution address book
+        The Ximian Evolution contacts tool
         can handle all of the functions of an address book, phone
         book, or Rolodex.  Of course, it's a lot easier to update
         Evolution than it is to change an actual paper book. Ximian
@@ -1258,15 +1256,15 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
       <para>
         Another advantage of the Ximian Evolution
-        address book is its integration with the rest of the
+        contacts tool is its integration with the rest of the
         application.  For example, you can right-click on an email
         address in Evolution mail to create a contact entry instantly.
       </para>
       <para>
-        To open your address book, click on
-        <guilabel>Contacts</guilabel> in the shortcut bar.  <xref
+        To use the contacts tool, click the
+        <guilabel>Contacts</guilabel> button in the shortcut bar.  <xref
         linkend="usage-contact-fig"/> shows the address book in all its
-        organizational glory.  By default, the address book shows all
+        organizational glory.  By default, the display shows all
         your contacts in alphabetical order, in a <glossterm
         linkend="minicard">minicard</glossterm> view.  You can select
         other views from the <guimenu>View</guimenu> menu, and adjust
@@ -1274,7 +1272,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
         column dividers.
       </para>
       <para>
-        The address book looks like this:
+        The contacts tool looks like this:
 
       <figure id="usage-contact-fig">
 	<title>Ximian Evolution Contact Interface</title>
@@ -1292,7 +1290,7 @@ linkend="usage-mail-organize-vfolders">vFolder</link>, an advanced
       </para>
 
       <para>
-        The largest section of the address book lists your
+        The largest section of the contacts display shows a list of individual
         contacts. You can also search through the contacts in the same way
         that you search email folders, with the search tool on the
         right side of the toolbar.