Added Search Base as an entry Added Search Scope as an entry

2002-01-27  Kevin Breit  <mrproper@ximian.com>

	* C/apx-gloss.sgml: Added Search Base as an entry
	Added Search Scope as an entry

	* C/config-prefs.sgml: Fixed indenting, I guess.

	* C/usage-contact.sgml: Rewrote LDAP introduction paragraph
	Added information about setting up Evolution to use LDAP.  It's just a lazy xref.

svn path=/trunk/; revision=15488

help/C/apx-gloss.sgml

@@ -335,6 +335,28 @@
   </glossdef>
  </glossentry>
 
+  <glossentry id="search-base">
+    <glossterm>Search Base:</glossterm>
+    <glossdef>
+      <para>
+	LDAP can break contact lists into many groups.  The Search
+	Base tells LDAP the top group to use.  How much of the Search
+	Base that is searched is set by the <glossterm
+	linkend="search-scope">Search Scope</glossterm> option.
+      </para>
+    </glossdef>
+  </glossentry>
+
+  <glossentry id="search-scope">
+    <glossterm>Search Scope:</glossterm>
+    <glossdef>
+      <para>
+	Search Scope states how much of the <glossterm
+	linkend="search-base">Search Base</glossterm> to search.
+      </para>
+    </glossdef>
+  </glossentry>
+  
   <glossentry id="sendmail">
     <glossterm>Sendmail:</glossterm>
     <glossdef>

help/C/config-prefs.sgml

@@ -762,8 +762,8 @@ smtp.omniport.com:143
     <sect2 id="config-prefs-contact-ldap-add">
       <title>Adding Directory Servers</title>
       <para>
-              To add a new LDAP server to your available contact
+	To add a new <glossterm linkend="ldap">LDAP</glossterm> server
-              folders:
+	to your available contact folders:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -772,22 +772,25 @@ smtp.omniport.com:143
 		<guimenu>Tools</guimenu>
 		<guimenuitem>Addressbook Sources</guimenuitem>
 	      </menuchoice>
+	      from the menu.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>Add</guibutton>.
+	      Click the <guibutton>Add</guibutton> button on the right
+	      side.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Enter the server information.
+	      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.
+		      The name that you see on the screen.  This could
+		      be anything you wish.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -803,7 +806,9 @@ smtp.omniport.com:143
 		  <term>My server requires authentication</term>
 		  <listitem>
 		    <para>
-		      Select this if the server needs a password to access the addressbook.
+		      Select this if the server requires
+		      <application>Evolution</application> to provide
+		      a server in order to access the LDAP contacts.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -811,7 +816,10 @@ smtp.omniport.com:143
 		  <term>Port</term>
 		  <listitem>
 		    <para>
-		      The internet port to connect to in order to access the database.  This is normally 389.
+		      The internet port
+		      <application>Evolution</application> connects to
+		      in order to access the LDAP database.  This is
+		      normally 389.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -819,7 +827,9 @@ smtp.omniport.com:143
 		  <term>Search base</term>
 		  <listitem>
 		    <para>
-		      The base node to use for all your searches.  Contact your administrator for information about setting this up.
+		      The base entry to use for all your searches.
+		      Contact your administrator for information about
+		      the correct settings.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -841,7 +851,9 @@ How broad the search is in the directory.
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Click <guibutton>OK</guibutton> to permanenty make changes or <guibutton>Apply</guibutton> to temporarily set the changes.
+	      Click <guibutton>OK</guibutton> to permanenty make
+	      changes or <guibutton>Apply</guibutton> to temporarily
+	      set the changes.
 	    </para>
 	  </listitem>
 	</orderedlist>

help/C/usage-contact.sgml

@@ -503,21 +503,20 @@
   <sect1 id="usage-contact-sharing">
     <title>Sharing your Cards</title>
     <para>
