aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/C/evolution-faq.sgml10
-rw-r--r--doc/ChangeLog4
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/C/evolution-faq.sgml b/doc/C/evolution-faq.sgml
index 45dc89e784..80650fdbd3 100644
--- a/doc/C/evolution-faq.sgml
+++ b/doc/C/evolution-faq.sgml
@@ -24,11 +24,9 @@
<answer>
<para>
If your server uses standard open protocols like IMAP,
- POP, and SMTP, you can use Evolution with it. You can
- share addresses with vCards and calendar items with iCal
- appointments. We hope to have support for the
- proprietary segments of Exchange and Notes servers
- eventually, but this will come after Evolution 1.0.
+ LDAP, POP, and SMTP, you can use Evolution with it. You
+ can share addresses with vCards and calendar items with
+ iCal appointments.
</para>
</answer>
</qandaentry>
@@ -279,7 +277,7 @@
<qandaentry>
<question>
<para>
- Will there be a server? How about a text-based or web-based front end?
+ Will there be an Evolution server? How about a text-based or web-based front end?
</para>
</question>
<answer>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c8a8c1c905..b38eea6a0f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-24 Aaron Weber <aaron@ximian.com>
+
+ * C/evolution-faq.sgml: Reworded a few questions.
+
2001-07-23 Kevin Breit <battery841@mediaone.net>
* C/Makefile.am: Pulled instance of config-setupassist.sgml to make stuff build right.