[pan2/help-new: 15/15] Update docs and include COPYING-DOCS



commit c6d0af71d70354db031b4fba8bb5b858ebafb605
Author: Petr Kovar <pknbe volny cz>
Date:   Sun Mar 26 20:30:17 2017 +0200

    Update docs and include COPYING-DOCS

 COPYING-DOCS         |  356 ++++++++++++++++++++++++++++++++++++
 Makefile.am          |    1 +
 README               |    4 +-
 help/C/index.docbook |  488 ++++++++++++++++++++------------------------------
 help/C/legal.xml     |    2 +-
 5 files changed, 553 insertions(+), 298 deletions(-)
---
diff --git a/COPYING-DOCS b/COPYING-DOCS
new file mode 100644
index 0000000..99ed582
--- /dev/null
+++ b/COPYING-DOCS
@@ -0,0 +1,356 @@
+                GNU Free Documentation License
+                   Version 1.1, March 2000
+
+ Copyright (C) 2000  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+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.
+
+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.
+
+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.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+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".
+
+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.
+
+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.
+
+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.
+
+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.
+
+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".
+
+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.
+
+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.
+
+
+2. VERBATIM COPYING
+
+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.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+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.
+
+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.
+
+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.
+
+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.
+
+
+4. MODIFICATIONS
+
+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:
+
+A. 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.
+B. 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).
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. 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.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. 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.
+J. 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.
+K. 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.
+L. 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.
+M. Delete any section entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+   or to conflict in title with any Invariant Section.
+
+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.
+
+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.
+
+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.
+
+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.
+
+
+5. COMBINING DOCUMENTS
+
+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.
+
+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.
+
+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."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+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.
+
+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.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+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.
+
+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.
+
+
+8. TRANSLATION
+
+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.
+
+
+9. TERMINATION
+
+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.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+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
+http://www.gnu.org/copyleft/.
+
+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.
+
+
+ADDENDUM: How to use this License for your documents
+
+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:
+
+      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".
+
+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.
+
+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.
+
diff --git a/Makefile.am b/Makefile.am
index 756ec7e..cfff6de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,7 @@ MAINTAINERCLEANFILES = \
  $(NULL)
 
 EXTRA_DIST = \
+ COPYING-DOCS \
  README \
  README.windows \
  Pan.ico \
diff --git a/README b/README
index 296fc0a..c5d73bf 100644
--- a/README
+++ b/README
@@ -6,8 +6,8 @@
 
 RELEASE NOTES
 
-        * You are advised to back up your PAN_HOME folder ('~/.pan2' by default)
-          before upgrading Pan.
+        * You are advised to back up your $PAN_HOME directory (by default,
+          '$HOME/.pan2') before upgrading Pan.
 
         * If you have previously been using a localhost server with stunnel and
           you now want to connect directly to a news server using the actual
diff --git a/help/C/index.docbook b/help/C/index.docbook
index 5ecfcca..c72fe97 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
   <!ENTITY legal SYSTEM "legal.xml">
   <!ENTITY appversion "1.0">
   <!ENTITY manrevision "0.1">
@@ -52,6 +52,12 @@
       <year>2011</year>
       <holder>Heinrich M&#252;ller</holder>
     </copyright>
+
+    <copyright>
+      <year>2011</year>
+      <holder>Petr Kovar</holder>
+    </copyright>
+
 <!-- translators: uncomment this:
 
   <copyright>
@@ -63,46 +69,44 @@
 <!-- An address can be added to the publisher information.  If a role is
      not specified, the publisher/author is the same for all versions of the
      document.  -->
-    <publisher>
+    <!--<publisher>
       <publishername>Pan Documentation Project</publishername>
-    </publisher>
+    </publisher>-->
 
    <!-- This file  contains link to license for the documentation (GNU FDL), and
         other legal stuff such as "NO WARRANTY" statement. Please do not change
-       any of this. -->
+        any of this. -->
 
     &legal;
 
     <authorgroup>
-      <author role="maintainer">
-               <firstname>Douglas</firstname>
-               <surname>Bollinger</surname>
-               <affiliation>
-                       <orgname>Pan Documentation Project</orgname>
-                       <address><email>pan rebelbase com</email></address>
-               </affiliation>
-      </author>
-
-<!-- This is appropriate place for other contributors: translators,
-     maintainers,  etc. Commented out by default.
-
-      <othercredit role="translator">
-               <firstname>Latin</firstname>
-               <surname>Translator 1</surname>
-               <affiliation>
-                       <orgname>Latin Translation Team</orgname>
-                       <address> <email>translator gnome org</email> </address>
-               </affiliation>
-               <contrib>Latin translation</contrib>
-      </othercredit>
--->
+        <author role="maintainer">
+            <firstname>Douglas</firstname>
+            <surname>Bollinger</surname>
+            <affiliation>
+                <!--<orgname>Pan Documentation Project</orgname>-->
+                <!--<address><email>pan rebelbase com</email></address>-->
+            </affiliation>
+        </author>
+
+        <!-- This is appropriate place for other contributors: translators,
+             maintainers,  etc. Commented out by default.
+            <othercredit role="translator">
+            <firstname>Latin</firstname>
+            <surname>Translator 1</surname>
+            <affiliation>
+                <orgname>Latin Translation Team</orgname>
+                <address>
+                    <email>translator gnome org</email>
+                </address>
+            </affiliation>
+            <contrib>Latin translation</contrib>
+        </othercredit>-->
     </authorgroup>
 
-
 <!-- According to GNU FDL, revision history is mandatory if you are -->
 <!-- modifying/reusing someone else's document.  If not, you can omit it. -->
-<!-- Remember to remove the &manrevision; entity from the revision entries other
--->
+<!-- Remember to remove the &manrevision; entity from the revision entries other -->
 <!-- than the current revision. -->
 <!-- The revision numbering system for GNOME manuals is as follows: -->
 <!-- * the revision number consists of two components -->
@@ -113,26 +117,44 @@
 <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
 <!-- to V3.0, and so on. -->
     <revhistory>
