From c984377de34d179929865b11bfc3b5aee96abaa1 Mon Sep 17 00:00:00 2001
From: Kevin Breit <battery841@mediaone.net>
Date: Tue, 28 Aug 2001 17:27:14 +0000
Subject: Renamed a xref to make it work.

2001-08-28  Kevin Breit  <battery841@mediaone.net>

	* C/usage-mail.sgml: Renamed a xref to make it work.

	* C/config-prefs.sgml: Updated for new LDAP UI.

svn path=/trunk/; revision=12499
---
 help/C/config-prefs.sgml  | 128 ++++++++++++++++++++++++++++++++++------------
 help/C/usage-contact.sgml |  23 +++------
 help/C/usage-mail.sgml    |   2 +-
 help/ChangeLog            |   6 +++
 4 files changed, 109 insertions(+), 50 deletions(-)

diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index f702f304c0..3e51c921ed 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -215,6 +215,12 @@
 	    </varlistentry>
 	  </variablelist>
           </para>
+	<note>
+	  <title>Encrypting Your Transmission</title>
+	  <para>
+	    Some servers require that the connection used to download email is encrypted.  <application>Evolution</application> supports encrypting the connection to servers.  To enable this, just click <guibutton>Use Secure Connection(SSL)</guibutton> in the Recieving Mail tab of the Account Editor.
+	  </para>
+	</note>
           <para>
             If you have several mail sources, clicking <guibutton>Get
             Mail</guibutton> will refresh any IMAP,
@@ -294,6 +300,7 @@
          </para>
 	</sect3>
       </sect2>
+
 <!-- NOT FOR 1.0, see usage-mail.sgml
       <sect2 id="config-prefs-network-news">          
           <title>News Servers</title>
@@ -508,7 +515,7 @@
 	    <para> <guilabel>To-Do item that is not yet
              due:</guilabel> Text color for To-Do list items that are
              not yet due. 
-               </para>
+	    </para>
 	  </listitem>
 
 
@@ -629,43 +636,100 @@
            <title>Adding Directory Servers</title>
            <para>
               To add a new LDAP server to your available contact
-              folders, select <menuchoice> <guimenu>Actions</guimenu>
-              <guimenuitem>New Directory Server</guimenuitem>
-              </menuchoice>.  This brings up a small dialog box which
-              will let you enter the following options:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Name</guilabel> &mdash; any name you choose for the server.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Description</guilabel> &mdash; a longer description of the server.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>LDAP Server</guilabel> &mdash; the network address of the server.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Port Number</guilabel> &mdash; by default, the port number is 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>Root DN</guilabel> &mdash; enter the root DN here.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
+              folders:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Select 
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>Addressbook Sources</guimenuitem>
+	      </menuchoice>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Add</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Enter the server information.
+	      <variablelist>
+		<varlistentry>
+		  <term>Account name</term>
+		  <listitem>
+		    <para>
+		      The name that you see on the screen.  This could be anything you wish.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Server name</term>
+		  <listitem>
+		    <para>
+		      Address of the server where the addressbook is located.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>My server requires authentication</term>
+		  <listitem>
+		    <para>
+		      Select this if the server needs a password to access the addressbook.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Port</term>
+		  <listitem>
+		    <para>
+		      The internet port to connect to in order to access the database.  This is normally 389.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Search base</term>
+		  <listitem>
+		    <para>
+		      The base node to use for all your searches.  Contact your administrator for information about setting this up.
+		    </para>
+		  </listitem>
+		</varlistentry>
+		<varlistentry>
+		  <term>Search scope</term>
+		  <listitem>
+		    <para>
+		      The scope of the search <!-- FIXME: THIS DEFINITION SUCKS -->
+		    </para>
+		  </listitem>
+		</varlistentry>
+	      </variablelist>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton>.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>OK</guibutton> to permanenty make changes or <guibutton>Apply</guibutton> to temporarily set the changes.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+  </sect1>
     
 
 
   <sect1 id="config-prefs-general">
     <title>General Preferences</title> 
     <para>
-          Additional configuration options will be covered here, as
-          they become available.
-        </para>
+      Additional configuration options will be covered here, as
+      they become available.
+    </para>
   </sect1>
 </chapter>
     
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index ec3d504f6b..0d469af19b 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -516,18 +516,7 @@
      </para>
   </sect1>
 
-  <sect1 id="usage-contact-automate">
-    <title>Address Book Tools</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
+    <sect1 id="contact-automation-basic">
       <title>Send me a Card: Adding New Cards Quickly</title>
       <para>
 	As noted before, when you get information about a person in
@@ -539,9 +528,9 @@
 	hand-held device during HotSync operation.  For more
 	information about that, see <xref linkend="usage-sync">.
       </para>
-    </sect2>
+    </sect1>
 
-    <sect2 id="contact-automation-lists">
+    <sect1 id="contact-automation-lists">
       <title>Managing a Mailing list</title>
       <para>
 	 You already know that when you are writing an email, you can
@@ -564,9 +553,9 @@
       </para>
  -->
 
-    </sect2>
+    </sect1>
     <!---  FIXME this feature not yet implemented 
-  <sect2 id="usage-contact-automation-extra">
+  <sect1 id="usage-contact-automation-extra">
   <title>Map It!</title>
   <para>
     Need a map or directions? Click
@@ -578,5 +567,5 @@
     -->
     
     
-  </sect1>
+
 </chapter> 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index ef02915fd3..6e42c4ab2f 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -650,7 +650,7 @@
           <para>
             For more information about using email together with the
             contact manager and the calendar, see <xref
-            linkend="usage-contact-automate"> and <xref
+            linkend="contact-automation-basic"> and <xref
             linkend="usage-calendar-apts">.
           </para>
         </sect3>
diff --git a/help/ChangeLog b/help/ChangeLog
index 2b26cc5bfb..e1287d23e4 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-28  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-mail.sgml: Renamed a xref to make it work.
+
+	* C/config-prefs.sgml: Updated for new LDAP UI.
+
 2001-08-24  Kevin Breit  <battery841@mediaone.net>
 
 	* C/usage-mail.sgml: Added info about tables, rules, and images
-- 
cgit