snapshot of project "lynx", label v2-8-2dev_14

4 files changed, 136 insertions, 126 deletions

diff --git a/lynx_help/keystrokes/environments.html b/lynx_help/keystrokes/environments.html
index 7a832e8a..a735894a 100644
--- a/lynx_help/keystrokes/environments.html
+++ b/lynx_help/keystrokes/environments.html
@@ -97,12 +97,12 @@ Environment Variables Used By Lynx:
                            that  can act as firewall gateways and
                            caching servers.  They are  preferable
                            to  the  older  gateway  servers  (see
-                           WWW_access_GATEWAY, below).  Each protocol
-                           used   by  Lynx,  (http,  ftp,
+                           WWW_access_GATEWAY, below).
+                           Each protocol used by Lynx (http, ftp,
                            gopher, etc), can be mapped separately
-                           by  setting  environment  variables of
-                           the  form  PROTOCOL_proxy  (literally:
-                           http_proxy,  ftp_proxy,  gopher_proxy,
+                           by setting environment variables of
+                           the form PROTOCOL_proxy (literally:
+                           http_proxy, ftp_proxy, gopher_proxy,
                            etc), to "http://some.server.dom:port/".
                            See <a href="#proxy">details and examples</a>.
 
@@ -343,8 +343,11 @@ Proxy:
                  proxying for all clients on your system.)
 
     If you wish to override the use of a proxy server for specific hosts or
-    entire domains you may use the "no_proxy" environment variable. Here is
-    an example use of "no_proxy":
+    entire domains you may use the "no_proxy" environment variable.
+    The no_proxy variable can be a comma-separated list of strings defining
+    no-proxy zones in the DNS domain name space.  If a tail substring of the
+    domain-path for a host matches one of these strings, transactions with that
+    node will not be proxied.  Here is an example use of "no_proxy":
 
         UNIX
                 setenv no_proxy "host.domain.dom, domain1.dom, domain2"
@@ -360,9 +363,13 @@ Proxy:
     and gopher services (if normally proxied) would still be included,
     as would any news or wais services on other hosts.
 
+    Warning:  Note that setting 'il' as an entry in this list
+    will block proxying for the .mil domain as well as the .il domain.
+    If the entry is '.il' this will not happen.
+
     If you wish to override the use of a proxy server completely (i.e.,
     globally override any existing proxy variables), set the value of
-    "no_proxy" to "*".
+    "no_proxy" to "*".  This is the only allowed use of * in no_proxy.
 
     Note that Lynx treats file URLs on the local host as requests for
     direct access to the file, and does not attempt ftp if that fails.
@@ -374,8 +381,9 @@ Proxy:
     Other WWW clients may require that the http server's configuration
     file have "Map file:* ftp:*" in it to perform that conversion.
 
-    The proxy and no_proxy variables also can be set at run time via
-    lynx.cfg.
+    If you have not set NNTPSERVER, proxy or no_proxy environment variables
+    you can set them at run time via the configuration file lynx.cfg
+    (this will not override external settings).
 
 <a name="dos"><em>
 Win32 (95/NT) and 386 DOS
diff --git a/lynx_help/keystrokes/keystroke_help.html b/lynx_help/keystrokes/keystroke_help.html
index 3a2724ae..aa7a3da1 100644
--- a/lynx_help/keystrokes/keystroke_help.html
+++ b/lynx_help/keystrokes/keystroke_help.html
@@ -39,10 +39,10 @@
 	       r              - Remove selected file
 	       t              - Tag highlighted file
 	       u	      - Upload a file into the current directory
-	       
+
   <A HREF="other_help.html">OTHER</A>:       ? (or h)       - Help (this screen)
                a              - Add the current link to a bookmark file
-               c              - Send a comment to the document owner 
+               c              - Send a comment to the document owner
                d              - Download the current link
 	       e	      - Edit the current file
                g              - Goto a user specified <a
@@ -83,17 +83,17 @@
 	       ]	      - Send a HEAD request for the current doc or link
 	       "	      -	Toggle valid or "soft" double-quote parsing
                CTRL-R         - Reload current file and refresh the screen
