about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES7
-rw-r--r--lynx.hlp409
-rw-r--r--lynx.man117
-rw-r--r--src/LYMain.c8
4 files changed, 291 insertions, 250 deletions
diff --git a/CHANGES b/CHANGES
index f5db57c3..e683813e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,15 +1,18 @@
--- $LynxId: CHANGES,v 1.882 2017/04/27 09:20:25 tom Exp $
+-- $LynxId: CHANGES,v 1.884 2017/04/27 22:45:53 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2017-04-28 (2.8.9dev.12)
+* consistently use "_" in command-line options table and manual page, to work
+  with program logic that treats "-" as "_", but not the reverse (report by
+  Larry Hines) -TD
 * improved several configure macros:  CF_ADD_CFLAGS, CF_CC_ENV_FLAGS,
   CF_GNU_SOURCE, CF_LARGEFILE, CF_MATH_LIB, CF_PROG_LINT, CF_SRAND,
   CF_XOPEN_SOURCE -TD
 * modify Windows makefile to allow SSL_LIBS and SSL_DEFS to be overridden,
   reflecting naming-incompatibility in recent OpenSSL development -TD
-* modify ncurses-specific to allow its TERMINAL struct to be opaque -TD 
+* modify ncurses-specific code to allow its TERMINAL struct to be opaque -TD 
 * refine special case of server Content-Type from 2.8.7dev.11 changes to
   decompress files offered for download when the server has gzip'd them
   (report by TH) -TD
diff --git a/lynx.hlp b/lynx.hlp
index c6d83cf6..33415c72 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -43,9 +43,9 @@
        (local files and remote URLs) are added to the G)oto history.
 
        Lynx uses only long option names.  Option names can begin  with  double
-       dash  as well, underscores and dashes can be intermixed in option names
-       (in the reference below options are with one dash before them and  with
-       underscores).
+       dash  "--"  as well, underscores and dashes can be intermixed in option
+       names (in the reference below, options are  shown  with  one  dash  "-"
+       before them, and with underscores "_").
 
        Lynx  provides many command-line options.  Some options require a value
        (string, number or keyword).  These are noted in the  reference  below.
@@ -55,9 +55,11 @@
        or toggle (between true/false).  For any of these,  an  explicit  value
        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
        ignored.
@@ -69,7 +71,7 @@
        third pass of options-processing, so any option which sets a value,  as
        well as runtime configuration values are reflected in the help-message.
 
-       -      If  the  argument  is only `-', then Lynx expects to receive the
+       -      If  the  argument  is only "-", then Lynx expects to receive the
               arguments from the standard input.  This is  to  allow  for  the
               potentially  very  long command line that can be associated with
               the -get_data or -post_data arguments (see below).  It can  also
@@ -85,7 +87,7 @@
               -restrictions.
 
        -assume_charset=MIMEname
-              charset for documents that don't specify it.
+              charset for documents that do not specify it.
 
        -assume_local_charset=MIMEname
               charset assumed for local files, i.e., files which Lynx  creates
@@ -210,7 +212,7 @@
        -debug_partial
               separate incremental display stages with MessageSecs delay
 
-       -default-colors
+       -default_colors
               toggles  the default-colors feature which is normally set in the
               lynx.cfg file.
 
@@ -231,7 +233,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
@@ -263,7 +265,7 @@
               session.
 
        -force_empty_hrefless_a
-              force  HREF-less `A' elements to be empty (close them as soon as
+              force  HREF-less "A" elements to be empty (close them as soon as
               they are seen).
 
        -force_html
@@ -275,8 +277,17 @@
               files).
 
               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.
@@ -289,13 +300,13 @@
        -ftp   disable ftp access.
 
        -get_data
-              properly formatted data for a get form  are  read  in  from  the
+              properly  formatted  data  for  a  get form are read in from the
               standard input and passed to the form.  Input is terminated by a
-              line that starts with `---'.
+              line that starts with "---".
 
-              Lynx issues an HTTP GET, sending the form to  the  path  or  URL
+              Lynx  issues  an  HTTP  GET, sending the form to the path or URL
               given on the command-line and prints the response of the server.
-              If no path or URL is given, Lynx sends the form  to  the  start-
+              If  no  path  or URL is given, Lynx sends the form to the start-
               page.
 
        -head  send a HEAD request for the mime headers.
@@ -306,21 +317,21 @@
               control the display of hidden links.
 
               merge
-                 hidden  links  show  up as bracketed numbers and are numbered
+                 hidden links show up as bracketed numbers  and  are  numbered
                  together with other links in the sequence of their occurrence
                  in the document.
 
               listonly
-                 hidden  links  are  shown  only on L)ist screens and listings
-                 generated by -dump  or  from  the  P)rint  menu,  but  appear
-                 separately  at  the  end of those lists.  This is the default
+                 hidden links are shown only on  L)ist  screens  and  listings
+                 generated  by  -dump  or  from  the  P)rint  menu, but appear
+                 separately at the end of those lists.  This  is  the  default
                  behavior.
 
               ignore
                  hidden links do not appear even in listings.
 
        -historical
-              toggles use of `>' or `-->' as a terminator for comments.
+              toggles use of ">" or "-->" as a terminator for comments.
 
        -homepage=URL
               set homepage separate from start page.
@@ -331,7 +342,7 @@
        -index=URL
               set the default index file to the specified URL.
 
-       -ismap toggles inclusion of  ISMAP  links  when  client-side  MAPs  are
+       -ismap toggles  inclusion  of  ISMAP  links  when  client-side MAPs are
               present.
 
        -justify
@@ -350,17 +361,17 @@
               disable URLs that point to remote hosts.
 
        -locexec