-       If you keep your cards on a network using an <glossterm
+      The <glossterm linkend="ldap">LDAP</glossterm> protocol was
-       linkend="ldap">LDAP</glossterm> server, you can share access to
+      created to let users share contact information over a network.
-       them, browse other peoples addressbooks, or maintain a shared set of
+      LDAP allows for users to browse other people's addressbooks, or
-       contact information for your company or your department.  This
+      maintain a shared set of contact information for a company or
-       is the sort of feature you'll want to use if your company has a
+      department.  This feature comes in handy if you are in a group
-       list of vendors and clients that needs constant updating.  If
+      where there are lots of people using the same contacts.  Such an
-       you share calendars as well as addressbooks, people can avoid
+      example would be the sales department of a company with their
-       duplicating work and keep up to date on developments within
+      client list.
-       their workgroup or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
 	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
+	    Rich wants to schedule a meeting with Company X, so he
 	    checks the network for the Company X address card so he
 	    knows whom to call there.  Since his company also shares
 	    calendars, he then learns that his co-worker Deanna has
@@ -527,6 +526,7 @@
 	    scheduling an extra meeting with Company X. 
 	 </para>
       </example>
+
     <para>
        Of course, you don't want to share all of your cards&mdash; why
        overload the network with a list of babysitters or tell
@@ -537,7 +537,7 @@
     <para>
        To learn how to add a remote directory to your available
        contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
+       Once you have a LDAP connection, the network contacts folder or
        folders will appear inside the <guilabel>External
        Directories</guilabel> folder in the folder bar.  It will work
        exactly like a local folder of cards, with the following
@@ -549,7 +549,8 @@
               Network folders are only available when you are
               connected to the network.  If you use a laptop or have a
               modem connection, you may wish to copy or cache the
-              network directory.  You do this by dragging and dropping your desired contacts into the local contacts list.
+              network directory.  You do this by dragging and dropping
+              your desired contacts into the local contacts list.
 	    </para>
 	  </listitem>
 	  
@@ -572,6 +573,14 @@
 	  </listitem>
 	</itemizedlist>
     </para>
+    <sect2 id="usage-contact-sharing-setup">
+      <title>Configuring Evolution to use LDAP</title>
+      <para>
+	For information about setting up
+	<application>Evolution</application> to use LDAP, please refer
+	to <xref linkend="conifg-prefs-contact-ldap-add" />
+      </para>
+    </sect2>
   </sect1>
 
   <sect1 id="contact-automation-basic">
@@ -581,7 +590,7 @@
       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 Address
-	Card</guimenuitem> from the menu that appears.  Of course,
+	Card</guimenuitem> from the menu that appears.
       <application> Evolution</application> can also add cards from a
       hand-held device during HotSync operation.  For more
       information about that, see <xref linkend="usage-sync">.
@@ -603,7 +612,6 @@
   will map the address for you online.
   </para>
   -->
-    
-    
-
 </chapter> 
+
+

help/C/usage-mail-org.sgml

@@ -1030,10 +1030,12 @@ include any messages from that source.
 	<title>Selecting a vFolder Rule</title>
 	<screenshot>
 	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <mediaobject><imageobject><imagedata
+	    <mediaobject>
-	  fileref="figures/vfolder-createrule-fig" format="png"
+	      <imageobject>
+		<imagedata fileref="figures/vfolder-createrule-fig" format="PNG"
 			   srccredit="Aaron Weber">
-	  </imageobject></mediaobject>
+	      </imageobject>
+	    </mediaobject>
 	  </screenshot>
 	</figure>
       </para>

help/ChangeLog

@@ -1,3 +1,13 @@
+2002-01-27  Kevin Breit  <mrproper@ximian.com>
+
+	* C/apx-gloss.sgml: Added Search Base as an entry
+	Added Search Scope as an entry
+
+	* C/config-prefs.sgml: Fixed indenting, I guess.
+
+	* C/usage-contact.sgml: Rewrote LDAP introduction paragraph
+	Added information about setting up Evolution to use LDAP.  It's just a lazy xref.
+
 2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
 
 	* sgmldocs.make: Use `-f' instead of `-e' so installation of