aboutsummaryrefslogtreecommitdiffstats
path: root/doc/C
diff options
context:
space:
mode:
authorAaron Weber <aaron@helixcode.com>2000-09-22 02:14:44 +0800
committerAaron Weber <aaron@src.gnome.org>2000-09-22 02:14:44 +0800
commit0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f (patch)
treea2bdd609783fd79172475ddb7ca995bfcd2d2a66 /doc/C
parent8b2ca2678997eee8b2b50206f51c72fbe242f972 (diff)
downloadgsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar.gz
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar.bz2
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar.lz
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar.xz
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.tar.zst
gsoc2013-evolution-0b1e68cb22f92bfe82b3fcbca4d57814cc26ad4f.zip
Switched to the "official" FSF markup. I will have to make changes to the
2000-09-21 Aaron Weber <aaron@helixcode.com> * C/evolution-guide.sgml: Switched to the "official" FSF markup. I will have to make changes to the markup-- adding ids, etc, or switch to another version of the markup. Pending discussion by GDP. * C/apx-authors.sgml: Changed Matt Loper's email address to loper.org; added Jeff Stedfast and Peter Williams to authors list, realphebetized. * C/config-prefs.sgml: Revision to reflect current options labelling. * C/evolution-guide.sgml: Changes to part intros. * C/preface.sgml: Spelling and menu fixes. Will need more work tomorrow. svn path=/trunk/; revision=5540
Diffstat (limited to 'doc/C')
-rw-r--r--doc/C/apx-authors.sgml32
-rw-r--r--doc/C/apx-fdl.sgml1118
-rw-r--r--doc/C/config-prefs.sgml227
-rw-r--r--doc/C/evolution-guide.sgml14
-rw-r--r--doc/C/preface.sgml36
5 files changed, 632 insertions, 795 deletions
diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
index b07f236b8b..89f0dd6bc5 100644
--- a/doc/C/apx-authors.sgml
+++ b/doc/C/apx-authors.sgml
@@ -4,26 +4,28 @@
<application>Evolution</application> was written by:
<simplelist>
<member>Seth Alves: <email>alves@helixcode.com</email></member>
- <member>Anders Carlsson<email>andersca@gnu.org</email></member>
- <member>Damon Chaplin:<email>damon@helixcode.com</email></member>
- <member>Clifford R. Conover <email>rusty@zootweb.com</email></member>
+ <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
+ <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
+ <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
<member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
- <member>Arturo Espinoza <email>arturo@nucleu.unam.mx</email></member>
+ <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
+ <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
<member>Larry Ewing: <email>lewing@helixcode.com</email></member>
<member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
<member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
<member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
- <member>Matthew Loper: <email>matt@helixcode.com</email></member>
- <member> Federico Mena: <email>federico@helixcode.com</email></member>
- <member>Eskil Heyn Olsen<email>deity@eski.dk</email></member>
- <member> Nat Friedman: <email>nat@helixcode.com</email></member>
- <member>Ettore Perazzoli:<email>ettore@helixcode.com</email></member>
- <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>
- <member> Peter Teichman: <email>peter@helixcode.com</email></member>
- <member> Chris Toshok: <email>toshok@helixcode.com</email></member>
- <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
- <member> Dan Winship: <email>danw@helixcode.com</email></member>
- <member> Michael Zucchi: <email>notzed@helixcode.com</email></member>
+ <member>Matthew Loper: <email>matt@loper.org</email></member>
+ <member>Federico Mena: <email>federico@helixcode.com</email></member>
+ <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
+ <member>Nat Friedman: <email>nat@helixcode.com</email></member>
+ <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
+ <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
+ <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>
+ <member>Peter Teichman: <email>peter@helixcode.com</email></member>
+ <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
+ <member>Peter Williams: <email>peter@newton.cx</email></member>
+ <member>Dan Winship: <email>danw@helixcode.com</email></member>
+ <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
</simplelist>
and other dedicated GNOME programmers.
</para>
diff --git a/doc/C/apx-fdl.sgml b/doc/C/apx-fdl.sgml
index 8b49729cfc..17a3bf3070 100644
--- a/doc/C/apx-fdl.sgml
+++ b/doc/C/apx-fdl.sgml
@@ -1,678 +1,466 @@
<appendix id="fdl">
- <title>GNU Free Documentation License</title>
- <para>
- Version 1.1, March 2000
- </para>
-
- <para>
- Copyright &copy; 2000
- <address>
- Free Software Foundation, Inc.
- <street>59 Temple Place, Suite 330</street>,
- <city>Boston</city>,
- <state>MA</state>
- <postcode>02111-1307</postcode>
- <country>USA</country>
- </address>
- Everyone is permitted to copy and distribute verbatim copies of this license
- document, but changing it is not allowed.
- </para>
-
- <variablelist>
- <varlistentry id="fdl-preamble">
- <term>0. PREAMBLE</term>
- <listitem>
- <para>
- The purpose of this License is to make a manual, textbook, or other
- written document "free" in the sense of freedom: to assure everyone
- the effective freedom to copy and redistribute it, with or without
- modifying it, either commercially or noncommercially. Secondarily,
- this License preserves for the author and publisher a way to get
- credit for their work, while not being considered responsible for
- modifications made by others.
- </para>
-
- <para>
- This License is a kind of "copyleft", which means that derivative
- works of the document must themselves be free in the same sense. It
- complements the GNU General Public License, which is a copyleft
- license designed for free software.
- </para>
-
- <para>
- We have designed this License in order to use it for manuals for free
- software, because free software needs free documentation: a free
- program should come with manuals providing the same freedoms that the
- software does. But this License is not limited to software manuals; it
- can be used for any textual work, regardless of subject matter or
- whether it is published as a printed book. We recommend this License
- principally for works whose purpose is instruction or reference.
- </para>
+<title>GNU Free Documentation License</title>
+<!-- - GNU Project - Free Software Foundation (FSF) -->
+<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
+
+
+ <sect1 id="fdl-version">
+ <title>GNU Free Documentation License</title>
+
+ <para>Version 1.1, March 2000</para>
+
+ <blockquote>
+ <para>Copyright (C) 2000 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.</para>
+ </blockquote>
+ </sect1>
+ <sect1 id="fdl-preamble" label="0">
+ <title>PREAMBLE</title>
+
+ <para>The purpose of this License is to make a manual, textbook,
+ or other written document "free" in the sense of freedom: to
+ assure everyone the effective freedom to copy and redistribute it,
+ with or without modifying it, either commercially or
+ noncommercially. Secondarily, this License preserves for the
+ author and publisher a way to get credit for their work, while not
+ being considered responsible for modifications made by
+ others.</para>
+
+ <para>This License is a kind of "copyleft", which means that
+ derivative works of the document must themselves be free in the
+ same sense. It complements the GNU General Public License, which
+ is a copyleft license designed for free software.</para>
+
+ <para>We have designed this License in order to use it for manuals
+ for free software, because free software needs free documentation:
+ a free program should come with manuals providing the same
+ freedoms that the software does. But this License is not limited
+ to software manuals; it can be used for any textual work,
+ regardless of subject matter or whether it is published as a
+ printed book. We recommend this License principally for works
+ whose purpose is instruction or reference.</para>
+ </sect1>
+
+ <sect1 id="fdl-applicability" label="1">
+ <title>APPLICABILITY AND DEFINITIONS</title>
+
+ <para>This License applies to any manual or other work that
+ contains a notice placed by the copyright holder saying it can be
+ distributed under the terms of this License. The "Document",
+ below, refers to any such manual or work. Any member of the
+ public is a licensee, and is addressed as "you".</para>
+
+ <para>A "Modified Version" of the Document means any work
+ containing the Document or a portion of it, either copied
+ verbatim, or with modifications and/or translated into another
+ language.</para>
+
+ <para>A "Secondary Section" is a named appendix or a front-matter
+ section of the Document that deals exclusively with the
+ relationship of the publishers or authors of the Document to the
+ Document's overall subject (or to related matters) and contains
+ nothing that could fall directly within that overall subject.
+ (For example, if the Document is in part a textbook of
+ mathematics, a Secondary Section may not explain any mathematics.)
+ The relationship could be a matter of historical connection with
+ the subject or with related matters, or of legal, commercial,
+ philosophical, ethical or political position regarding
+ them.</para>
+
+ <para>The "Invariant Sections" are certain Secondary Sections
+ whose titles are designated, as being those of Invariant Sections,
+ in the notice that says that the Document is released under this
+ License.</para>
+
+ <para>The "Cover Texts" are certain short passages of text that
+ are listed, as Front-Cover Texts or Back-Cover Texts, in the
+ notice that says that the Document is released under this
+ License.</para>
+
+ <para>A "Transparent" copy of the Document means a
+ machine-readable copy, represented in a format whose specification
+ is available to the general public, whose contents can be viewed
+ and edited directly and straightforwardly with generic text
+ editors or (for images composed of pixels) generic paint programs
+ or (for drawings) some widely available drawing editor, and that
+ is suitable for input to text formatters or for automatic
+ translation to a variety of formats suitable for input to text
+ formatters. A copy made in an otherwise Transparent file format
+ whose markup has been designed to thwart or discourage subsequent
+ modification by readers is not Transparent. A copy that is not
+ "Transparent" is called "Opaque".</para>
+
+ <para>Examples of suitable formats for Transparent copies include
+ plain ASCII without markup, Texinfo input format, LaTeX input
+ format, SGML or XML using a publicly available DTD, and
+ standard-conforming simple HTML designed for human modification.
+ Opaque formats include PostScript, PDF, proprietary formats that
+ can be read and edited only by proprietary word processors, SGML
+ or XML for which the DTD and/or processing tools are not generally
+ available, and the machine-generated HTML produced by some word
+ processors for output purposes only.</para>
+
+ <para>The "Title Page" means, for a printed book, the title page
+ itself, plus such following pages as are needed to hold, legibly,
+ the material this License requires to appear in the title page.
+ For works in formats which do not have any title page as such,
+ "Title Page" means the text near the most prominent appearance of
+ the work's title, preceding the beginning of the body of the
+ text.</para>
+ </sect1>
+
+ <sect1 label="2">
+ <title>VERBATIM COPYING</title>
+
+ <para>You may copy and distribute the Document in any medium,
+ either commercially or noncommercially, provided that this
+ License, the copyright notices, and the license notice saying this
+ License applies to the Document are reproduced in all copies, and
+ that you add no other conditions whatsoever to those of this
+ License. You may not use technical measures to obstruct or
+ control the reading or further copying of the copies you make or
+ distribute. However, you may accept compensation in exchange for
+ copies. If you distribute a large enough number of copies you
+ must also follow the conditions in section 3.</para>
+
+ <para>You may also lend copies, under the same conditions stated
+ above, and you may publicly display copies.</para>
+ </sect1>
+
+ <sect1 label="3">
+ <title>COPYING IN QUANTITY</title>
+
+ <para>If you publish printed copies of the Document numbering more
+ than 100, and the Document's license notice requires Cover Texts,
+ you must enclose the copies in covers that carry, clearly and
+ legibly, all these Cover Texts: Front-Cover Texts on the front
+ cover, and Back-Cover Texts on the back cover. Both covers must
+ also clearly and legibly identify you as the publisher of these
+ copies. The front cover must present the full title with all
+ words of the title equally prominent and visible. You may add
+ other material on the covers in addition. Copying with changes
+ limited to the covers, as long as they preserve the title of the
+ Document and satisfy these conditions, can be treated as verbatim
+ copying in other respects.</para>
+
+ <para>If the required texts for either cover are too voluminous to
+ fit legibly, you should put the first ones listed (as many as fit
+ reasonably) on the actual cover, and continue the rest onto
+ adjacent pages.</para>
+
+ <para>If you publish or distribute Opaque copies of the Document
+ numbering more than 100, you must either include a
+ machine-readable Transparent copy along with each Opaque copy, or
+ state in or with each Opaque copy a publicly-accessible
+ computer-network location containing a complete Transparent copy
+ of the Document, free of added material, which the general
+ network-using public has access to download anonymously at no
+ charge using public-standard network protocols. If you use the
+ latter option, you must take reasonably prudent steps, when you
+ begin distribution of Opaque copies in quantity, to ensure that
+ this Transparent copy will remain thus accessible at the stated
+ location until at least one year after the last time you
+ distribute an Opaque copy (directly or through your agents or
+ retailers) of that edition to the public.</para>
+
+ <para>It is requested, but not required, that you contact the
+ authors of the Document well before redistributing any large
+ number of copies, to give them a chance to provide you with an
+ updated version of the Document.</para>
+ </sect1>
+
+ <sect1 label="4">
+ <title>MODIFICATIONS</title>
+
+ <para>You may copy and distribute a Modified Version of the
+ Document under the conditions of sections 2 and 3 above, provided
+ that you release the Modified Version under precisely this
+ License, with the Modified Version filling the role of the
+ Document, thus licensing distribution and modification of the
+ Modified Version to whoever possesses a copy of it. In addition,
+ you must do these things in the Modified Version:</para>
+
+ <orderedlist numeration="upperalpha">
+ <listitem><para>Use in the Title Page
+ (and on the covers, if any) a title distinct from that of the
+ Document, and from those of previous versions (which should, if
+ there were any, be listed in the History section of the
+ Document). You may use the same title as a previous version if
+ the original publisher of that version gives permission.</para>
</listitem>
- </varlistentry>
- <varlistentry id="fdl-section1">
- <term>1. APPLICABILITY AND DEFINITIONS</term>
- <listitem>
- <para id="fdl-document">
- This License applies to any manual or other work that contains a
- notice placed by the copyright holder saying it can be distributed
- under the terms of this License. The <link
- linkend="fdl-document">"Document" </link>, below, refers to any such
- manual or work. Any member of the public is a licensee, and is
- addressed as "you".
- </para>
-
- <para id="fdl-modified">
- A <link linkend="fdl-modified">"Modified Version"</link> of the
- Document means any work containing the Document or a portion of it,
- either copied verbatim, or with modifications and/or translated into
- another language.
- </para>
-
- <para id="fdl-secondary">
- A <link linkend="fdl-secondary">"Secondary Section"</link> is a named
- appendix or a front-matter section of the <link
- linkend="fdl-document">Document</link> that deals exclusively with the
- relationship of the publishers or authors of the <link
- linkend="fdl-document"> Document</link> to the <link
- linkend="fdl-document"> Document's</link> overall subject (or to
- related matters) and contains nothing that could fall directly within
- that overall subject. (For example, if the <link
- linkend="fdl-document">Document</link> is in part a textbook of
- mathematics, a <link linkend="fdl-secondary">Secondary Section</link>
- may not explain any mathematics.) The relationship could be a matter
- of historical connection with the subject or with related matters, or
- of legal, commercial, philosophical, ethical or political position
- regarding them.
- </para>
-
- <para id="fdl-invariant">
- The <link linkend="fdl-invariant">"Invariant Sections"</link> are
- certain <link linkend="fdl-secondary"> Secondary Sections</link> whose
- titles are designated, as being those of <link
- linkend="fdl-invariant">Invariant Sections</link>, in the notice that
- says that the <link linkend="fdl-document">Document</link> is released
- under this License.
- </para>
-
- <para id="fdl-cover-texts">
- The <link linkend="fdl-cover-texts">"Cover Texts"</link> are certain
- short passages of text that are listed, as <link
- linkend="fdl-cover-texts">Front-Cover Texts</link> or <link
- linkend="fdl-cover-texts">Back-Cover Texts</link>, in the notice that
- says that the <link linkend="fdl-document">Document</link> is released
- under this License.
- </para>
-
- <para id="fdl-transparent">
- A <link linkend="fdl-transparent">"Transparent"</link> copy of the
- <link linkend="fdl-document"> Document</link> means a machine-readable
- copy, represented in a format whose specification is available to the
- general public, whose contents can be viewed and edited directly and
- straightforwardly with generic text editors or (for images composed of
- pixels) generic paint programs or (for drawings) some widely available
- drawing editor, and that is suitable for input to text formatters or
- for automatic translation to a variety of formats suitable for input
- to text formatters. A copy made in an otherwise <link
- linkend="fdl-transparent"> Transparent</link> file format whose markup
- has been designed to thwart or discourage subsequent modification by
- readers is not <link linkend="fdl-transparent">Transparent</link>. A
- copy that is not <link linkend="fdl-transparent">"Transparent"</link>
- is called "Opaque".
- </para>
-
- <para>
- Examples of suitable formats for <link
- linkend="fdl-transparent">Transparent</link> copies include plain
- ASCII without markup, Texinfo input format, LaTeX input format, SGML
- or XML using a publicly available DTD, and standard-conforming simple
- HTML designed for human modification. Opaque formats include
- PostScript, PDF, proprietary formats that can be read and edited only
- by proprietary word processors, SGML or XML for which the DTD and/or
- processing tools are not generally available, and the
- machine-generated HTML produced by some word processors for output
- purposes only.
- </para>
-
- <para id="fdl-title-page">
- The <link linkend="fdl-title-page">"Title Page"</link> means, for a
- printed book, the title page itself, plus such following pages as are
- needed to hold, legibly, the material this License requires to appear
- in the title page. For works in formats which do not have any title
- page as such, <link linkend="fdl-title-page"> "Title Page"</link>
- means the text near the most prominent appearance of the work's title,
- preceding the beginning of the body of the text.
- </para>
+
+ <listitem><para>List on the Title Page,
+ as authors, one or more persons or entities responsible for
+ authorship of the modifications in the Modified Version,
+ together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has less than
+ five).</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section2">
- <term>2. VERBATIM COPYING</term>
- <listitem>
- <para>
- You may copy and distribute the <link
- linkend="fdl-document">Document</link> in any medium, either
- commercially or noncommercially, provided that this License, the
- copyright notices, and the license notice saying this License applies
- to the <link linkend="fdl-document">Document</link> are reproduced in
- all copies, and that you add no other conditions whatsoever to those
- of this License. You may not use technical measures to obstruct or
- control the reading or further copying of the copies you make or
- distribute. However, you may accept compensation in exchange for
- copies. If you distribute a large enough number of copies you must
- also follow the conditions in <link linkend="fdl-section3">section
- 3</link>.
- </para>
-
- <para>
- You may also lend copies, under the same conditions stated above, and
- you may publicly display copies.
- </para>
+
+ <listitem><para>State on the Title page
+ the name of the publisher of the Modified Version, as the
+ publisher.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section3">
- <term>3. COPYING IN QUANTITY</term>
- <listitem>
- <para>
- If you publish printed copies of the <link
- linkend="fdl-document">Document</link> numbering more than 100, and
- the <link linkend="fdl-document">Document's</link> license notice
- requires <link linkend="fdl-cover-texts">Cover Texts</link>, you must
- enclose the copies in covers that carry, clearly and legibly, all
- these <link linkend="fdl-cover-texts">Cover Texts</link>: Front-Cover
- Texts on the front cover, and Back-Cover Texts on the back cover. Both
- covers must also clearly and legibly identify you as the publisher of
- these copies. The front cover must present the full title with all
- words of the title equally prominent and visible. You may add other
- material on the covers in addition. Copying with changes limited to
- the covers, as long as they preserve the title of the <link
- linkend="fdl-document">Document</link> and satisfy these conditions,
- can be treated as verbatim copying in other respects.
- </para>
-
- <para>
- If the required texts for either cover are too voluminous to fit
- legibly, you should put the first ones listed (as many as fit
- reasonably) on the actual cover, and continue the rest onto adjacent
- pages.
- </para>
-
- <para>
- If you publish or distribute <link
- linkend="fdl-transparent">Opaque</link> copies of the <link
- linkend="fdl-document">Document</link> numbering more than 100, you
- must either include a machine-readable <link
- linkend="fdl-transparent">Transparent</link> copy along with each
- <link linkend="fdl-transparent">Opaque</link> copy, or state in or
- with each <link linkend="fdl-transparent">Opaque</link> copy a
- publicly-accessible computer-network location containing a complete
- <link linkend="fdl-transparent"> Transparent</link> copy of the <link
- linkend="fdl-document">Document</link>, free of added material, which
- the general network-using public has access to download anonymously at
- no charge using public-standard network protocols. If you use the
- latter option, you must take reasonably prudent steps, when you begin
- distribution of <link linkend="fdl-transparent">Opaque</link> copies
- in quantity, to ensure that this <link
- linkend="fdl-transparent">Transparent</link> copy will remain thus
- accessible at the stated location until at least one year after the
- last time you distribute an <link
- linkend="fdl-transparent">Opaque</link> copy (directly or through your
- agents or retailers) of that edition to the public.
- </para>
-
- <para>
- It is requested, but not required, that you contact the authors of the
- <link linkend="fdl-document">Document</link> well before
- redistributing any large number of copies, to give them a chance to
- provide you with an updated version of the <link
- linkend="fdl-document">Document</link>.
- </para>
+
+ <listitem><para>Preserve all the
+ copyright notices of the Document.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section4">
- <term>4. MODIFICATIONS</term>
- <listitem>
- <para>
- You may copy and distribute a <link linkend="fdl-modified">Modified
- Version</link> of the <link linkend="fdl-document">Document</link>
- under the conditions of sections <link linkend="fdl-section2">2</link>
- and <link linkend="fdl-section3">3</link> above, provided that you
- release the <link linkend="fdl-modified">Modified Version</link> under
- precisely this License, with the <link linkend="fdl-modified">Modified
- Version</link> filling the role of the <link
- linkend="fdl-document">Document</link>, thus licensing distribution
- and modification of the <link linkend="fdl-modified">Modified
- Version</link> to whoever possesses a copy of it. In addition, you
- must do these things in the <link linkend="fdl-modified">Modified
- Version</link>:
- </para>
-
- <itemizedlist mark="opencircle">
- <listitem>
- <formalpara>
- <title>A</title>
- <para>
- Use in the <link linkend="fdl-title-page">Title Page</link> (and
- on the covers, if any) a title distinct from that of the <link
- linkend="fdl-document">Document</link>, and from those of
- previous versions (which should, if there were any, be listed in
- the History section of the <link
- linkend="fdl-document">Document</link>). You may use the same
- title as a previous version if the original publisher of that
- version gives permission.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>B</title>
- <para>
- List on the <link linkend="fdl-title-page">Title Page</link>, as
- authors, one or more persons or entities responsible for
- authorship of the modifications in the <link
- linkend="fdl-modified">Modified Version</link>, together with at
- least five of the principal authors of the <link
- linkend="fdl-document">Document</link> (all of its principal
- authors, if it has less than five).
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>C</title>
- <para>
- State on the <link linkend="fdl-title-page">Title Page</link>
- the name of the publisher of the <link
- linkend="fdl-modified">Modified Version</link>, as the
- publisher.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>D</title>
- <para>
- Preserve all the copyright notices of the <link
- linkend="fdl-document">Document</link>.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>E</title>
- <para>
- Add an appropriate copyright notice for your modifications
- adjacent to the other copyright notices.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>F</title>
- <para>
- Include, immediately after the copyright notices, a license
- notice giving the public permission to use the <link
- linkend="fdl-modified">Modified Version</link> under the terms
- of this License, in the form shown in the Addendum below.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>G</title>
- <para>
- Preserve in that license notice the full lists of <link
- linkend="fdl-invariant"> Invariant Sections</link> and required
- <link linkend="fdl-cover-texts">Cover Texts</link> given in the
- <link linkend="fdl-document">Document's</link> license notice.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>H</title>
- <para>
- Include an unaltered copy of this License.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>I</title>
- <para>
- Preserve the section entitled "History", and its title, and add
- to it an item stating at least the title, year, new authors, and
- publisher of the <link linkend="fdl-modified">Modified Version
- </link>as given on the <link linkend="fdl-title-page">Title
- Page</link>. If there is no section entitled "History" in the
- <link linkend="fdl-document">Document</link>, create one stating
- the title, year, authors, and publisher of the <link
- linkend="fdl-document">Document</link> as given on its <link
- linkend="fdl-title-page">Title Page</link>, then add an item
- describing the <link linkend="fdl-modified">Modified
- Version</link> as stated in the previous sentence.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>J</title>
- <para>
- Preserve the network location, if any, given in the <link
- linkend="fdl-document">Document</link> for public access to a
- <link linkend="fdl-transparent">Transparent</link> copy of the
- <link linkend="fdl-document">Document</link>, and likewise the
- network locations given in the <link
- linkend="fdl-document">Document</link> for previous versions it
- was based on. These may be placed in the "History" section. You
- may omit a network location for a work that was published at
- least four years before the <link
- linkend="fdl-document">Document</link> itself, or if the
- original publisher of the version it refers to gives permission.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>K</title>
- <para>
- In any section entitled "Acknowledgements" or "Dedications",
- preserve the section's title, and preserve in the section all
- the substance and tone of each of the contributor
- acknowledgements and/or dedications given therein.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>L</title>
- <para>
- Preserve all the <link linkend="fdl-invariant">Invariant
- Sections</link> of the <link
- linkend="fdl-document">Document</link>, unaltered in their text
- and in their titles. Section numbers or the equivalent are not
- considered part of the section titles.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>M</title>
- <para>
- Delete any section entitled "Endorsements". Such a section may
- not be included in the <link linkend="fdl-modified">Modified
- Version</link>.
- </para>
- </formalpara>
- </listitem>
-
- <listitem>
- <formalpara>
- <title>N</title>
- <para>
- Do not retitle any existing section as "Endorsements" or to
- conflict in title with any <link
- linkend="fdl-invariant">Invariant Section</link>.
- </para>
- </formalpara>
- </listitem>
- </itemizedlist>
-
- <para>
- If the <link linkend="fdl-modified">Modified Version</link> includes
- new front-matter sections or appendices that qualify as <link
- linkend="fdl-secondary">Secondary Sections</link> and contain no
- material copied from the Document, you may at your option designate
- some or all of these sections as invariant. To do this, add their
- titles to the list of <link linkend="fdl-invariant">Invariant
- Sections</link> in the <link linkend="fdl-modified">Modified
- Version's</link> license notice. These titles must be distinct from
- any other section titles.
- </para>
-
- <para>
- You may add a section entitled "Endorsements", provided it contains
- nothing but endorsements of your <link linkend="fdl-modified">Modified
- Version</link> by various parties--for example, statements of peer
- review or that the text has been approved by an organization as the
- authoritative definition of a standard.
- </para>
-
- <para>
- You may add a passage of up to five words as a <link
- linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage of up
- to 25 words as a <link linkend="fdl-cover-texts">Back-Cover
- Text</link>, to the end of the list of <link
- linkend="fdl-cover-texts">Cover Texts</link> in the <link
- linkend="fdl-modified">Modified Version</link>. Only one passage of
- <link linkend="fdl-cover-texts">Front-Cover Text</link> and one of
- <link linkend="fdl-cover-texts">Back-Cover Text</link> may be added by
- (or through arrangements made by) any one entity. If the <link
- linkend="fdl-document">Document</link> already includes a cover text
- for the same cover, previously added by you or by arrangement made by
- the same entity you are acting on behalf of, you may not add another;
- but you may replace the old one, on explicit permission from the
- previous publisher that added the old one.
- </para>
-
- <para>
- The author(s) and publisher(s) of the <link
- linkend="fdl-document">Document</link> do not by this License give
- permission to use their names for publicity for or to assert or imply
- endorsement of any <link linkend="fdl-modified">Modified Version
- </link>.
- </para>
+
+ <listitem><para>Add an appropriate
+ copyright notice for your modifications adjacent to the other
+ copyright notices.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section5">
- <term>5. COMBINING DOCUMENTS</term>
- <listitem>
- <para>
- You may combine the <link linkend="fdl-document">Document</link> with
- other documents released under this License, under the terms defined
- in <link linkend="fdl-section4">section 4</link> above for modified
- versions, provided that you include in the combination all of the
- <link linkend="fdl-invariant">Invariant Sections</link> of all of the
- original documents, unmodified, and list them all as <link
- linkend="fdl-invariant">Invariant Sections</link> of your combined
- work in its license notice.
- </para>
-
- <para>
- The combined work need only contain one copy of this License, and
- multiple identical <link linkend="fdl-invariant">Invariant
- Sections</link> may be replaced with a single copy. If there are
- multiple <link linkend="fdl-invariant"> Invariant Sections</link> with
- the same name but different contents, make the title of each such
- section unique by adding at the end of it, in parentheses, the name of
- the original author or publisher of that section if known, or else a
- unique number. Make the same adjustment to the section titles in the
- list of <link linkend="fdl-invariant">Invariant Sections</link> in the
- license notice of the combined work.
- </para>
-
- <para>
- In the combination, you must combine any sections entitled "History"
- in the various original documents, forming one section entitled
- "History"; likewise combine any sections entitled "Acknowledgements",
- and any sections entitled "Dedications". You must delete all sections
- entitled "Endorsements."
- </para>
+
+ <listitem><para>Include, immediately
+ after the copyright notices, a license notice giving the public
+ permission to use the Modified Version under the terms of this
+ License, in the form shown in the Addendum below.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section6">
- <term>6. COLLECTIONS OF DOCUMENTS</term>
- <listitem>
- <para>
- You may make a collection consisting of the <link
- linkend="fdl-document">Document</link> and other documents released
- under this License, and replace the individual copies of this License
- in the various documents with a single copy that is included in the
- collection, provided that you follow the rules of this License for
- verbatim copying of each of the documents in all other respects.
- </para>
-
- <para>
- You may extract a single document from such a collection, and
- distribute it individually under this License, provided you insert a
- copy of this License into the extracted document, and follow this
- License in all other respects regarding verbatim copying of that
- document.
- </para>
+
+ <listitem><para>Preserve in that license
+ notice the full lists of Invariant Sections and required Cover
+ Texts given in the Document's license notice.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section7">
- <term>7. AGGREGATION WITH INDEPENDENT WORKS</term>
- <listitem>
- <para>
- A compilation of the <link linkend="fdl-document">Document</link> or
- its derivatives with other separate and independent documents or
- works, in or on a volume of a storage or distribution medium, does not
- as a whole count as a <link linkend="fdl-modified">Modified
- Version</link> of the <link linkend="fdl-document"> Document</link>,
- provided no compilation copyright is claimed for the compilation.
- Such a compilation is called an "aggregate", and this License does not
- apply to the other self-contained works thus compiled with the <link
- linkend="fdl-document">Document</link> , on account of their being
- thus compiled, if they are not themselves derivative works of the
- <link linkend="fdl-document">Document</link>. If the <link
- linkend="fdl-cover-texts">Cover Text</link> requirement of <link
- linkend="fdl-section3">section 3</link> is applicable to these copies
- of the <link linkend="fdl-document">Document</link>, then if the <link
- linkend="fdl-document">Document</link> is less than one quarter of the
- entire aggregate, the <link linkend="fdl-document">Document's</link>
- <link linkend="fdl-cover-texts">Cover Texts</link> may be placed on
- covers that surround only the <link
- linkend="fdl-document">Document</link> within the aggregate. Otherwise
- they must appear on covers around the whole aggregate.
- </para>
+
+ <listitem><para>Include an unaltered
+ copy of this License.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section8">
- <term>8. TRANSLATION</term>
- <listitem>
- <para>
- Translation is considered a kind of modification, so you may
- distribute translations of the <link
- linkend="fdl-document">Document</link> under the terms of <link
- linkend="fdl-section4">section 4</link>. Replacing <link
- linkend="fdl-invariant"> Invariant Sections</link> with translations
- requires special permission from their copyright holders, but you may
- include translations of some or all <link
- linkend="fdl-invariant">Invariant Sections</link> in addition to the
- original versions of these <link linkend="fdl-invariant">Invariant
- Sections</link>. You may include a translation of this License
- provided that you also include the original English version of this
- License. In case of a disagreement between the translation and the
- original English version of this License, the original English version
- will prevail.
- </para>
+
+ <listitem><para>Preserve the section
+ entitled "History", and its title, and add to it an item stating
+ at least the title, year, new authors, and publisher of the
+ Modified Version as given on the Title Page. If there is no
+ section entitled "History" in the Document, create one stating
+ the title, year, authors, and publisher of the Document as given
+ on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section9">
- <term>9. TERMINATION</term>
- <listitem>
- <para>
- You may not copy, modify, sublicense, or distribute the <link
- linkend="fdl-document">Document</link> except as expressly provided
- for under this License. Any other attempt to copy, modify, sublicense
- or distribute the <link linkend="fdl-document">Document</link> is
- void, and will automatically terminate your rights under this
- License. However, parties who have received copies, or rights, from
- you under this License will not have their licenses terminated so long
- as such parties remain in full compliance.
- </para>
+
+ <listitem><para>Preserve the network
+ location, if any, given in the Document for public access to a
+ Transparent copy of the Document, and likewise the network
+ locations given in the Document for previous versions it was
+ based on. These may be placed in the "History" section. You
+ may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-section10">
- <term>10. FUTURE REVISIONS OF THIS LICENSE</term>
- <listitem>
- <para>
- The <ulink type="http" url="http://www.gnu.org/fsf/fsf.html">Free
- Software Foundation</ulink> may publish new, revised versions of the
- GNU Free Documentation License from time to time. Such new versions
- will be similar in spirit to the present version, but may differ in
- detail to address new problems or concerns. See <ulink type="http"
- url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
- </para>
-
- <para>
- Each version of the License is given a distinguishing version
- number. If the <link linkend="fdl-document">Document</link> specifies
- that a particular numbered version of this License "or any later
- version" applies to it, you have the option of following the terms and
- conditions either of that specified version or of any later version
- that has been published (not as a draft) by the Free Software
- Foundation. If the <link linkend="fdl-document">Document</link> does
- not specify a version number of this License, you may choose any
- version ever published (not as a draft) by the Free Software
- Foundation.
- </para>
+
+ <listitem><para>In any section entitled
+ "Acknowledgements" or "Dedications", preserve the section's
+ title, and preserve in the section all the substance and tone of
+ each of the contributor acknowledgements and/or dedications
+ given therein.</para>
+ </listitem>
+
+ <listitem><para>Preserve all the
+ Invariant Sections of the Document, unaltered in their text and
+ in their titles. Section numbers or the equivalent are not
+ considered part of the section titles.</para>
+ </listitem>
+
+ <listitem><para>Delete any section
+ entitled "Endorsements". Such a section may not be included in
+ the Modified Version.</para>
</listitem>
- </varlistentry>
-
- <varlistentry id="fdl-using">
- <term>Addendum</term>
- <listitem>
- <para>
- To use this License in a document you have written, include a copy of
- the License in the document and put the following copyright and
- license notices just after the title page:
- </para>
-
- <para>
- Copyright &copy; YEAR YOUR NAME.
- </para>
-
- <para>
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.1 or
- any later version published by the Free Software Foundation; with the
- <link linkend="fdl-invariant">Invariant Sections</link> being LIST
- THEIR TITLES, with the <link linkend="fdl-cover-texts">Front-Cover
- Texts</link> being LIST, and with the <link
- linkend="fdl-cover-texts">Back-Cover Texts</link> being LIST. A copy
- of the license is included in the section entitled <quote>GNU Free
- Documentation License</quote>.
- </para>
-
- <para>
- If you have no <link linkend="fdl-invariant">Invariant
- Sections</link>, write "with no Invariant Sections" instead of saying
- which ones are invariant. If you have no <link
- linkend="fdl-cover-texts">Front-Cover Texts</link>, write "no
- Front-Cover Texts" instead of "Front-Cover Texts being LIST"; likewise
- for <link linkend="fdl-cover-texts">Back-Cover Texts</link>.
- </para>
-
- <para>
- If your document contains nontrivial examples of program code, we
- recommend releasing these examples in parallel under your choice of
- free software license, such as the <ulink type="http"
- url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
- License</ulink>, to permit their use in free software.
- </para>
+
+ <listitem><para>Do not retitle any
+ existing section as "Endorsements" or to conflict in title with
+ any Invariant Section.</para>
</listitem>
- </varlistentry>
- </variablelist>
-</appendix> \ No newline at end of file
+ </orderedlist>
+
+ <para>If the Modified Version includes new front-matter sections
+ or appendices that qualify as Secondary Sections and contain no
+ material copied from the Document, you may at your option
+ designate some or all of these sections as invariant. To do this,
+ add their titles to the list of Invariant Sections in the Modified
+ Version's license notice. These titles must be distinct from any
+ other section titles.</para>
+
+ <para>You may add a section entitled "Endorsements", provided it
+ contains nothing but endorsements of your Modified Version by
+ various parties--for example, statements of peer review or that
+ the text has been approved by an organization as the authoritative
+ definition of a standard.</para>
+
+ <para>You may add a passage of up to five words as a Front-Cover
+ Text, and a passage of up to 25 words as a Back-Cover Text, to the
+ end of the list of Cover Texts in the Modified Version. Only one
+ passage of Front-Cover Text and one of Back-Cover Text may be
+ added by (or through arrangements made by) any one entity. If the
+ Document already includes a cover text for the same cover,
+ previously added by you or by arrangement made by the same entity
+ you are acting on behalf of, you may not add another; but you may
+ replace the old one, on explicit permission from the previous
+ publisher that added the old one.</para>
+
+ <para>The author(s) and publisher(s) of the Document do not by
+ this License give permission to use their names for publicity for
+ or to assert or imply endorsement of any Modified Version.</para>
+ </sect1>
+
+ <sect1 label="5">
+ <title>COMBINING DOCUMENTS</title>
+
+ <para>You may combine the Document with other documents released
+ under this License, under the terms defined in section 4 above for
+ modified versions, provided that you include in the combination
+ all of the Invariant Sections of all of the original documents,
+ unmodified, and list them all as Invariant Sections of your
+ combined work in its license notice.</para>
+
+ <para>The combined work need only contain one copy of this
+ License, and multiple identical Invariant Sections may be replaced
+ with a single copy. If there are multiple Invariant Sections with
+ the same name but different contents, make the title of each such
+ section unique by adding at the end of it, in parentheses, the
+ name of the original author or publisher of that section if known,
+ or else a unique number. Make the same adjustment to the section
+ titles in the list of Invariant Sections in the license notice of
+ the combined work.</para>
+
+ <para>In the combination, you must combine any sections entitled
+ "History" in the various original documents, forming one section
+ entitled "History"; likewise combine any sections entitled
+ "Acknowledgements", and any sections entitled "Dedications". You
+ must delete all sections entitled "Endorsements."</para>
+ </sect1>
+
+ <sect1 label="6">
+ <title>COLLECTIONS OF DOCUMENTS</title>
+
+ <para>You may make a collection consisting of the Document and
+ other documents released under this License, and replace the
+ individual copies of this License in the various documents with a
+ single copy that is included in the collection, provided that you
+ follow the rules of this License for verbatim copying of each of
+ the documents in all other respects.</para>
+
+ <para>You may extract a single document from such a collection,
+ and distribute it individually under this License, provided you
+ insert a copy of this License into the extracted document, and
+ follow this License in all other respects regarding verbatim
+ copying of that document.</para>
+ </sect1>
+
+ <sect1 label="7">
+ <title>AGGREGATION WITH INDEPENDENT WORKS</title>
+
+ <para>A compilation of the Document or its derivatives with other
+ separate and independent documents or works, in or on a volume of
+ a storage or distribution medium, does not as a whole count as a
+ Modified Version of the Document, provided no compilation
+ copyright is claimed for the compilation. Such a compilation is
+ called an "aggregate", and this License does not apply to the
+ other self-contained works thus compiled with the Document, on
+ account of their being thus compiled, if they are not themselves
+ derivative works of the Document.</para>
+
+ <para>If the Cover Text requirement of section 3 is applicable to
+ these copies of the Document, then if the Document is less than
+ one quarter of the entire aggregate, the Document's Cover Texts
+ may be placed on covers that surround only the Document within the
+ aggregate. Otherwise they must appear on covers around the whole
+ aggregate.</para>
+ </sect1>
+
+ <sect1 label="8">
+ <title>TRANSLATION</title>
+
+ <para>Translation is considered a kind of modification, so you may
+ distribute translations of the Document under the terms of section
+ 4. Replacing Invariant Sections with translations requires
+ special permission from their copyright holders, but you may
+ include translations of some or all Invariant Sections in addition
+ to the original versions of these Invariant Sections. You may
+ include a translation of this License provided that you also
+ include the original English version of this License. In case of
+ a disagreement between the translation and the original English
+ version of this License, the original English version will
+ prevail.</para>
+ </sect1>
+
+ <sect1 label="9">
+ <title>TERMINATION</title>
+
+ <para>You may not copy, modify, sublicense, or distribute the
+ Document except as expressly provided for under this License. Any
+ other attempt to copy, modify, sublicense or distribute the
+ Document is void, and will automatically terminate your rights
+ under this License. However, parties who have received copies, or
+ rights, from you under this License will not have their licenses
+ terminated so long as such parties remain in full
+ compliance.</para>
+ </sect1>
+
+ <sect1 label="10">
+ <title>FUTURE REVISIONS OF THIS LICENSE</title>
+
+ <para>The Free Software Foundation may publish new, revised
+ versions of the GNU Free Documentation License from time to time.
+ Such new versions will be similar in spirit to the present
+ version, but may differ in detail to address new problems or
+ concerns. See <ulink
+ url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
+
+ <para>Each version of the License is given a distinguishing
+ version number. If the Document specifies that a particular
+ numbered version of this License "or any later version" applies to
+ it, you have the option of following the terms and conditions
+ either of that specified version or of any later version that has
+ been published (not as a draft) by the Free Software Foundation.
+ If the Document does not specify a version number of this License,
+ you may choose any version ever published (not as a draft) by the
+ Free Software Foundation.</para>
+ </sect1>
+
+ <sect1 label="">
+ <title>How to use this License for your documents</title>
+
+ <para>To use this License in a document you have written, include
+ a copy of the License in the document and put the following
+ copyright and license notices just after the title page:</para>
+
+<blockquote><para>
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1
+ or any later version published by the Free Software Foundation;
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+</para></blockquote>
+
+ <para>If you have no Invariant Sections, write "with no Invariant
+ Sections" instead of saying which ones are invariant. If you have
+ no Front-Cover Texts, write "no Front-Cover Texts" instead of
+ "Front-Cover Texts being LIST"; likewise for Back-Cover
+ Texts.</para>
+
+ <para>If your document contains nontrivial examples of program
+ code, we recommend releasing these examples in parallel under your
+ choice of free software license, such as the GNU General Public
+ License, to permit their use in free software.</para>
+ </sect1>
+
+</appendix>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-parent-document: ("referenz.sgml" "appendix")
+sgml-exposed-tags:nil
+sgml-local-ecat-files:nil
+sgml-local-catalogs: CATALOG
+sgml-validate-command: "nsgmls -s referenz.sgml"
+ispell-skip-sgml: t
+End:
+-->
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index fa3e118a15..7119f13580 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -14,21 +14,20 @@
<sect1 id="config-prefs-mail">
<title>Mail Settings</title>
<para>
- To change your mail settings, first go to your
- <interface>Inbox</interface>. Then select <guimenuitem>Mail
- Settings</guimenuitem> from the <guimenu>Tools</guimenu> menu.
- This will open the <interface>mail preferences
- window</interface>, illustrated in <xref
- linkend="config-prefs-mail-fig">. Mail Preferences are
- separated into several categories:
+ To change your mail settings, select <menuchoice>
+ <guimenu>Settings</guimenu> <guimenuitem>Mail
+ configuration</guimenuitem></menuchoice> in the Inbox. This
+ will open the <interface>mail preferences window</interface>,
+ illustrated in <xref linkend="config-prefs-mail-fig">. Mail
+ preferences are separated into several categories:
<variablelist>
<varlistentry>
- <term><guilabel>Identity</guilabel></term>
+ <term><guilabel>Identies</guilabel></term>
<listitem>
<para>
- This allows you to set
- your name, email address, and other information. The
- default values are the ones found on your system account.
+ This allows you to create and alter one or more
+ identities for your email: your name, address, and so
+ forth.
</para>
</listitem>
</varlistentry>
@@ -36,16 +35,19 @@
<term><guilabel>Sources</guilabel></term>
<listitem>
<para>
- Set your mail-checking protocols and servers here.
+ This tab lets you tell
+ <application>Evolution</application> where to get the
+ mail sent to you, and how to get it.
</para>
</listitem>
</varlistentry>
-
<varlistentry>
- <term><guilabel>Sources</guilabel></term>
+
+ <term><guilabel>Mail Transport</guilabel></term>
<listitem>
<para>
- Set your mail-checking protocols and servers here.
+ This tab lets you tell
+ <application>Evolution</application> how to send mail.
</para>
</listitem>
</varlistentry>
@@ -54,21 +56,28 @@
<term><guilabel>News Servers</guilabel></term>
<listitem>
<para>
- Specify your News Server preferences here.
+ If you would like to use
+ <application>Evolution</application> to read newsgroups,
+ you can secify your news server preferences here.
</para>
</listitem>
</varlistentry>
- </variablelist>
-<!-- THE FOLLOWING MAY BE REINSTATED:
- as well as attachment
- and HTML handling, forwarding behavior, filters, and
- other <application>Evolution</application> behaviors
- specific to email. The default behaviors are those
- approved by Jamie Zawinski.
--->
+ <varlistentry>
+ <term><guilabel>Other</guilabel></term>
+ <listitem>
+ <para>
+ Miscellaneous mail and news settings, such as HTML
+ handling preferences, and how long
+ <application>Evolution</application> should wait before
+ marking message read.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
</para>
<!-- ==============Figure===================== -->
@@ -86,19 +95,23 @@
<sect2 id="config-prefs-mail-identity">
<title>Identity Settings</title>
<para>
- If you have only one email address, or use automatic
- forwarding to funnel multiple addresses to one account, then
- you will only need to configure one identity. You may,
- however, want more that one. To alter an identity, click on
- it in the <guilabel>Identity</guilabel> tab of the
+ If you have only one email account, or send email from only
+ one address, you will only need to configure one identity. If
+ you want, however, you can have multiple identities. This
+ can be useful if you want to keep personal and professional
+ email seperate.
+ </para>
+ <para>
+ To add a new identity, simply click
+ <guibutton>Add</guibutton>. To alter an existing identity,
+ click on it in the <guilabel>Identity</guilabel> tab of the
<interface>Preferences</interface> window, and then click
- <guibutton>Edit</guibutton>. To add a new identity, simply
- click <guibutton>Add</guibutton>.
+ <guibutton>Edit</guibutton>.
</para>
<para>
- In either case, you'll be presented with a dialog box with
- four fields:
+ <application>Evolution</application> will then present you
+ with a dialog box containing four fields:
<itemizedlist>
<listitem>
<para>
@@ -131,7 +144,6 @@
</para>
</listitem>
</itemizedlist>
-
</para>
</sect2>
@@ -145,12 +157,9 @@
protocols your network uses, and the names of the servers
you'll be using. If you're switching from another groupware
or email program, you can almost certainly use the same
- settings as you did with that program. Select the
- <guibutton>Sources</guibutton> tab in the
- <interface>Preferences</interface> window to tell
- <application>Evolution</application> where you want to get
- your mail, and click <guibutton>Transports</guibutton> to
- determine how you want to send your mail.
+ settings as you did with that program. Network-related
+ settings are in the <guilabel>Mail Sources</guilabel> and
+ <guilabel>Mail Transport</guilabel> tabs.
</para>
<sect3 id="config-prefs-network-sources">
@@ -185,8 +194,10 @@
<term><guilabel>Username:</guilabel></term>
<listitem>
<para>
- Enter your user name here. Eva Lucianne Tester's
- user name is <userinput>eltester</userinput>.
+ Enter your user name here. This is often related to
+ your real name, but not always. Examples include
+ <guilabel>eltester</guilabel> and
+ <guilabel>rupert</guilabel>.
</para>
</listitem>
</varlistentry>
@@ -194,48 +205,50 @@
<term><guilabel>Authentication:</guilabel></term>
<listitem>
<para>
- Your system administrator will know which type of
- authentication your system requires.
- <application>Evolution</application> can also detect
- what sorts of authentication are available once it
- knows where to find the server.
+ Tell <application>Evolution</application> how to
+ verify your identity with the server. Your options
+ vary depending upon the type of server you are
+ using, and the ways it is configured. Given the
+ name of a server,
+ <application>Evolution</application> can detect what
+ sorts of authentication it offers.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><guilabel>Test values before continuing</guilabel></term>
+ <term><guilabel>Test Settings</guilabel></term>
<listitem>
<para>
- If this box is checked,
- <application>Evolution</application> will attempt to
- make sure that all the other entries in the dialog
- window are correct.
+ Click this button to have
+ <application>Evolution</application> check to see if
+ mail sources are configured correctly.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
<para>
- If you choose several mail sources, clicking
- <guibutton>Get Mail</guibutton> will refresh any IMAP or
+ If you have several mail sources, clicking <guibutton>Get
+ Mail</guibutton> will refresh any IMAP or
<filename>mbox</filename> listings and check and download
all POP servers. In other words, <guibutton>Get
Mail</guibutton> gets your mail, no matter how many
sources you have, or what types they are.
</para>
-
</sect3>
+
<sect3 id="config-prefs-mail-network-transports">
- <title>Transports</title>
+ <title>Mail Transports</title>
<para>
- The <interface>Transports</interface> tab lets you set how
- you will send mail. Evolution currently supports two mail
- transport options: <guilabel>SMTP</guilabel>, which uses a
- remote mail server, and <guilabel>sendmail</guilabel>,
- which uses the <application>sendmail</application> program
- on your local system. <application>Sendmail</application>
- is more difficult to configure, but offers more flexibility
- than <systemitem>SMTP</systemitem>.
+ The <interface>Mail Transports</interface> tab lets you set
+ how you will send mail. Evolution currently supports two
+ mail transport options: <guilabel>SMTP</guilabel>, which
+ uses a remote mail server, and
+ <guilabel>sendmail</guilabel>, which uses the
+ <application>sendmail</application> program on your local
+ system. <application>Sendmail</application> is more
+ difficult to configure, but offers more flexibility than
+ <systemitem>SMTP</systemitem>.
</para>
<para>
To use <guilabel>SMTP</guilabel>, you'll need to enter the
@@ -245,9 +258,8 @@
<para>
<application>Evolution</application> can attempt to
determine if you have entered a valid server name. To
- have it do so, check the box labelled <guilabel>Test these
- values before continuing</guilabel> before you click
- <guibutton>OK</guibutton>.
+ have it do so, click the <guilabel>Test
+ Settings</guilabel> button.
</para>
</sect3>
</sect2>
@@ -255,18 +267,20 @@
<title>News Servers</title>
<para>
Newsgroups are so much like mailing lists that there's no
- reason not to have access to them right next to your mail.
- When you first select the <guilabel>News
- Servers</guilabel> tab, you will see a blank box with
- three familiar buttons on the right:
- <guibutton>Add</guibutton>, <guibutton>Edit</guibutton>,
- and <guibutton>Delete</guibutton>. </para>
+ reason not to keep them right next to your mail. When you
+ first select the <guilabel>News Servers</guilabel> tab,
+ you will see a blank box with the three familiar buttons
+ on the right: <guibutton>Add</guibutton>,
+ <guibutton>Edit</guibutton>, and
+ <guibutton>Delete</guibutton>.
+ </para>
<para>
Click <guibutton>Add</guibutton> to add a news server; you
will be prompted for its name. Enter the name, click
<guibutton>OK</guibutton>, and you're done. You can have
as many mail servers as you like, of course. News servers
- will appear next to your IMAP servers.
+ will appear next to your IMAP servers in the
+ <interface>folder bar</interface>.
</para>
</sect2>
@@ -277,6 +291,7 @@
contains some miscellaneous configurations that don't have
too much to do with each other.
<variablelist>
+
<varlistentry>
<term>
<guilabel>Send messages in HTML format</guilabel>
@@ -291,6 +306,17 @@
for more information about HTML mail.
</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Mark Messages as Seen After</guilabel>
+ </term>
+ <listitem><para>
+ When you click on a message,
+ <application>Evolution</application> will wait a
+ moment before marking it as seen. You can set the
+ delay, in milliseconds, here.
+ </para></listitem>
+ </varlistentry>
<varlistentry>
<term>
<guilabel>Folder Format</guilabel>
@@ -314,28 +340,14 @@
</sect2>
</sect1>
- <sect1 id="config-prefs-contact">
- <title>Managing the Contact Manager</title>
- <para>
- To set the behavior of your Contact Manager, click on the
- <guibutton>Contact Manager</guibutton> tab in the
- <interface>Preferences</interface> window.
- </para>
- <para>
- You can set the following options: <!--insert variable list
- here-->
- </para>
- </sect1>
-
- <sect1 id="config-prefs-cal">
- <title>Configuring the Calendar</title>
- <para>
- This section discusses calendar-specific preferences. While
- looking at your calendar, select
- <guimenuitem>Preferences</guimenuitem> from the
- <guimenu>Edit</guimenu> menu. This will open up the
- <interface>Preferences</interface> window. It contains four
- tabs: <guilabel>Time display</guilabel>,
+ <sect1 id="config-prefs-cal">
+ <title>Configuring the Calendar</title>
+ <para>
+ To set your calendar preferences, select
+ <menuchoice><guimenu>Settings</guimenu>
+ <guimenuitem>Calendar Configuration</guimenuitem></menuchoice>. This
+ will open up the <interface>Preferences</interface> window.
+ It contains four tabs: <guilabel>Time display</guilabel>,
<guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>
and <guilabel>Alarms</guilabel>. The <interface>calendar
preferences window</interface> is illustrated in <xref
@@ -540,13 +552,14 @@
this box to have <application>Evolution</application> beep
at you for any alarms you have set. If you leave this box
unchecked, <application>Evolution</application> will only
- alert you to events by opening a dialog box.
+ alert you to events by opening a dialog box. These beeps
+ are distict from full-fledged audio alarms.
</para>
</listitem>
<listitem>
<para><guilabel>Audio alarms timeout after: </guilabel>
- Select this button to have the beeping stop automatically
- after a certain number of seconds. </para>
+ Select this button to have your audio alarms stop
+ automatically after a certain number of seconds. </para>
</listitem>
<listitem>
<para><guilabel>Enable snoozing for:</guilabel> If you
@@ -563,6 +576,22 @@
</sect1>
+
+ <sect1 id="config-prefs-contact">
+ <title>Managing the Contact Manager</title>
+ <para>
+ To set the behavior of your Contact Manager, click on the
+ <guibutton>Contact Manager</guibutton> tab in the
+ <interface>Preferences</interface> window.
+ </para>
+ <para>
+ You can set the following options: <!--insert variable list
+ here-->
+ </para>
+ </sect1>
+
+
+
<sect1 id="config-prefs-general">
<title>General Preferences</title>
<para>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 0eff8b99a0..9cab3a8bf8 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -102,12 +102,14 @@
<para>
<application>Evolution</application> is highly configurable.
Usually, when developers say that, they mean that they didn't
- test it out thoroughly and have left it to other hackers to
- "configure" themselves a working system. But in the case of
- <application>Evolution</application>, you can expect that it
- will work perfectly well with minimal setup hassle, and that
- you can alter its behavior to fit your needs with just a
- little more work.
+ test it out thoroughly and have left it to other programmers
+ to "configure" themselves a working system. But in the case
+ of <application>Evolution</application>, you can expect that
+ it will work perfectly well with minimal setup hassle, and
+ that you can alter its behavior to fit your needs with just a
+ little more work. This part of the book will describe that
+ process, from the quickest glimpse of the Setup Assistant to
+ an in-depth tour of the preferences dialogs.
</para>
</partintro>
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index cf40c03d37..5cceac51ea 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -14,9 +14,11 @@
<emphasis>informed</emphasis>.
<application>Evolution</application>'s goal is to make the
tasks of storing, organizing, and retrieving information
- easier, so you can work and cooperate with others. That is,
+ easier, so you can work and communicate with others. That is,
it's a more evolved <glossterm>groupware</glossterm> program,
- and an integral part of the Internet-connected desktop.
+ an integral part of the Internet-connected desktop. On the
+ inside, it's a powerful database; on the outside, it's a tool
+ to help you get your work done.
</para>
<para>
Because it's part of the GNOME project,
@@ -32,11 +34,12 @@
<note>
<title>This is a preview release</title>
<para>
- Please help develop <application>Evolution</application>
- by submitting bug reports when you find bugs. You can do
- so by using the <application>Bug Report
- Tool</application> (known as <command>bug-buddy</command>
- at the command line).
+ <application>Evolution</application> is not complete, and
+ still has a lot of flaws. Please help improve it by
+ letting us know about them. You should do this by
+ submitting bug reports with the GNOME <application>Bug
+ Report Tool</application> (known as
+ <command>bug-buddy</command> at the command line).
</para>
</note>
</para>
@@ -308,11 +311,11 @@
</varlistentry>
<varlistentry>
- <term>Reply to a message Message</term>
+ <term>Reply to a Message</term>
<listitem>
<para>
Select the message to which you want to reply, and
- click Click <guibutton>Reply</guibutton> in the
+ click <guibutton>Reply</guibutton> in the
toolbar, or press
<keycombo action="simul">
<keycap>FIXME</keycap>
@@ -328,7 +331,7 @@
<listitem>
<para>
Select the message you want to forward, and
- click Click <guibutton>Forward</guibutton> in the
+ click <guibutton>Forward</guibutton> in the
toolbar, or press
<keycombo action="simul">
<keycap>FIXME</keycap>
@@ -340,6 +343,19 @@
</varlistentry>
<varlistentry>
+ <term>Open a Message in a New Window</term>
+ <listitem>
+ <para>
+ Double-click the message you want to view, or press
+ <keycombo action="simul">
+ <keycap>Ctrl</keycap>
+ <keycap>O</keycap>
+ </keycombo>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Create Filters and vFolders</term>
<listitem>
<para>