-              enable  local  program  execution from local files only (if Lynx
+              enable local program execution from local files  only  (if  Lynx
               was compiled with local execution enabled).
 
        -lss=FILENAME
-              specify  filename  containing  color-style   information.    The
+              specify   filename   containing  color-style  information.   The
               default is lynx.lss.  If you give an empty filename, Lynx uses a
-              built-in monochrome scheme which  imitates  the  non-color-style
+              built-in  monochrome  scheme  which imitates the non-color-style
               configuration.
 
        -mime_header
-              prints  the  MIME  header  of  a fetched document along with its
+              prints the MIME header of a  fetched  document  along  with  its
               source.
 
        -minimal
@@ -382,11 +393,11 @@
               disable directory browsing.
 
        -nocc  disable Cc: prompts for self copies of mailings.  Note that this
-              does  not disable any CCs which are incorporated within a mailto
+              does not disable any CCs which are incorporated within a  mailto
               URL or form ACTION.
 
        -nocolor
-              force color mode off, overriding terminal capabilities  and  any
+              force  color  mode off, overriding terminal capabilities and any
               -color flags, COLORTERM variable, and saved .lynxrc settings.
 
        -noexec
@@ -407,13 +418,13 @@
               disable -more- string in statusline messages.
 
        -nonrestarting_sigwinch
-              This  flag  is  not  available  on all systems, Lynx needs to be
-              compiled with HAVE_SIGACTION defined.  If available,  this  flag
-              may  cause Lynx to react more immediately to window changes when
+              This flag is not available on all  systems,  Lynx  needs  to  be
+              compiled  with  HAVE_SIGACTION defined.  If available, this flag
+              may cause Lynx to react more immediately to window changes  when
               run within an xterm.
 
        -nonumbers
-              disable   link-    and    field-numbering.     This    overrides
+              disable    link-    and    field-numbering.     This   overrides
               -number_fields and -number_links.
 
        -nopause
@@ -423,7 +434,7 @@
               disable most print functions.
 
        -noredir
-              prevents  automatic redirection and prints a message with a link
+              prevents automatic redirection and prints a message with a  link
               to the new URL.
 
        -noreferer
@@ -457,29 +468,29 @@
               number  of  lines  to  render  before  repainting  display  with
               partial-display logic
 
-       -passive-ftp
+       -passive_ftp
               toggles passive ftp connections.
 
        -pauth=ID:PASSWD
-              set  authorization  ID and password for a protected proxy server
-              at startup.  Be sure to protect any script files which use  this
+              set authorization ID and password for a protected  proxy  server
+              at  startup.  Be sure to protect any script files which use this
               switch.
 
-       -popup toggles  handling  of  single-choice  SELECT  options  via popup
+       -popup toggles handling  of  single-choice  SELECT  options  via  popup
               windows or as lists of radio buttons.
 
        -post_data
-              properly formatted data for a post form are  read  in  from  the
+              properly  formatted  data  for  a post form are read in from the
               standard input and passed to the form.  Input is terminated by a
-              line that starts with `---'.
+              line that starts with "---".
 
-              Lynx issues an HTTP POST, sending the form to the  path  or  URL
+              Lynx  issues  an  HTTP POST, sending the form to the path or URL
               given on the command-line and prints the response of the server.
-              If no path or URL is given, Lynx sends the form  to  the  start-
+              If  no  path  or URL is given, Lynx sends the form to the start-
               page.
 
        -preparsed
-              show  HTML  source  preparsed  and  reformatted  when  used with
+              show HTML  source  preparsed  and  reformatted  when  used  with
               -source or in source view.
 
        -prettysrc
@@ -490,7 +501,7 @@
        -pseudo_inlines
               toggles pseudo-ALTs for inline images with no ALT string.
 
-       -raw   toggles default setting of 8-bit character translations  or  CJK
+       -raw   toggles  default  setting of 8-bit character translations or CJK
               mode for the startup character set.
 
        -realm restricts access to URLs in the starting realm.
@@ -499,12 +510,12 @@
               Sets the read-timeout, where N is given in seconds.
 
        -reload
-              flushes  the  cache  on  a proxy server (only the first document
+              flushes the cache on a proxy server  (only  the  first  document
               given on the command-line is affected).
 
        -restrictions=[option][,option][,option]...
-              allows a list of services to be  disabled  selectively.   Dashes
-              and   underscores  in  option  names  can  be  intermixed.   The
+              allows  a  list  of services to be disabled selectively.  Dashes
+              and  underscores  in  option  names  can  be  intermixed.    The
               following list is printed if no options are specified.
 
               all
@@ -517,18 +528,18 @@
                  disallow execution links via the bookmark file.
 
               change_exec_perms
-                 disallow changing the eXecute permission on files (but  still
-                 allow  it  for  directories)  when  local  file management is
+                 disallow  changing the eXecute permission on files (but still
+                 allow it for  directories)  when  local  file  management  is
                  enabled.
 
               default
-                 same as command line  option  -anonymous.   Disables  default
-                 services  for anonymous users.  Set to all restricted, except
-                 for: inside_telnet, outside_telnet, inside_ftp,  outside_ftp,
-                 inside_rlogin,   outside_rlogin,  inside_news,  outside_news,
+                 same  as  command  line  option -anonymous.  Disables default
+                 services for anonymous users.  Set to all restricted,  except
+                 for:  inside_telnet, outside_telnet, inside_ftp, outside_ftp,
+                 inside_rlogin,  outside_rlogin,  inside_news,   outside_news,
                  telnet_port, jump, mail, print, exec, and goto.  The settings
-                 for  these,  as  well  as  additional  goto  restrictions for
-                 specific URL schemes that are also applied, are derived  from
+                 for these,  as  well  as  additional  goto  restrictions  for
+                 specific  URL schemes that are also applied, are derived from
                  definitions within userdefs.h.
 
               dired_support
@@ -541,7 +552,7 @@
                  disallow access to, or creation of, hidden (dot) files.
 
               download
-                 disallow  some  downloaders  in  the  download menu (does not
+                 disallow some downloaders in  the  download  menu  (does  not
                  imply disk_save restriction).
 
               editor
@@ -554,35 +565,35 @@
                  disallow the user from changing the local execution option.
 
               externals
-                 disallow some "EXTERNAL" configuration lines if  support  for
+                 disallow  some  "EXTERNAL" configuration lines if support for
                  passing  URLs  to  external  applications  (with  the  EXTERN
                  command) is compiled in.
 
               file_url
-                 disallow using G)oto, served links  or  bookmarks  for  file:
+                 disallow  using  G)oto,  served  links or bookmarks for file:
                  URLs.
 
               goto
-                 disable the `g' (goto) command.
+                 disable the "g" (goto) command.
 
               inside_ftp
                  disallow ftps for people coming from inside your domain (utmp
                  required for selectivity).
 
               inside_news
-                 disallow USENET news posting for people  coming  from  inside
+                 disallow  USENET  news  posting for people coming from inside
                  your domain (utmp required for selectivity).
 
               inside_rlogin
-                 disallow  rlogins  for  people coming from inside your domain
+                 disallow rlogins for people coming from  inside  your  domain
                  (utmp required for selectivity).
 
               inside_telnet
-                 disallow telnets for people coming from  inside  your  domain
+                 disallow  telnets  for  people coming from inside your domain
                  (utmp required for selectivity).
 
               jump
-                 disable the `j' (jump) command.
+                 disable the "j" (jump) command.
 
               multibook
                  disallow multiple bookmarks.
@@ -597,22 +608,22 @@
                  disallow saving options in .lynxrc.
 
               outside_ftp
-                 disallow  ftps  for  people  coming  from outside your domain
+                 disallow ftps for people  coming  from  outside  your  domain
                  (utmp required for selectivity).
 
               outside_news
-                 disallow USENET news reading and posting  for  people  coming
-                 from  outside  your  domain  (utmp required for selectivity).
-                 This restriction applies to "news", "nntp",  "newspost",  and
-                 "newsreply"   URLs,  but  not  to  "snews",  "snewspost",  or
+                 disallow  USENET  news  reading and posting for people coming
+                 from outside your domain  (utmp  required  for  selectivity).
+                 This  restriction  applies to "news", "nntp", "newspost", and
+                 "newsreply"  URLs,  but  not  to  "snews",  "snewspost",   or
                  "snewsreply" in case they are supported.
 
               outside_rlogin
-                 disallow rlogins for people coming from outside  your  domain
+                 disallow  rlogins  for people coming from outside your domain
                  (utmp required for selectivity).
 
               outside_telnet
-                 disallow  telnets  for people coming from outside your domain
+                 disallow telnets for people coming from outside  your  domain
                  (utmp required for selectivity).
 
               print
@@ -631,8 +642,8 @@
                  disallow modifications of the User-Agent header.
 
        -resubmit_posts
-              toggles forced resubmissions (no-cache)  of  forms  with  method
-              POST  when  the  documents  they  returned  are  sought with the
+              toggles  forced  resubmissions  (no-cache)  of forms with method
+              POST when the  documents  they  returned  are  sought  with  the
               PREV_DOC command or from the History List.
 
        -rlogin
@@ -658,7 +669,7 @@
               saves session to specified file.
 
        -short_url
-              show  very  long URLs in the status line with "..." to represent
+              show very long URLs in the status line with "..."  to  represent
               the portion which cannot be displayed.  The beginning and end of
               the URL are displayed, rather than suppressing the end.
 
@@ -667,34 +678,34 @@
               and exit.
 
        -show_cursor
-              If enabled the cursor will not  be  hidden  in  the  right  hand
-              corner  but  will  instead  be  positioned  at  the start of the
+              If  enabled  the  cursor  will  not  be hidden in the right hand
+              corner but will instead  be  positioned  at  the  start  of  the
               currently selected link.  Show cursor is the default for systems
-              without  FANCY_CURSES  capabilities.   The default configuration
-              can be changed in userdefs.h  or  lynx.cfg.   The  command  line
+              without FANCY_CURSES capabilities.   The  default  configuration
+              can  be  changed  in  userdefs.h  or lynx.cfg.  The command line
               switch toggles the default.
 
        -show_rate
-              If  enabled  the  transfer  rate  is  shown in bytes/second.  If
-              disabled, no transfer  rate  is  shown.   Use  lynx.cfg  or  the
+              If enabled the transfer  rate  is  shown  in  bytes/second.   If
+              disabled,  no  transfer  rate  is  shown.   Use  lynx.cfg or the
               options menu to select KB/second and/or ETA.
 
        -soft_dquotes
-              toggles  emulation  of  the  old  Netscape  and Mosaic bug which
-              treated `>' as a co-terminator for double-quotes and tags.
+              toggles emulation of the  old  Netscape  and  Mosaic  bug  which
+              treated ">" as a co-terminator for double-quotes and tags.
 
        -source
-              works the same as  dump  but  outputs  HTML  source  instead  of
+              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
+              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
@@ -703,9 +714,9 @@
               allow non-http startfile and homepage with -validate.
 
        -stderr
-              When dumping a document using -dump or  -source,  Lynx  normally
-              does  not  display  alert  (error)  messages that you see on the
-              screen in the status line.  Use the -stderr option to tell  Lynx
+              When  dumping  a  document using -dump or -source, Lynx normally
+              does not display alert (error) messages  that  you  see  on  the
+              screen  in the status line.  Use the -stderr option to tell Lynx
               to write these messages to the standard error.
 
        -stdin read the startfile from standard input (UNIX only).
@@ -713,7 +724,7 @@
        -syslog=text
               information for syslog call.
 
-       -syslog-urls
+       -syslog_urls
               log requested URLs with syslog.
 
        -tagsoup
@@ -723,25 +734,25 @@
               disable recognition of telnet commands.
 
        -term=TERM
-              tell  Lynx what terminal type to assume it is talking to.  (This
-              may be useful for remote  execution,  when,  for  example,  Lynx
-              connects  to  a remote TCP/IP port that starts a script that, in
+              tell Lynx what terminal type to assume it is talking to.   (This
+              may  be  useful  for  remote  execution, when, for example, Lynx
+              connects to a remote TCP/IP port that starts a script  that,  in
               turn, starts another Lynx process.)
 
        -timeout=N
-              For win32, sets the network read-timeout, where N  is  given  in
+              For  win32,  sets  the network read-timeout, where N is given in
               seconds.
 
-       -tlog  toggles  between  using  a  Lynx  Trace Log and stderr for trace
+       -tlog  toggles between using a Lynx Trace  Log  and  stderr  for  trace
               output from the session.
 
        -tna   turns on "Textfields Need Activation" mode.
 
-       -trace turns on Lynx trace mode.  Destination of trace  output  depends
+       -trace turns  on  Lynx trace mode.  Destination of trace output depends
               on -tlog.
 
        -trace_mask=value
-              turn  on  optional  traces, which may result in very large trace
+              turn on optional traces, which may result in  very  large  trace
               files.  Logically OR the values to combine options:
 
               1  SGML character parsing states
@@ -750,7 +761,7 @@
 
               4  TRST (table layout)
 
-              8  configuration (lynx.cfg, .lynxrc,  .lynx-keymaps,  mime.types
+              8  configuration  (lynx.cfg,  .lynxrc, .lynx-keymaps, mime.types
                  and mailcap contents)
 
               16 binary string copy/append, used in form data construction.
@@ -766,10 +777,11 @@
                  timing
 
        -traversal
-              traverse  all http links derived from startfile.  When used with
-              -crawl, each link that begins with the same string as  startfile
-              is  output to a file, intended for indexing.  See CRAWL.announce
-              for more information.
+              traverse all http links derived from startfile.  When used  with
+              -crawl,  each link that begins with the same string as startfile
+              is output to a file, intended for indexing.
+
+              See CRAWL.announce for more information.
 
        -trim_input_fields
               trim input text/textarea fields in forms.
@@ -823,7 +835,7 @@
               typically 1024 (the MAX_LINE symbol).
 
        -with_backspaces
-              emit backspaces in output if -dump'ing or -crawl'ing (like `man'
+              emit  backspaces  in output if -dump'ing or -crawl'ing (like man
               does)
 
        -xhtml_parsing
@@ -834,22 +846,22 @@
        More  than  one key can be mapped to a given command.  Here are some of
        the most useful:
 
-       o  Use Up arrow and Down arrow to scroll through hypertext links.
+       *   Use Up arrow and Down arrow to scroll through hypertext links.
 
-       o  Right arrow or Return will follow a highlighted hypertext link.
+       *   Right arrow or Return will follow a highlighted hypertext link.
 
-       o  Left Arrow or "u" will retreat from a link.
+       *   Left Arrow or "u" will retreat from a link.
 
-       o  Type "H", "?", or F1 for online help and descriptions of  key-stroke
-          commands.
+       *   Type "H", "?", or F1 for online help and descriptions of key-stroke
+           commands.
 
-       o  Type  "k"  or  "K"  for  a  list  of  the current key-stroke command
-          mappings.
+       *   Type  "k"  or  "K"  for  a  list  of the current key-stroke command
+           mappings.
 
-          If the same command is mapped to the same letter differing  only  by
-          upper/lowercase only the lowercase mapping is shown.
+           If the same command is mapped to the same letter differing only  by
+           upper/lowercase only the lowercase mapping is shown.
 
-       o  Type Delete to view history list.
+       *   Type Delete to view history list.
 
 2 Environment
        In  addition  to various "standard" environment variables such as HOME,
@@ -878,31 +890,33 @@
                            location and name of the global configuration  file
                            (normally,   lynx.cfg)  that  was  defined  by  the
                            LYNX_CFG_FILE  constant  in  the  userdefs.h  file,
-                           during  installation.   See the userdefs.h file for
-                           more information.
+                           during installation.
+
+                           See the userdefs.h file for more information.
 
-       LYNX_CFG_PATH       If set, this  variable  overrides  the  compiled-in
-                           search-list   of   directories  used  to  find  the
-                           configuration files, e.g., lynx.cfg  and  lynx.lss.
+       LYNX_CFG_PATH       If  set,  this  variable  overrides the compiled-in
+                           search-list  of  directories  used  to   find   the
+                           configuration  files,  e.g., lynx.cfg and lynx.lss.
                            The list is delimited with ":" (or ";" for Windows)
                            like the PATH environment variable.
 
        LYNX_HELPFILE       If set, this variable overrides the compiled-in URL
                            and configuration file URL for the Lynx help file.
 
-       LYNX_LOCALEDIR      If  set,  this  variable  overrides the compiled-in
-                           location of the  locale  directory  which  contains
+       LYNX_LOCALEDIR      If set, this  variable  overrides  the  compiled-in
+                           location  of  the  locale  directory which contains
                            native language (NLS) message text.
 
-       LYNX_LSS            This  variable,  if  set, specifies the location of
-                           the  default  Lynx  character  style  sheet   file.
-                           [Currently  only meaningful if Lynx was built using
+       LYNX_LSS            This variable, if set, specifies  the  location  of
+                           the   default  Lynx  character  style  sheet  file.
+                           [Currently only meaningful if Lynx was built  using
                            curses color style support.]
 
-       LYNX_SAVE_SPACE     This variable, if set, will  override  the  default
+       LYNX_SAVE_SPACE     This  variable,  if  set, will override the default
                            path prefix for files saved to disk that is defined
-                           in the lynx.cfg  SAVE_SPACE:  statement.   See  the
-                           lynx.cfg file for more information.
+                           in the lynx.cfg SAVE_SPACE: statement.
+
+                           See the lynx.cfg file for more information.
 
        LYNX_TEMP_SPACE     This  variable,  if  set, will override the default
                            path prefix for temporary files  that  was  defined
@@ -932,29 +946,33 @@
        PROTOCOL_proxy      Lynx supports the use of proxy servers 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,  gopher,  etc),  can  be  mapped
-                           separately  by setting environment variables of the
-                           form   PROTOCOL_proxy    (literally:    http_proxy,
-                           ftp_proxy,       gopher_proxy,       etc),       to
-                           "http://some.server.dom:port/".   See  Lynx   Users
-                           Guide for additional details and examples.
-
-       SSL_CERT_DIR        Set    to    the   directory   containing   trusted
+                           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,
+                           etc), to "http://some.server.dom:port/".
+
+                           See  Lynx  Users  Guide  for additional details and
+                           examples.
+
+       SSL_CERT_DIR        Set   to   the   directory    containing    trusted
                            certificates.
 
-       SSL_CERT_FILE       Set to the full path and filename for your file  of
+       SSL_CERT_FILE       Set  to the full path and filename for your file of
                            trusted certificates.
 
-       WWW_access_GATEWAY  Lynx  still  supports  use of gateway servers, with
-                           the  servers  specified  via   "WWW_access_GATEWAY"
-                           variables  (where "access" is lower case and can be
-                           "http", "ftp", "gopher" or  "wais"),  however  most
-                           gateway  servers have been discontinued.  Note that
-                           you do not include a terminal `/' for gateways, but
-                           do   for   proxies   specified   by  PROTOCOL_proxy
-                           environment variables.  See Lynx  Users  Guide  for
-                           details.
+       WWW_access_GATEWAY  Lynx still supports use of  gateway  servers,  with
+                           the   servers  specified  via  "WWW_access_GATEWAY"
+                           variables (where "access" is lower case and can  be
+                           "http",  "ftp",  "gopher" or "wais").  However most
+                           gateway servers have been discontinued.  Note  that
+                           you do not include a terminal "/" for gateways, but
+                           do  for   proxies   specified   by   PROTOCOL_proxy
+                           environment variables.
+
+                           See Lynx Users Guide for details.
 
        WWW_HOME            This  variable,  if  set, will override the default
                            startup  URL  specified  in   any   of   the   Lynx
@@ -1009,26 +1027,27 @@
 
        LYNX_VERSION        This variable is always set by  Lynx,  and  may  be
                            used  by an external program to determine if it was
-                           invoked by Lynx.  See  also  the  comments  in  the
-                           distribution's  sample  mailcap  file, for notes on
-                           usage in such a file.
+                           invoked by Lynx.
+
+                           See also the comments in the distribution's  sample
+                           mailcap file, for notes on usage in such a file.
 
-       TERM                Normally,  this  variable  is  used  by   Lynx   to
-                           determine  the  terminal  type being used to invoke
+       TERM                Normally,   this   variable  is  used  by  Lynx  to
+                           determine the terminal type being  used  to  invoke
                            Lynx.  If, however, it is unset at startup time (or
-                           has  the value "unknown"), or if the -term command-
-                           line option is used (see  OPTIONS  section  above),
-                           Lynx  will  set  or  modify  its  value to the user
-                           specified terminal type  (for  the  Lynx  execution
-                           environment).   Note:  If set/modified by Lynx, the
-                           values of  the  LINES  and/or  COLUMNS  environment
+                           has the value "unknown"), or if the -term  command-
+                           line  option  is  used (see OPTIONS section above),
+                           Lynx will set or  modify  its  value  to  the  user
+                           specified  terminal  type  (for  the Lynx execution
+                           environment).  Note: If set/modified by  Lynx,  the
+                           values  of  the  LINES  and/or  COLUMNS environment
                            variables may also be changed.
 
 2 Simulated Cgi Support
        If built with the cgi-links option enabled, Lynx allows access to a cgi
        script directly without the need for an http daemon.
 
-       When executing such  "lynxcgi  scripts"  (if  enabled),  the  following
+       When  executing  such  "lynxcgi  scripts"  (if  enabled), the following
        variables may be set for simulating a CGI environment:
 
        CONTENT_LENGTH
@@ -1057,98 +1076,98 @@
 
        SERVER_SOFTWARE
 
-       Other  environment  variables  are  not inherited by the script, unless
-       they  are  provided  via  a  LYNXCGI_ENVIRONMENT   statement   in   the
-       configuration  file.   See  the  lynx.cfg file, and the (draft) CGI 1.1
+       Other environment variables are not inherited  by  the  script,  unless
+       they   are   provided   via  a  LYNXCGI_ENVIRONMENT  statement  in  the
+       configuration file.  See the lynx.cfg file, and  the  (draft)  CGI  1.1
        Specification <http://Web.Golux.Com/coar/cgi/draft-coar-cgi-v11-00.txt>
        for the definition and usage of these variables.
 
-       The  CGI  Specification,  and other associated documentation, should be
+       The CGI Specification, and other associated  documentation,  should  be
        consulted for general information on CGI script programming.
 
 2 Native Language Support
-       If configured and installed with Native  Language  Support,  Lynx  will
+       If  configured  and  installed  with Native Language Support, Lynx will
        display status and other messages in your local language.  See the file
-       ABOUT_NLS in the source distribution, or at your local  GNU  site,  for
+       ABOUT_NLS  in  the  source distribution, or at your local GNU site, for
        more information about internationalization.
 
-       The  following  environment  variables  may  be  used  to alter default
+       The following environment  variables  may  be  used  to  alter  default
        settings:
 
-       LANG                This variable, if set, will  override  the  default
+       LANG                This  variable,  if  set, will override the default
                            message language.  It is an ISO 639 two-letter code
-                           identifying the language.  Language codes  are  NOT
+                           identifying  the  language.  Language codes are NOT
                            the same as the country codes given in ISO 3166.
 
-       LANGUAGE            This  variable,  if  set, will override the default
+       LANGUAGE            This variable, if set, will  override  the  default
                            message language.  This is a GNU extension that has
-                           higher  priority  for  setting  the message catalog
+                           higher priority for  setting  the  message  catalog
                            than LANG or LC_ALL.
 
        LC_ALL              and
 
-       LC_MESSAGES         These variables, if  set,  specify  the  notion  of
+       LC_MESSAGES         These  variables,  if  set,  specify  the notion of
                            native language formatting style.  They are POSIXly
                            correct.
 
        LINGUAS             This  variable,  if  set  prior  to  configuration,
-                           limits  the installed languages to specific values.
-                           It is a space-separated list of  two-letter  codes.
+                           limits the installed languages to specific  values.
+                           It  is  a space-separated list of two-letter codes.
                            Currently, it is hard-coded to a wish list.
 
-       NLSPATH             This  variable,  if set, is used as the path prefix
+       NLSPATH             This variable, if set, is used as the  path  prefix
                            for message catalogs.
 
 2 Notes
        This is the Lynx v2.8.8 Release; development is in progress for 2.8.9.
 
        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
+       to our mailing list.  Send email to <lynx-dev-request@nongnu.org>  with
        "subscribe lynx-dev" as the only line in the body of your message.
 
-       Send bug reports, comments, suggestions to <lynx-dev@nongnu.org>  after
+       Send  bug reports, comments, suggestions to <lynx-dev@nongnu.org> after
        subscribing.
 
-       Unsubscribe  by  sending  email  to  <lynx-dev-request@nongnu.org> with
-       "unsubscribe lynx-dev" as the only line in the body  of  your  message.
+       Unsubscribe by  sending  email  to  <lynx-dev-request@nongnu.org>  with
+       "unsubscribe  lynx-dev"  as  the only line in the body of your message.
        Do not send the unsubscribe message to the lynx-dev list, itself.
 
 2 See Also
-       catgets(3),  curses(3),  environ(7),  execve(2),  ftp(1), gettext(GNU),
-       localeconv(3),   ncurses(3),   setlocale(3),   slang(?),    termcap(5),
+       catgets(3), curses(3),  environ(7),  execve(2),  ftp(1),  gettext(GNU),
+       localeconv(3),    ncurses(3),   setlocale(3),   slang(?),   termcap(5),
        terminfo(5), wget(GNU)
 
        Note that man page availability and section numbering is somewhat platform
        dependent, and may vary from the above references.
 
-       A section shown as (GNU), is intended to denote that the topic  may  be
+       A  section  shown as (GNU), is intended to denote that the topic may be
        available via an info page, instead of a man page (i.e., try "info subject",
        rather than "man subject").
 
-       A section shown as (?) denotes that documentation on the topic  exists,
-       but  is  not part of an established documentation retrieval system (see
-       the distribution files associated with the topic, or contact your  System
+       A  section shown as (?) denotes that documentation on the topic exists,
+       but is not part of an established documentation retrieval  system  (see
+       the  distribution files associated with the topic, or contact your System
        Administrator for further information).
 
 2 Acknowledgments
-       Lynx  has  incorporated  code  from a variety of sources along the way.
-       The earliest versions of Lynx included code from Earl Fogel of  Comput-
-       ing  Services at the University of Saskatchewan, who implemented HYPER-
-       REZ in the Unix environment.  HYPERREZ was developed by Niel Larson  of
-       Think.com  and  served  as  the  model  for the early versions of Lynx.
+       Lynx has incorporated code from a variety of  sources  along  the  way.
+       The  earliest versions of Lynx included code from Earl Fogel of Comput-
+       ing Services at the University of Saskatchewan, who implemented  HYPER-
+       REZ  in the Unix environment.  HYPERREZ was developed by Niel Larson of
+       Think.com and served as the model  for  the  early  versions  of  Lynx.
        Those versions also incorporated libraries from the Unix Gopher clients
-       developed  at  the  University  of Minnesota, and the later versions of
-       Lynx rely on the WWW client library code developed by  Tim  Berners-Lee
-       and  the  WWW  community.  Also a special thanks to Foteos Macrides who
+       developed at the University of Minnesota, and  the  later  versions  of
+       Lynx  rely  on the WWW client library code developed by Tim Berners-Lee
+       and the WWW community.  Also a special thanks to  Foteos  Macrides  who
        ported much of Lynx to VMS and did or organized most of its development
-       since  the  departures of Lou Montulli and Garrett Blythe from the Uni-
-       versity of Kansas in the summer of 1994 through the release of  v2.7.2,
-       and  to  everyone  on the net who has contributed to Lynx's development
+       since the departures of Lou Montulli and Garrett Blythe from  the  Uni-
+       versity  of Kansas in the summer of 1994 through the release of v2.7.2,
+       and to everyone on the net who has contributed  to  Lynx's  development
        either directly (through patches, comments or bug reports) or indirect-
        ly (through inspiration and development of other systems).
 
 2 Authors
-       Lou  Montulli,  Garrett  Blythe, Craig Lavender, Michael Grobe, Charles
+       Lou Montulli, Garrett Blythe, Craig Lavender,  Michael  Grobe,  Charles
        Rezac
        Academic Computing Services
        University of Kansas
diff --git a/lynx.man b/lynx.man
index 9e82ccb8..b4ada44f 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.113 2016/10/14 08:59:24 tom Exp $
+.\" $LynxId: lynx.man,v 1.116 2017/04/27 23:12:12 tom Exp $
 .\" **************************************************************************
 .\" Escape single quotes in literal strings from groff's Unicode transform.
 .ie \n(.g .ds AQ \(aq
@@ -7,6 +7,22 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.de bP
+.IP \(bu 4
+..
+.de NS
+.ie \n(.sp
+.el    .sp .5
+.ie \n(.in +4
+.el    .in +2
+.nf
+.ft C			\" Courier
+..
+.de NE
+.fi
+.ft R
+.in -4
+..
 .\" **************************************************************************
 .TH LYNX 1
 .SH NAME
@@ -72,10 +88,12 @@ If more than one local file or remote URL is listed on the command line,
 All of the names (local files and remote URLs) are added to the \fBG)oto\fP history.
 .PP
 \fILynx\fR uses only long option names.
-Option names can begin with double dash as well,
+Option names can begin with double dash \*(``\-\-\*('' as well,
 underscores and dashes can be intermixed in
-option names (in the reference below options
-are with one dash before them and with underscores).
+option names (in the reference below, options
+are shown
+with one dash \*(``\-\*('' before them, and
+with underscores \*(``_\*('').
 .PP
 \fILynx\fR provides many command-line options.
 Some options require a value (string, number or keyword).
@@ -87,13 +105,12 @@ set (to true), unset (to false), or toggle (between true/false).
 For any of these, an explicit value can be given in different
 forms to allow for operating system constraints,
 e.g.,
-.RS
-.nf
+.NS
 \fB\-center:off\fP
 \fB\-center=off\fP
 \fB\-center\-\fP
-.fi
-.RE
+.NE
+.PP
 \fILynx\fR recognizes
 \*(``1\*('', \*(``+\*('', \*(``on\*('' and \*(``true\*('' for true values, and
 \*(``0\*('', \*(``\-\*('', \*(``off\*('' and \*(``false\*('' for false values.
@@ -108,7 +125,7 @@ so any option which sets a value,
 as well as runtime configuration values are reflected in the help-message.
 .TP 7
 .B \-
-If the argument is only '\-', then \fILynx\fP expects to receive
+If the argument is only \*(``\-\*('', then \fILynx\fP expects to receive
 the arguments from the standard input.
 This is to allow for the
 potentially very long command line that can be associated
@@ -125,7 +142,7 @@ accept all cookies.
 apply restrictions for anonymous account, see also \fB\-restrictions\fR.
 .TP
 .B \-assume_charset\fR=\fIMIMEname
-charset for documents that don't specify it.
+charset for documents that do not specify it.
 .TP
 .B \-assume_local_charset\fR=\fIMIMEname
 charset assumed for local files,
@@ -266,7 +283,7 @@ Toggling this option makes the feature altogether unavailable.
 .B \-debug_partial
 separate incremental display stages with MessageSecs delay
 .TP
-.B \-default-colors
+.B \-default_colors
 toggles the default-colors feature which is normally set in the lynx.cfg file.
 .TP
 .B \-delay
@@ -287,8 +304,9 @@ dumps the formatted output of the default document or those
 specified on the command line to standard output.
 Unlike interactive mode, all documents are processed.
 This can be used in the following way:
-.sp
+.NS
 lynx \fB\-dump\fR http://www.subir.com/lynx.html
+.NE
 .IP
 Files specified on the command line are formatted as HTML if
 their names end with one of the standard web suffixes such
@@ -324,7 +342,8 @@ is not compiled-into your executable, but when it is,
 it can be disabled for a session.
 .TP
 .B \-force_empty_hrefless_a
-force HREF-less 'A' elements to be empty (close them as soon as they are seen).
+force HREF-less \*(``A\*('' elements to be empty
+(close them as soon as they are seen).
 .TP
 .B \-force_html
 forces the first document to be interpreted as HTML.
@@ -334,7 +353,7 @@ which have an unrecognized suffix (or the suffix is associated with a
 non-HTML type, such as \*(``.txt\*('' for plain text files).
 .IP
 \fILynx\fP recognizes these file suffixes as HTML:
-.RS
+.NS
 \*(``.ht3\*('',
 \*(``.htm\*('',
 \*(``.html3\*('',
@@ -345,7 +364,7 @@ non-HTML type, such as \*(``.txt\*('' for plain text files).
 \*(``.phtml\*('',
 \*(``.sht\*('', and
 \*(``.shtml\*(''.
-.RE
+.NE
 .TP
 .B \-force_secure
 toggles forcing of the secure flag for SSL cookies.
@@ -362,7 +381,7 @@ disable ftp access.
 .B \-get_data
 properly formatted data for a \fIget\fP form are read in from
 the standard input and passed to the form.
-Input is terminated by a line that starts with '\-\-\-'.
+Input is terminated by a line that starts with \*(``\-\-\-\*(''.
 .IP
 \fILynx\fP issues an HTTP \fBGET\fP,
 sending the form to the path or URL given on the
@@ -395,7 +414,7 @@ hidden links do not appear even in listings.
 .RE
 .TP
 .B \-historical
-toggles use of '>' or '\-\->' as a terminator for comments.
+toggles use of \*(``>\*('' or \*(``\-\->\*('' as a terminator for comments.
 .TP
 .B \-homepage\fR=\fIURL
 set homepage separate from start page.
@@ -537,7 +556,7 @@ toggles display partial pages while loading.
 number of lines to render before repainting display
 with partial-display logic
 .TP
-.B \-passive-ftp
+.B \-passive_ftp
 toggles passive ftp connections.
 .TP
 .B \-pauth\fR=\fIID\fR:\fIPASSWD
@@ -551,7 +570,7 @@ popup windows or as lists of radio buttons.
 .B \-post_data
 properly formatted data for a \fIpost\fP form are read in from
 the standard input and passed to the form.
-Input is terminated by a line that starts with '\-\-\-'.
+Input is terminated by a line that starts with \*(``\-\-\-\*(''.
 .IP
 \fILynx\fP issues an HTTP \fBPOST\fP,
 sending the form to the path or URL given on the
@@ -656,7 +675,7 @@ disallow using \fBG)oto\fP, served links or bookmarks for
 file: URLs.
 .TP
 .B goto
-disable the 'g' (goto) command.
+disable the \*(``g\*('' (goto) command.
 .TP
 .B inside_ftp
 disallow ftps for people coming from inside your
@@ -675,7 +694,7 @@ disallow telnets for people coming from inside
 your domain (utmp required for selectivity).
 .TP
 .B jump
-disable the 'j' (jump) command.
+disable the \*(``j\*('' (jump) command.
 .TP
 .B multibook
 disallow multiple bookmarks.
@@ -773,24 +792,22 @@ Use lynx.cfg or the options menu to select KB/second and/or ETA.
 .TP
 .B \-soft_dquotes
 toggles emulation of the old Netscape and Mosaic bug which
-treated '>' as a co-terminator for double-quotes and tags.
+treated \*(``>\*('' as a co-terminator for double-quotes and tags.
 .TP
 .B \-source
 works the same as dump but outputs HTML source instead of
 formatted text.
 For example
-.sp
-.RS
+.NS
 lynx \-source . >foo.html
-.RE
+.NE
 .IP
 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:
-.sp
-.RS
+.NS
 lynx \-source ./ >foo.html
-.RE
+.NE
 .TP
 .B \-stack_dump
 disable SIGINT cleanup handler
@@ -812,7 +829,7 @@ read the startfile from standard input
 .B \-syslog\fR=\fItext
 information for syslog call.
 .TP
-.B \-syslog\-urls
+.B \-syslog_urls
 log requested URLs with syslog.
 .TP
 .B \-tagsoup
@@ -880,6 +897,7 @@ traverse all http links derived from startfile.
 When used with
 \fB\-crawl\fR, each link that begins with the same string as startfile
 is output to a file, intended for indexing.
+.IP
 See CRAWL.announce for more information.
 .TP
 .B \-trim_input_fields
@@ -936,7 +954,8 @@ This is limited by the number of columns that \fILynx\fP could display,
 typically 1024 (the \fIMAX_LINE\fP symbol).
 .TP
 .B \-with_backspaces
-emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing (like 'man' does)
+emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing
+(like \fBman\fP does)
 .TP
 .B \-xhtml_parsing
 tells \fILynx\fP that it can ignore certain tags which have no content
@@ -946,28 +965,22 @@ For example \*(``<p/>\*('' will be discarded.
 .PP
 More than one key can be mapped to a given command.
 Here are some of the most useful:
-.TP 3
-.B o
+.bP
 Use \fBUp arrow\fR and \fBDown arrow\fR to scroll through hypertext links.
-.TP
-.B o
+.bP
 \fBRight arrow\fR or \fBReturn\fR will follow a highlighted hypertext link.
-.TP
-.B o
+.bP
 \fBLeft Arrow\fR or \*(``\fBu\fR\*('' will retreat from a link.
-.TP
-.B o
+.bP
 Type \*(``\fBH\fR\*('', \*(``\fB?\fR\*('', or \fBF1\fR for online help and descriptions
 of key-stroke commands.
-.TP
-.B o
+.bP
 Type \*(``\fBk\fR\*('' or \*(``\fBK\fR\*('' for a list of the current key-stroke
 command mappings.
 .IP
 If the same command is mapped to the same letter differing only
 by upper/lowercase only the lowercase mapping is shown.
-.TP
-.B o
+.bP
 Type \fBDelete\fR to view history list.
 .SH ENVIRONMENT
 In addition to various \*(``standard\*('' environment variables such as
@@ -998,6 +1011,7 @@ screen-handling library.
 This variable, if set, will override the default location and name of
 the global configuration file (normally, \fBlynx.cfg\fR) that was defined
 by the LYNX_CFG_FILE constant in the userdefs.h file, during installation.
+.IP
 See the userdefs.h file for more information.
 .TP
 .B LYNX_CFG_PATH
@@ -1023,6 +1037,7 @@ built using curses color style support.]
 .B LYNX_SAVE_SPACE
 This variable, if set, will override the default path prefix for files
 saved to disk that is defined in the \fBlynx.cfg SAVE_SPACE:\fR statement.
+.IP
 See the \fBlynx.cfg\fR file for more information.
 .TP
 .B LYNX_TEMP_SPACE
@@ -1051,15 +1066,17 @@ header of \fBUSENET\fR news postings.
 On \fBUNIX\fR, it will override the
 contents of an /etc/organization file, if present.
 .TP
-.B PROTOCOL_proxy
+.I PROTOCOL\fB_proxy\fR
 \fILynx\fR supports the use of proxy servers that can act as firewall
 gateways and caching servers.
 They are preferable to the older gateway
 servers (see WWW_access_GATEWAY, below).
+.IP
 Each protocol used by \fILynx\fR,
 (http, ftp, gopher, etc), can be mapped separately by setting environment
-variables of the form PROTOCOL_proxy (literally: http_proxy, ftp_proxy,
+variables of the form \fIPROTOCOL\fP_proxy (literally: http_proxy, ftp_proxy,
 gopher_proxy, etc), to \*(``http://some.server.dom:port/\*(''.
+.IP
 See \fBLynx Users Guide\fR for additional details and examples.
 .TP
 .B SSL_CERT_DIR
@@ -1071,10 +1088,11 @@ Set to the full path and filename for your file of trusted certificates.
 .B WWW_access_GATEWAY
 \fILynx\fR still supports use of gateway servers, with the servers specified
 via \*(``WWW_access_GATEWAY\*('' variables (where \*(``access\*('' is lower case and can be
-\*(``http\*('', \*(``ftp\*('', \*(``gopher\*('' or \*(``wais\*(''), however most gateway servers have been
-discontinued.
-Note that you do not include a terminal '/' for gateways, but
-do for proxies specified by PROTOCOL_proxy environment variables.
+\*(``http\*('', \*(``ftp\*('', \*(``gopher\*('' or \*(``wais\*('').
+However most gateway servers have been discontinued.
+Note that you do not include a terminal \*(``/\*('' for gateways, but
+do for proxies specified by \fIPROTOCOL\fP_proxy environment variables.
+.IP
 See \fBLynx Users Guide\fR for details.
 .TP
 .B WWW_HOME
@@ -1136,6 +1154,7 @@ The trace file is in either case relative to the home directory.
 .B LYNX_VERSION
 This variable is always set by \fILynx\fR, and may be used by an external
 program to determine if it was invoked by \fILynx\fR.
+.IP
 See also the comments
 in the distribution's sample \fBmailcap\fR file, for notes on usage in such
 a file.
@@ -1266,7 +1285,7 @@ A section shown as (GNU), is intended to denote that the topic
 may be available via an info page, instead of a man page (i.e., try
 \*(``info subject\*('', rather than \*(``man subject\*('').
 .PP
-A section shown as (?) denotes that documentation on the topic exists,
+A section shown as \fB(?)\fP denotes that documentation on the topic exists,
 but is not part of an established documentation retrieval system (see
 the distribution files associated with the topic, or contact your
 System Administrator for further information).
diff --git a/src/LYMain.c b/src/LYMain.c
index f70bc3b7..fcb87baf 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.260 2015/12/18 00:34:45 tom Exp $
+ * $LynxId: LYMain.c,v 1.261 2017/04/27 22:34:12 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -3779,7 +3779,7 @@ with partial-display logic"
 #endif
 #ifndef DISABLE_FTP
    PARSE_SET(
-      "passive-ftp",	4|TOGGLE_ARG,		ftp_passive,
+      "passive_ftp",	4|TOGGLE_ARG,		ftp_passive,
       "toggles passive ftp connection"
    ),
 #endif
@@ -3931,7 +3931,7 @@ bug which treated '>' as a co-terminator for\ndouble-quotes and tags"
       "=text\ninformation for syslog call"
    ),
    PARSE_SET(
-      "syslog-urls",	4|SET_ARG,		syslog_requested_urls,
+      "syslog_urls",	4|SET_ARG,		syslog_requested_urls,
       "log requested URLs with syslog"
    ),
 #endif
@@ -4039,7 +4039,7 @@ with filenames of these images"
    ),
 #endif
    PARSE_SET(
-      "xhtml-parsing",	4|SET_ARG,		LYxhtml_parsing,
+      "xhtml_parsing",	4|SET_ARG,		LYxhtml_parsing,
       "enable XHTML 1.0 parsing"
    ),
    PARSE_NIL