aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/apx-gloss.sgml68
-rw-r--r--help/C/config-prefs.sgml52
-rw-r--r--help/C/usage-contact.sgml88
-rw-r--r--help/C/usage-mail-org.sgml36
-rw-r--r--help/ChangeLog10
5 files changed, 154 insertions, 100 deletions
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 5d07fb1b1a..380f9e38be 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -335,31 +335,53 @@
</glossdef>
</glossentry>
- <glossentry id="sendmail">
- <glossterm>Sendmail:</glossterm>
- <glossdef>
- <para>
- As its name implies, <application>sendmail</application> is a
- program which sends mail. <application>Evolution</application>
- can use it instead of <glossterm>SMTP:</glossterm>; some people
- prefer it because it offers more flexibility, but is more
- difficult to set up.
- </para>
- </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="shortcut-bar">
- <glossterm>Shortcut Bar:</glossterm>
- <glossdef>
- <para>
- A portion of <application>Evolution</application> which offers
- users fast access to the most frequently used portions of the
- application.
- </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>
+ <para>
+ As its name implies, <application>sendmail</application> is a
+ program which sends mail. <application>Evolution</application>
+ can use it instead of <glossterm>SMTP:</glossterm>; some people
+ prefer it because it offers more flexibility, but is more
+ difficult to set up.
+ </para>
+ </glossdef>
+ </glossentry>
+
+ <glossentry id="shortcut-bar">
+ <glossterm>Shortcut Bar:</glossterm>
+ <glossdef>
+ <para>
+ A portion of <application>Evolution</application> which offers
+ users fast access to the most frequently used portions of the
+ application.
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry id="signature">
<glossterm>Signature:</glossterm>
<glossdef>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index dd4f940037..13b8fa9364 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -751,19 +751,19 @@ smtp.omniport.com:143
</sect2>
</sect1>
- <sect1 id="config-prefs-contact">
- <title>Managing the Addressbook</title>
- <para>
- The addressbook does not have a large list of configuration
- settings, but those that are there can be found in the
- <guimenu>Tools</guimenu> menu.
- </para>
+ <sect1 id="config-prefs-contact">
+ <title>Managing the Addressbook</title>
+ <para>
+ The addressbook does not have a large list of configuration
+ settings, but those that are there can be found in the
+ <guimenu>Tools</guimenu> menu.
+ </para>
- <sect2 id="config-prefs-contact-ldap-add">
- <title>Adding Directory Servers</title>
- <para>
- To add a new LDAP server to your available contact
- folders:
+ <sect2 id="config-prefs-contact-ldap-add">
+ <title>Adding Directory Servers</title>
+ <para>
+ To add a new <glossterm linkend="ldap">LDAP</glossterm> server
+ 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>
@@ -827,7 +837,7 @@ smtp.omniport.com:143
<term>Search scope</term>
<listitem>
<para>
-How broad the search is in the directory.
+ How broad the search is in the directory.
</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>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index dc11b4bd0a..04f8154ea8 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -20,8 +20,8 @@
The toolbar for the addressbook is quite simple.
<itemizedlist>
<listitem><para>
- Click <guibutton>New Contact</guibutton> to create a new card, or double-click
- in a blank space in the contact list.
+ Click <guibutton>New Contact</guibutton> to create a new card, or double-click
+ in a blank space in the contact list.
</para></listitem>
<listitem><para>
@@ -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
- linkend="ldap">LDAP</glossterm> server, you can share access to
- them, browse other peoples addressbooks, or maintain a shared set of
- contact information for your company or your department. This
- is the sort of feature you'll want to use if your company has a
- list of vendors and clients that needs constant updating. If
- you share calendars as well as addressbooks, people can avoid
- duplicating work and keep up to date on developments within
- their workgroup or across the entire company.
+ The <glossterm linkend="ldap">LDAP</glossterm> protocol was
+ created to let users share contact information over a network.
+ LDAP allows for users to browse other people's addressbooks, or
+ maintain a shared set of contact information for a company or
+ department. This feature comes in handy if you are in a group
+ where there are lots of people using the same contacts. Such an
+ example would be the sales department of a company with their
+ client list.
</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,24 +537,25 @@
<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
exceptions:
<itemizedlist>
-
+
<listitem>
- <para>
+ <para>
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.
- </para>
+ network directory. You do this by dragging and dropping
+ your desired contacts into the local contacts list.
+ </para>
</listitem>
-
+
<listitem>
- <para>
+ <para>
To prevent excess network traffic,
<application>Evolution</application> will not normally
load the contents of LDAP folders immediately upon
@@ -562,32 +563,40 @@
All</guilabel> before LDAP folder cards will be loaded
from the network. You can change this behavior in the
<interface>Contact Preferences</interface> window.
- </para>
+ </para>
</listitem>
<listitem>
- <para>
+ <para>
Your ability to view, change, add, and delete contacts
depends on the settings of the LDAP server.
- </para>
+ </para>
</listitem>
- </itemizedlist>
- </para>
- </sect1>
-
- <sect1 id="contact-automation-basic">
- <title>Send me a Card: Adding New Cards Quickly</title>
+ </itemizedlist>
+ </para>
+ <sect2 id="usage-contact-sharing-setup">
+ <title>Configuring Evolution to use LDAP</title>
<para>
- 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 Address
- Card</guimenuitem> from the menu that appears. Of course,
- <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">.
+ For information about setting up
+ <application>Evolution</application> to use LDAP, please refer
+ to <xref linkend="conifg-prefs-contact-ldap-add" />
</para>
- </sect1>
+ </sect2>
+ </sect1>
+ <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
+ 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.
+ <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">.
+ </para>
+ </sect1>
+
<!-- Unimplemented features:
<para>
You can also use the addressbook to print postal addresses
@@ -603,7 +612,6 @@
will map the address for you online.
</para>
-->
-
-
-
</chapter>
+
+
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index f9c55edb39..571e74b2f8 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -1015,27 +1015,29 @@
</para>
</listitem>
</itemizedlist>
-
- </para>
- </listitem>
- </orderedlist>
-</para>
-<para>
-Remote folders are considered active if you are connected to the
-server; you must be connected to your mail server for the vFolder to
-include any messages from that source.
-</para>
-<para>
+
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ <para>
+ Remote folders are considered active if you are connected to the
+ server; you must be connected to your mail server for the vFolder to
+ include any messages from that source.
+ </para>
+ <para>
<figure id="usage-mail-vfolder-fig-createrule">
<title>Selecting a vFolder Rule</title>
<screenshot>
<screeninfo>Creating a vFolder Rule</screeninfo>
- <mediaobject><imageobject><imagedata
- fileref="figures/vfolder-createrule-fig" format="png"
- srccredit="Aaron Weber">
- </imageobject></mediaobject>
- </screenshot>
- </figure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="figures/vfolder-createrule-fig" format="PNG"
+ srccredit="Aaron Weber">
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </figure>
</para>
</sect2>
</sect1>
diff --git a/help/ChangeLog b/help/ChangeLog
index db14719995..bf059c3a80 100644
--- a/help/ChangeLog
+++ b/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