aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/C/config-setupassist.sgml205
-rw-r--r--doc/C/evolution.sgml2
-rw-r--r--doc/C/usage-mainwindow.sgml12
-rw-r--r--doc/ChangeLog6
-rw-r--r--help/C/config-setupassist.sgml205
-rw-r--r--help/C/evolution.sgml2
-rw-r--r--help/C/usage-mainwindow.sgml12
-rw-r--r--help/ChangeLog6
8 files changed, 26 insertions, 424 deletions
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
deleted file mode 100644
index bbc7ed6a34..0000000000
--- a/doc/C/config-setupassist.sgml
+++ /dev/null
@@ -1,205 +0,0 @@
-<!--
-
-this chapter is useless and outdated now.
-
- <chapter id="config-setupassist">
- <title>Easy Setup with the Setup Assistant</title>
- <para>
- The first time you try to use email, the mail setup assistant
- will ask you for some basic information, so
- <application>Evolution</application> can let you use email. If
- you prefer more detailed configuration, or if you want to make
- changes to an existing email setup, see <xref
- linkend="config-prefs">.
- </para>
-
- <sect1 id="config-setupassist-mail">
- <title>Mail Setup</title>
- <para>
- The first time you try to send or receive mail with
- <application>Evolution</application>, the <interface>mail
- setup assistant</interface> will pop up to help you with your
- email preferences. If you don't plan to use email, or if
- you'd rather deal with your email preferences later, click
- <guibutton>Cancel</guibutton>.
- </para>
-
-<!--
-
- Before you get it, though, you should decide where you want to
- keep it. Your options will vary a little depending on your
- network setup, but they come down to storing the mail on your
- hard disk (using <glossterm linkend="pop">POP</glossterm>), or
- storing it on the network (using <glossterm
- linkend="imap">IMAP</glossterm>). If you store your mail on
- your local hard disk, you can read it whether you're online or
- not, but you can only read it from one computer. If you store
- it on the network, you can only read it when you're online,
- but you can access it from almost any computer with a network
- connection, even if it doesn't have
- <application>Evolution</application>.
-
-
- If you choose POP, you'll be putting mail in the
- <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
- folder. If you choose IMAP, it's the
- <guilabel>Inbox</guilabel> of a folder with the same name as
- your mail server. That's so you can maintain several distinct
- IMAP servers if you want. See <xref
- linkend="config-prefs-mail"> for more information about mail
- servers.
--->
-
- <para>
- The setup assistant, sometimes called a
- <glossterm>Druid</glossterm>, by analogy with the "Wizards"
- that some other programs use, will guide you through the
- network configuration process. It will ask you for some
- basic information; your system administrator or ISP should
- have the answers you'll need. The mail setup assistant is
- pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
- <figure id="usage-setup-fig">
- <title>Mail Setup Assistant</title>
- <screenshot>
- <screeninfo>Evolution Main Window</screeninfo>
- <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
- </graphic>
- </screenshot>
- </figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
- The assistant will ask you for the following information:
- <variablelist>
-
- <varlistentry>
- <term> <guilabel>Full Name:</guilabel> </term> <listitem>
- <para>Your name. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Email address:</guilabel></term>
- <listitem><para>
- Your complete email address.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Organization:</guilabel></term>
- <listitem>
- <para>
- Any organization you represent, or the company where you
- work. Leave this blank if you wish, or type "My own bad
- self" so people know your opinions are yours alone.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Signature File:</guilabel></term>
- <listitem>
- <para>
- A text file appended to any email you send. A signature
- file typically consists of your name and email address,
- or a quotation you like. It's good form to keep your
- "sig" on the short side: four lines is plenty. Remember,
- this is attached to every email you send.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Receiving Email</guilabel></term>
- <listitem>
- <para>
- <application>Evolution</application> supports several
- mail sources: <glossterm linkend="pop">POP</glossterm> and
- <glossterm linkend="imap">IMAP</glossterm> servers, UNIX-style
- <systemitem><filename>mbox</filename></systemitem> and
- <systemitem><filename>Qmail maildir-format</filename></systemitem> files.
- POP servers retrieve your mail and store it on your
- local system so you can refer to it even when not
- connected to a network; <glossterm>IMAP</glossterm>
- servers store the mail on the server so you can access
- it from multiple locations;
- <systemitem><filename>mbox</filename>></systemitem>
- files are used by your computer for internal mail, and
- may be useful if you want to switch from another email
- client such as <application>Spruce</application> or
- <application>Netscape Communicator</application>. Qmail files
- maybe useful if you use qmail to retrieve your mail. Ask
- your system administrator which you should use, or keep
- guessing until one works. You may use multiple sources
- if you wish; see <xref
- linkend="config-prefs-mail-network"> for more
- information.
- </para>
- <para>
- If you decide not to have
- <application>Evolution</application> use any servers,
- the remaining items are not relevant; you only need to
- point to the location of the files you wish to access.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Sending Email</guilabel></term>
- <listitem>
- <para>
- This should be the name of the server where you send
- mail. It may (or may not) be the same as the
- server where you get your incoming mail.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Authentication:</guilabel></term>
- <listitem>
- <para>
- Select the type of authentication you will use. You can
- click <guibutton>Detect supported types</guibutton> to
- find out which authentication protocols your network
- allows.
- </para>
- <para>
- In the <guilabel>Username:</guilabel> input box, type your
- username for your email account (the part before the "@").
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Account Management</guilabel></term>
- <listitem>
- <para>
- This is where you put the name of this email account. It
- could be "Home" or "Work".
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- To learn how to configure <application>Evolution</application>
- in greater detail, or to change preferences once you have set
- them, see <xref linkend="config-prefs">.
- </para>
- </sect1>
-
-</chapter>
-
-
--->
-
-
-
-
-
-
diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index 8201284062..8c56579c11 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -9,7 +9,6 @@
<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
<!ENTITY CONFIG-ENCRYPTION SYSTEM "config-encryption.sgml">
@@ -116,7 +115,6 @@ implemented. -->
</para>
</partintro>
- &CONFIG-SETUPASSIST;
&CONFIG-PREFS;
&CONFIG-SYNC;
</part>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index a2ce19a0cf..edf8298278 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,5 +1,6 @@
+<!--
<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+-->
<chapter id="usage-mainwindow">
<title>The Evolution Workspace</title>
@@ -213,6 +214,7 @@
<application>Evolution</application> can import the following types of
files:
<variablelist>
+ <varlistentry>
<term>VCard (.vcf, gcrd)</term>
<listitem>
<para>
@@ -239,9 +241,9 @@
</para>
</listitem>
</varlistentry>
- </itemizedlist>
-
-
+ </variablelist>
+</para>
+<para>
<note>
<title>Outlook 2000</title>
<para>
@@ -249,7 +251,7 @@
<application>Evolution</application> cannot import directly.
To import files from Outlook 2000, you will need to boot to
Windows, import the files into Mozilla mail, then reboot and
- import from Mozilla. Please see the <xref="faq">FAQ for more
+ import from Mozilla. Please see the <xref linkend="evolution-faq">FAQ for more
information.
</para>
</note>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 773197418d..1daf3f15f8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,11 @@
2001-07-23 Aaron Weber <aaron@ximian.com>
+ * C/usage-mainwindow.sgml: validated.
+
+ * C/config-setupassist.sgml: Removed.
+
+ * C/evolution.sgml: removed config-setupassist.
+
* C/usage-exec-summary.sgml: Minor revisions.
* C/usage-contact.sgml: Added 'format="png"' to all <image> tags
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
deleted file mode 100644
index bbc7ed6a34..0000000000
--- a/help/C/config-setupassist.sgml
+++ /dev/null
@@ -1,205 +0,0 @@
-<!--
-
-this chapter is useless and outdated now.
-
- <chapter id="config-setupassist">
- <title>Easy Setup with the Setup Assistant</title>
- <para>
- The first time you try to use email, the mail setup assistant
- will ask you for some basic information, so
- <application>Evolution</application> can let you use email. If
- you prefer more detailed configuration, or if you want to make
- changes to an existing email setup, see <xref
- linkend="config-prefs">.
- </para>
-
- <sect1 id="config-setupassist-mail">
- <title>Mail Setup</title>
- <para>
- The first time you try to send or receive mail with
- <application>Evolution</application>, the <interface>mail
- setup assistant</interface> will pop up to help you with your
- email preferences. If you don't plan to use email, or if
- you'd rather deal with your email preferences later, click
- <guibutton>Cancel</guibutton>.
- </para>
-
-<!--
-
- Before you get it, though, you should decide where you want to
- keep it. Your options will vary a little depending on your
- network setup, but they come down to storing the mail on your
- hard disk (using <glossterm linkend="pop">POP</glossterm>), or
- storing it on the network (using <glossterm
- linkend="imap">IMAP</glossterm>). If you store your mail on
- your local hard disk, you can read it whether you're online or
- not, but you can only read it from one computer. If you store
- it on the network, you can only read it when you're online,
- but you can access it from almost any computer with a network
- connection, even if it doesn't have
- <application>Evolution</application>.
-
-
- If you choose POP, you'll be putting mail in the
- <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>
- folder. If you choose IMAP, it's the
- <guilabel>Inbox</guilabel> of a folder with the same name as
- your mail server. That's so you can maintain several distinct
- IMAP servers if you want. See <xref
- linkend="config-prefs-mail"> for more information about mail
- servers.
--->
-
- <para>
- The setup assistant, sometimes called a
- <glossterm>Druid</glossterm>, by analogy with the "Wizards"
- that some other programs use, will guide you through the
- network configuration process. It will ask you for some
- basic information; your system administrator or ISP should
- have the answers you'll need. The mail setup assistant is
- pictured in <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
- <figure id="usage-setup-fig">
- <title>Mail Setup Assistant</title>
- <screenshot>
- <screeninfo>Evolution Main Window</screeninfo>
- <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
- </graphic>
- </screenshot>
- </figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
- The assistant will ask you for the following information:
- <variablelist>
-
- <varlistentry>
- <term> <guilabel>Full Name:</guilabel> </term> <listitem>
- <para>Your name. </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Email address:</guilabel></term>
- <listitem><para>
- Your complete email address.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Organization:</guilabel></term>
- <listitem>
- <para>
- Any organization you represent, or the company where you
- work. Leave this blank if you wish, or type "My own bad
- self" so people know your opinions are yours alone.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Signature File:</guilabel></term>
- <listitem>
- <para>
- A text file appended to any email you send. A signature
- file typically consists of your name and email address,
- or a quotation you like. It's good form to keep your
- "sig" on the short side: four lines is plenty. Remember,
- this is attached to every email you send.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Receiving Email</guilabel></term>
- <listitem>
- <para>
- <application>Evolution</application> supports several
- mail sources: <glossterm linkend="pop">POP</glossterm> and
- <glossterm linkend="imap">IMAP</glossterm> servers, UNIX-style
- <systemitem><filename>mbox</filename></systemitem> and
- <systemitem><filename>Qmail maildir-format</filename></systemitem> files.
- POP servers retrieve your mail and store it on your
- local system so you can refer to it even when not
- connected to a network; <glossterm>IMAP</glossterm>
- servers store the mail on the server so you can access
- it from multiple locations;
- <systemitem><filename>mbox</filename>></systemitem>
- files are used by your computer for internal mail, and
- may be useful if you want to switch from another email
- client such as <application>Spruce</application> or
- <application>Netscape Communicator</application>. Qmail files
- maybe useful if you use qmail to retrieve your mail. Ask
- your system administrator which you should use, or keep
- guessing until one works. You may use multiple sources
- if you wish; see <xref
- linkend="config-prefs-mail-network"> for more
- information.
- </para>
- <para>
- If you decide not to have
- <application>Evolution</application> use any servers,
- the remaining items are not relevant; you only need to
- point to the location of the files you wish to access.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term> <guilabel>Sending Email</guilabel></term>
- <listitem>
- <para>
- This should be the name of the server where you send
- mail. It may (or may not) be the same as the
- server where you get your incoming mail.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Authentication:</guilabel></term>
- <listitem>
- <para>
- Select the type of authentication you will use. You can
- click <guibutton>Detect supported types</guibutton> to
- find out which authentication protocols your network
- allows.
- </para>
- <para>
- In the <guilabel>Username:</guilabel> input box, type your
- username for your email account (the part before the "@").
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><guilabel>Account Management</guilabel></term>
- <listitem>
- <para>
- This is where you put the name of this email account. It
- could be "Home" or "Work".
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- To learn how to configure <application>Evolution</application>
- in greater detail, or to change preferences once you have set
- them, see <xref linkend="config-prefs">.
- </para>
- </sect1>
-
-</chapter>
-
-
--->
-
-
-
-
-
-
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 8201284062..8c56579c11 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -9,7 +9,6 @@
<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
<!ENTITY CONFIG-ENCRYPTION SYSTEM "config-encryption.sgml">
@@ -116,7 +115,6 @@ implemented. -->
</para>
</partintro>
- &CONFIG-SETUPASSIST;
&CONFIG-PREFS;
&CONFIG-SYNC;
</part>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index a2ce19a0cf..edf8298278 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,5 +1,6 @@
+<!--
<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+-->
<chapter id="usage-mainwindow">
<title>The Evolution Workspace</title>
@@ -213,6 +214,7 @@
<application>Evolution</application> can import the following types of
files:
<variablelist>
+ <varlistentry>
<term>VCard (.vcf, gcrd)</term>
<listitem>
<para>
@@ -239,9 +241,9 @@
</para>
</listitem>
</varlistentry>
- </itemizedlist>
-
-
+ </variablelist>
+</para>
+<para>
<note>
<title>Outlook 2000</title>
<para>
@@ -249,7 +251,7 @@
<application>Evolution</application> cannot import directly.
To import files from Outlook 2000, you will need to boot to
Windows, import the files into Mozilla mail, then reboot and
- import from Mozilla. Please see the <xref="faq">FAQ for more
+ import from Mozilla. Please see the <xref linkend="evolution-faq">FAQ for more
information.
</para>
</note>
diff --git a/help/ChangeLog b/help/ChangeLog
index 773197418d..1daf3f15f8 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,5 +1,11 @@
2001-07-23 Aaron Weber <aaron@ximian.com>
+ * C/usage-mainwindow.sgml: validated.
+
+ * C/config-setupassist.sgml: Removed.
+
+ * C/evolution.sgml: removed config-setupassist.
+
* C/usage-exec-summary.sgml: Minor revisions.
* C/usage-contact.sgml: Added 'format="png"' to all <image> tags