about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rw-r--r--CHANGES25
-rw-r--r--INSTALLATION6
-rw-r--r--PACKAGE/debian/changelog6
-rw-r--r--PACKAGE/debian/control2
-rw-r--r--PACKAGE/debian/copyright2
-rw-r--r--PACKAGE/lynx.nsi8
-rw-r--r--PACKAGE/lynx.spec4
-rw-r--r--PACKAGE/version.iss4
-rw-r--r--README10
-rw-r--r--aclocal.m44
-rwxr-xr-xconfigure4
-rw-r--r--configure.in6
-rw-r--r--docs/OS-390.announce2
-rw-r--r--docs/README.metrics94
-rw-r--r--lynx.cfg14
-rw-r--r--lynx.hlp64
-rw-r--r--lynx.man33
-rw-r--r--lynx_help/Lynx_users_guide.html22
-rw-r--r--lynx_help/about_lynx.html4
-rw-r--r--lynx_help/lynx-dev.html6
-rw-r--r--lynx_help/lynx_help_main.html6
-rw-r--r--makefile.in8
-rw-r--r--po/lynx.pot4
-rw-r--r--samples/lynx-demo.cfg4
-rw-r--r--samples/lynx_bookmarks.htm4
-rwxr-xr-xscripts/indent.sh4
-rw-r--r--src/LYIcon.rc12
-rw-r--r--src/LYMain.c4
-rw-r--r--src/LYSession.c4
-rw-r--r--userdefs.h16
31 files changed, 205 insertions, 184 deletions
diff --git a/AUTHORS b/AUTHORS
index d6a88cc3..765129ac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
--- $LynxId: AUTHORS,v 1.7 2018/03/01 22:00:51 tom Exp $
+-- $LynxId: AUTHORS,v 1.8 2018/07/08 16:20:14 tom Exp $
 -- vile:txtmode
 Most of the people who have contributed more than one patch to Lynx (as well as
 a few who have only one) are noted in the changelogs by their initials (to keep
@@ -6,6 +6,7 @@ the changelog short).  Here is a summary of those initials and the
 corresponding full names:
 
 AAC	Andrey A Chernov
+AJL	Alex J Lyons
 BD	Binh Do
 BJP	Brian J Pardy
 BL	Bela Lubkin