-      <revision>
-               <revnumber>V 0.1</revnumber>
-               <date>December 2006</date>
-               <revdescription>
-                       <para role="author">Douglas Bollinger
-               <email>pan rebelbase com</email>
-                       </para>
-                       <para role="publisher">GNOME Documentation Project</para>
-               </revdescription>
-      </revision>
+        <revision>
+            <revnumber>V 0.3</revnumber>
+            <date>April 2017</date>
+            <revdescription>
+                <para role="author">Petr Kovar</para>
+            </revdescription>
+        </revision>
+        <revision>
+            <revnumber>V 0.2</revnumber>
+            <date>January 2011</date>
+            <revdescription>
+                <para role="author">Heinrich M&#252;ller</para>
+                <para role="author">Petr Kovar</para>
+            </revdescription>
+        </revision>
+        <revision>
+            <revnumber>V 0.1</revnumber>
+            <date>December 2006</date>
+            <revdescription>
+                <para role="author">Douglas Bollinger
+                    <!--<email>pan rebelbase com</email>-->
+                </para>
+                <!--<para role="publisher">GNOME Documentation Project</para>-->
+            </revdescription>
+        </revision>
     </revhistory>
 
-    <releaseinfo>This manual describes Pan version 1.0.</releaseinfo>
+    <!--<releaseinfo>This manual describes Pan version 1.0.</releaseinfo>-->
+
     <legalnotice>
       <title>Feedback</title>
-      <para>To report a bug or make a suggestion regarding the <application>Pan</application> application or
-      this manual, follow the directions in the <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback 
Page</ulink>.
+      <para>To report a bug or make a suggestion regarding the <application>Pan</application>
+      application or this manual, follow the directions in the <ulink 
url="http://pan.rebelbase.com/contact/";>Pan
+      Contact Page</ulink>.
       </para>
-<!-- Translators may also add here feedback address for translations -->
+      <!-- Translators may also add here feedback address for translations -->
     </legalnotice>
+
   </articleinfo>
 
   <indexterm zone="index">
@@ -159,27 +181,23 @@
 
   <sect2 id="pan-getstart-start">
     <title>To Start <application>Pan</application></title>
-    <para>You can start &app; in the following ways:
+    <para>How to start &app; depends on your desktop environment.
     </para>
     <variablelist>
        <varlistentry>
-               <term><guimenu>Applications</guimenu> menu</term>
+               <term>The GNOME Desktop Environment</term>
                <listitem>
-               <para>Choose
-               <menuchoice>
-               <guisubmenu>Internet </guisubmenu>
-               <guimenuitem>Pan Newsreader</guimenuitem>
-               </menuchoice>. </para>
+               <para>Press the <keycap>Super</keycap> key to enter the Activities
+               Overview, type <userinput>pan</userinput>, and then press
+               <keycap>Enter</keycap>.</para>
                </listitem>
        </varlistentry>
        <varlistentry>
                <term>Command line</term>
                <listitem>
                <para>To start &app; from a command line, type the following command,
-               then press <keycap>Return</keycap>:</para>
-               <para>
-                       <command>pan</command>
-               </para>
+               then press <keycap>Enter</keycap>:</para>
+               <screen><command>pan</command></screen>
                </listitem>
        </varlistentry>
     </variablelist>
@@ -219,14 +237,14 @@
     </para>
     <variablelist>
                <varlistentry>
-                       <term><interface>Menubar. </interface></term>
+                       <term><interface>Menubar</interface></term>
                <listitem>
                <para> The menubar contains all the commands that you need to run &app;.</para>
                </listitem>
                </varlistentry>
 
                <varlistentry>
-                       <term><interface>Toolbar.</interface> </term>
+                       <term><interface>Toolbar</interface> </term>
                <listitem>
                <para> The toolbar contains a subset of the commands that you can access from the menubar. It 
also contains
                        two textboxes that allow you to limit the number of groups and/or the number of 
articles displayed.</para>
@@ -234,7 +252,7 @@
                </varlistentry>
 
                <varlistentry>
-                       <term><interface>Group Pane.</interface> </term>
+                       <term><interface>Group Pane</interface> </term>
                <listitem>
                        <para>The Group Pane displays a list of all the newsgroups available on the server.  
This list is split into
                                two groups: Subscribed Groups are a user-selected list of favorite groups, 
Other Groups are the rest of the
@@ -243,7 +261,7 @@
                </varlistentry>
 
                <varlistentry>
-                       <term><interface>Header Pane.</interface> </term>
+                       <term><interface>Header Pane</interface> </term>
                <listitem>
                        <para>The Header Pane displays a list of all the individual article headers available 
in the selected group.
                                The Header Pane is highly customizable via sorting, threading and 
scoring.</para>
@@ -251,20 +269,20 @@
                </varlistentry>
 
                <varlistentry>
-                       <term><interface>Body Pane.</interface> </term>
+                       <term><interface>Body Pane</interface> </term>
                <listitem>
                        <para>The Body Pane displays the text of the selected article header.</para>
                </listitem>
                </varlistentry>
 
                <varlistentry>
-                       <term><interface>Statusbar. </interface></term>
+                       <term><interface>Status Bar</interface></term>
                <listitem>
                        <para>The Status Bar displays information about current &app;
                                activity:</para>
                                <itemizedlist>
                                        <listitem><para>Current number of connections to the 
server</para></listitem>
-                                       <listitem><para>Number of uncompleted tasks in the Task 
Mananger</para></listitem>
+                                       <listitem><para>Number of uncompleted tasks in the Task 
Manager</para></listitem>
                                        <listitem><para>Completed percentage of current 
tasks</para></listitem>
                                        <listitem><para>Error status of the event log</para></listitem>
                                </itemizedlist>
@@ -273,7 +291,7 @@
        </variablelist>
        <para>When you right-click in the &app; window, the application displays
                a popup menu.  The popup menu contains the most common commands for whichever pane you 
clicked.</para>
-       <para>Like other applications, actions in &app; can be performed in serveral ways: with the menu, 
with the toolbar
+       <para>Like other applications, actions in &app; can be performed in several ways: with the menu, with 
the toolbar
                or with shortcut keys.  The shortcut key for most menu items is shown in the menu itself, 
following the menu
                command.</para>
        </sect2>
@@ -289,12 +307,12 @@
                <title>Description</title>
                        <para>Usenet is a distributed discussion system.  Using a special program called a 
newsreader, a user accesses
                                a news server to read and post email-like messages called articles.  These 
articles are then exchanged
-                               back and forth with other news servers throughout the world.  In this way, 
articles proprogate from one
+                               back and forth with other news servers throughout the world.  In this way, 
articles propagate from one
                                news server to another throughout the entire Usenet system.</para>
        </sect2>
        <sect2 id="pan-nutshell-organize">
                <title>Organization</title>
-                       <para>Articles are organized into catagories called groups.  In discussion groups, 
most articles are responses
+                       <para>Articles are organized into categories called groups.  In discussion groups, 
most articles are responses
                                to another article.  The set of articles which can be traced to one single 
non-reply article is called a
                                thread.  When articles are organized into threads, it is much easier to 
follow a single discussion.</para>
        </sect2>
@@ -303,15 +321,14 @@
                        <para>Articles are routed around Usenet based on the information contained in the 
article header, which is the
                                first part of an article that contains information like the subject, author, 
date and routing information.
                                To save time and bandwidth, most newsreaders first download just the article 
headers to sort and thread
-                               them.  The user selects a article of interest from the list of headers and 
then downloads the article body
+                               them.  The user selects an article of interest from the list of headers and 
then downloads the article body
                                to read.</para>
        </sect2>
        <sect2 id="pan-nutshell-binary">
                <title>Binary Data</title>
                        <para>Usenet was originally created to distribute text content encoded in 7-bit 
ASCII.  With additional
                                encoding programs, multiple posts per chunk and other various tricks, it 
became possible to send binary
-                               data through Usenet.  Certain groups are devoted specifically to binary 
content such as images, music or
-                               movies.</para>
+                               data through Usenet.  Groups that allow for binary content or binaries are 
called binary groups.</para>
        </sect2>
        </sect1>
 
@@ -319,45 +336,19 @@
 
   <sect1 id="pan-basic-usage">
     <title>Basic Usage</title>
-    <para>This section is an overview on how to perform basic Usenet actions with &app;.
-      <itemizedlist>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-server"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-groups"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-articles"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-post"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-reply"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-basic-binaries"/></para>
-               </listitem>
-      </itemizedlist> </para>
+    <para>This section is an overview on how to perform basic Usenet actions with &app;.</para>
 
     <!-- ================ Basic Usage Subsection ================================ -->
 
     <sect2 id="pan-basic-server">
-               <title>Setup a News Server</title>
+               <title>Set Up a News Server</title>
                <para>When you start &app; for the first time, the <interface>Add a Server</interface> dialog 
is displayed.</para>
 
                        <para>At this point, you must enter the connection information for the server you 
wish to access.  After you
                                enter this information, &app; will contact the server and download a list of 
all the groups the server
-                               carries and save it to disk.. </para>
+                               carries and save it to disk.</para>
 
-                       <para> Refer to <xref linkend="pan-custom-servers"/> for more detailed 
information:</para>
+                       <para> Refer to <xref linkend="pan-custom-servers"/> for more detailed 
information.</para>
        </sect2>
 
        <!-- ================ Basic Usage Subsection ================================ -->
@@ -365,11 +356,11 @@
     <sect2 id="pan-basic-groups">
       <title>Selecting a News Group</title>
         <para>The Group Pane contains a list of all the news groups available on the server.  Scroll through 
the list
-                and enter a group by clicking on it's name.</para>
+                and enter a group by clicking on its name.</para>
 
         <para>If this is the first time you have entered this group, you will be prompted on how many 
article headers you wish to
-                retrieve from the server.  You can choose to retreive all article headers available for that 
group or limit the
-                retrieval by either quantity of articles or number of days. </para>
+                retrieve from the server.  You can choose to retrieve all article headers available for that 
group or limit the
+                retrieval by either quantity of articles or number of days.</para>
 
         <para>After making a selection from this dialog, &app; will download the article headers for the
                 selected group and save them locally on the computer.</para>
@@ -386,9 +377,8 @@
         <menuchoice>
                <guimenu>Groups</guimenu>
                <guimenuitem>Subscribe</guimenuitem>
-        </menuchoice>
-        .  Scroll the group window to the top if necessary and you will see that the selected newsgroup is 
listed directly under
-        the Subscribed Groups section.</para>
+        </menuchoice>. Scroll the group window to the top if necessary and you will see that the selected 
newsgroup is listed directly under
+        the <interface>Subscribed Groups</interface> section.</para>
 
     </sect2>
 
@@ -402,13 +392,14 @@
          <para>&app; defaults to showing collapsed threads.  Only the first article of the thread is shown 
with a number in
                  parenthesis indicating how many posts are hidden.  Clicking on the right-facing arrow 
before the header text will
                  expand the thread, showing the hidden articles in the thread.  Reading the first article of 
the thread will also
-                 expand the thread.  The keyboard shortcut for expanding threads is shift-right arrow.  
Shift-left arrow will collapse
-                 the thread.</para>
+                 expand the thread.  The keyboard shortcut for expanding threads is
+                 <keycombo><keycap>Shift</keycap><keycap>&#8594;</keycap></keycombo>.
+                 <keycombo><keycap>Shift</keycap><keycap>&#8592;</keycap></keycombo> will collapse the 
thread.</para>
          <para>Clicking on a header will download the article from the server, store it in the article cache 
and display it in the
                  article pane.  The article is then marked as read.  Read articles are distinguished in the 
header pane by using a
-                 normal (not bold) font and by showing a open envelope icon in the state column.</para>
-         <para>You can scroll the message in the Article Pane by using the scrollbar or by pressing the 
spacebar.  Whenever
-                 the bottom of the retreived article is already displayed, press the spacebar will download 
the next
+                 normal (not bold) font and by showing an open envelope icon in the state column.</para>
+         <para>You can scroll the message in the Article Pane by using the scrollbar or by pressing 
<keycap>Space</keycap>.  Whenever
+                 the bottom of the retrieved article is already displayed, pressing <keycap>Space</keycap> 
will download the next
                  article.</para>
     </sect2>
     <!-- ================ Basic Usage Subsection ================================ -->
@@ -442,20 +433,20 @@
                        <guimenu>Post</guimenu>
                        <guimenuitem>Followup to Newsgroup</guimenuitem>
                 </menuchoice>.
