aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAaron Weber <aaron@helixcode.com>2000-07-19 22:20:34 +0800
committerAaron Weber <aaron@src.gnome.org>2000-07-19 22:20:34 +0800
commitfe922f643779c83d9c71b7fc19a0f66d9f15d37a (patch)
tree94548c0730d0e94c99fb14eef61dc6edadee17b1 /doc
parent27a0f69321dcc93bc16816c4147af1f4e44dd753 (diff)
downloadgsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar.gz
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar.bz2
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar.lz
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar.xz
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.tar.zst
gsoc2013-evolution-fe922f643779c83d9c71b7fc19a0f66d9f15d37a.zip
lots of minor fixes to language. added desc. of clahey's cool
2000-07-19 Aaron Weber <aaron@helixcode.com> * C/usage-mail.sgml: lots of minor fixes to language. added desc. of clahey's cool button-address thing. * C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut bar & folder descs, removed refs to trash. svn path=/trunk/; revision=4219
Diffstat (limited to 'doc')
-rw-r--r--doc/C/evolution-guide.sgml18
-rw-r--r--doc/C/usage-mail.sgml121
-rw-r--r--doc/C/usage-mainwindow.sgml205
-rw-r--r--doc/ChangeLog70
4 files changed, 243 insertions, 171 deletions
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index b322e106a5..c6e844025b 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -22,12 +22,12 @@
<bookinfo>
<title>A User's Guide to Evolution</title>
<authorgroup>
- <author><firstname>Aaron</firstname><surname>Weber</surname></author>
+ <author><firstname>Aaron</firstname><surname>Weber</surname></author>
<author><firstname>Kevin</firstname><surname>Breit</surname></author>
-
- </authorgroup>
+ </authorgroup>
<copyright>
- <year>2000</year><holder>Helix Code, Inc.</holder>
+ <year>2000</year>
+ <holder>Helix Code, Inc. </holder>
<holder>Kevin Breit</holder>
</copyright>
@@ -42,16 +42,6 @@
</releaseinfo>
<!-- this is version of manual, not application -->
-<!-- ########## TO DO LIST: ########### -->
- <!--
-finish content.
-standardize capitalization/formatting of titles, interface and
-component names.
-standardize spelling of buzzwords & techterms like email
-add glossterms and glossary
-standardize on second person, not 1st pers. plural.
--->
-
</bookinfo>
&PREFACE;
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 88b7db86eb..16edcf15ca 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -25,7 +25,7 @@
<listitem>
<para>
It supports multiple mail sources, including IMAP, POP3,
- and local mbox files.
+ and local <filename>mbox</filename> files.
</para>
</listitem>
</itemizedlist>
@@ -125,17 +125,18 @@
<sect3 id="usage-mail-getnsend-get-attach">
<title>Attachments, HTML Mail, and Live Documents</title>
<para>
- If you receive a file attached to an email,
- <application>Evolution</application> will display it at the
- bottom of the message to which it's attached. Text, HTML,
- and most images will be displayed in the message itself.
- For other files, <application>Evolution</application> will
- provide a link and icon at the end of the message. Click on
- that, and <application>Evolution</application> will ask you
- where you want to put the file. Once you've chosen one and
- saved the file, you can open, move, copy, or execute it just
- like any other, using <application>Nautilus</application> or
- your favorite shell or file manager.
+ If someone sends you a file attached to an email (an
+ "attachment"), <application>Evolution</application> will
+ display the file at the bottom of the message to which it's
+ attached. Text, HTML, and most images will be displayed in
+ the message itself. For other files,
+ <application>Evolution</application> will provide a link and
+ icon at the end of the message. Click on that, and
+ <application>Evolution</application> will ask you where you
+ want to put the file. Once you've chosen one and saved the
+ file, you can open, move, copy, or execute it just like any
+ other, using <application>Nautilus</application> or your
+ favorite shell or file manager.
</para>
<para>
@@ -235,8 +236,17 @@
feature, once it is decided upon). --> If you enter a name or
nickname that can go with more than one card, Evolution will
open a dialog box to ask you which person you meant.
- <!-- (QUESTION: will users be able to drag & drop address cards
- to send email?). --> For more information about using email
+ </para>
+ <para>
+ Alternately, you can click on the
+ <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
+ <guibutton>Bcc:</guibutton> buttons to get a list of email
+ addresses. Click the checkboxes next to the addresses, then
+ click <guibutton>OK</guibutton>, and the address will be
+ added to the appropriate form field.
+ </para>
+ <para>
+ For more information about using email
together with the contact manager and the calendar, see
<xref linkend="usage-contact-automate"> and <xref
linkend="usage-calendar-apts-group">.
@@ -265,7 +275,7 @@
She puts her co-worker, Tim, in the in the
<guilabel>Cc:</guilabel> field, so that he know
what's going on. The client can see that Tim also
- recieved the message, and know that they can talk to
+ recieved the message, and knows that he can talk to
Tim about the message as well.
</para>
</example>
@@ -279,20 +289,21 @@
<guilabel>Bcc:</guilabel> field get the message, but
nobody else sees their email address. They will still see
the list of addresses from the <guilabel>To:</guilabel>
- and <guilabel>Cc:</guilabel> fields.
+ and <guilabel>Cc:</guilabel> fields, though.
<example id="ex-mail-bcc">
<title>Using the Bcc: field</title>
<para>
- Tim is sending out a message to all of his company's
- clients, some of whom are in competition with each
- other, and all of whom value their privacy. If he
- puts every address from his address book's "Clients"
+ Tim is sending an email announcement to all of his
+ company's clients, some of whom are in competition
+ with each other, and all of whom value their
+ privacy. He needs to use the
+ <guilabel>Bcc:</guilabel> field here. If he puts
+ every address from his address book's "Clients"
category into the <guilabel>To:</guilabel> or
- <guilabel>Cc:</guilabel> fields, he'll have made the
- <emphasis>entire</emphasis> client list public.
- Don't assume it won't happen to you; I got careless
- one day and did it myself.
+ <guilabel>Cc:</guilabel> fields, he'll make the
+ company's <emphasis>entire</emphasis> client list
+ public. Don't assume it won't happen to you!
</para>
</example>
</para>
@@ -383,9 +394,9 @@ with quoted materials and the relevant replies interspersed-->
If you format a message with HTML, but do not have
<guilabel>Send Messages as HTML</guilabel> enabled in your
mail settings, the composer will remove your text styles.
- It will, however, preserve indentation and lists. It will
- do the same thing for any individuals in your address book
- whom you have marked as preferring not to receive HTML.
+ It will, however, preserve indentation and lists. The
+ same is true for individuals in your address book whom you
+ have not marked as wanting to receive HTML mail.
</para>
</note>
<para>
@@ -404,7 +415,7 @@ with quoted materials and the relevant replies interspersed-->
<term>Headers and lists</term>
<listitem>
<para>
- Choose <guilabel>Normal</guilabel> for your default
+ Choose <guilabel>Normal</guilabel> for a default
text style, or <guilabel>Header 1</guilabel> through
<guilabel>Header 6</guilabel> for varying sizes of
header. You can also select
@@ -419,7 +430,7 @@ with quoted materials and the relevant replies interspersed-->
<listitem>
<para>
<itemizedlist mark="none">
- <listitem><para><guilabel>B</guilabel> is for bold text</para></listitem>
+ <listitem><para><guilabel>B</guilabel> is for bold text</para></listitem>
<listitem><para><guilabel>I</guilabel> for italics</para></listitem>
<listitem><para><guilabel>U</guilabel> to underline</para></listitem>
<listitem><para><guilabel>S</guilabel> for a strikethrough.</para></listitem>
@@ -488,18 +499,24 @@ with quoted materials and the relevant replies interspersed-->
of characters, and not "make this text bold," as an HTML
composition tool or text editor would.
</para>
- </note>
- </sect3>
- <sect3 id="usage-mail-getnsend-send-attach">
- <title>Attachments</title>
- <para>
- If you want to attach a file to your email message, just
- click the button with a paper clip on it, labelled
- <guibutton>Attach</guibutton>.
- <application>Evolution</application> will then ask you to
- select the file. Do so, and then send the message. Be
- aware that big attachments can take a long time to
- download.
+ </note>
+ </sect3>
+ <sect3 id="usage-mail-getnsend-send-attach">
+ <title>Attachments</title>
+ <para>
+ If you want to attach a file to your email message, you
+ can drag it from your desktop into the message window, or
+ click the button in the toolbar with a paper clip on it,
+ labelled <guibutton>Attach</guibutton>. If you click the
+ <guibutton>Attach</guibutton> button,
+ <application>Evolution</application> will open a file
+ selection dialog box, to ask you which file you want to
+ send. Select the file and click <guilabel>OK</guilabel>.
+ </para>
+ <para>
+ When you send the message, a copy of the file will
+ go with it. Be aware that big attachments can take a long
+ time to download.
</para>
</sect3>
@@ -527,7 +544,7 @@ possibly never will be due to security evil. -->
works in much the same way. It's particularly useful if you
have received a message and you think someone else would
like to see it. You can forward a message as an attachment
- to a new message (this is the default way of forwarding) or
+ to a new message (this is the default) or
you can send it <glossterm>inline</glossterm> as a quoted
portion of the message you are sending. Attachment
forwarding is best if you want to send the full, unaltered
@@ -542,9 +559,10 @@ possibly never will be due to security evil. -->
To forward a message, first make sure it is selected by
clicking it once in the message list. Then, press
<guibutton>Forward</guibutton> on the toolbar, or select
- SOMETHING. To forward a message
+ <guimenuitem>Forward</guimenuitem> from the
+ <guimenu>Message</guimenu> menu. To forward a message
<glossterm>inline</glossterm> instead of attached, select
- <guimenuitem>Forward Inline </guimenuitem> from the
+ <guimenuitem>Forward Inline</guimenuitem> from the
<guimenu>Message</guimenu> menu. Choose an addressee as you
would when sending a new message; the subject will already
be entered, but you can alter it. Enter your comments on
@@ -607,7 +625,7 @@ possibly never will be due to security evil. -->
<listitem>
<para>
When you reply or forward, include just enough of
- the previous message to provide context. Not too
+ the previous message to provide context: not too
much, not too little.
</para>
</listitem>
@@ -646,10 +664,12 @@ possibly never will be due to security evil. -->
<note>
<title>Folders have Limits</title>
<para>
- A folder can hold mail, calendars, or address cards, but
- you can't mix them up. Also, an email message can be in
- only one folder at a time, just like real mail in real
- folders. If you need more flexibility, try vFolders.
+ You can always place a folder inside other folders,
+ regardless of folder type. However, calendars,
+ contacts, and mail can't go into the same
+ folder. Calendars have to go in calendar folders, mail
+ in mail folders, and contacts in contact folders.
+ FIXME: should this go in a different section?
</para>
</note>
</para>
@@ -741,8 +761,7 @@ possibly never will be due to security evil. -->
they have sent, find filters especially helpful to seperate
personal from list-related mail, but they're good for anybody
who gets more than a few messages a day. To create a filter,
- go to your <interface>Inbox</interface>. Then select
- <guimenuitem>Filter Assistant</guimenuitem> from the
+ select <guimenuitem>Filter Assistant</guimenuitem> from the
<guimenu>Tools</guimenu> menu. This will bring up a window
which will guide you through filter creation. The
<interface>filter assistant</interface> is shown in <xref
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 4ba1c29292..e9d2babb3b 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,7 +1,6 @@
-
-<!-- UNComment the following during debugging:
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
+<!--
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
<chapter id="usage-mainwindow">
@@ -21,9 +20,9 @@
bar</interface>, and below that, the <interface>tool
bar</interface> with buttons for different functions. The largest
part of the <interface>main window</interface> is taken up by the
- actual <interface>Inbox</interface>, with a listing of messages
- you have recieved. If you're running the program for the first
- time, you'll just have one: a welcome message from Helix Code.
+ actual <interface>Inbox</interface>, where messages are listed
+ and displayed for . If you're running the program for the first
+ time, you'll have just one message: a welcome from Helix Code.
<!-- ==============Figure=================================== -->
@@ -75,59 +74,71 @@ Can these things be labelled with little arrows & stuff?
</para>
<para>
The category buttons are labelled <guilabel>Evolution
- Shortcuts</guilabel> <guilabel>Internet Directories</guilabel>.
- When you click on them, they'll slide up and down to give you
- access to different sorts of shortcuts. When you first start
- <application>Evolution</application>, you are looking at the
- <guilabel>Evolution Shortcuts</guilabel> category. If you click
- <guilabel>Internet Directories</guilabel>, it will slide up and
- you'll see buttons for the <guilabel>Bigfoot</guilabel> and
+ Shortcuts</guilabel> and <guilabel>Internet
+ Directories</guilabel>. When you click on them, they'll slide
+ up and down to give you access to different sorts of shortcuts.
+ When you first start <application>Evolution</application>, you
+ are looking at the <guilabel>Evolution Shortcuts</guilabel>
+ category. If you click <guilabel>Internet
+ Directories</guilabel>, it will slide up and you'll see buttons
+ for the <guilabel>Bigfoot</guilabel> and
<guilabel>Netcenter</guilabel> directories, as well as any
others you or your system administrator might have added.
- Click on <guibutton>Evolution Shortcuts</guibutton> to look at
- the shortcuts again.
- </para>
+ Internet directories behave a lot like the local contact
+ manager, which is covered in <xref linkend="usage-contact">.
+ </para>
<para>
- They are:
- <itemizedlist>
+ Take a look at the <guilabel>Evolution Shortcuts</guilabel>
+ again. They are:
+
+ <variablelist>
<!-- NOT IMPLEMENTED!
+ <varlistentry>
+ <term> <guibutton>Today</guibutton></term>
<listitem>
<para>
- <guibutton>Today</guibutton>, which will bring up a summary
- of any new messages you've recieved, along with the tasks and
- appointments you have lined up for today.
- </para>
- </listitem>
+ This will bring up a summary of any new messages you've
+ recieved, along with the tasks and appointments you have
+ lined up for today.
+ </para>
+ </listitem>
+ </varlistentry>
-->
- <listitem>
- <para>
- <guibutton>Inbox</guibutton>, which will show you all
- of your email. Your Inbox is also where you can
- access Evolution's tools to filter, sort, organize,
- and search your mail.
- </para>
- </listitem>
- <listitem>
- <para>
- The <guibutton>Calendar</guibutton>, which can store
- appointments for you. Connected to a network, you
- can use it to keep a group of people on schedule and
- up to date.
+ <varlistentry>
+ <term> <guibutton>Inbox</guibutton></term>
+ <listitem>
+ <para>
+ The Inbox will show you all of your email. Your Inbox
+ is also where you can access Evolution's tools to
+ filter, sort, organize, and search your mail.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guibutton>Calendar</guibutton></term>
+ <listitem>
+ <para>
+ The Calendar can store your appointments and To do lists
+ for you. Connected to a network, you can use it to keep
+ a group of people on schedule and up to date.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><guibutton>Contacts</guibutton></term>
+ <listitem>
+ <para>
+ The Contact Manager holds your addresses, phone numbers,
+ and contact information. Like calendar information,
+ contact data can be synchronized with hand-held devices
+ and shared over a network.
</para>
- </listitem>
-
- <listitem>
- <para>
- The <guibutton>Contacts</guibutton> tool holds your
- addresses, phone numbers, and contact information.
- Like calendar information, contact data can be
- synchronized with hand-held devices and shared over a
- network.
- </para>
- </listitem>
-
+ </listitem>
+ </varlistentry>
<!-- NOT IMPLEMENTED YET
<listitem>
@@ -138,19 +149,19 @@ Can these things be labelled with little arrows & stuff?
</para>
</listitem>
-->
+ <varlistentry>
+ <term> <guibutton>Notes</guibutton></term>
<listitem>
- <para> <guibutton>Notes</guibutton> is your catch-all
- notepad: write <glossterm>haiku</glossterm>, take down
- messages from phone conversations, or keep small things
- organized. This feature is not yet implemented, but will
- be soon. See <xref linkend="usage-notes"> for more information.
+ <para> The notepad is your catch-all tool: use it to take
+ messages from phone conversations, keep small things
+ organized, write <glossterm>haiku</glossterm>, or whatever
+ you like. This feature is not yet implemented, but will be
+ soon. See <xref linkend="usage-notes"> for more
+ information.
</para>
</listitem>
-
-
- </itemizedlist>
-
-
+ </varlistentry>
+ </variablelist>
</para>
<para>
If you prefer to use a keyboard shortcut, or <glossterm>hot
@@ -173,43 +184,42 @@ Can these things be labelled with little arrows & stuff?
<application>Evolution</application>. It displays all your
appointments, address cards, and email in a tree that's a lot
like a <glossterm>file tree</glossterm>&mdash; it starts small
- at the top, and branches downwards. On my computer, I have only
- one: <guilabel>Local</guilabel>. When I click on the plus sign
- next to the label, I see the contents:
+ at the top, and branches downwards. On most computers, there
+ will be three folders at the base. The first one is
+ <guilabel>VFolders</guilabel>, for virtual folders (discussed in
+ <xref linkend="usage-mail-vfolders">. The next one is
+ <guilabel>External Directories</guilabel>, which (FIXME: What is
+ this for?). The most important one is probably
+ <guilabel>Local</guilabel>, which contains all the data that's
+ actually stored on your computer. If you click on the plus sign
+ plus sign next to the <guilabel>Local</guilabel> folder, you'll
+ see the contents:
<itemizedlist>
<listitem>
<para>
- <guilabel>Calendar</guilabel>, where I keep
- appointments and event listings.
+ <guilabel>Calendar</guilabel>, for appointments and
+ event listings.
</para>
</listitem>
<listitem>
<para>
- <guilabel>Contacts</guilabel>, where address
- cards are stored.
+ <guilabel>Contacts</guilabel>, for address cards.
</para>
</listitem>
<listitem>
<para>
- <guilabel>Directories</guilabel>, for search directories, which
- have not been implemented yet.
+ <guilabel>Directories</guilabel>, for Internet contact directories.
</para>
</listitem>
<listitem>
<para>
- <guilabel>Inbox</guilabel>, for incoming mail, and all
- the rest of my mail folders.
+ <guilabel>Inbox</guilabel>, for incoming mail.
</para>
</listitem>
<listitem>
<para>
- <guilabel>Outbox</guilabel>, which is for
- drafts of messages and mail that's already been sent.
- </para>
- </listitem>
- <listitem>
- <para>
- <guilabel>Trash</guilabel>, which is for trash.
+ <guilabel>Outbox</guilabel>, which is for drafts of
+ messages and mail that's already been sent.
</para>
</listitem>
</itemizedlist>
@@ -240,36 +250,20 @@ Can these things be labelled with little arrows & stuff?
</tip>
<para>
- If a folder has other folders inside it, there will be a plus
- sign next to it. Click on the plus sign, and the folder will
- open to let you see the other folders inside. This may
- change in the future to something more attractive, like
- triangles that drop down as you click on them to display the
- rest of the tree.
+ Any time new information arrives in a folder, that folder label
+ is displayed as bold text.
</para>
<para>
- Any time new information arrives in a folder, that folder
- will be highlighted, or its label displayed as bold
- text. You can learn more about customizing
- <application>Evolution</application> alerts and appearance
- in <xref linkend="config">.
- </para>
-
- <para>
- Moving and deleting folders and other items works in one of
- two ways: using <glossterm>drag-and-drop</glossterm> or by
- right-clicking and selecting an item from the
- <interface>right-click menu</interface>. You can drag the
- folders inside the folder view to change their order or put
- one folder inside another. To delete a folder, drag it into
- the trash folder or right-click it and select
- <guimenuitem>Delete</guimenuitem> from the menu that pops
- up. The same goes for individual messages, appointments,
- and address cards, whether they're in the <interface>folder
- view</interface> or not: drag them where you want them, and
- they will go there. <!-- ****This paragraph could use some
- work**** -->
+ You can move folders and other items using
+ <glossterm>drag-and-drop</glossterm>. You can drag the folders
+ inside the folder view to change their order or put one folder
+ inside another. To delete a folder, right-click it and select
+ <guimenuitem>Delete</guimenuitem> from the menu that pops up.
+ The same goes for individual messages, appointments, and address
+ cards, whether they're in the <interface>folder view</interface>
+ or not: drag them where you want them, and they will go there.
+ <!-- ****This paragraph could use some work**** -->
</para>
</sect1>
<sect1 id="usage-mainwindow-menubar">
@@ -291,7 +285,6 @@ Can these things be labelled with little arrows & stuff?
<application>Evolution</application>.
</para>
-
<para>
Once you've familiarized yourself with the <interface>main
window</interface> you can start doing things with it.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ffc357b892..683793ff0a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,18 +1,88 @@
+2000-07-19 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-mail.sgml: lots of minor fixes to language. added
+ desc. of clahey's cool button-address thing.
+
+ * C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
+ bar & folder descs, removed refs to trash.
+
+2000-07-18 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-contact.sgml: Altered category addition stuff, plus
+ suggestions from Kevin.
+
+ * C/apx-gloss.sgml: Added ldap and signature definitions (from
+ Kevin).
+
+ * C/usage-mail.sgml: Move to variablelists from itemizedlists.
+
+2000-07-14 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-contact.sgml: moved to variablelists from itemizedlists
+ * C/usage-calendar.sgml: moved to variablelists from itemizedlists
+
+2000-06-29 Aaron Weber <aaron@helixcode.com>
+
+ * C/preface.sgml: Minor fixes.
+
+ * C/usage-notes.sgml: New File for feature that is yet to come.
+ * C/evolution-guide.sgml: Added entity for notes chapter.
+ * C/usage-mainwindow.sgml: Un-commented references to notes section.
+
+ * C/apx-authors.sgml: Removed dcm from author list.
+
+ * C/usage-calendar.sgml: Added to-do list features.
+
+2000-06-28 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-contact.sgml: commented out future features; redid
+ contact editor stuff.
+
+ * C/apx-gloss.sgml: Removed "live doc" and added "minicard"
+
+2000-06-27 Aaron Weber <aaron@helixcode.com>
+
+ * C/devel-action.sgml: Removed file.
+ * C/devel-script.sgml: Same.
+ * C/devel-component.sgml: Same.
+ * C/preface.sgml: Removed references to devel section.
+ * C/evolution-guide.sgml: Removed references to devel section.
+
+2000-06-23 Aaron Weber <aaron@helixcode.com>
+
+ * C/evolution-guide.sgml: Made moderate to major stylistic updates
+ to this, apx-gloss.sgml, and to all files beginning with "usage,"
+ especially wrt HTML mail.
+
+
+<<<<<<< ChangeLog
+2000-06-15 Aaron Weber <aaron@helixcode.com>
+
+ * C/usage-contact.sgml: Category stuff improved.
+
+ * C/usage-calendar.sgml: Now covers how to add an event properly.
+
+=======
+=======
+=======
2000-07-17 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am (SUBDIRS): Added the devel directory.
+>>>>>>> 1.15
2000-06-28 Peter Williams <peterw@curious-george.helixcode.com>
* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
devel-*.sgml files.
+>>>>>>> 1.13
2000-06-16 Damon Chaplin <damon@helixcode.com>
* C/.cvsignore: added evolution-guide and evolution-guide.junk
so we don't get the '? doc/C/evolution-guide' messages each time we
do a cvs update.
+>>>>>>> 1.12
2000-06-14 Aaron Weber <aaron@helixcode.com>
* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.