about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2017-07-06 00:25:29 +0000
committerThomas E. Dickey <dickey@invisible-island.net>2017-07-06 00:25:29 +0000
commitd53b10484174f94b6ddf17ef00c6f91cefac14d4 (patch)
tree5019a8a4af53cbcfe70f6d562bb0c61e4ab99c23
parent4b84022da163df7eff5a1518b088be14be926d4c (diff)
downloadlynx-snapshots-d53b10484174f94b6ddf17ef00c6f91cefac14d4.tar.gz
snapshot of project "lynx", label v2-8-9dev_15c
-rw-r--r--CHANGES4
-rw-r--r--lynx.cfg18
2 files changed, 15 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 641bd277..21308f77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.911 2017/07/05 22:23:00 tom Exp $
+-- $LynxId: CHANGES,v 1.912 2017/07/06 00:25:29 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2017-07-05 (2.8.9dev.16)
+* add a note in the comments for INCLUDE in lynx.cfg regarding the default
+  directory searches LYOpenCFG(), added in 2.8.4dev.20 (Debian #818047) -TD
 * add a check to ensure that HTML_put_string() will not append a chunk onto
   itself (report by Ned Williamson) -TD
 * update et.po, tr.po from
diff --git a/lynx.cfg b/lynx.cfg
index 7ef0f9c6..ffa43fd2 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.286 2017/07/05 20:13:35 tom Exp $
+# $LynxId: lynx.cfg,v 1.287 2017/07/06 00:23:23 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -60,12 +60,18 @@
 #
 #   INCLUDE:/usr/local/lib/lynx.cfg
 #           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
-# and now your own tweaks.
+# and now your own tweaks.  If you omit the directory name, e.g.,
 #
-# Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful.  You can
-# suppress all but specific settings that will be read from included files.
-# This allows sysadmins to provide users the ability to customize lynx with
-# options that normally do not affect security, such as COLOR, VIEWER, KEYMAP.
+#   INCLUDE:lynx.cfg
+#
+# then lynx first checks if it is in any of the directories listed in the
+# environment variable LYNX_CFG_PATH, then tries the directory of the default
+# config-file.
+#
+# You can also suppress all but specific settings that will be read from
+# included files.  This allows sysadmins to provide users the ability to
+# customize lynx with options that normally do not affect security, such as
+# COLOR, VIEWER, KEYMAP.
 #
 # The syntax is
 #
lt;vc@akkartik.com> 2016-03-08 01:30:14 -0800 committer Kartik K. Agaram <vc@akkartik.com> 2016-03-08 01:46:47 -0800 2735 - define recipes using 'def'' href='/akkartik/mu/commit/counters.mu?h=main&id=1ead356219bb2eb59487d1012f837bd07ec336f5'>1ead3562 ^
77d5b5d6 ^
b96af395 ^
e5e3640c ^
b96af395 ^
e5e3640c ^
b96af395 ^
ce87c19e ^
192d59d3 ^

b96af395 ^
1ead3562 ^
50685c29 ^
b96af395 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29