diff --git a/CHANGES b/CHANGES
index 662c3a99..73e996a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,11 @@
--- $LynxId: CHANGES,v 1.987 2018/06/10 21:35:39 tom Exp $
+-- $LynxId: CHANGES,v 1.990 2018/07/08 16:51:50 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2018-07-08 (2.8.9rel.1)
+* documentation/metrics updates -TD
+
 2018-06-10 (2.8.9pre.1)
 * fix an inconsistency in message for "-listonly" option (Debian #805753) -TD
 
@@ -60,7 +63,7 @@ Changes since Lynx 2.8 release
   pdcurses -TD
 * rename test-package for ".rpm" to "lynx-dev" for consistency with ".deb" -TD
 * improve samples/lynx.bat by using location of script rather than current
-  directory ("Smuggler" loto1992@inbox.ru).
+  directory -loto1992@inbox.ru ("Smuggler")
 * permanently enable MISC_EXP feature -TD
 * remove several obsolete ifdefs: DGUX, DGUX_OLD, HP_TERMINAL,
   REVERSE_CLEAR_SCREEN_PROBLEM, SHORTENED_RBIND, SLANG_MBCS_HACK, SNAKE -TD
@@ -105,11 +108,11 @@ Changes since Lynx 2.8 release
 * modify configure script to work around pkgsrc's misconfiguration of shared
   libraries -TD
 * modify po/makefile.inn to ensure the temporary files have distinct names
-  to avoid problem with "make -j8" (Debian #890811).
+  to avoid problem with "make -j8" (Debian #890811) -TD
 * update makefile/batch-scripts to allow building with newer Visual Studio
   versions, e.g., 2010, 2012, so that a 64-bit executable can be built -TD
 * repair link in lynx_help_main.html to HTML 3.2 documentation
-  (Savannah #47803).
+  (Savannah #47803) -TD
 * update eo.po, fr.po from
     http://translationproject.org/latest/lynx
 * improved several configure macros:
@@ -198,7 +201,7 @@ Changes since Lynx 2.8 release
   as well as problem introduced by 2.8.8dev.6 cleanup -TH
 * update ca.po, from
     http://translationproject.org/latest/lynx
-* tidy whitespace in lynx.cfg (report by David Niklas)
+* tidy whitespace in lynx.cfg (report by David Niklas) -TD
 * fix two more typos in the list of ENABLE_LYNXRC in lynx.cfg -TD
 * remove a repeated item for SEND_USERAGENT from lynx.cfg (Larry Hynes)
 * accept userinfo in a URL, subject to override by -auth option or -pauth
@@ -230,7 +233,7 @@ Changes since Lynx 2.8 release
 * build-fix for OpenSSL 1.1 (Kamil Dudka)
 * begin work to parse gopher extension "link to URL" -TD
 * remove an obsolete comment in the manual page about -dump versus -force_html
-  (report by Peter Schmitt).
+  (report by Peter Schmitt) -TD
 * modify samples/oldlynx to provide an empty ".lss" file as a better default
   than providing an empty "-lss" option -TD
 * amend change made in 2.8.8dev.17 to permit multiple COLOR_STYLE items to
@@ -392,7 +395,7 @@ Changes since Lynx 2.8 release
   rather than gcry_randomize() (adapted from patch by Andreas Metzler,
   Debian #753699) -TD
 * fix a reference-after-free in scan_cookie_sublist(), probably fixing RedHat
-  #1120925 (patch by Mike Gorse).
+  #1120925 -Mike Gorse
 * update eo.po, id.po from
     http://translationproject.org/latest/lynx
 * improve workaround for too-long pathnames in LYPrint.c SetupFilename() -TD
@@ -453,7 +456,7 @@ Changes since Lynx 2.8 release
   do not mention this since forms are an HTTP feature (Debian #738121) -TD
 * reviewed command-line options which were not provided in lynx.cfg; added
   others which could be useful for dumps (i.e., force_html, hiddenlinks,
-  listonly, list_inline, localhost, short_url, with_backspaces) -TD:
+  listonly, list_inline, localhost, short_url, with_backspaces) -TD
 * add dont_wrap_pre to lynx.cfg (request by GV) -TD
 * use idn_free() rather than ordinary free (patch by GV)
 * build-fix when alt-bindings are disabled (patch by GV)
@@ -496,7 +499,7 @@ Changes since Lynx 2.8 release
 * change URL for HELPFILE in lynx.cfg, etc., to omit version-specifics -TD
 * update example of options menu shown in user-guide -TD
 * restore ^Z maxscreen-toggle for Windows, omitted in 2.8.8dev.17 cleanup -TD
-* typographical fixes for manpage (Bjarni I. Gislason, Debian #732236).
+* typographical fixes for manpage (patch by Bjarni I. Gislason, Debian #732236)
 * allow fallback sleep() function to be used for MinGW -GV
 * remove special case in configure.in which added "-lcompat" to $LIBS
   for OpenBSD, MirBSD and EkkoBSD (Christian Weisgerber, Thorsten Glaser).
@@ -1391,7 +1394,7 @@ Changes since Lynx 2.8 release
 * translate named entities, etc., for "content" field of refresh-URL, cf:
   2.8.5dev.13 (report by Ivan Shmakov) -TD
 * suppress computation in TrimmedLength() for source-view, which is not needed
-  for Debian #204515 (patch by Mike Knight)
+  for Debian #204515 -Mike Knight
 * add check-po rule to po/makefile -TD
 * modify top-level makefile to work with configure --srcdir -TD
 * add update-po rule to top-level makefile -TD
@@ -1402,7 +1405,7 @@ Changes since Lynx 2.8 release
 * parse xml processing-instruction to turn on UTF-8 decoding, as well as
   disable upper/lower case transforming in source view (discussion on
   lynx-dev) -TD
-* fix typo in Lynx_users_guide.html (report by Kristof Zelechovski)
+* fix typo in Lynx_users_guide.html (report by Kristof Zelechovski) -TD
 * minor fix to documentation in lynx.cfg -PW
 * use off_t rather than long for representing file sizes, e.g., when used to
   print progress messages (reports by LP, Tomas Liska, TG, PG) -TD
diff --git a/INSTALLATION b/INSTALLATION
index eb35b9f4..e98dfb01 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -152,7 +152,7 @@ II. Compile instructions -- UNIX
     periodically.
 
     Note compiler/system specific problems below.  See also:
-	http://invisible-island.net/ncurses/ncurses.faq.html
+	https://invisible-island.net/ncurses/ncurses.faq.html
 
 1b. Platforms.  Configure should work properly on any Unix-style system.
     It has been tested on the following platforms.
@@ -952,7 +952,7 @@ Simplified:
 
 Sources:
     Download the current sources (choose a zip-file) from
-	http://lynx.invisible-island.net/
+	https://lynx.invisible-island.net/
     and unzip them into a directory where you will build Lynx.
 
 Compiler:
@@ -1484,4 +1484,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.129 2018/03/11 22:29:22 tom Exp $
+-- $LynxId: INSTALLATION,v 1.130 2018/07/08 15:22:44 tom Exp $
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 37abd240..5557db44 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9pre.1) unstable; urgency=low
+lynx-dev (2.8.9rel.1) unstable; urgency=low
 
-  * prerelease
+  * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Jun 2018 16:24:17 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 08 Jul 2018 06:46:06 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/control b/PACKAGE/debian/control
index b0dd38b2..1875ecee 100644
--- a/PACKAGE/debian/control
+++ b/PACKAGE/debian/control
@@ -2,7 +2,7 @@ Source: lynx-dev
 Section: web
 Priority: optional
 Maintainer: Thomas E. Dickey <dickey@invisible-island.net>
-Homepage: http://invisible-island.net/lynx/
+Homepage: https://invisible-island.net/lynx/
 Build-Depends: debhelper (>= 7), dpatch, po-debconf, libncursesw5-dev, zlib1g-dev, gettext, libgnutls-dev, sharutils, telnet, openssh-client, libbsd-dev, libidn11-dev
 Standards-Version: 3.8.2
 
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 74db3b29..e027ffc4 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -1,4 +1,4 @@
-Upstream source http://lynx.invisible-island.net/current/
+Upstream source https://lynx.invisible-island.net/current/
 
 Current maintainer: Thomas Dickey <dickey@invisible-island.net>
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 961ea758..c081c953 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.42 2018/06/10 20:24:17 tom Exp $

+; $LynxId: lynx.nsi,v 1.44 2018/07/08 15:22:44 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "8"

 !define VERSION_MINOR "9"

-!define VERSION_LEVEL "2001"

-!define VERSION_PATCH "pre.1"

+!define VERSION_LEVEL "01"

+!define VERSION_PATCH "rel.1"

 

 !define SUBKEY "Lynx"

 

@@ -27,7 +27,7 @@ CRCCheck on
 SetCompressor /SOLID lzma

 

 VIAddVersionKey ProductName "${SUBKEY}"

-VIAddVersionKey CompanyName "http://invisible-island.net/lynx"

+VIAddVersionKey CompanyName "https://invisible-island.net/lynx"

 VIAddVersionKey LegalCopyright "© 1997-2017,2018, Thomas E. Dickey"

 VIAddVersionKey FileDescription "Lynx Installer (MinGW)"

 VIAddVersionKey FileVersion "${VERSION}"

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 7f8263b3..cdbc2007 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.51 2018/06/10 20:24:17 tom Exp $
+# $LynxId: lynx.spec,v 1.52 2018/07/08 10:46:06 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
 Version: 2.8.9
-Release: pre.1
+Release: rel.1
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 1b55c525..eeb62923 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.

 

 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$

-#define LYNX_VERSION "2.8.9pre.1"

+#define LYNX_VERSION "2.8.9rel.1"

 

 ; most-recent full release and target

 #define LYNX_RELEASE "2.8.9"

@@ -10,5 +10,5 @@
 #define MyAppProg "Lynx"

 #define MyAppName "Lynx - web browser"

 #define MyAppPublisher "Thomas E Dickey"

-#define MyAppURL "http://invisible-island.net/lynx"

+#define MyAppURL "https://invisible-island.net/lynx"

 #define MyAppVerName "Lynx " + LYNX_VERSION

diff --git a/README b/README
index ed35a58a..3f80db5e 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ To use this package, you need a compiler & a bit of experience
 at very simple programming.  If you just want something which will work
 `out-of-the-box', you can get pre-compiled versions of Lynx
 by following the links from
-        <URL: http://lynx.invisible-island.net/resources.html/> ;
+        <URL: https://lynx.invisible-island.net/resources.html/> ;
 
 For DOS or Windows, go to
         <URL: http://www.fdisk.com/doslynx/lynxport.htm>.
@@ -35,13 +35,13 @@ WHAT IS LYNX?
 HOW TO GET LYNX
 
    For the latest release of Lynx go to:
-       <URL: http://lynx.invisible-island.net/release>;
+       <URL: https://lynx.invisible-island.net/release>;
        <URL: ftp://ftp.invisible-island.net/lynx/tarballs>;
 
    The latest development version is at:
-       <URL: http://lynx.invisible-island.net/current/>.
+       <URL: https://lynx.invisible-island.net/current/>.
 
-   The Lynx homepage is <URL: http://lynx.invisible-island.net/>.
+   The Lynx homepage is <URL: https://lynx.invisible-island.net/>.
    The on-line help page (enter `h') has links to many useful things.
 
 LICENSE
@@ -150,5 +150,5 @@ LYNX-DEV MAILING LIST
 
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: README,v 1.33 2017/08/08 22:34:10 tom Exp $
+-- $LynxId: README,v 1.34 2018/07/08 15:22:44 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/aclocal.m4 b/aclocal.m4
index b28968fd..41139f90 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.251 2018/02/22 02:31:22 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.252 2018/07/08 15:22:44 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -8,7 +8,7 @@ dnl Created: 1997/01/28
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
-dnl http://invisible-island.net/autoconf/autoconf.html
+dnl https://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
diff --git a/configure b/configure
index a3abbd45..e2cb245d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.9pre.1.
+# From configure.in 2.8.9rel.1.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20170501.
 #
@@ -45271,7 +45271,7 @@ if test -n "$srcdir" ; then
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
-HOMEPAGE_URL="http://lynx.invisible-island.net/"
+HOMEPAGE_URL="https://lynx.invisible-island.net/"
 
 cat >>confdefs.h <<EOF
 #define HOMEPAGE_URL "$HOMEPAGE_URL"
diff --git a/configure.in b/configure.in
index 151beb72..04f6f28b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.300 2018/06/10 21:09:45 tom Exp $
+dnl $LynxId: configure.in,v 1.302 2018/07/08 15:22:44 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9pre.1)
+AC_REVISION(2.8.9rel.1)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -1561,7 +1561,7 @@ if test -n "$srcdir" ; then
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
-HOMEPAGE_URL="http://lynx.invisible-island.net/"
+HOMEPAGE_URL="https://lynx.invisible-island.net/"
 AC_DEFINE_UNQUOTED(HOMEPAGE_URL,"$HOMEPAGE_URL",[Define to Lynx homepage URL])
 AC_SUBST(HOMEPAGE_URL)
 
diff --git a/docs/OS-390.announce b/docs/OS-390.announce
index 55e3fb38..923d2a35 100644
--- a/docs/OS-390.announce
+++ b/docs/OS-390.announce
@@ -3,7 +3,7 @@ This document suggests steps to install Lynx on OS/390 systems.
 ========================================================================
 o Download the archive file lynx2-8-6.tar.Z in BINARY from the site
   where you found this announcement or from a site listed at
-  http://lynx.invisible-island.net/
+  https://lynx.invisible-island.net/
 
 o Unpack with:
 
diff --git a/docs/README.metrics b/docs/README.metrics
index 63e4c803..bdfdf3f2 100644
--- a/docs/README.metrics
+++ b/docs/README.metrics
@@ -1,4 +1,4 @@
--- $LynxId: README.metrics,v 1.12 2014/02/13 23:56:42 tom Exp $
+-- $LynxId: README.metrics,v 1.17 2018/07/08 16:43:30 tom Exp $
 
 This is a short summary of code metrics showing how lynx has grown from
 release to release.  It also shows how the original codebase has
@@ -23,8 +23,10 @@ Release         Current                 Original
                                         15573   13587     3.9     8.0
 2.8.7           441453  180674          25064   23101     5.7    12.8
                                         15436   13473     3.5     7.5
-2.8.8           465971  184961          24031   22293     5.2    12.1
-                                        14612   12874     3.1     7.0
+2.8.8           465971  185375          24513   22293     5.3    12.0
+                                        15094   12874     3.2     6.9
+2.8.9           478344  186103          24314   22116     5.1    11.9
+                                        14931   12733     3.1     6.8
 
 Beginning with 2.8.6, the percentage of the remaining original codebase is
 shown on two lines (i.e., comparing against 2.4.2 indented to use the current
@@ -34,7 +36,7 @@ viewed taking into account insignificant similarities (such as blank lines).
 
 Starting in 2.8.6dev.3, all C source code has been routinely indented using
 the lnx-indent script from
-    http://invisible-island.net/cindent/
+    https://invisible-island.net/cindent/
 
 Current lynx releases contain a large amount of text other than C code.
 That includes plain text, html, message libraries, custom and generated
@@ -47,13 +49,16 @@ start of the 2.8 series:
 
     0.5 AJL
     3   Al Gilman
+    1   Al Walker
     1   Alexei Anatski
     2   Alexey Dobriyan
+    2   Andreas Metzler
     2   Andrew Belov
     3.5 Andrey A Chernov
     1   Arkadiusz Miskiewicz
     1   Arnaud Giersch
     2   Atsuhito Kohda
+    2   Axel Beckert
     1   Bake Timmons
    25.5 Bela Lubkin
     1   Bill Nottingham
@@ -80,9 +85,10 @@ start of the 2.8 series:
   129.7 Doug Kaufman
     1   Duncan Simpson
     2.5 Eduardo Chappa
+    1   Elliot Thomas
     2   Emanuele Giaquinta
     1   Eric Brun
-   51   External
+   70   External
     1   Fabian Fingerle
   280.5 Foteos Macrides
     2   Frank Heckenbach
@@ -90,10 +96,10 @@ start of the 2.8 series:
     1   Frederick P Herrmann
     1   Georg Drenkhahn
     1   George Lindholm
-   22   Gisle Vanem
+   27   Gisle Vanem
     1   Glenn Nielsen
     1   Hans Wurst
-   26.5 Hataguchi Takeshi
+   28.5 Hataguchi Takeshi
     1   Heikki Kantola
     0.5 Helen Sommer
    23   Henry Nelson
@@ -123,13 +129,14 @@ start of the 2.8 series:
     2   Jonathan Sergent
     1   Josef Sontgen
     2   Julian Coleman
-    1   Kamil Dudka
+    2   Kamil Dudka
     3   Karl Eichwalder
     1   Karl-Andre Skevik
-    3   Kihara Hideto
+    4   Kihara Hideto
    29.3 Kim DeVaughn
   706.3 Klaus Weide
     1   Lalo Martins
+    1   Larry Hynes
     1   Larry Virden
    15.8 Larry W Virden
    11   Laura Eaves
@@ -137,6 +144,7 @@ start of the 2.8 series:
     1   Liam Davis
     1   Marc Huber
     0.3 Marek Kubita
+    1   Martijn Dekker
     2   Masashi Fujita
     1   Masayasu Ishikawa
     1   Masayuki Hatta
@@ -154,30 +162,37 @@ start of the 2.8 series:
    13.5 Paul B Mahol
     1   Paul D Smith
    52.5 Paul Gilmartin
+    1   Peter Backes
     1   Peter Canning
     1   Phil Pennock
    27.3 Philip Webb
    14   Philippe De Muyter
+    1   Quentin Minster
     5.5 Rado Smiljanic
     2   Ralph Babel
     1   Randall
+    1   Reiner Hermann
     1   Risto Widenius
     1   Rob Cameron
+    1   Ruda Moura
     1   Ryan Nielsen
     2   Scott Bigham
     1   Sergej Kvachonok
     6   Sergey Svishchev
     1   Serhii Hlodin
+    2   Simon Kainz
    15   Sinan Kaan Yerli
     7.8 Stefan Caunter
     1   Stepan Kasal
     1   Tadayoshi Okuma
     1   Takao Fujiwara
+    1   Taketo Kabe
     1   Thomas Braun
- 2030.3 Thomas E Dickey
-    0.5 Thomas Klausner
+ 2188.3 Thomas E Dickey
+    1.5 Thomas Klausner
+    1   Thomas Petazzoni
     1   Thomas Viehmann
-   17   Thorsten Glaser
+   21   Thorsten Glaser
     1   Tim Chase
     4   Tim Larson
     1   Timur Birsh
@@ -190,7 +205,7 @@ start of the 2.8 series:
     1   Wesley Morgan
     1   Zdenek Prikryl
     1.5 nsh@horae.dti.ne.jp
- 4355   Total
+ 4563   Total
 
 -------------------------------------------------------------------------------
 
@@ -206,35 +221,34 @@ However, some information can be gleaned from the existing change-logs
 to show the principal contributors for each release (i.e., not listing those
 with less than 1%):
 
-** credits from CHANGES docs/CHANGES2.8 (4328.6 changes)
-  1.1 Brian J Pardy
-  3.0 Doug Kaufman
-  6.5 Foteos Macrides
-  2.0 Ilya Zakharevich
- 16.3 Klaus Weide
-  7.9 Leonid Pauzner
+** credits from CHANGES docs/CHANGES2.8 (4492.6 changes)
+  1.0 Brian J Pardy
+  2.9 Doug Kaufman
+  6.2 Foteos Macrides
+  1.9 Ilya Zakharevich
+ 15.7 Klaus Weide
+  7.6 Leonid Pauzner
   1.2 Paul Gilmartin
- 47.4 Thomas E Dickey
-  2.0 Vlad Harchev
-** credits from CHANGES docs/CHANGES* (5795.6 changes)
-  2.3 Doug Kaufman
- 23.6 Foteos Macrides
-  1.5 Ilya Zakharevich
- 12.4 Klaus Weide
-  5.9 Leonid Pauzner
- 35.4 Thomas E Dickey
-  1.5 Vlad Harchev
-  3.6 unknown
-** credits from CHANGES (3408.6 changes)
-  1.4 Brian J Pardy
-  3.5 Doug Kaufman
-  2.5 Ilya Zakharevich
-  1.0 John Bley
- 12.9 Klaus Weide
-  9.2 Leonid Pauzner
+ 48.7 Thomas E Dickey
+  1.9 Vlad Harchev
+** credits from CHANGES docs/CHANGES* (5959.6 changes)
+  2.2 Doug Kaufman
+ 23.0 Foteos Macrides
+  1.4 Ilya Zakharevich
+ 12.1 Klaus Weide
+  5.7 Leonid Pauzner
+ 36.7 Thomas E Dickey
+  1.4 Vlad Harchev
+  3.5 unknown
+** credits from CHANGES (3572.6 changes)
+  1.3 Brian J Pardy
+  3.3 Doug Kaufman
+  2.4 Ilya Zakharevich
+ 12.3 Klaus Weide
+  8.8 Leonid Pauzner
   1.5 Paul Gilmartin
- 52.8 Thomas E Dickey
-  2.5 Vlad Harchev
+ 54.2 Thomas E Dickey
+  2.4 Vlad Harchev
 ** credits from docs/CHANGES2.8 (920 changes)
   1.2 Doug Kaufman
  30.5 Foteos Macrides
diff --git a/lynx.cfg b/lynx.cfg
index 69187d71..028b95da 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.299 2018/06/10 21:09:45 tom Exp $
+# $LynxId: lynx.cfg,v 1.302 2018/07/08 15:22:44 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9pre.1"
+#PRCS LYNX_VERSION "2.8.9rel.1"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Sun, 10 Jun 2018 17:09:45 -0400"
+#PRCS LYNX_DATE "Sun, 08 Jul 2018 06:46:06 -0400"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
@@ -35,7 +35,7 @@
 
 # An HTML'ized description of all settings (based on comments in this file,
 # with alphabetical table of settings and with table of settings by category)
-# is available at http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html
+# is available at https://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html
 #
 ### The conversion is done via the scripts/cfg2html.pl script.
 ### Several directives beginning with '.' are used for this purpose.
@@ -108,7 +108,7 @@
 #
 # Normally we expect you will connect to a remote site, e.g., the Lynx starting
 # site:
-STARTFILE:http://lynx.invisible-island.net/
+STARTFILE:https://lynx.invisible-island.net/
 #
 # As an alternative, you may want to use a local URL.  A good choice for this is
 # the user's home directory:
@@ -127,12 +127,12 @@ STARTFILE:http://lynx.invisible-island.net/
 #   for this distribution (use SHELL syntax including the device
 #   on VMS systems).
 # The default HELPFILE is:
-.url http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
+.url https://lynx.invisible-island.net/lynx_help/lynx_help_main.html
 #   This should be changed to the local path.
 # This definition will be overridden if the "LYNX_HELPFILE" environment
 # variable has been set.
 #
-HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
+HELPFILE:https://lynx.invisible-island.net/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 f09b7e69..78249f25 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -56,9 +56,9 @@
        can  be  given  in  different  forms  to  allow  for  operating  system
        constraints, e.g.,
 
-         -center:off
-         -center=off
-         -center-
+           -center:off
+           -center=off
+           -center-
 
        Lynx recognizes "1", "+", "on" and "true" for  true  values,  and  "0",
        "-",  "off"  and  "false"  for  false  values.  Other option-values are
@@ -236,7 +236,7 @@
               interactive mode, all documents are processed.  This can be used
               in the following way:
 
-                lynx -dump http://www.subir.com/lynx.html
+                  lynx -dump http://www.subir.com/lynx.html
 
               Files specified on the command line are  formatted  as  HTML  if
               their  names  end  with one of the standard web suffixes such as
@@ -281,16 +281,16 @@
 
               Lynx recognizes these file suffixes as HTML:
 
-                ".ht3",
-                ".htm",
-                ".html3",
-                ".html",
-                ".htmlx",
-                ".php3",
-                ".php",
-                ".phtml",
-                ".sht", and
-                ".shtml".
+                  ".ht3",
+                  ".htm",
+                  ".html3",
+                  ".html",
+                  ".htmlx",
+                  ".php3",
+                  ".php",
+                  ".phtml",
+                  ".sht", and
+                  ".shtml".
 
        -force_secure
               toggles forcing of the secure flag for SSL cookies.
@@ -701,14 +701,14 @@
               works  the  same  as  dump  but  outputs  HTML source instead of
               formatted text.  For example
 
-                lynx -source . >foo.html
+                  lynx -source . >foo.html
 
               generates  HTML  source  listing  the  files  in   the   current
               directory.   Each  file  is  marked  by  an HREF relative to the
               parent directory.  Add a  trailing  slash  to  make  the  HREF's
               relative to the current directory:
 
-                lynx -source ./ >foo.html
+                  lynx -source ./ >foo.html
 
        -stack_dump
               disable SIGINT cleanup handler
@@ -966,21 +966,21 @@
                            supported  protocols,  the  environment   variables
                            recognized by lynx may include
 
-                             cso_proxy
-                             finger_proxy
-                             ftp_proxy
-                             gopher_proxy
-                             https_proxy
-                             http_proxy
-                             newspost_proxy
-                             newsreply_proxy
-                             news_proxy
-                             nntp_proxy
-                             no_proxy
-                             snewspost_proxy
-                             snewsreply_proxy
-                             snews_proxy
-                             wais_proxy
+                               cso_proxy
+                               finger_proxy
+                               ftp_proxy
+                               gopher_proxy
+                               https_proxy
+                               http_proxy
+                               newspost_proxy
+                               newsreply_proxy
+                               news_proxy
+                               nntp_proxy
+                               no_proxy
+                               snewspost_proxy
+                               snewsreply_proxy
+                               snews_proxy
+                               wais_proxy
 
                            See  Lynx  Users  Guide  for additional details and
                            examples.
@@ -1147,7 +1147,7 @@
                            for message catalogs.
 
 2 Notes
-       This is the Lynx v2.8.8 Release; development is in progress for 2.8.9.
+       This is the Lynx v2.8.9 Release; development is in progress for 2.9.0.
 
        If you wish to contribute to the further development of Lynx, subscribe
        to our mailing list.  Send email to <lynx-dev-request@nongnu.org>  with
diff --git a/lynx.man b/lynx.man
index c3a4d072..ff4eb1b8 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.121 2018/05/14 00:21:39 tom Exp $
+.\" $LynxId: lynx.man,v 1.123 2018/07/08 10:54:20 tom Exp $
 .\" **************************************************************************
 .\" Escape single quotes in literal strings from groff's Unicode transform.
 .ie \n(.g .ds AQ \(aq
@@ -22,7 +22,8 @@
 .de NE
 .fi
 .ft R
-.in -4
+.ie n  .in -4
+.el    .in -2
 ..
 .\" **************************************************************************
 .TH LYNX 1
@@ -1293,7 +1294,7 @@ Currently, it is hard-coded to a wish list.
 .B NLSPATH
 This variable, if set, is used as the path prefix for message catalogs.
 .SH NOTES
-This is the \fILynx\fP v2.8.8 Release; development is in progress for 2.8.9.
+This is the \fILynx\fP v2.8.9 Release; development is in progress for 2.9.0.
 .PP
 If you wish to contribute to the further development
 of \fILynx\fR, subscribe to our mailing list.
@@ -1309,19 +1310,19 @@ Unsubscribe by sending email to <lynx-dev-request@nongnu.org> with
 Do not send the unsubscribe message to the lynx-dev list, itself.
 .SH SEE ALSO
 .hy 0
-\fIcatgets\fR(3),
-\fIcurses\fR(3),
-\fIenviron\fR(7),
-\fIexecve\fR(2),
-\fIftp\fR(1),
-\fIgettext\fR(GNU),
-\fIlocaleconv\fR(3),
-\fIncurses\fR(3),
-\fIsetlocale\fR(3),
-\fIslang\fR(?),
-\fItermcap\fR(5),
-\fIterminfo\fR(5),
-\fIwget\fR(GNU)
+\fBcatgets\fR(3),
+\fBcurses\fR(3),
+\fBenviron\fR(7),
+\fBexecve\fR(2),
+\fBftp\fR(1),
+\fBgettext\fR(GNU),
+\fBlocaleconv\fR(3),
+\fBncurses\fR(3),
+\fBsetlocale\fR(3),
+\fBslang\fR(?),
+\fBtermcap\fR(5),
+\fBterminfo\fR(5),
+\fBwget\fR(GNU)
 .hy 1
 .PP
 Note that man page availability and section numbering is somewhat
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index eec78c54..b493e512 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: Lynx_users_guide.html,v 1.139 2018/03/02 20:34:59 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.141 2018/07/08 15:22:44 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org">
 
-  <title>Lynx Users Guide v2.8.8</title>
+  <title>Lynx Users Guide v2.8.9</title>
   <link rev="made" href="mailto:lynx-dev@nongnu.org">
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii">
@@ -15,7 +15,7 @@
   </head>
 
 <body>
-  <h1>Lynx Users Guide v2.8.8</h1>
+  <h1>Lynx Users Guide v2.8.9</h1>
 
   <p>Lynx is a fully-featured <em>World Wide Web</em>
   (<em>WWW</em>) client for users running cursor-addressable,
@@ -340,7 +340,7 @@
   <dl>
     <dt>HTTP (HyperText Transfer Protocol)</dt>
 
-    <dd><code>http://invisible-island.net/lynx/</code></dd>
+    <dd><code>https://invisible-island.net/lynx/</code></dd>
 
     <dt>Gopher</dt>
 
@@ -776,7 +776,7 @@
   Preferred document language      : en_______________________________
   HTTP protocol (!)                : [HTTP 1.0]
   Send User-Agent header (!)       : [X]
-  User-Agent header (!)            : Lynx/2.8.8pre.2 libwww-FM/2.14 SSL-MM/1.4.
+  User-Agent header (!)            : Lynx/2.8.9rel.1 libwww-FM/2.14 SSL-MM/1.4.
 
   Listing and Accessing Files
   Use Passive FTP (!)              : [ON_]
@@ -1588,7 +1588,7 @@
       indicate the User-Agent is displayed here. Changes may be
       disallowed via the <em>-restrictions</em> switch. Otherwise,
       the header can be changed temporarily to a string such as
-      <em>L_y_n_x/2.8.8</em> for access to sites which discriminate
+      <em>L_y_n_x/2.8.9</em> for access to sites which discriminate
       against Lynx based on checks for the presence of "Lynx" in
       the header. If the User-Agent header has been changed, it can
       be restored to the built-in default value by deleting the
@@ -5136,9 +5136,9 @@ lynx -source ./ &gt;foo.html
   comments for hundreds of options, most of them commented out
   because they are built-in defaults. You may visit an index of
   options: <a href=
-  "http://lynx.invisible-island.net/release/lynx_help/cattoc.html">by
+  "https://lynx.invisible-island.net/release/lynx_help/cattoc.html">by
   category</a> or <a href=
-  "http://lynx.invisible-island.net/release/lynx_help/alphatoc.html">
+  "https://lynx.invisible-island.net/release/lynx_help/alphatoc.html">
   by alphabet</a>.</p>
 
   <p>To view your current configuration derived from lynx.cfg and
@@ -5226,7 +5226,9 @@ lynx -source ./ &gt;foo.html
   The 2.8.6 development set was released as v2.8.7 in July
   2009.<br>
   The 2.8.7 development set was released as v2.8.8 in February
-  2014.<br></p>
+  2014.<br>
+  The 2.8.8 development set was released as v2.8.9 in July
+  2018.<br></p>
 
   <p>Since early 1997, the Lynx code has expanded into
   autoconfigure and PC versions. The branching of the Lynx source
@@ -5250,7 +5252,7 @@ lynx -source ./ &gt;foo.html
 
   <p>Information on obtaining the most current version of Lynx is
   available at <a href=
-  "http://lynx.invisible-island.net/current/index.html">the current
+  "https://lynx.invisible-island.net/current/index.html">the current
   distribution page</a>.</p>
 
   <p>[<a href="#Contents">ToC</a>]</p>
diff --git a/lynx_help/about_lynx.html b/lynx_help/about_lynx.html
index 5313066a..3896fdcd 100644
--- a/lynx_help/about_lynx.html
+++ b/lynx_help/about_lynx.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: about_lynx.html,v 1.22 2015/09/19 17:36:28 tom Exp $ -->
+<!-- $LynxId: about_lynx.html,v 1.23 2018/07/08 15:22:44 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -103,7 +103,7 @@
 
   <p>Information on obtaining the most current version of
   <strong>Lynx</strong> is available via the <a href=
-  "http://lynx.invisible-island.net">Lynx homepage</a>.</p>
+  "https://lynx.invisible-island.net">Lynx homepage</a>.</p>
 
   <h2><a name="lynx-dev_list" id="lynx-dev_list">Mailing
   List</a></h2>
diff --git a/lynx_help/lynx-dev.html b/lynx_help/lynx-dev.html
index 077ea462..ab64fe23 100644
--- a/lynx_help/lynx-dev.html
+++ b/lynx_help/lynx-dev.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx-dev.html,v 1.18 2017/04/28 16:47:05 tom Exp $ -->
+<!-- $LynxId: lynx-dev.html,v 1.19 2018/07/08 15:22:44 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -49,14 +49,14 @@
   <p>Besides <em>releases</em>, which are stable versions of
   <strong>Lynx</strong> which come out once or twice a year and can
   be obtained from <a href=
-  "http://lynx.invisible-island.net/release/">the release site</a>,
+  "https://lynx.invisible-island.net/release/">the release site</a>,
   there are <em>development</em> versions, which are experimental
   &mdash; though usually stable enough to use &mdash; and appear
   every few weeks, depending on current activity.</p>
 
   <p>You can find the latest <em>development</em> version of
   <strong>Lynx</strong> by visiting <a href=
-  "http://lynx.invisible-island.net/current/">the development
+  "https://lynx.invisible-island.net/current/">the development
   site</a>.</p>
 
   <h2>Subscribing to Lynx-Dev</h2>
diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html
index e84bc7ca..90caa0cd 100644
--- a/lynx_help/lynx_help_main.html
+++ b/lynx_help/lynx_help_main.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx_help_main.html,v 1.54 2018/02/03 18:37:41 tom Exp $ -->
+<!-- $LynxId: lynx_help_main.html,v 1.55 2018/07/08 15:22:44 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -48,12 +48,12 @@
 
   <ul>
     <li><a href=
-    "http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html">
+    "https://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html">
     lynx.cfg options</a> &mdash; a reference for advanced
     configurations</li>
 
     <li><a href=
-    "http://lynx.invisible-island.net/release/breakout/docs/">lynx
+    "https://lynx.invisible-island.net/release/breakout/docs/">lynx
     documentation</a> &mdash; supplementary documentation</li>
 
     <li><a href=
diff --git a/makefile.in b/makefile.in
index a5ff4923..f39b4951 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.171 2018/06/10 21:09:45 tom Exp $
+# $LynxId: makefile.in,v 1.173 2018/07/08 10:56:19 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -45,14 +45,14 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9pre.1
+LYNX_VERSION	= 2.8.9rel.1
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
-VERSION		= 2-8-8
+VERSION		= 2-8-9
 
 ##this is the name of the directory the lynx source code is in.
-##(e.g., lynx2-8-8, not the full path)
+##(e.g., lynx2-8-9, not the full path)
 lynxdir= lynx$(VERSION)
 lynxname= lynx$(VERSION)
 
diff --git a/po/lynx.pot b/po/lynx.pot
index a3176f87..08ce57c0 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.9pre.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-10 16:44-0400\n"
+"POT-Creation-Date: 2018-07-08 12:48-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"
@@ -4381,7 +4381,7 @@ msgstr ""
 
 #: src/LYMain.c:3276
 msgid ""
-"See http://lynx.invisible-island.net/ and the online help for more "
+"See https://lynx.invisible-island.net/ and the online help for more "
 "information."
 msgstr ""
 
diff --git a/samples/lynx-demo.cfg b/samples/lynx-demo.cfg
index b1b595ce..3a7fe88f 100644
--- a/samples/lynx-demo.cfg
+++ b/samples/lynx-demo.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx-demo.cfg,v 1.5 2018/03/18 17:44:27 tom Exp $

+# $LynxId: lynx-demo.cfg,v 1.6 2018/07/08 15:22:44 tom Exp $

 # vile:cfgmode

 # From: claudio santambrogio <claudio.santambrogio@tiscali.it>

 

 STARTFILE:file://localhost/~/home.htm

 HELPFILE:file://localhost/~/help/lynx_help_main.html.gz

-DEFAULT_INDEX_FILE:http://lynx.invisible-island.net/

+DEFAULT_INDEX_FILE:https://lynx.invisible-island.net/

 

 CHARACTER_SET:cp850

 ASSUME_CHARSET:utf-8

diff --git a/samples/lynx_bookmarks.htm b/samples/lynx_bookmarks.htm
index 567f7d8f..378f28ca 100644
--- a/samples/lynx_bookmarks.htm
+++ b/samples/lynx_bookmarks.htm
@@ -4,10 +4,10 @@
 </head>

      You can delete links by the 'R' key<br>

 <ol>

-<li><a href="http://lynx.invisible-island.net/">Lynx homepage</a>

+<li><a href="https://lynx.invisible-island.net/">Lynx homepage</a>

 <li><a href="http://home.pacific.net.sg/~kennethkwok/lynx/">Lynx Browser for Windows 9x/NT/2000/XP</a>

 <li><a href="http://www.fdisk.com/doslynx/lynxport.htm">Lynx for DOS 386 and Win32</a>

 <li><a href="http://www.chass.utoronto.ca/~purslow/lhfb.html">Lynx Help for Beginners</a>

 <li><a href="http://www.hicom.net/~oedipus/weave.html">HTML Authoring and Accessibility Resources for Lynx</a>

 <li><a href="http://perso.club-internet.fr/dominique.guebey/tekno/lynx.htm">La page navigateur LYNX</a>

-<li><a href="http://lynx.invisible-island.net/release/">Current Lynx Release</a>

+<li><a href="https://lynx.invisible-island.net/release/">Current Lynx Release</a>

diff --git a/scripts/indent.sh b/scripts/indent.sh
index ca06d26f..506be6a1 100755
--- a/scripts/indent.sh
+++ b/scripts/indent.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# $LynxId: indent.sh,v 1.4 2013/10/20 19:34:35 tom Exp $
+# $LynxId: indent.sh,v 1.5 2018/07/08 15:22:44 tom Exp $
 # Indent LYNX files (for reference).  See "lnx-indent" from
-#	http://invisible-island.net/cindent/
+#	https://invisible-island.net/cindent/
 NOOP=no
 OPTS='
 --blank-lines-after-declarations
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 4862bb86..5ea08929 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.36 2018/06/10 20:24:17 tom Exp $
+// $LynxId: LYIcon.rc,v 1.38 2018/07/08 15:22:44 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,2001
-PRODUCTVERSION 2,8,9,2001
+FILEVERSION    2,8,9,01
+PRODUCTVERSION 2,8,9,01
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -17,14 +17,14 @@ BEGIN
   BEGIN
     BLOCK "040904B0"
     BEGIN
-      VALUE "CompanyName",      "http://invisible-island.net/lynx"
+      VALUE "CompanyName",      "https://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.2001"
+      VALUE "FileVersion",      "2.8.9.01"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2018 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.2001"
+      VALUE "ProductVersion",   "2.8.9.01"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYMain.c b/src/LYMain.c
index eafa7a60..36c22ed5 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.281 2018/05/11 23:11:18 tom Exp $
+ * $LynxId: LYMain.c,v 1.282 2018/07/08 15:22:44 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -3273,7 +3273,7 @@ static int version_fun(char *next_arg GCC_UNUSED)
     puts(gettext("Copyrights held by the Lynx Developers Group,"));
     puts(gettext("the University of Kansas, CERN, and other contributors."));
     puts(gettext("Distributed under the GNU General Public License (Version 2)."));
-    puts(gettext("See http://lynx.invisible-island.net/ and the online help for more information."));
+    puts(gettext("See https://lynx.invisible-island.net/ and the online help for more information."));
     puts("");
 #ifdef USE_SSL
 #if defined(OPENSSL_VERSION_TEXT) && !defined(LIBGNUTLS_VERSION)
diff --git a/src/LYSession.c b/src/LYSession.c
index 8f55b76a..a4438bd4 100644
--- a/src/LYSession.c
+++ b/src/LYSession.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYSession.c,v 1.11 2015/09/19 17:40:20 tom Exp $ */
+/* $LynxId: LYSession.c,v 1.12 2018/07/08 15:22:44 tom Exp $ */
 
 #include <LYSession.h>
 
@@ -20,7 +20,7 @@
  * / hereby
  * / reduce
  * g file://localhost/COPYRIGHT
- * g http://lynx.invisible-island.net
+ * g https://lynx.invisible-island.net
  * h 1 -1 file://localhost/COPYRIGHT       Entry into main screen
  * h 1 0 LYNXCACHE:/       Cache Jar
  * h 1 16 file://localhost/usr/local/share/lynx_help/Lynx_users_guide.html#Cache   Lynx Users Guide v2.8.6
diff --git a/userdefs.h b/userdefs.h
index 9e509603..91f49101 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.339 2018/06/10 21:09:45 tom Exp $
+ * $LynxId: userdefs.h,v 1.342 2018/07/08 15:22:44 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -484,7 +484,7 @@
  * site:
  */
 #ifndef HOMEPAGE_URL
-#define HOMEPAGE_URL "http://lynx.invisible-island.net/"
+#define HOMEPAGE_URL "https://lynx.invisible-island.net/"
 #endif
 #define STARTFILE HOMEPAGE_URL
 /*
@@ -505,12 +505,12 @@
  *   for this distribution (use SHELL syntax including the device
  *   on VMS systems).
  * The default HELPFILE is:
- * http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
+ * https://lynx.invisible-island.net/lynx_help/lynx_help_main.html
  *   This should be changed here or in lynx.cfg to the local path.
  * The definition here can be overridden at run time by defining a
  * "LYNX_HELPFILE" environment variable.
  */
-#define HELPFILE "http://lynx.invisible-island.net/lynx_help/lynx_help_main.html"
+#define HELPFILE "https://lynx.invisible-island.net/lynx_help/lynx_help_main.html"
 /* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
 
 /*****************************
@@ -1445,11 +1445,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9pre.1"
-#define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
-#define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
+#define LYNX_VERSION "2.8.9rel.1"
+#define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
+#define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Sun, 10 Jun 2018 17:09:45 -0400"
+#define LYNX_DATE "Sun, 08 Jul 2018 06:46:06 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */