Switch from lynx to "links" as the default doc browser.

Submitted by:	jim

5 files changed, 13 insertions, 12 deletions

diff --git a/usr.sbin/sysinstall/help/html.hlp b/usr.sbin/sysinstall/help/html.hlp
index f63dd30..e6f22c4 100644
--- a/usr.sbin/sysinstall/help/html.hlp
+++ b/usr.sbin/sysinstall/help/html.hlp
@@ -6,11 +6,12 @@ resources such as the FreeBSD Handbook & FreeBSD FAQ
 
 If you've loaded the doc distribution.
 
-The default browser package used is lynx (a text based
-browser), which will be automatically loaded from the
-installation media if it is available.  You may change
-the selection of browser & browser package to auto-load
-by visiting the Options editor.
+The default browser package used is links (a text based
+browser which can render tables), which will be
+automatically loaded from the installation media if it
+is available.  You may change the selection of browser
+& browser package to auto-load by visiting the Options
+editor.
 
 In order to visit remote URLs, you naturally must have 
 some sort of working Internet connection.  If you have not
diff --git a/usr.sbin/sysinstall/help/options.hlp b/usr.sbin/sysinstall/help/options.hlp
index dced216..1f32172 100644
--- a/usr.sbin/sysinstall/help/options.hlp
+++ b/usr.sbin/sysinstall/help/options.hlp
@@ -93,7 +93,7 @@ Release Name:  Which release to attempt to load from installation media.
 
 Browser Package:  Which package to load for an HTML browser.
 
-    By default, this is set to lynx but may also be set to any other
+    By default, this is set to links but may also be set to any other
     text capable HTML browser for which a package exists.  If you set this
     to an X based browser, you will not be able to use it if you're running
     in text mode! :)
diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp
index b40d29a..8964ead 100644
--- a/usr.sbin/sysinstall/help/shortcuts.hlp
+++ b/usr.sbin/sysinstall/help/shortcuts.hlp
@@ -11,8 +11,8 @@ Where "var" can be one or more of:
 
 blanktime               Screen blank time setting in seconds
 bootManager             Select boot manager: booteasy, standard or none
-browserBinary           Which doc browser to use (default: lynx)
-browserPackage          Which package to get browser from (default: lynx)
+browserBinary           Which doc browser to use (default: links)
+browserPackage          Which package to get browser from (default: links)
 cpioVerbose             How verbose to be with cpio: high, medium or low
 debug                   Extra debugging?
 disk                    Which disk to operate on (wd0, da0, etc).
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 4c51dac..00f73d3 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -1059,8 +1059,8 @@ installVarDefaults(dialogMenuItem *self)
 	cp = "/usr/bin/ee";
     variable_set2(VAR_EDITOR,			cp, 0);
     variable_set2(VAR_FTP_USER,			"ftp", 0);
-    variable_set2(VAR_BROWSER_PACKAGE,		"lynx", 0);
-    variable_set2(VAR_BROWSER_BINARY,		"/usr/local/bin/lynx", 0);
+    variable_set2(VAR_BROWSER_PACKAGE,		"links", 0);
+    variable_set2(VAR_BROWSER_BINARY,		"/usr/local/bin/links", 0);
     variable_set2(VAR_FTP_STATE,		"passive", 0);
     variable_set2(VAR_NFS_SECURE,		"NO", -1);
     if (OnVTY)
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index 38d5c8c..7d1fa2b 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -620,11 +620,11 @@ HTML documentation submenu.
 .Bl -tag -width indent
 .It browserPackage
 The name of the browser package to try and install as necessary.
-Defaults to latest lynx package.
+Defaults to latest links package.
 .It browserBinary
 The name of the browser binary itself (if overriding the
 .Ar browserPackage
-variable).  Defaults to lynx.
+variable).  Defaults to links.
 .El
 .It installCommit
 Commit any and all pending changes to disk.  This function