snapshot of project "lynx", label v2-8-1dev_21

2 files changed, 82 insertions, 53 deletions

diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 7acc581a..95c3aa45 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -615,20 +615,33 @@ return to Lynx or the '<em>&gt;</em>' command to save the options to a
 
    <dt>Raw 8-bit or CJK Mode
 	<dd>Whether 8-bit characters are assumed to correspond with the
-	    selected character set and therefore are processed without
+	    display character set and therefore are processed without
 	    translation via the chartrans conversion tables.  Should be ON
-	    by default when the selected character set is one of the Asian
-	    (CJK) sets and the 8-bit characters are Kanji multibytes.
-	    Should be OFF for the other character sets, but can be turned ON
+	    by default when the display character set is one of the
+	    Asian (CJK) sets and the 8-bit characters are Kanji multibytes.
+	    Should be OFF for the other display character sets, but can be turned ON
 	    when the document's charset is unknown (e.g., is not ISO-8859-1
 	    and no charset parameter was specified in a reply header from
 	    an HTTP server to indicate what it is) but you know by some
 	    means that you have the matching display character set selected.
 	    Should be OFF when an Asian (CJK) set is selected but the document
-	    is ISO-8859-1.  The setting also can be toggled via the RAW_TOGGLE
+	    is ISO-8859-1 or another 'assumed document character set'.
+	    The setting also can be toggled via the RAW_TOGGLE
 	    command, normally mapped to '<em>@</em>', and at startup via the
 	    <em>-raw</em> switch.
 
+   <dt>Assumed document character set
+	<dd>This option changes the handling of documents which do not
+	    explicitly specify a charset.  Normally Lynx assumes that 8-bit
+	    characters in those documents are encoded according to iso-8859-1
+	    (the official default for the HTTP protocol).  Unfortunately,
+	    many non-English web pages "forget" to include proper charset info;
+	    this option helps you to browse those broken pages if you know
+	    by some means what the charset is.  When the value
+	    given here or by an -assume_charset command line flag is in effect,
+	    Lynx will treat documents as if they were encoded accordingly.
+	    This option active when 'Raw 8-bit or CJK Mode' is OFF.
+
    <dt>Show color.
 	<dd>This option will be present if color support is available.
 	    If set to ON or ALWAYS, color mode will be forced on if possible.
diff --git a/lynx_help/keystrokes/option_help.html b/lynx_help/keystrokes/option_help.html
index 2ef8151c..26783901 100644
--- a/lynx_help/keystrokes/option_help.html
+++ b/lynx_help/keystrokes/option_help.html
@@ -13,7 +13,7 @@
 
      Editor             -  If non-empty it defines the editor to spawn
                            when editing a local file or sending mail.
-			   Any valid text editor may be entered here.
+                           Any valid text editor may be entered here.
 
      DISPLAY variable   -  If non-empty it specifies your <A HREF="xterm_help.html">X terminal</A>
                            display address.
@@ -56,7 +56,7 @@
                            a from: field.
 
      Searching type     -  If set to 'case sensitive', user searches
-                           invoked by the '/' command will be case 
+                           invoked by the '/' command will be case
                            sensitive substring searches.  The
                            default is 'Case Insensitive' substring
                            searches
@@ -65,11 +65,11 @@
      Language              are available from servers.  Use RFC 1766 tags,
                            e.g., en for English, fr for French, etc.  Can be
                            a comma-separated list, which may be interpreted
-			   by servers as descending order of preferences.
-			   You can also make your order of preference explicit
-			   by using q factors as defined by the HTTP protocol,
-			   for servers which understand it, for example:
-				<kbd>da, en-gb;q=0.8, en;q=0.7</kbd>
+                           by servers as descending order of preferences.
+                           You can also make your order of preference explicit
+                           by using q factors as defined by the HTTP protocol,
+                           for servers which understand it, for example:
+                                <kbd>da, en-gb;q=0.8, en;q=0.7</kbd>
 
      Preferred Document -  The character set you prefer if sets in addition
      Charset               to ISO-8859-1 and US-ASCII are available from
@@ -77,40 +77,56 @@
                            and do not include ISO-8859-1 or US-ASCII, since
                            those values are always assumed by default.  Can
                            be a comma-separated list, which may be interpreted
-			   by servers as descending order of preferences.
-			   You can also make your order of preference explicit
-			   by using q factors as defined by the HTTP protocol,
-			   for servers which understand it, for example:
-				<kbd>iso-8859-5, unicode-1-1;q=0.8</kbd>
+                           by servers as descending order of preferences.
+                           You can also make your order of preference explicit
+                           by using q factors as defined by the HTTP protocol,
+                           for servers which understand it, for example:
+                                <kbd>iso-8859-5, utf-8;q=0.8</kbd>
 
      Display Character  -  This option allows you to set up the default
-     set                   character set for your specific terminal.
-                           The character set provides a mapping of 8-bit ISO
-                           Latin character entities and/or Asian (CJK) or
-                           Unicode characters into viewable characters and
-                           should be set according to your terminal's
-                           character set if you will be viewing such
-                           characters with Lynx.  You must have the selected
-                           character set installed on your terminal.
+     set                   character set for your specific terminal. The
+                           display character set provides a mapping from the
+                           character encodings of viewed documents and from
+                           HTML entities into viewable characters. It should
+                           be set according to your terminal's character set
+                           so that characters other than 7-bit ASCII can be
+                           displayed correctly, using approximations if
+                           necessary. You must have the selected character set
+                           installed on your terminal.
 
      Raw 8-bit or CJK   -  Toggles whether 8-bit characters are assumed to
-     mode                  correspond with the selected character set and
-                           therefore are processed without translation via
-                           the chartrans conversion tables.  Should be ON
-                           by default when the selected character set is one
-                           of the Asian (CJK) sets and the 8-bit characters
-                           are Kanji multibytes.  Should be OFF for the other
-                           character sets, but can be turned ON when the
-                           document's charset is unknown (e.g., is not
-                           ISO-8859-1 and no charset parameter was included in
-                           a reply header from an HTTP server to indicate what
-                           it is) but you know by some means that you have the
-                           matching display character set selected.  Should be
-                           OFF when an Asian (CJK) set is selected but the
-                           document is ISO-8859-1.  The setting also can be
+     mode                  correspond with the display character set and
+                           therefore are processed without translation via the
+                           chartrans conversion tables. Should be ON by
+                           default when the display character set is one of
+                           the Asian (CJK) sets and the 8-bit characters are
+                           Kanji multibytes. Should be OFF for the other
+                           display character sets, but can be turned ON when
+                           the document's charset is unknown (e.g., is not
+                           ISO-8859-1 and no charset parameter was specified
+                           in a reply header from an HTTP server to indicate
+                           what it is) but you know by some means that you
+                           have the matching display character set selected.
+                           Should be OFF when an Asian (CJK) set is selected
+                           but the document is ISO-8859-1 or another 'assumed
+                           document character set'. The setting also can be
                            toggled via the RAW_TOGGLE command, normally mapped
                            to '@', and at startup via the -raw switch.
 
+     Assumed document   -  This option changes the handling of documents
+     character set         which do not explicitly specify a charset.
+                           Normally Lynx assumes that 8-bit characters in
+                           those documents are encoded according to iso-8859-1
+                           (the official default for the HTTP protocol).
+                           Unfortunately, many non-English web pages "forget"
+                           to include proper charset info; this option helps
+                           you to browse those broken pages if you know by
+                           some means what the charset is.  When the value
+                           given here or by an -assume_charset command line
+                           flag is in effect, Lynx will treat documents as if
+                           they were encoded accordingly. This option active
+                           when 'Raw 8-bit or CJK Mode' is OFF.
+
      Show color        -   This option will be present if color support is
                            available.  If set to ON or ALWAYS, color mode will
                            be forced on if possible.  If (n)curses color
@@ -152,12 +168,12 @@
 
      VI keys           -   If set to 'ON' then the lowercase h, j, k, and l,
                            keys will be mapped to left-arrow, down-arrow,
-			   up-arrow, and right-arrow, respectively.  The
+                           up-arrow, and right-arrow, respectively.  The
                            uppercase H, J, K, and L keys remain mapped to
                            their configured bindings (normally HELP, JUMP,
                            KEYMAP, and LIST, respectively).
 
-     Emacs keys        -   If set to 'ON' then the CTRL-P, CTRL-N, CTRL-F, 
+     Emacs keys        -   If set to 'ON' then the CTRL-P, CTRL-N, CTRL-F,
                            and CTRL-B keys will be mapped to up-arrow,
                            down-arrow, right-arrow,  and left-arrow,
                            respectively.  Otherwise, they remain mapped
@@ -185,7 +201,7 @@
      option                the screen, so that the current link or OPTION
                            is indicated solely by its highlighting or color.
                            If show cursor is set to ON, the cursor will be
-	                   positioned at the left of the current link or
+                           positioned at the left of the current link or
                            OPTION.  This is helpful when Lynx is being used
                            with a speech or braille interface.  It also is
                            useful for sighted users when the terminal cannot
@@ -193,11 +209,11 @@
                            distinguish the current link or OPTION from the
                            others in the screen display.
 
-     Keypad mode       -   This option gives the choice between navigating 
+     Keypad mode       -   This option gives the choice between navigating
                            with the keypad (as arrows; see Lynx Navigation)
                            and having every link numbered (numbered links)
-			   so that the links may be selected by numbers
-			   instead of moving to them with the arrow keys.
+                           so that the links may be selected by numbers
+                           instead of moving to them with the arrow keys.
 
      Line edit style   -   This option allows you to set alternate key
                            bindings for the built-in line editor, if your
@@ -218,19 +234,19 @@
                               Files and directories are separated into two
                               alphabetical lists.  Files are listed first.
 
-     User Mode         -   Beginner 
-                              Shows two extra lines of help at the bottom 
+     User Mode         -   Beginner
+                              Shows two extra lines of help at the bottom
                               of the screen
-                           Intermediate (normal mode) 
-                              The "normal" statusline messages appear. 
-                           Advanced 
-                              The URL is shown on the statusline. 
+                           Intermediate (normal mode)
+                              The "normal" statusline messages appear.
+                           Advanced
+                              The URL is shown on the statusline.
 
-      User Agent       -   The header string which Lynx sends to servers
+     User Agent        -   The header string which Lynx sends to servers
                            to indicate the User-Agent is displayed here.
                            Changes may be disallowed via the -restrictions
                            switch.  Otherwise, the header can be changed
-                           temporarily to a string such as L_y_n_x/2.7.2 for
+                           temporarily to a string such as L_y_n_x/2.8 for
                            access to sites which discriminate against Lynx
                            based on checks for the presence of "Lynx" in the
                            header. If changed during a Lynx session, the