[SACVS] CVS: spamassassin/lib/Mail/SpamAssassin Conf.pm,1.254,1.255

Update of /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin
In directory sc8-pr-cvs1:/tmp/cvs-serv19536/lib/Mail/SpamAssassin

Modified Files:
        Conf.pm 
Log Message:
various formatting fixes


Index: Conf.pm
===================================================================
RCS file: /cvsroot/spamassassin/spamassassin/lib/Mail/SpamAssassin/Conf.pm,v
retrieving revision 1.254
retrieving revision 1.255
diff -b -w -u -d -r1.254 -r1.255
--- Conf.pm     17 Sep 2003 20:33:27 -0000      1.254
+++ Conf.pm     17 Sep 2003 21:16:40 -0000      1.255
@@ -1006,158 +1006,161 @@
 
 =item ok_languages xx [ yy zz ... ]            (default: all)
 
-Which languages are considered OK to receive mail in.  SpamAssassin will try to
-detect the language used in the message text.
+This option is used to specify which languages are considered OK for
+incoming mail.  SpamAssassin will try to detect the language used in the
+message text.
 
-Note that the language cannot always be recognized reliably.  In that case, no
-points will be assigned.
+Note that the language cannot always be recognized with sufficient
+confidence.  In that case, no points will be assigned.
 
 The rule C<UNDESIRED_LANGUAGE_BODY> is triggered based on how this is set.
 
-The following languages are recognized.  In your configuration, you must use
-the language specifier located in the first column, not the English name for
-the language.  You may also specify C<all> if your language is not listed, or
-if you want to allow any language.  The default setting is C<all>.
+In your configuration, you must use the two or three letter language
+specifier in lowercase, not the English name for the language.  You may
+also specify C<all> if a desired language is not listed, or if you want to
+allow any language.  The default setting is C<all>.
 
-=over 4
+Examples:
 
-=item af       afrikaans
+  ok_languages all         (allow all languages)
+  ok_languages en          (only allow English)
+  ok_languages en ja zh    (allow English, Japanese, and Chinese)
 
-=item am       amharic
+Note: if there are multiple ok_languages lines, only the last one is used.
 
-=item ar       arabic
+Select the languages to allow from the list below:
 
-=item be       byelorussian
+=over 4
 
-=item bg       bulgarian
+=item af       - Afrikaans
 
-=item bs       bosnian
+=item am       - Amharic
 
-=item ca       catalan
+=item ar       - Arabic
 
-=item cs       czech
+=item be       - Byelorussian
 
-=item cy       welsh
+=item bg       - Bulgarian
 
-=item da       danish
+=item bs       - Bosnian
 
-=item de       german
+=item ca       - Catalan
 
-=item el       greek
+=item cs       - Czech
 
-=item en       english
+=item cy       - Welsh
 
-=item eo       esperanto
+=item da       - Danish
 
-=item es       spanish
+=item de       - German
 
-=item et       estonian
+=item el       - Greek
 
-=item eu       basque
+=item en       - English
 
-=item fa       persian
+=item eo       - Esperanto
 
-=item fi       finnish
+=item es       - Spanish
 
-=item fr       french
+=item et       - Estonian
 
-=item fy       frisian
+=item eu       - Basque
 
-=item ga       irish gaelic
+=item fa       - Persian
 
-=item gd       scottish gaelic
+=item fi       - Finnish
 
-=item he       hebrew
+=item fr       - French
 
-=item hi       hindi
+=item fy       - Frisian
 
-=item hr       croatian
+=item ga       - Irish Gaelic
 
-=item hu       hungarian
+=item gd       - Scottish Gaelic
 
-=item hy       armenian
+=item he       - Hebrew
 
-=item id       indonesian
+=item hi       - Hindi
 
-=item is       icelandic
+=item hr       - Croatian
 
-=item it       italian
+=item hu       - Hungarian
 
-=item ja       japanese
+=item hy       - Armenian
 
-=item ka       georgian
+=item id       - Indonesian
 
-=item ko       korean
+=item is       - Icelandic
 
-=item la       latin
+=item it       - Italian
 
-=item lt       lithuanian
+=item ja       - Japanese
 
-=item lv       latvian
+=item ka       - Georgian
 
-=item mr       marathi
+=item ko       - Korean
 
-=item ms       malay
+=item la       - Latin
 
-=item ne       nepali
+=item lt       - Lithuanian
 
-=item nl       dutch
+=item lv       - Latvian
 
-=item no       norwegian
+=item mr       - Marathi
 
-=item pl       polish
+=item ms       - Malay
 
-=item pt       portuguese
+=item ne       - Nepali
 
-=item qu       quechua
+=item nl       - Dutch
 
-=item rm       rhaeto-romance
+=item no       - Norwegian
 
-=item ro       romanian
+=item pl       - Polish
 
-=item ru       russian
+=item pt       - Portuguese
 
-=item sa       sanskrit
+=item qu       - Quechua
 
-=item sco      scots
+=item rm       - Rhaeto-Romance
 
-=item sk       slovak
+=item ro       - Romanian
 
-=item sl       slovenian
+=item ru       - Russian
 
-=item sq       albanian
+=item sa       - Sanskrit
 
-=item sr       serbian
+=item sco      - Scots
 
-=item sv       swedish
+=item sk       - Slovak
 
-=item sw       swahili
+=item sl       - Slovenian
 
-=item ta       tamil
+=item sq       - Albanian
 
-=item th       thai
+=item sr       - Serbian
 
-=item tl       tagalog
+=item sv       - Swedish
 
-=item tr       turkish
+=item sw       - Swahili
 
-=item uk       ukrainian
+=item ta       - Tamil
 
-=item vi       vietnamese
+=item th       - Thai
 
-=item yi       yiddish
+=item tl       - Tagalog
 
-=item zh       chinese
+=item tr       - Turkish
 
-=back
+=item uk       - Ukrainian
 
-examples:
+=item vi       - Vietnamese
 
-  ok_languages all         (allow all languages)
-  ok_languages en          (only allow English)
-  ok_languages en ja zh    (allow English, Japanese, and Chinese)
+=item yi       - Yiddish
 
-Note: if there are multiple ok_languages lines, only the last one is used.
+=item zh       - Chinese
+
+=back
 
 =cut
 
@@ -1165,11 +1168,18 @@
       $self->{ok_languages} = $1; next;
     }
 
+=back
+
+Z<>
+
+=over 4
+
 =item ok_locales xx [ yy zz ... ]              (default: all)
 
-Which locales (country codes) are considered OK to receive mail from.  Mail
-using B<character sets> used by languages in these countries, will not be
-marked as possibly being spam in a foreign language.
+This option is used to specify which locales (country codes) are
+considered OK for incoming mail.  Mail using B<character sets> used by
+languages in these countries will not be marked as possibly being spam in
+a foreign language.
 
 If you receive lots of spam in foreign languages, and never get any non-spam in
 these languages, this may help.  Note that all ISO-8859-* character sets, and
@@ -1180,44 +1190,32 @@
 The rules C<CHARSET_FARAWAY>, C<CHARSET_FARAWAY_BODY>, and
 C<CHARSET_FARAWAY_HEADERS> are triggered based on how this is set.
 
-Select the locales to allow from the list below:
-
-=over 4
-
-=item en
-
-Western character sets in general
+Examples:
 
-=item ja
+  ok_locales all         (allow all locales)
+  ok_locales en          (only allow English)
+  ok_locales en ja zh    (allow English, Japanese, and Chinese)
 
-Japanese
+Note: if there are multiple ok_locales lines, only the last one is used.
 
-=item ko
+Select the locales to allow from the list below:
 
-Korea
+=over 4
 
-=item ru
+=item en       - Western character sets in general
 
-Cyrillic charsets
+=item ja       - Japanese character sets
 
-=item th
+=item ko       - Korean character sets
 
-Thai
+=item ru       - Cyrillic character sets
 
-=item zh
+=item th       - Thai character sets
 
-Chinese (both simplified and traditional)
+=item zh       - Chinese (both simplified and traditional) character sets
 
 =back
 
-examples:
-
-  ok_locales all         (allow all locales)
-  ok_locales en          (only allow English)
-  ok_locales en ja zh    (allow English, Japanese, and Chinese)
-
-Note: if there are multiple ok_locales lines, only the last one is used.
-
 =cut
 
     if (/^ok_locales\s+(.+)$/) {
@@ -1374,25 +1372,29 @@
 will result in all those networks becoming trusted.  To clear out the
 existing entries, use C<clear_trusted_networks>.
 
-If you're running with DNS checks enabled, SpamAssassin includes code to infer
-your trusted networks on the fly, so this may not be necessary.  This inference
-works as follows:
+If you're running with DNS checks enabled, SpamAssassin includes code to
+infer your trusted networks on the fly, so this may not be necessary.
+(Thanks to Scott Banister and Andrew Flury for the inspiration for this
+algorithm.)  This inference works as follows:
 
 =over 4
 
-=item if the 'from' IP address is on the same /16 network as the top Received
+=item *
+
+if the 'from' IP address is on the same /16 network as the top Received
 line's 'by' host, it's trusted
 
-=item if the address of the 'from' host is in a reserved network range,
+=item *
+
+if the address of the 'from' host is in a reserved network range,
 then it's trusted
 
-=item if any addresses of the 'by' host is in a reserved network range,
+=item *
+
+if any addresses of the 'by' host is in a reserved network range,
 then it's trusted
 
 =back
-
-(Thanks to Scott Banister and Andrew Flury for the inspiration for this
-algorithm.)
 
 =cut
 



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf