diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | help/C/Makefile.am | 1 | ||||
| -rw-r--r-- | help/C/usage-mail.sgml | 6 | ||||
| -rw-r--r-- | help/ChangeLog | 4 |
4 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2001-10-01 Aaron Weber <aaron@ximian.com> + + * help/C/Makefile.am: removed an extraneous tab. + 2001-10-01 Ettore Perazzoli <ettore@ximian.com> * configure.in: 0.15.99. @@ -16,6 +20,7 @@ the order in Mozilla (it is suggested that they be in this order). (nss_libs): Same. +>>>>>>> 1.945 2001-09-27 Dan Winship <danw@ximian.com> * configure.in: Remove references to the "compose" program, since diff --git a/help/C/Makefile.am b/help/C/Makefile.am index c8610fd947..96b00881c8 100644 --- a/help/C/Makefile.am +++ b/help/C/Makefile.am @@ -44,6 +44,5 @@ sgml_ents = \ usage-mainwindow.sgml \ usage-print.sgml \ usage-sync.sgml - include $(top_srcdir)/help/sgmldocs.make dist-hook: app-dist-hook diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml index a1e1df466b..b78a9edcb4 100644 --- a/help/C/usage-mail.sgml +++ b/help/C/usage-mail.sgml @@ -1,6 +1,3 @@ -<!-- -<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> ---> <chapter id="usage-mail"> <title>Using Evolution for Email</title> @@ -89,12 +86,11 @@ message with the original, so you can follow the thread of a conversation from one message to the next. </para> - <figure> <title>Threaded Mail View</title> <screenshot> <screeninfo>Threaded Mail View</screeninfo> -<mediaobject><imageobject><imagedata format="png" fileref="mail-threaded" srccredit="Aaron Weber"> +<mediaobject><imageobject><imagedata format="png" fileref="figures/mail-threaded" srccredit="Aaron Weber"> </imageobject></mediaobject> </screenshot> </figure> diff --git a/help/ChangeLog b/help/ChangeLog index 8fa891d0ed..63c1785903 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -1,3 +1,7 @@ +2001-10-01 Aaron Weber <aaron@ximian.com> + + * C/usage-mail.sgml: missing directory for figure file ref. + 2001-09-29 Kevin Breit <battery841@mediaone.net> * C/usage-mail.sgml: Slightly improved encryption documentation. |