-               CTRL-V         - Switch to alternative parsing of HTML documents
+               CTRL-V         - Switch to <A HREF="option_help.html#tagsoup"
+                                >alternative parsing</A> of HTML documents
                CTRL-W         - Refresh the screen
                CTRL-U         - Erase input line (<a href="edit_help.html"
 				>more input line commands</a>)
                CTRL-G         - Cancel input or transfer
                CTRL-T         - Toggle trace mode on and off
-               ;              - View the Lynx Trace Log for the current
-               			session.
+               ;              - View the Lynx Trace Log for the current session
                CTRL-K         - Invoke the <A HREF="cookie_help.html"
 	       			>Cookie Jar Page</A>
-               numbers        - Invoke the prompt 
+               numbers        - Invoke the prompt
 				<a href="follow_help.html"
 	                          >Follow link (or goto link or page) number:</a>
                                   or the
diff --git a/lynx_help/keystrokes/option_help.html b/lynx_help/keystrokes/option_help.html
index 594010d9..6d9ae0f6 100644
--- a/lynx_help/keystrokes/option_help.html
+++ b/lynx_help/keystrokes/option_help.html
@@ -17,7 +17,6 @@ compiled in or chosen in `lynx.cfg':<P>
 <LI><A HREF="#CK">Cookies</A>
 <LI><A HREF="#ED">Editor</A>
 <LI><A HREF="#EM">Emacs keys</A>
-<LI><A HREF="#LL">Execution links</A>
 <LI><A HREF="#KM">Keypad mode</A>
 <LI><A HREF="#LE">Line edit style</A>
 <LI><A HREF="#PM">Personal Mail Address</A>
@@ -26,10 +25,13 @@ compiled in or chosen in `lynx.cfg':<P>
 <LI><A HREF="#CL">Show cursor for current link or option</A>
 <LI><A HREF="#UM">User Mode</A>
 <LI><A HREF="#VI">VI keys</A>
+<LI><A HREF="#DC">Display Character set</A>
 <LI><A HREF="#DV">X DISPLAY variable</A></UL>
 <LI>Document Layout
 <UL>
-<LI><A HREF="#tagsoup">HTML error tolerance</A>
+<LI><A HREF="#AD">Assumed document character set</A>
+<LI><A HREF="#JK">Raw 8-bit or CJK mode</A>
+<LI><A HREF="#tagsoup">HTML error recovery</A>
 <LI><A HREF="#PU">Pop-ups for select fields</A>
 <LI><A HREF="#SI">Show Images</A>
 <LI><A HREF="#VB">Verbose Images</A></UL>