-                The highlighted article's text will appear as quoted text (each line is preceeded by a ">") 
in the editor window.
+                The highlighted article's text will appear as quoted text (each line is preceded by a ">") 
in the editor window.
                 Type in your response and then choose
                 <menuchoice>
                        <guimenu>File</guimenu>
                        <guimenuitem>Send Article</guimenuitem>
                 </menuchoice>
          to send the article to the news server. </para>
-                <para>If you want to send a reply to a specfic article via email, highlight that article in 
the Header Pane with
+                <para>If you want to send a reply to a specific article via email, highlight that article in 
the Header Pane with
                         the middle mouse button and choose
                 <menuchoice>
                        <guimenu>Post</guimenu>
                        <guimenuitem>Reply to Author in Mail</guimenuitem>
                 </menuchoice>
-                .  The highlighted article's text will appear as quoted text (each line is preceeded by a 
">") in the editor window.
+                .  The highlighted article's text will appear as quoted text (each line is preceded by a 
">") in the editor window.
                 Type in your response and then choose
                 <menuchoice>
                        <guimenu>File</guimenu>
@@ -487,21 +478,7 @@
   <!-- ============= News Groups ================== -->
   <sect1 id="pan-groups">
          <title>Groups</title>
-         <para>Working with groups in &app;.
-      <itemizedlist>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-groups-view"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-groups-actions"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-groups-newsrc"/></para>
-               </listitem>
-      </itemizedlist> </para>
+         <para>Working with groups in &app;.</para>
 
   <!-- ================ Groups Subsection ================================ -->
 
@@ -509,9 +486,9 @@
          <title>Group Views</title>
 
          <para>The total number of groups on a news server can be quite extensive.  An easy way to find a 
specific group is
-                 to use the Group Name textbox in the toolbar.  Only groups that match the characters typed 
in the box will be
-                 displayed in the Group Pane.  If you wish to return the Group Pane to it's original state, 
simply delete the
-                 characters in the box by clicking the red X icon to the right of the box.</para>
+                 to use the <interface>Group</interface> text box in the toolbar.  Only groups that match 
the characters typed in the box will be
+                 displayed in the Group Pane.  If you wish to return the Group Pane to its original state, 
simply delete the
+                 characters in the box by clicking the X icon to the right of the box.</para>
 
                 <para>The group names presented in the Group Pane can be shortened by choosing
                 <menuchoice>
@@ -624,7 +601,7 @@
   <sect2 id="pan-groups-newsrc">
          <title>The Newsrc File</title>
          <para>The group list, subscribe/unsubscribe status of each group and the articles marked read in 
each group are
-                 stored in the newsrc file at <filename>~/.pan2/newsrc-1.</filename></para>
+                 stored in the newsrc file at <filename>$HOME/.pan2/newsrc-1.</filename></para>
          <para>The newsrc file format is standard among many Unix newsreaders and can be used to import and 
export this
                  information between these applications.</para>
   </sect2>
@@ -634,37 +611,19 @@
   <sect1 id="pan-headers">
          <title>Headers</title>
          <para>Users will spend most of their time in &app; interacting with the article headers in the 
Header Pane.  &app; has
-                 many features to optimize header viewing and article retreival.
-      <itemizedlist>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-headers-view"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-headers-movement"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-headers-selection"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-headers-action"/></para>
-               </listitem>
-      </itemizedlist> </para>
+                 many features to optimize header viewing and article retrieval.</para>
 
   <!-- ================ Headers Subsection ================================ -->
   <sect2 id="pan-headers-view">
          <title>Header View</title>
 
          <para>Since the total number of all the available article headers in a group might be enormous, 
&app; has several
-                 options to limit the number of visible headers to a more managable number.</para>
+                 options to limit the number of visible headers to a more manageable number.</para>
 
-         <para>In the toolbar, the Subject or Author text box is a filter than can be used to limit the 
viewable headers.
-                 Usually this is used to search for a specific article or a group of articles.  Click on the 
hourglass icon to
-                 choose which header field to base the filter.  Only the article headers that match the 
characters typed into the
-                 text box will be displayed.  Click the red X to erase and reset.</para>
+         <para>In the toolbar, the <interface>Subject or Author</interface> text box is a filter than can be 
used to limit the
+           visible headers. Usually this is used to search for a specific article or a group of articles. 
Click on the magnifying
+           glass icon to choose which header field to base the filter.  Only the article headers that match 
the characters typed into the
+                 text box will be displayed.  Click the X to erase and reset.</para>
 
          <variablelist>
                  <varlistentry>
@@ -768,7 +727,7 @@
                                                  <listitem>
                                                          <para><guilabel>Match Scores of 
xxxx</guilabel></para>
                                                          <para>These options deal with scoring where you 
choose to display an article based on
-                                                                 it's score.  Refer to <xref 
linkend="pan-scoring"/> for more information.</para>
+                                                                 its score.  Refer to <xref 
linkend="pan-scoring"/> for more information.</para>
                                                  </listitem>
                                          </itemizedlist>
                                  </listitem>
@@ -856,7 +815,7 @@
                                          </menuchoice>
                                  </term>
                                  <listitem>
-                                         <para>Read the next article, regardless of it's read/unread 
state.</para>
+                                         <para>Read the next article, regardless of its read/unread 
state.</para>
                                  </listitem>
                           </varlistentry>
                           <varlistentry>
@@ -938,8 +897,8 @@
   <sect2 id="pan-headers-selection">
          <title>Header Selection</title>
 
-         <para>In order to perform an action on a article header, you must select it first.  Use the middle 
mouse button to
-                 select a article.  Drag the selection field with the mouse to select multiple articles.  
Hold down the control
+         <para>In order to perform an action on an article header, you must select it first. Use the middle 
mouse button to
+                 select an article. Drag the selection field with the mouse to select multiple articles. 
Hold down the <keycap>Ctrl</keycap>
                  key while clicking articles with the middle mouse button to add individual articles to the 
selection.</para>
 
          <para>&app; also offers a number of other ways to efficiently select articles.</para>
@@ -1009,7 +968,7 @@
                                  </menuchoice>
                          </term>
                          <listitem>
-                                 <para>Select the entire article body.  You must retreive the article 
first.</para>
+                                 <para>Select the entire article body.  You must retrieve the article 
first.</para>
                          </listitem>
                  </varlistentry>
   </variablelist>
@@ -1018,11 +977,11 @@
 
   <sect2 id="pan-headers-action">
          <title>Header Action</title>
-         <para>Whenever &app; downloads a article body, the data is saved to disk in the article cache.  The 
article cache is
-                 a fixed-size buffer and when the cache has beened filled, the older articles are erased to 
make room for newer
+         <para>Whenever &app; downloads an article body, the data is saved to disk in the article cache.  
The article cache is
+                 a fixed-size buffer and when the cache has been filled, the older articles are erased to 
make room for newer
                  ones.</para>
 
-         <para>These are the actions you can perform on a article selected in the Header Pane.</para>
+         <para>These are the actions you can perform on an article selected in the Header Pane.</para>
          <variablelist>
                <varlistentry>
                          <term>
@@ -1117,7 +1076,7 @@
 
          <sect2 id="pan-body-images">
                  <title>Digital Images</title>
-                 <para>Some groups specialize in digital images where each binary post is a seperate image.  
&app; can
+                 <para>Some groups specialize in digital images where each binary post is a separate image.  
&app; can
                          automatically decode and display these images.  To display the image, select and 
view the article header as
                          you normally would for text and the image will be displayed in the Body Pane.
                  </para>
@@ -1179,7 +1138,7 @@
                                                  <listitem>
                                                          <para><guilabel>Size Pictures to 
Fit</guilabel></para>
                                                                  <para>Size digital images so they will 
display in the Body Pane without scrolling.
-                                                                         Click on the image to view it in 
it's original size.</para>
+                                                                         Click on the image to view it in 
its original size.</para>
                                                  </listitem>
                                          </itemizedlist>
                                  </listitem>
@@ -1191,21 +1150,7 @@
   <!-- ================ Posting ================================ -->
   <sect1 id="pan-posting">
          <title>Posting</title>
-         <para>How to post articles in &app;.
-      <itemizedlist>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-posting-actions"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-posting-profiles"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-posting-dialog"/></para>
-               </listitem>
-      </itemizedlist> </para>
+         <para>How to post articles in &app;.</para>
 
   <!-- ================ Posting Subsection ================================ -->
 
@@ -1314,7 +1259,7 @@
                  <title>Signatures</title>
                  <para>A signature is a block of text that is appended to the end of every outgoing article. 
 Generally it is contact
                          information, a personal motto or a witty saying.</para>
-                 <para>Click "Use Signature" to activate signature support.</para>
+                 <para>Click <guilabel>Use a Signature</guilabel> to activate signature support.</para>
                  <itemizedlist>
                          <listitem>
                                  <para><guilabel>Text</guilabel></para>
@@ -1331,20 +1276,22 @@
                                  <para>Example: <command>fortune -s</command></para>
                          </listitem>
                          <listitem>
-                                 <para><guilabel>PGP-Signature</guilabel></para>
-                                 <para>Choose this if you want to sign/encrypt your message with PGP. The 
given Email-Address has to match the PGP Email-Address for
-                                 this method to work.</para>
+                                 <para><guilabel>PGP Signature</guilabel></para>
+                                 <para>Choose this if you want to sign or encrypt your message with PGP. The 
given email address has to
+                                   match the PGP email address for this method to work.</para>
+                                 <note>
+                                   <para>PGP support is an optional feature and may not be available in your 
&app; build.</para>
+                                 </note>
                          </listitem>
                  </itemizedlist>
          </sect3>
 
          <sect3 id="pan-posting-profiles-optional">
-                 <title>Option Information</title>
-                 <para>Optional Information:</para>
+                 <title>Optional Information</title>
                  <itemizedlist>
                          <listitem>
                                  <para><guilabel>Attribution</guilabel></para>
-                                 <para>When you reply to a post, the text in the attribution box proceeds 
the quoted text.  The %d flag is
+                                 <para>When you reply to a post, the text in the attribution box precedes 
the quoted text.  The %d flag is
                                          replaced the by the date of the selected post while the %n flag is 
replaced with the author of the
                                          selected post.</para>
                          </listitem>
@@ -1366,14 +1313,14 @@
                  <para>The <interface>Post Article Dialog</interface> is composed of the following 
parts:</para>
                  <variablelist>
                                <varlistentry>
-                                       <term><guilabel>Menubar.</guilabel></term>
+                                       <term><guilabel>Menubar</guilabel></term>
                                        <listitem>
                                                <para> The menubar contains all the commands that you need to 
post an article.</para>
                                        </listitem>
                                </varlistentry>
 
                                <varlistentry>
-                                       <term><guilabel>Toolbar.</guilabel> </term>
+                                       <term><guilabel>Toolbar</guilabel> </term>
                                        <listitem>
                                                <para> The toolbar contains a subset of the commands that you 
can access from the menubar.</para>
                                        </listitem>
@@ -1402,9 +1349,9 @@
                                </varlistentry>
 
                                <varlistentry>
-                                       <term><guilabel>Mailto</guilabel></term>
+                                       <term><guilabel>Mail To</guilabel></term>
                                        <listitem>
-                                               <para>Enter a email address to send the article.</para>
+                                               <para>Enter an email address to send the article.</para>
                                        </listitem>
                                </varlistentry>
 
@@ -1488,7 +1435,7 @@
                                          </menuchoice>
                                  </term>
                                  <listitem>
-                                         <para>Starts an external editor.  Type in your post in the external 
editor as your
+                                         <para>Starts an external editor.  Type in your post in the external 
editor as you
                                                  normally would and save your work.  The external editor 
will close and the text that
                                                  was entered into that editor will be located in the text 
area.</para>
                                  </listitem>
@@ -1569,7 +1516,7 @@
                                  </term>
                                  <listitem>
                                          <para>ROT13 is a simple cipher to hide story spoilers, joke 
punchlines, etc.  Select the
-                                                 text to cypher and use this command.</para>
+                                                 text to cipher and use this command.</para>
                                  </listitem>
                          </varlistentry>
                  </variablelist>
@@ -1581,28 +1528,14 @@
 
   <sect1 id="pan-tasks">
          <title>Tasks</title>
-         <para>Certains tasks performed by &app;, like downloading binary posts or grabbing new headers for 
a group, can take
+         <para>Certain tasks performed by &app;, like downloading binary posts or grabbing new headers for a 
group, can take
                  a long time. These tasks are queued and performed in the background while &app; is 
processing other tasks like
-                 grabbing an article.
-      <itemizedlist>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-tasks-cancel"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-tasks-taskmanager"/></para>
-               </listitem>
-               <listitem>
-                 <para>
-                       <xref linkend="pan-tasks-nzb"/></para>
-               </listitem>
-      </itemizedlist> </para>
+                 grabbing an article.</para>
 
   <!-- ================ Tasks Subsection ================================ -->
   <sect2 id="pan-tasks-cancel">
          <title>Cancel Last Task</title>
-         <para>You can quickly cancel the last task added to the task queue (The Oops command) by selecting:
+         <para>You can quickly cancel the last task added to the task queue by selecting:
                 <menuchoice>
                        <guimenu>File</guimenu>
                        <guimenuitem>Cancel Last Task</guimenuitem>
@@ -1622,14 +1555,14 @@
         <para> The Task Manger window is composed of the following parts:</para>
                <variablelist>
                        <varlistentry>
-                               <term><guilabel>Toolbar.</guilabel> </term>
+                               <term><guilabel>Toolbar</guilabel> </term>
                                <listitem>
                                        <para> The toolbar contains all the commands you need to manipulate 
the tasks in the Task Manger
                                                Window.</para>
                                </listitem>
                        </varlistentry>
                        <varlistentry>
-                               <term><guilabel>Informational Area.</guilabel> </term>
+                               <term><guilabel>Informational Area</guilabel> </term>
                                <listitem>
                                        <para> The Informational Area displays the number of queued tasks, 
the amount of data that needs to
                                                downloaded to complete the queued tasks, the current download 
rate and the estimated time needed
@@ -1637,7 +1570,7 @@
                                </listitem>
                        </varlistentry>
                        <varlistentry>
-                               <term><guilabel>Task List.</guilabel> </term>
+                               <term><guilabel>Task List</guilabel> </term>
                                <listitem>
                                        <para> A list of queued tasks.  Each row is a separate task.</para>
                                </listitem>
@@ -1646,14 +1579,13 @@
                <para>In order to manipulate a task, click on it and the row will be highlighted.  Then click 
on one of the
                        buttons in the toolbar.</para>
                <tip><para>If &app; is shutdown whiles tasks are still waiting in the task manager, the task 
list is saved to disk
-                               and resumed when &app; is restarted. This, however is not true for upload 
tasks at the moment. In the next version,
-                               this will be possible.</para></tip>
+                               and resumed when &app; is restarted. This, however, is not true for upload 
tasks in the current version.</para></tip>
        </sect2>
 
   <!-- ================ Tasks Subsection ================================ -->
        <sect2 id="pan-tasks-nzb">
                <title>NZB Files</title>
-               <para>&app; saves its task list in <filename>~/.pan2/tasks.nzb</filename> file.  You can 
import other task lists
+               <para>&app; saves its task list in <filename>$HOME/.pan2/tasks.nzb</filename> file.  You can 
import other task lists
                        into &app; by choosing
                         <menuchoice>
                                <guimenu>File</guimenu>
@@ -1674,31 +1606,13 @@
          article from John Smith a high score, while articles with a subject line containing the phrase "For 
Sale" a negative
          score.</para>
 
-  <itemizedlist>
-       <listitem>
-         <para>
-           <xref linkend="pan-scoring-actions"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-scoring-addrules"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-scoring-editrules"/></para>
-    </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-scoring-advanced"/></para>
-    </listitem>
-  </itemizedlist>
   <!-- ============= Scoring Subsection ================== -->
 
      <sect2 id="pan-scoring-actions">
         <title>Scoring Actions</title>
-                <para>&app; can perform two actions based on a article's score:
+                <para>&app; can perform two actions based on an article's score:
                         <itemizedlist>
-                                <listitem><para>View a article by using
+                                <listitem><para>View an article by using
                                          <menuchoice>
                                                <guimenu>View</guimenu>
                                                <guisubmenu>Header Pane</guisubmenu>
@@ -1713,7 +1627,7 @@
                                                <guimenu>Edit</guimenu>
                                                <guisubmenu>Preferences</guisubmenu>
                                                <guimenuitem>Colors</guimenuitem>
-                                         </menuchoice>
+                                         </menuchoice>.
                                </para></listitem>
                        </itemizedlist>
                </para>
@@ -1723,7 +1637,7 @@
        <sect2 id="pan-scoring-addrules">
                <title>Adding Scoring Rules</title>
 
-                 <para>There are several ways to add rules to the score file.  Select a article in the 
Header Pane and then
+                 <para>There are several ways to add rules to the score file.  Select an article in the 
Header Pane and then
                          select
                                  <menuchoice>
                                        <guimenu>Articles</guimenu>
@@ -1742,22 +1656,22 @@
 
                  <para>Both of these scoring rules only work in the selected group and expire in one 
month.</para>
 
-                 <para>Selecting a article and selecting
+                 <para>Selecting an article and selecting
                                  <menuchoice>
                                        <guimenu>Articles</guimenu>
                                        <guisubmenu>Ignore Author</guisubmenu>
                                  </menuchoice>
-                                 will open the <interface>New Scoring Rule dialog</interface>.</para>
+                                 will open the <interface>New Scoring Rule</interface> dialog.</para>
 
                  <para>The default of this scoring rule is to score all the posts of the author of the 
selected article -9999 for
                          the next month in the selected group.  By clicking on various fields and selecting 
different options in the
-                         New Scoring Rule dialog, you can customize the rule further.  For instance, instead 
of having the rule expire
-                         in one month, you can have the rule last forever.  Also note that you can make the 
rule add to the score of a
-                         article, making it a watch rule.  So the name "Ignore Author" can be somewhat of a 
misnomer.</para>
+                         <interface>New Scoring Rule</interface> dialog, you can customize the rule further. 
 For instance, instead of
+                         having the rule expire in one month, you can have the rule last forever.  Also note 
that you can make the rule
+                         add to the score of an article, making it a watch rule.  So the name "Ignore 
Author" can be somewhat of a misnomer.</para>
 
-                 <para>When finished, click add and rescore to close the dialog box.</para>
+                 <para>When finished, click <guibutton>Add and Rescore</guibutton> to close the dialog 
box.</para>
 
-                 <para>Selecting a article and selecting
+                 <para>Selecting an article and selecting
                                  <menuchoice>
                                        <guimenu>Articles</guimenu>
                                        <guisubmenu>Add a Scoring Rule</guisubmenu>
@@ -1771,7 +1685,7 @@
          <sect2 id="pan-scoring-editrules">
          <title>Editing or Deleting Scoring Rules</title>
 
-         <para>Selecting a article that is currently being scored and choosing
+         <para>Selecting an article that is currently being scored and choosing
                          <menuchoice>
                                <guimenu>Articles</guimenu>
                                <guisubmenu>Edit Article's Watch/Ignore/Score</guisubmenu>
@@ -1779,20 +1693,22 @@
                          will open the <interface>Article's Scores</interface> dialog box.  From this dialog 
you can manipulate the
                          scoring rule for the currently selected article.  Each rule will have its own row 
describing the scoring
                          action (plus or minus points), locations and line number of this rule in the score 
file and the texts of the
-                         rule.  Select the rule and click <guibutton>+Add</guibutton> button to alter the 
rule or
-                         <guibutton>-Remove</guibutton> button to delete the rule from the score file.  
Click <guibutton>close and
-                                 rescore</guibutton> when finished.</para>
+                         rule.  Select the rule and click <guibutton>Add</guibutton> button to alter the 
rule or
+                         <guibutton>Remove</guibutton> button to delete the rule from the score file.  Click 
<guibutton>Close and
+                               Rescore</guibutton> when finished.</para>
          </sect2>
   <!-- ============= Scoring Subsection ================== -->
 
          <sect2 id="pan-scoring-advanced">
                  <title>Advanced Scoring</title>
 
-                 <para>The scoring file is located at <filename>~/.pan2/Scoring</filename>.  Advanced users 
might want to edit this
+                 <para>The scoring file is located at <filename>$HOME/.pan2/Scoring</filename>.  Advanced 
users might want to edit this
                          file directly with a text editor to create advanced scoring rules that are 
difficult or impossible to
                          construct from the <interface>New Scoring Rule</interface> dialog.  The format of 
the scoring rules is
                          similar to the application <application>slrn</application>, but be aware that not 
all
                          <application>slrn</application> scoring functions will work in &app;.</para>
+                         <para>The slrn scoring functions are described in the document
+                         <ulink url="http://www.slrn.org/docs/score.html";>slrn - Scoring</ulink>.</para>
          </sect2>
   </sect1>
 
@@ -1800,33 +1716,12 @@
   <sect1 id="pan-custom">
          <title>Customization</title>
          <para>This section describes how certain features or actions in &app; can be customized.</para>
-      <itemizedlist>
-       <listitem>
-         <para>
-           <xref linkend="pan-custom-behavior"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-custom-gui"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-custom-externalapps"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-custom-articlecache"/></para>
-       </listitem>
-       <listitem>
-         <para>
-           <xref linkend="pan-custom-servers"/></para>
-       </listitem>
-         </itemizedlist>
+
   <!-- ============= Customization Subsection ================== -->
   <sect2 id="pan-custom-behavior">
       <title>Behavior</title>
       <para>Many of the default actions of &app;, such as mouse clicks, actions when entering or leaving
-                 a group and the action of the space bar can be altered.</para>
+                 a group and the action of <keycap>Space</keycap> can be altered.</para>
          <variablelist>
                  <varlistentry>
                          <term>In
@@ -1850,7 +1745,7 @@
                                                  <itemizedlist>
                                                          <listitem>
                                                                  <para>The first box, when activated, will 
automatically get new headers for all
-                                                                         subscribed groups whenever Pan is 
started.  This is the equivilant of using
+                                                                         subscribed groups whenever Pan is 
started.  This is the equivalent of using
                                                                         <menuchoice>
                                                                                <guimenu>Groups</guimenu>
                                                                                <guimenuitem>Get New Headers 
in Subscribed Groups</guimenuitem>
@@ -1860,7 +1755,7 @@
                                                          </listitem>
                                                          <listitem>
                                                                 <para>The next box, when activated, will 
automatically get new headers when entering a
-                                                                         group.  This is the equivilant of 
using
+                                                                         group.  This is the equivalent of 
using
                                                                 <menuchoice>
                                                                        <guimenu>Groups</guimenu>
                                                                        <guimenuitem>Get New Headers in 
Selected Group</guimenuitem>
@@ -1870,7 +1765,7 @@
                                                         </listitem>
                                                         <listitem>
                                                                 <para>The next box, when activated, will 
mark the entire group read when leaving a group.
-                                                                        This is the equivilant of using
+                                                                        This is the equivalent of using
                                                                         <menuchoice>
                                                                                <guimenu>Groups</guimenu>
                                                                                <guimenuitem>Mark Group 
Read</guimenuitem>
@@ -1886,7 +1781,7 @@
                                             </listitem>
                                          <listitem>
                                                  <para><guilabel>Articles</guilabel></para>
-                                                 <para>The first option, when activated, makes the spacebar 
select the next article rather than
+                                                 <para>The first option, when activated, makes 
<keycap>Space</keycap> select the next article rather than
                                                          the next unread article.  This is handy if you are 
viewing a thread with read and unread
                                                          articles mixed together.</para>
                                                  <para>The next option activates smooth scrolling in the 
Article Pane.</para>
@@ -1899,7 +1794,7 @@
   <!-- ============= Customization Subsection ================== -->
   <sect2 id="pan-custom-gui">
          <title>GUI Composition</title>
-         <para>The layout and view of the Group, Header and Body Panes in &app; can customized in serveral 
ways.</para>
+         <para>The layout and view of the Group, Header and Body Panes in &app; can be customized in several 
ways.</para>
 
       <variablelist>
                  <varlistentry>
@@ -1923,9 +1818,9 @@
                                                <guimenu>View</guimenu>
                                                <guisubmenu>Layout</guisubmenu>
                                                <guimenuitem>Tabbed Layout</guimenuitem>
