aboutsummaryrefslogtreecommitdiffstats
path: root/doc/C
diff options
context:
space:
mode:
Diffstat (limited to 'doc/C')
-rw-r--r--doc/C/config-prefs.sgml29
-rw-r--r--doc/C/menuref.sgml24
-rw-r--r--doc/C/usage-contact.sgml13
-rw-r--r--doc/C/usage-mail.sgml13
4 files changed, 68 insertions, 11 deletions
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 7fee2fd340..6139b9a01d 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -595,6 +595,35 @@
You can set the following options: <!--insert variable list
here-->
</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, 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>
</sect1>
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index 7b5394d0c1..036b663b23 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -245,12 +245,18 @@
<varlistentry>
<term><guimenuitem>Mail Configuration</guimenuitem></term>
+ <listitem><para>
+ Tools for setting up all your mail account preferences.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guimenuitem>Manage Subscriptions</guimenuitem></term>
<listitem><para>
- This is a poorly named tool. You can set your identity,
- and everything else related to your mail account, here.
+ Tools for newsgroup and IMAP folder subscriptions.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guimenuitem>Forget Passwords</guimenuitem></term>
<listitem><para>
@@ -1228,7 +1234,17 @@
<sect2 id="menuref-contact-actions">
<title>Contact Manager Tools Menu</title>
<para>
- This menu is broken. (FIXME).
+ This menu contains only one item:
+
+ <variablelist>
+ <varlistentry>
+ <term><guimenuitem>New Directory Server</guimenuitem></term> <listitem><para> Brings up
+ the in-depth search window. <xref
+ linkend="config-prefs-contact-ldap-add"> describes how to use this
+ feature. </para></listitem>
+ </varlistentry>
+ </variablelist>
+
</para>
</sect2>
</sect1>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index f4d7e50ebc..21630cacb3 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -507,12 +507,13 @@
you want to make accessible to others.
</para>
<para>
- To learn how to set up your connection to an LDAP server, see
- <xref linkend="config-prefs-contact">. Once you have a
- connection, the network contacts folder or folders will appear
- inside the <guilabel>External Directories</guilabel> folder in
- the folder bar, and will work exactly like a local folder of
- cards, with the following exceptions:
+ 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
+ folders will appear inside the <guilabel>External
+ Directories</guilabel> folder in the folder bar, and will work
+ exactly like a local folder of cards, with the following
+ exceptions:
<itemizedlist>
<listitem><para>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 9184b77b82..864a46ff38 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -29,7 +29,8 @@
linkend="pop">POP3</glossterm>, local
<systemitem><filename>mbox</filename></systemitem> and
<systemitem><filename>mh</filename></systemitem> files, and
- even NNTP data (newsgroups), which isn't technically email.
+ even NNTP messages (newsgroups), which aren't technically
+ email.
</para>
</listitem>
</itemizedlist>
@@ -1384,6 +1385,16 @@ possibly never will be due to security evil. -->
</figure>
</para>
</sect2>
+ <sect2 id="usage-mail-subscriptions">
+ <title>Subscription Management</title>
+ <para>
+ <application>Evolution</application> lets you handle your
+ IMAP and newsgroup subscriptions with the same tool: the
+ subscriptions manager. To start using it, choose
+ <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
+ Subscriptions</guimenuitem> </menuchoice>.
+ </para>
+ </sect2>
</sect1>
</chapter>