@@ -37,16 +39,12 @@ compiled in or chosen in `lynx.cfg':<P>
 <UL>
 <LI><A HREF="#MB">Multi-bookmarks</A>
 <LI><A HREF="#BF">Bookmark file</A></UL>
-<LI>Character Set Options
-<UL>
-<LI><A HREF="#AD">Assumed document character set</A>
-<LI><A HREF="#DC">Display Character set</A>
-<LI><A HREF="#JK">Raw 8-bit or CJK mode</A></UL>
 <LI>File Management Options
 <UL>
 <LI><A HREF="#FT">FTP sort criteria</A>
 <LI><A HREF="#LD">Local directory sort criteria</A>
-<LI><A HREF="#DF">Show dot files</A></UL>
+<LI><A HREF="#DF">Show dot files</A>
+<LI><A HREF="#LL">Execution links</A></UL>
 <LI>Headers transferred to remote server
 <UL>
 <LI><A HREF="#PC">Preferred Document Charset</A>
@@ -70,7 +68,7 @@ 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 to their configured bindings (normally UP_TWO lines,
 DOWN_TWO lines, NEXT_PAGE and PREV_PAGE respectively).
-<p>Note: setting emacs keys does not affect the line-editor bindings. 
+<p>Note: setting emacs keys does not affect the line-editor bindings.
 
 <H1><A NAME="LL">Execution links</A></H1>
 
@@ -85,13 +83,13 @@ 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.  You can also number form fields.
 
-<H1><A NAME="LE">Line edit style</A></H1> 
- 
-This allows you to set alternate key bindings for the built-in line editor, 
-if your system administrator has installed  
-<A HREF="alt_edit_help.html">Alternate Bindings</A>. 
-Otherwise, Lynx uses the <A HREF="edit_help.html">Default Binding</A>. 
- 
+<H1><A NAME="LE">Line edit style</A></H1>
+
+This allows you to set alternate key bindings for the built-in line editor,
+if your system administrator has installed
+<A HREF="alt_edit_help.html">Alternate Bindings</A>.
+Otherwise, Lynx uses the <A HREF="edit_help.html">Default Binding</A>.
+
 <H1><A NAME="PM">Personal Mail Address</A></H1>
 
 You may set your mail address here so that when mailing messages
@@ -167,38 +165,67 @@ for beginners.
 <dt><EM>Advanced</EM>: The URL is shown on the status line.
 </dl>
 
-<H1><A NAME="tagsoup">HTML error tolerance</A></H1>
-
-Lynx often has to deal with invalid HTML markup.  It always tries to 
-recover from errors, but there is no universally correct way for doing 
-this.  As a result, there are two parsing modes: 
-"<DFN>SortaSGML</DFN>" attempts to enforce valid nesting of most tags 
-at an earlier stage of processing, while "<DFN>TagSoup</DFN>" relies 
-more on the HTML rendering stage to mimic the behavior of some other 
-browsers. 
-You can also switch between these modes with the CTRL-V key, and the 
-default can be changed in lynx.cfg or with the -tagsoup command line 
-switch. 
- 
-<P> 
-The "SortaSGML" mode will often appear to be more strict, and makes 
-some errors apparent that are otherwise unnoticeable.  One particular 
-difference is the handling of block elements or 
-&lt;li&gt;..&lt;/li&gt; inside &lt;a HREF="some.url"&gt;..&lt;/a&gt;. 
-Invalid nesting like this may turn anchors into hidden links which 
-cannot be easily followed, this is avoided in "TagSoup" mode.  See the 
-<a href="follow_help.html">help on following links by 
-number</a> for more information on hidden links.  Often pages may be 
-more readable in "TagSoup" mode, but sometimes the opposite is true. 
-Most documents with valid HTML, and documents with only minor errors, 
-should be rendered the same way in both modes. 
- 
-<P> 
-If you are curious about what goes on behind the scenes, but find that 
-the information from the -trace switch is just too much, Lynx can be 
-started with the -preparsed switch; going into SOURCE mode ('\' key) 
-and toggling the parsing mode (with CTRL-V) should then show some of 
-the differences. 
+<H1><A NAME="AD">Assumed document character set</A></H1>
+
+This 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 HTTP protocol).
+Unfortunately, many non-English web pages forget to include proper charset
+info; this option helps you browse those broken pages if you know somehow
+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.  Option is active when 'Raw 8-bit or CJK Mode' is OFF.
+
+<H1><A NAME="JK">Raw 8-bit or CJK mode</A></H1>
+
+This is set automatically, but can be toggled manually in certain cases:
+it toggles whether 8-bit characters are assumed to correspond with the display
+character set and therefore are processed without translation
+via the chartrans conversion tables.  ON by default when the display
+character set is one of the Asian (CJK) sets and the 8-bit characters
+are Kanji multibytes.  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 have no better idea than viewing it as from display character set
+(see 'assumed document character set' for best choice).  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 can also be toggled
+via the RAW_TOGGLE command, normally mapped to '@', and at startup
+via the -raw switch.
+
+<H1><A NAME="tagsoup">HTML error recovery</A></H1>
+
+Lynx often has to deal with invalid HTML markup.  It always tries to
+recover from errors, but there is no universally correct way for doing
+this.  As a result, there are two parsing modes:
+"<DFN>SortaSGML</DFN>" attempts to enforce valid nesting of most tags
+at an earlier stage of processing, while "<DFN>TagSoup</DFN>" relies
+more on the HTML rendering stage to mimic the behavior of some other
+browsers.
+You can also switch between these modes with the CTRL-V key, and the
+default can be changed in lynx.cfg or with the -tagsoup command line
+switch.
+
+<P>
+The "SortaSGML" mode will often appear to be more strict, and makes
+some errors apparent that are otherwise unnoticeable.  One particular
+difference is the handling of block elements or
+&lt;li&gt;..&lt;/li&gt; inside &lt;a HREF="some.url"&gt;..&lt;/a&gt;.
+Invalid nesting like this may turn anchors into hidden links which
+cannot be easily followed, this is avoided in "TagSoup" mode.  See the
+<a href="follow_help.html">help on following links by
+number</a> for more information on hidden links.  Often pages may be
+more readable in "TagSoup" mode, but sometimes the opposite is true.
+Most documents with valid HTML, and documents with only minor errors,
+should be rendered the same way in both modes.
+
+<P>
+If you are curious about what goes on behind the scenes, but find that
+the information from the -trace switch is just too much, Lynx can be
+started with the -preparsed switch; going into SOURCE mode ('\' key)
+and toggling the parsing mode (with CTRL-V) should then show some of
+the differences.
 
 <!--
 LP's version - for reference - TD
@@ -221,10 +248,10 @@ from lynx.cfg or command line switch.
 <H1><A NAME="SI">Show Images</A></H1>
 
 Text-based browser cannot show images directly, so we have a choice:
-ignore all images without ALT= text string (this is also switched by
-<A HREF="../Lynx_users_guide.html#[-key">'[' key</A>),
-show labels (see also "verbose images" for choice between [IMAGE] and filename),
-use links for every image to make it possible to download them
+<em>ignore all</em> images without ALT= text string
+(this is also switched by <A HREF="../Lynx_users_guide.html#[-key">'[' key</A>),
+<em>show labels</em> (see also "verbose images" for choice between [IMAGE] and filename),
+<em>use links</em> for every image to make it possible to download them
 (also switched by <A HREF="../Lynx_users_guide.html#*-key">'*' key</A>).
 Changing these settings will not be saved but could be made permanent
 by changing the respective settings in lynx.cfg.
@@ -242,7 +269,20 @@ 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.
 <p>The uppercase H, J, K, and L keys remain mapped to their configured bindings
 (normally HELP, JUMP, KEYMAP and LIST, respectively).
-<p>Note: setting vi keys does not affect the line-editor bindings. 
+<p>Note: setting vi keys does not affect the line-editor bindings.
+
+<H1><A NAME="DC">Display Character set</A></H1>
+
+This allows you to set up the default 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,
+<A HREF="test_display.html">try the test here</A>.
+Since Lynx now supports a wide range of platforms
+it may be useful to note that cpXXX codepages are used within IBM PC computers,
+and windows-xxxx within native MS-Windows applications.
 
 <H1><A NAME="DV">X DISPLAY variable</A></H1>
 
@@ -280,48 +320,6 @@ if subdirectories are included (e.g., './BM/lynx_bookmarks.html').
 Lynx will create bookmark files when you first 'a'dd a link,
 but any subdirectories in the filepath must already exist.
 
-<H1><A NAME="AD">Assumed document character set</A></H1>
-
-This 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 HTTP protocol).
-Unfortunately, many non-English web pages forget to include proper charset
-info; this option helps you browse those broken pages if you know somehow
-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.  Option is active when 'Raw 8-bit or CJK Mode' is OFF.
-
-<H1><A NAME="DC">Display Character set</A></H1>
-
-This allows you to set up the default 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,
-<A HREF="test_display.html">try the test here</A>.
-Since Lynx now supports a wide range of platforms
-it may be useful to note that cpXXX codepages are used within IBM PC computers,
-and windows-xxxx within native MS-Windows applications.
-
-<H1><A NAME="JK">Raw 8-bit or CJK mode</A></H1>
-
-This is set automatically, but can be toggled manually in certain cases:
-it toggles whether 8-bit characters are assumed to correspond with the display
-character set and therefore are processed without translation
-via the chartrans conversion tables.  ON by default when the display
-character set is one of the Asian (CJK) sets and the 8-bit characters
-are Kanji multibytes.  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 have no better idea than viewing it as from display character set
-(see 'assumed document character set' for best choice).  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 can also be toggled
-via the RAW_TOGGLE command, normally mapped to '@', and at startup
-via the -raw switch.
-
 <H1><A NAME="FT">FTP sort criteria</A></H1>
 
 This allows you to specify how files will be sorted within FTP listings.
diff --git a/lynx_help/keystrokes/other_help.html b/lynx_help/keystrokes/other_help.html
index e9b2bf24..2aa7f337 100644
--- a/lynx_help/keystrokes/other_help.html
+++ b/lynx_help/keystrokes/other_help.html
@@ -17,7 +17,7 @@
 
        d      -	Downloads the file pointed to by the current link
 		and displays an option menu allowing the file to
-		be saved or transfered by configurable options.
+		be saved or transferred by configurable options.
 		Can also be used when positioned on a form SUBMIT
 		button to download the reply to a form submission.
 
@@ -57,13 +57,13 @@
 
        p      -	Brings up a list of <A HREF="print_help.html">print commands</A>.
 
-       o      -	Brings up a list of setable <A HREF="option_help.html">options</A>.
+       o      - Brings up a list of settable <A HREF="option_help.html">options</A>.
 
-       q      -	Quits Lynx. ('Q' quits without asking)
+       q      - Quits Lynx. ('Q' quits without asking)
 
-       /      -	Search for a string of characters in the current
-		document case insensitive or case sensitive
-		depending on the options set. (see <A HREF="option_help.html">options)</A>.
+       /      - Search for a string of characters in the current document
+                (case insensitive or case sensitive
+                depending on the <A HREF="option_help.html">options</A> set).
 
        s      -	Search through an external searchable indexed document.
 
@@ -72,12 +72,14 @@
 
        v      -	View a <A HREF="bookmark_help.html">Bookmark file</A>.
 
+       V      - Go to the <A HREF="visited_help.html">Visited Links Page</A>
+
        x      - Force submission of form or link with no-cache.
 
        z      -	Abort a network transfer in progress.  If any partial
-		data has been transfered it will be displayed.
+                data has been transferred it will be displayed.
 
-  &lt;backspace&gt; - displays the <a href="history_help.html">history page</A>.
+  &lt;backspace&gt; - displays the <a href="history_help.html">History Page</A>.
 
        =      -	Show information about the file and link that you
 		are currently viewing.
@@ -110,14 +112,15 @@
        *      -	Toggles image_links mode on and off.  When on, links will
                 be created for all images, including inlines.
 
-       @      -	Toggles raw 8-bit translations or CJK mode on and off.
+       @      - Toggles raw 8-bit translations or CJK mode on and off, only
+                for documents which does not specify character set explicitely.
                 Should be on when the document's charset matches the
-		selected character set, and otherwise off so that 8-bit
-		characters will be reverse translated with respect to the
-		ISO-8859-1 conversion table for the character set (see
-		<A HREF="option_help.html">options)</A>.
+                display character set, and otherwise off so that 8-bit
+                characters will be translated by Lynx with respect to the
+                Assumed document charset, using approximations if necessary
+                (see <A HREF="option_help.html">options</A>).
 
-       [      -	Toggles pseudo_inlines mode on and off.  When on, inline
+       [      - Toggles pseudo_inlines mode on and off.  When on, inline
                 images which have no ALT string specified will have an
                 "[INLINE]" pseudo-ALT string inserted in the Lynx display.
                 When off, they will be treated as having ALT="" (i.e.,
@@ -145,7 +148,8 @@
 
      CTRL-V   -	Switches to an alternative way of parsing HTML documents.
                 This may help to get a more readable rendering of some
-                documents with invalidly placed HTML tags.
+                documents with invalidly placed HTML tags, <A
+                HREF="option_help.html#tagsoup">more details</A>.
 
      CTRL-W   -	Resets or cleans up the display.