-                                        </menuchoice>
-                                 .  Now, only one of the three Panes will displayed at a time.  Each Pane is 
brought to the front of
-                                 other Panes by clicking on it's tab located directly under the tool bar or 
by pressing "1", "2" or "3"
+                                        </menuchoice>.
+                                       Now, only one of the three Panes will be displayed at a time.  Each 
Pane is brought to the front of
+                                 other Panes by clicking on its tab located directly under the tool bar or 
by pressing "1", "2" or "3"
                                  for the Group, Header or Body Pane respectively.</para>
                          </listitem>
                  </varlistentry>
@@ -1973,7 +1868,7 @@
   <!-- ============= Customization Subsection ================== -->
   <sect2 id="pan-custom-externalapps">
          <title>External Applications</title>
-         <para>In this section you setup external applications that &app; can use.</para>
+         <para>In this section you set up external applications that &app; can use.</para>
          <variablelist>
                  <varlistentry>
                          <term>In
@@ -1981,25 +1876,25 @@
                                        <guimenu>Edit</guimenu>
                                        <guisubmenu>Preferences</guisubmenu>
                                        <guimenuitem>Applications</guimenuitem>
-                                 </menuchoice>
+                                 </menuchoice>:
                          </term>
                          <listitem>
                                  <itemizedlist>
                                          <listitem>
                                                  <para><guilabel>Web Browser</guilabel></para>
-                                                 <para>Click the Web Button to choose which external 
application to launch when clicking on a HTML
+                                                 <para>Click the Web Button to choose which external 
application to launch when clicking on an HTML
                                                          link.</para>
                                          </listitem>
                                          <listitem>
                                                  <para><guilabel>Mail Reader</guilabel></para>
-                                                 <para>Choose which external application to launch when 
clicking on a email address or when
+                                                 <para>Choose which external application to launch when 
clicking on an email address or when
                                                          sending a post via email.</para>
                                          </listitem>
                                  </itemizedlist>
                          </listitem>
                  </varlistentry>
                </variablelist>
-                 <para>To setup an external text editor, choose
+                 <para>To set up an external text editor, choose
                                  <menuchoice>
                                        <guimenu>Post</guimenu>
                                        <guisubmenu>Post to Newsgroup</guisubmenu>
@@ -2018,11 +1913,12 @@
          <para>The article cache is a fixed-size disk buffer where &app; stores articles when they are 
downloaded from a
                  news server.  If the user downloads a large amount of binary attachments, the default cache 
size might be
                  inadequate.</para>
-         <para>The article cache size can be altered by changing
+         <para>The article cache size can be changed in
       <menuchoice>
               <guimenu>Edit</guimenu>
               <guisubmenu>Preferences</guisubmenu>
               <guimenuitem>Behavior</guimenuitem>
+              <guilabel>Article Cache</guilabel>
       </menuchoice>
          </para>
   </sect2>
@@ -2039,7 +1935,7 @@
                        <guisubmenu>Edit News Servers</guisubmenu>
                </menuchoice>
                and the <interface>Servers</interface> dialog will appear.  Click on a server name and you 
can edit or remove it
-               via the buttons.  Click the add button to add another server.</para>
+               via the buttons.  Click the <guibutton>Add</guibutton> button to add another server.</para>
 
          <para>When you add or edit an existing server, the <interface>Edit a Server's Settings</interface> 
dialog will
                  appear.</para>
@@ -2052,7 +1948,7 @@
                  </listitem>
                  <listitem>
                          <para><guilabel>Port</guilabel></para>
-                         <para>The port of the server.  Port 119 is the standard port number for unsecured 
NNTP connections, 563 is for TLS/SSL connections.</para>
+                         <para>The port of the server. Port 119 is the standard port number for unsecured 
NNTP connections, port 563 is for TLS/SSL connections.</para>
                  </listitem>
          </itemizedlist>
          <para>The next section is the login information for the server.  If you server requires a username 
and password,
@@ -2074,12 +1970,12 @@
                          <para><guilabel>Connection Limit</guilabel></para>
                          <para>&app; can open multiple connections to a server so the user can perform 
simultaneous actions like
                                  download a binary attachment will reading articles in a text group.</para>
-                         <para>In order to follow the GNKSA rules, the maximum number of connections &app; 
can have open with a server
-                                 is 4.</para>
+                         <para>In order to follow the <ulink 
url="https://js.home.xs4all.nl/gnksa/";>GNKSA</ulink> rules, the
+                           maximum number of connections &app; can have open with a server is 4.</para>
                  </listitem>
                  <listitem>
                          <para><guilabel>Expire Old Articles</guilabel></para>
-                         <para>From this toggle box, you can pick a time when &app; will expire old articles 
and remove them from it's
+                         <para>From this toggle box, you can pick a time when &app; will expire old articles 
and remove them from its
                                  article index.</para>
                  </listitem>
                  <listitem>
@@ -2093,11 +1989,13 @@
                  </listitem>
                  <listitem>
                          <para><guilabel>TLS (SSL) Options</guilabel></para>
-                         <para>If security and privacy are concerns, choose secured connections if the 
server supports it.
-                                 article index.</para>
+                         <para>If security and privacy are of concern, choose secured connections if the 
server supports it.</para>
+                               <note>
+                                 <para>TLS (SSL) support is an optional feature and may not be available in 
your &app; build.</para>
+                               </note>
                  </listitem>
                  <listitem>
-                         <para><guilabel>Always trust</guilabel></para>
+                         <para><guilabel>Always trust this server's certificate</guilabel></para>
                          <para>If you want to trust the server regardless of the authenticity of its 
certificate, you can enable this option. Use with caution!</para>
                  </listitem>
          </itemizedlist>
@@ -2107,7 +2005,7 @@
 <!-- ============= Bugs ================================== -->
 <!-- This section is optional and is commented out by default.
      You can use it to describe known bugs and limitations of the
-         program if there are any - please be frank and list all
+          program if there are any - please be frank and list all
      problems you know of.
 
   <sect1 id="mayapp-bugs">
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1d..899282c 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,7 +6,7 @@
          by the Free Software Foundation with no Invariant Sections,
          no Front-Cover Texts, and no Back-Cover Texts.  You can find
          a copy of the GFDL at this <ulink type="help"
-         url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+         url="help:fdl">link</ulink> or in the file COPYING-DOCS
          distributed with this manual.
          </para>
          <para> This manual is part of a collection of GNOME manuals


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]