24 files changed, 105 insertions, 91 deletions

diff --git a/CHANGES b/CHANGES
index 74ed0964..9512f7f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,18 @@
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2000-04-13 (2.8.3pre.5)
+* fix printing of Last-Modified field in downloaded/printed source -LP
+* update URL for RFC 1942 -LV, DK
+* update Subir Grewal's Lynx links URL to the newest location
+  http://www.trill-home.com/lynx.html -LV, TD
+* move assignment to donelookup in LYGetHostByName() to avoid race with
+  CreateThread() -Alexei Anatski
+* modify LYexecv() in LYLocal.c for MINGW32 -HS, Victor Schneider
+* re-correct logic for .h1 comments in cattoc.html by cfg2html.pl (reported
+  by LP) -TD
+* move call to cleanup_files() into LYexit(), to fix stray temporary directory
+  left, e.g,. when doing "lynx -version" -TD
 2000-04-11 (2.8.3pre.4)
 * add to logic of --with-charsets configure option, checking for charset names
   that happen to be built-into UCdomap.c rather than defined via .tbl files
@@ -14,10 +26,10 @@ Changes since Lynx 2.8 release
   with USE_MOUSE (and modifier when necessary) -LP
 * windows makefiles: add new symbols SOURCE_CACHE and USE_PRETTYSRC,
   remove obsolete EXP_CHARTRANS and unused EXP_CHARTRANS_AUTOSWITCH -LP
-* fixed a bug with psrcview on lss-enabled lynx. Code such as <a blah href=.> 
-  (i.e. unknown attribute and then some other attribute) was causing calls to 
-  PSRCSTOP(barattr) twice (and lynx was switched to "non-preformatted" mode 
-  losing all white spaces of the document after that piece of code) -VH 
+* fixed a bug with psrcview on lss-enabled lynx. Code such as <a blah href=.>
+  (i.e. unknown attribute and then some other attribute) was causing calls to
+  PSRCSTOP(barattr) twice (and lynx was switched to "non-preformatted" mode
+  losing all white spaces of the document after that piece of code) -VH
 * add configure option --with-screen=pdcurses, mainly for checking ifdef
   conflicts between ncurses and pdcurses.  This builds/runs with the PDCurses
   X11 library, but is not recommended for general use -TD
@@ -102,8 +114,8 @@ Changes since Lynx 2.8 release
   the same name during a session.  Define EXP_NAME_TEMPNAME in userdefs.h -TD
 * add Last-Modified header into the printed/downloaded source, in addition to
   the Date header (it is there for years).  (Last-Modified field will not be
-  printed if it is not present, or equal to 1 Jan 1970 (i.e., ctime(0)),
-  a common mistake in scripts) -LP
+  printed if it is not present, or equal to the Date header or equal to
+  "Thu, 01 Jan 1970 00:00:01 GMT", a common mistake in scripts) -LP
 * defined DIRED_SUPPORT in makefile.msc -TD
 * several small fixes in LYLocal.c for dired support, mostly win32-specific -TD
 * modify PDCurses mouse logic to use BUTTON_PRESSED mask rather than
@@ -352,8 +364,8 @@ Changes since Lynx 2.8 release
   (LYNXCOOKIE:, LYNXKEYMAP:, LYNXMESSAGES:) -KW
 * now check directly in postoptions() whether the loaded document is one from
   which submission of option changes can be accepted, using the new tracking
-  mechanism.  Only the form-based Options Menu and Visited Links are allowed. 
-  Relying on a good random generator to prevent spoofing is not necessary. 
+  mechanism.  Only the form-based Options Menu and Visited Links are allowed.
+  Relying on a good random generator to prevent spoofing is not necessary.
   Kept the secure_string check, but it should be only regarded as an aid to the
   user, it prevents changing options from an instance of the form-based Options
   Menu that is not the most recent one (this can happen if an Options Menu page
diff --git a/INSTALLATION b/INSTALLATION
index 688959d0..4b78b55f 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -321,7 +321,8 @@ II. Compile instructions -- UNIX
 	charsets for normal use.
 
   --enable-cjk				(define CJK_EX)
-	Add special logic for supporting CJK documents.
+	Add experimental logic for supporting CJK documents.  (This is not
+	necessary for CJK support and may go away in a future release.)
 
   --enable-color-style			(define USE_COLOR_STYLE)
   	Use this option to enable optional and *experimental* color style.
diff --git a/LYMessages_en.h b/LYMessages_en.h
index b906dda3..81431a8d 100644
--- a/LYMessages_en.h
+++ b/LYMessages_en.h
@@ -20,7 +20,7 @@
  * Links to collections of alternate definitions, developed by the Lynx
  * User Community, are maintained in Lynx links:
  *
- *    http://www.crl.com/~subir/lynx.html
+ *    http://www.trill-home.com/lynx.html
  *
  * See ABOUT-NLS and po/readme for details and location of contributed
  * translations.  When no translation is available, the English default is
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index ac8f6096..70cee43f 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1081,6 +1081,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		phost = gethostbyname(host);
 	} else {		/* for Windows NT */
 	    phost = (struct hostent *) NULL;
+	    donelookup = FALSE;
 	    hThread = CreateThread((void *)NULL, 4096UL,
 		(LPTHREAD_START_ROUTINE)_fork_func,
 		(void *)NULL, 0UL, (unsigned long *)&dwThreadID);
@@ -1088,7 +1089,6 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		MessageBox((void *)NULL, "CreateThread",
 			   "CreateThread Failed", 0L);
 
-	    donelookup = FALSE;
 	    while (!donelookup) {
 		if (HTCheckForInterrupt()) {
 		    /* Note that host is a character array and is not freed */
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index f7a2dc9a..89aa7045 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -159,7 +159,7 @@ PUBLIC int ws_netread(int fd, char *buf, int len)
     HANDLE hThread;
     DWORD dwThreadID;
     DWORD exitcode = 0;
-    DWORD ret_val, val, process_time, now_TickCount, save_TickCount;
+    DWORD ret_val = -1, val, process_time, now_TickCount, save_TickCount;
 
     static recv_data_t para;
 
diff --git a/WWW/Library/Implementation/HTTP.h b/WWW/Library/Implementation/HTTP.h
index 1079557f..cd6925f2 100644
--- a/WWW/Library/Implementation/HTTP.h
+++ b/WWW/Library/Implementation/HTTP.h
@@ -24,10 +24,6 @@ extern char * redirecting_url;
 extern BOOL permanent_redirection;
 extern BOOL redirect_post_content;
 
-#ifdef _WINDOWS
-extern int ws_netread(int fd, char *buf, int len);
-#endif /* _WINDOWS */
-
 #endif /* HTTP_H */
 
 /*
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index d1be848c..48d34f9f 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -175,6 +175,7 @@ IBM-PC running Windows NT
 #undef NETWRITE
 #undef NETCLOSE
 #undef IOCTL
+extern int ws_netread(int fd, char *buf, int len);
 #define NETREAD(s,b,l)  ws_netread((s),(b),(l))	/* 1997/11/06 (Thu) */
 #define NETWRITE(s,b,l) send((s),(b),(l),0)
 #define NETCLOSE(s)     closesocket(s)
diff --git a/lynx.cfg b/lynx.cfg
index f367ba7f..46909cf6 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -107,10 +107,10 @@ STARTFILE:http://lynx.browser.org/
 #   for this distribution (use SHELL syntax including the device
 #   on VMS systems).
 # The default HELPFILE is:
-# http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
+# http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
 #   This should be changed to the local path.
 #
-HELPFILE:http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
+HELPFILE:http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
 .ex
 #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
 
diff --git a/lynx.hlp b/lynx.hlp
index 9fdaeff3..c2f6cb3a 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -152,7 +152,7 @@
               or  one  specified  on the command line to standard
               output.  This can be used in the following way:
 
-              lynx -dump http://www.crl.com/~subir/lynx.html
+              lynx -dump http://www.trill-home.com/lynx.html
 
        -editor=EDITOR
               enable  external  editing,  using   the   specified
diff --git a/lynx.man b/lynx.man
index aba20aaf..0db62a2b 100644
--- a/lynx.man
+++ b/lynx.man
@@ -171,7 +171,7 @@ dumps the formatted output of the default document or one
 specified on the command line to standard output.
 This can be used in the following way:
 .sp
-lynx -dump http://www.crl.com/~subir/lynx.html
+lynx -dump http://www.trill-home.com/lynx.html
 .TP
 .B -editor\fR=\fIEDITOR
 enable external editing, using the specified
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 0088da1e..1353ec62 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -202,7 +202,7 @@ Here are some sample URLs.
 
 <dl>
    <dt>HTTP  (HyperText Transfer Protocol)
-        <dd><code>http://www.crl.com/~subir/lynx.html</code>
+	<dd><code>http://www.trill-home.com/lynx.html</code>
 
    <dt>Gopher
         <dd><code>gopher://gopher.micro.umn.edu/11/</code>
@@ -1704,8 +1704,8 @@ HTML includes markup for creating <em>tables</em> structured as arrays of
 cells aligned by columns and rows on the displayed page.
 
 <p>Lynx recognizes the TABLE element and all of its associated elements
-as described in <a href="ftp://ds.internic.net/rfc/rfc1942.txt"
->ftp://ds.internic.net/rfc/rfc1942.txt</a>
+as described in <a href="http://www.faqs.org/rfcs/rfc1942.html"
+>http://www.faqs.org/rfcs/rfc1942.html</a>
 and will process any ID attributes in the start tags for handling as NAME-ed
 anchors, but does not create actual <em>tables</em>.  Instead, it treats
 the TR start tag as a collapsible BR (line break), and inserts a collapsible
diff --git a/lynx_help/about_lynx.html b/lynx_help/about_lynx.html
index 5b85658b..0162d149 100644
--- a/lynx_help/about_lynx.html
+++ b/lynx_help/about_lynx.html
@@ -84,7 +84,7 @@ had their own hypertext format.
 <H2><A NAME="availability"><EM>Availability</EM></A></H2>
 
 <p>Information on obtaining the most current version of Lynx is
-available via <a href="http://www.crl.com/~subir/lynx.html"
+available via <a href="http://www.trill-home.com/lynx.html"
 >Lynx links</a>.
 
 <H2><A NAME="lynx-dev_list"><EM>Mailing List</EM></A></H2>
diff --git a/lynx_help/help_files.txt b/lynx_help/help_files.txt
index 56618d57..243a3802 100644
--- a/lynx_help/help_files.txt
+++ b/lynx_help/help_files.txt
@@ -45,7 +45,7 @@ LYNX_FAQ_AL=http://www.access.digex.net/~asgilman/lynx/FAQ/
 LYNX_FAQ_O_MATIC=http://lynx.isc.org/cgi-bin/fom
 LYNX_HOME=http://lynx.browser.org/
 LYNX_SPEECH=http://leb.net/blinux/blynx/
-LYNX_SUBIR=http://www.crl.com/~subir/lynx.html
+LYNX_SUBIR=http://www.trill-home.com/lynx.html
 WWW_NEWS=http://www.w3.org/hypertext/DataSources/News/Groups/Overview.html
 WWW_HTML2=http://www.w3.org/MarkUp/html-spec/html-spec_toc.html
 WWW_HTML3=http://www.w3.org/MarkUp/html3/Contents.html
diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html
index 76c4264e..16cc0180 100644
--- a/lynx_help/lynx_help_main.html
+++ b/lynx_help/lynx_help_main.html
@@ -30,7 +30,7 @@
  -- a reference for advanced configurations
 <li><a href="http://www.chass.utoronto.ca/%7Epurslow/lhfb.html">Lynx Help for Beginners</a> -- quick help on many common problems
 <li><a href="http://lynx.isc.org/cgi-bin/fom">The Lynx FAQ-O-Matic</a> -- many common queries, some more advanced; users may add answers.
-<li><a href="http://www.crl.com/%7Esubir/lynx.html">Lynx Links</a>
+<li><a href="http://www.trill-home.com/lynx.html">Lynx Links</a>
  -- source &amp; binaries, FAQs, developers &amp; archives,<br>
 SSL &amp; security, and more
 <li><A HREF="http://www.ocf.berkeley.edu/%7Ejeffwong/lynxstuff/">Lynxstuff</A>
diff --git a/lynx_help/lynx_url_support.html b/lynx_help/lynx_url_support.html
index b270f618..848fe313 100644
--- a/lynx_help/lynx_url_support.html
+++ b/lynx_help/lynx_url_support.html
@@ -93,7 +93,7 @@ which can correspond to positions in the rendering of the document.
 <p>The https URL has the same format, but the default port is <em>:443</em>.
 Patches for support of https URLs and the CONNECT procedure are available
 for qualified recipients via <a
-href="http://www.crl.com/~subir/lynx.html">Lynx links</a>.  US Export laws
+href="http://www.trill-home.com/lynx.html">Lynx links</a>.  US Export laws
 and associated red tape pose severe impediments to inclusion of this support
 in the general distributions of freeware WWW clients such as Lynx.  Sorry.
 <HR>
@@ -299,7 +299,7 @@ server pointed to by the NNTPSERVER environment variable or configuration
 symbol (see lynx.cfg), with default port <em>:119</em>.  A host field must
 be included in nntp URLs, and the port field is optional with the same
 default.  Patches for support of snews URLs are available to qualified
-recipients via <a href="http://www.crl.com/~subir/lynx.html">Lynx links</a>
+recipients via <a href="http://www.trill-home.com/lynx.html">Lynx links</a>
 but cannot be included in the general distribution (sorry, see <a
 href="#http">http and https</a>).
 
diff --git a/po/lynx.pot b/po/lynx.pot
index f6e61eb0..ed10c7f1 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-02 10:23-0400\n"
+"POT-Creation-Date: 2000-04-12 20:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #. * Links to collections of alternate definitions, developed by the Lynx
 #. * User Community, are maintained in Lynx links:
 #. *
-#. *    http://www.crl.com/~subir/lynx.html
+#. *    http://www.trill-home.com/lynx.html
 #. *
 #. * See ABOUT-NLS and po/readme for details and location of contributed
 #. * translations.  When no translation is available, the English default is
@@ -2865,7 +2865,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7540
+#: WWW/Library/Implementation/HTAccess.c:1065 src/LYMainLoop.c:7542
 msgid "Can't Access"
 msgstr ""
 
@@ -3444,34 +3444,34 @@ msgstr ""
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:11046
+#: src/GridText.c:11050
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
-#: src/GridText.c:12369
+#: src/GridText.c:12373
 msgid "Editor killed by signal"
 msgstr ""
 
-#: src/GridText.c:12371
+#: src/GridText.c:12375
 #, c-format
 msgid "Editor returned with error status, %s"
 msgstr ""
 
-#: src/GridText.c:12372
+#: src/GridText.c:12376
 msgid "reason unknown."
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12468
+#: src/GridText.c:12472
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12520
+#: src/GridText.c:12524
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:12973
+#: src/GridText.c:12977
 msgid "Very long lines have been truncated!"
 msgstr ""
 
@@ -3677,38 +3677,38 @@ msgstr ""
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:800
+#: src/LYCurses.c:795
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1101
+#: src/LYCurses.c:1102
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1106
+#: src/LYCurses.c:1107
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1184
+#: src/LYCurses.c:1185
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1185
+#: src/LYCurses.c:1186
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1198
+#: src/LYCurses.c:1199
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:1504
+#: src/LYCurses.c:1505
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:1506
+#: src/LYCurses.c:1507
 msgid ""
 "\n"
 "Please notify your system administrator to confirm a bug, and if\n"
@@ -4100,13 +4100,13 @@ msgstr ""
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
-#: src/LYLocal.c:2401
+#: src/LYLocal.c:2405
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
 #. error return
-#: src/LYLocal.c:2430
+#: src/LYLocal.c:2434
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
@@ -4155,15 +4155,15 @@ msgstr ""
 msgid "Personal Name: "
 msgstr ""
 
-#: src/LYMain.c:846
+#: src/LYMain.c:852
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1031
+#: src/LYMain.c:1037
 msgid "You MUST define a valid TMP or TEMP area!\n"
 msgstr ""
 
-#: src/LYMain.c:1438
+#: src/LYMain.c:1444
 #, c-format
 msgid ""
 "\n"
@@ -4171,21 +4171,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1454
+#: src/LYMain.c:1460
 msgid ""
 "\n"
 "Lynx character sets not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1478
+#: src/LYMain.c:1484
 msgid ""
 "\n"
 "Lynx edit map not declared.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1507
+#: src/LYMain.c:1513
 #, c-format
 msgid ""
 "\n"
@@ -4193,61 +4193,61 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1712
+#: src/LYMain.c:1718
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2265
+#: src/LYMain.c:2270
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2544
+#: src/LYMain.c:2549
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3030
+#: src/LYMain.c:3035
 #, c-format
 msgid ""
 "\n"
 "%s Version %s (%.*s)\n"
 msgstr ""
 
-#: src/LYMain.c:3042
+#: src/LYMain.c:3047
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3046
+#: src/LYMain.c:3051
 msgid ""
 "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
 msgstr ""
 
-#: src/LYMain.c:3048
+#: src/LYMain.c:3053
 msgid "Distributed under the GNU General Public License.\n"
 msgstr ""
 
-#: src/LYMain.c:3050
+#: src/LYMain.c:3055
 msgid ""
 "See http://lynx.browser.org/ and the online help for more information.\n"
 "\n"
 msgstr ""
 
-#: src/LYMain.c:3727
+#: src/LYMain.c:3732
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:3728
+#: src/LYMain.c:3733
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:3965
+#: src/LYMain.c:3970
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:462
+#: src/LYMainLoop.c:463
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
@@ -4255,63 +4255,63 @@ msgstr ""
 #.
 #. * Make a name for this new URL.
 #.
-#: src/LYMainLoop.c:616
+#: src/LYMainLoop.c:618
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:1104
+#: src/LYMainLoop.c:1106
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
 #.
 #. *  Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3051
+#: src/LYMainLoop.c:3053
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3192
+#: src/LYMainLoop.c:3194
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3578 src/LYMainLoop.c:5131
+#: src/LYMainLoop.c:3580 src/LYMainLoop.c:5133
 msgid "Entry into main screen"
 msgstr ""
 
-#: src/LYMainLoop.c:4153
+#: src/LYMainLoop.c:4155
 msgid "charset for this document specified explicitly, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:6083
+#: src/LYMainLoop.c:6085
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6371 src/LYMainLoop.c:6375
+#: src/LYMainLoop.c:6373 src/LYMainLoop.c:6377
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:7417 src/LYMainLoop.c:7598
+#: src/LYMainLoop.c:7419 src/LYMainLoop.c:7600
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:7459
+#: src/LYMainLoop.c:7461
 msgid "Inactive text input, activate to edit (e.g., press ENTER)"
 msgstr ""
 
-#: src/LYMainLoop.c:7535
+#: src/LYMainLoop.c:7537
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7548
+#: src/LYMainLoop.c:7550
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7549
+#: src/LYMainLoop.c:7551
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7592
+#: src/LYMainLoop.c:7594
 msgid "-more-"
 msgstr ""
 
diff --git a/scripts/cfg2html.pl b/scripts/cfg2html.pl
index 8e5dcc31..be75e24c 100755
--- a/scripts/cfg2html.pl
+++ b/scripts/cfg2html.pl
@@ -370,6 +370,9 @@ EOF
 	for $n (0..$#major) {
 		printf FP "\n";
 		printf FP "<h2><a name=\"%s\">%s</a></h2>\n", $cats{$major[$n]}, $major[$n];
+		if ($descs{$major[$n]} !~ /^$/) {
+			printf FP "<h3>Description</h3>\n%s\n", $descs{$major[$n]};
+		}
 		$c = $index{$major[$n]};
 		if ( $c ne "" ) {
 			@c = split(/\n/, $c);
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index aadd1dbd..64172a7f 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -891,8 +891,8 @@ Prepend_BASE:
 	    fprintf(ret_obj->fp,
 		"<!-- Date: %s -->\n", anchor->date);
 	    if (anchor->last_modified && *anchor->last_modified
-			&& !strcmp(anchor->last_modified, anchor->date)
-			&& !strcmp(anchor->last_modified, ctime((time_t)0))) {
+			&& strcmp(anchor->last_modified, anchor->date)
+			&& strcmp(anchor->last_modified, "Thu, 01 Jan 1970 00:00:01 GMT")) {
 		fprintf(ret_obj->fp,
 		    "<!-- Last-Modified: %s -->\n", anchor->last_modified);
 	    }
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 3cacc77e..b80c9a45 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -2358,8 +2358,8 @@ PRIVATE int LYExecv ARGS3(
 #else
 #if defined(_WINDOWS)
     if (!strcmp(path, TOUCH_PATH)) {
-#if defined(__BORLANDC__)
-	int fd = creat(argv[1], 'rw');
+#if defined(__BORLANDC__) || defined(__MINGW32__) 
+	int fd = _creat(argv[1], S_IREAD | S_IWRITE); 
 #else /* Visual C++ */
 	int fd = _creat(argv[1], _S_IREAD | _S_IWRITE);
 #endif
diff --git a/src/LYMain.c b/src/LYMain.c
index 0d82d8cc..c5cb0af9 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -2056,7 +2056,6 @@ PUBLIC int main ARGS2(
 	if (persistent_cookies)
 	    LYStoreCookies(LYCookieSaveFile);
 #endif /* EXP_PERSISTENT_COOKIES */
-	cleanup_files();	/* if someone starts with LYNXfoo: page */
 	exit_immediately(status);
     } else {
 	/*
diff --git a/src/LYPrint.c b/src/LYPrint.c
index 66f3ebd1..777aad7c 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -406,8 +406,8 @@ check_recall:
 	    fprintf(outfile_fp,
 		"<!-- Date: %s -->\n", HText_getDate());
 	    if (HText_getLastModified() != NULL
-			&& !strcmp(HText_getLastModified(), HText_getDate())
-			&& !strcmp(HText_getLastModified(), ctime((time_t)0))) {
+			&& strcmp(HText_getLastModified(), HText_getDate())
+			&& strcmp(HText_getLastModified(), "Thu, 01 Jan 1970 00:00:01 GMT")) {
 		fprintf(outfile_fp,
 		    "<!-- Last-Modified: %s -->\n", HText_getLastModified());
 	    }
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 6dbf737f..ceadb9cf 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -6788,6 +6788,7 @@ PUBLIC void LYCleanupTemp NOARGS
 	LYTrimPathSep(result);
 	CTRACE((tfp, "LYCleanupTemp removing %s\n", result));
 	rmdir(result);
+	lynx_temp_subspace = FALSE;
     }
 #endif
 }
diff --git a/src/LYexit.c b/src/LYexit.c
index 02ad6fa6..cc1d2b9a 100644
--- a/src/LYexit.c
+++ b/src/LYexit.c
@@ -153,6 +153,7 @@ PUBLIC void LYexit ARGS1(
 #undef exit
 #endif /* exit */
 
+    cleanup_files();	/* if someone starts with LYNXfoo: page */
 #ifndef VMS	/*  On VMS, the VMSexit() handler does these. - FM */
     fflush(stderr);
     if (LYOutOfMemory == TRUE) {
diff --git a/userdefs.h b/userdefs.h
index ef52a1f6..969f74ae 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -469,10 +469,10 @@
  *   for this distribution (use SHELL syntax including the device
  *   on VMS systems).
  * The default HELPFILE is:
- * http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
+ * http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html
  *   This should be changed here or in lynx.cfg to the local path.
  */
-#define HELPFILE "http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html"
+#define HELPFILE "http://www.trill-home.com/lynx/lynx_help/lynx_help_main.html"
 /* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
 
 /*****************************
@@ -1339,12 +1339,12 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.3pre.4"
+#define LYNX_VERSION "2.8.3pre.5"
 #define LYNX_WWW_HOME "http://lynx.browser.org/"
 #define LYNX_WWW_DIST "http://lynx.isc.org/current/"
 #define LYNX_RELEASE FALSE
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 11 Apr 2000 03:45:36 -0700"
+#define LYNX_DATE "Thu, 13 Apr 2000 19:39:31 -0700"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 #define LYNX_RELEASE_DATE "1999"