sysconf update

Add missing 'sysconf' to sys/unix/ and sys/winnt/ sections of Files.

Update sys/unix/sysconf; I started out just to remove the duplicate
DEBUGFILES entry but ended up expanding several of the comments too.

Also, fix a typo in the vms build/install instructions.

diff --git a/Files b/Files
index ee9db8e1c8a8884220a9b3c4cbad61cdee9d7f70..c0710ff988df5fd647a02518e1bb74fad560244d 100644 (file)
--- a/Files
+++ b/Files
@@ -169,8 +169,8 @@ sys/unix:
 (files for UNIX versions)
 Install.unx     Makefile.dat    Makefile.doc    Makefile.src    Makefile.top
 Makefile.utl    README.linux    depend.awk      mkmkfile.sh     nethack.sh
-setup.sh        unixmain.c      unixres.c       unixunix.c
-(files for replacement cpp, apparently only needed by some UNIX systems)
+setup.sh        sysconf         unixmain.c      unixres.c       unixunix.c
+(files for replacement cpp, only needed by some ancient UNIX systems)
 cpp1.shr        cpp2.shr        cpp3.shr
 (file for sound driver for 386 UNIX)
 snd86unx.shr
@@ -211,8 +211,8 @@ sys/winnt:
 (files for Windows 9x, NT and Windows2000 version)
 Install.nt      Makefile.gcc    Makefile.msc    console.rc      defaults.nh
 nethack.def     nh340key.c      nhdefkey.c      nhico.uu        nhraykey.c
-nhsetup.bat     ntsound.c       nttty.c         porthelp        win32api.h
-winnt.c
+nhsetup.bat     ntsound.c       nttty.c         porthelp        sysconf
+win32api.h      winnt.c
 
 util:
 (files for all versions)

diff --git a/sys/unix/sysconf b/sys/unix/sysconf
index f2da3769a2b3ba44d2b62ab533c91d2b2c91c32a..a33370961a76a9cec508ac4394b4726507077472 100644 (file)
--- a/sys/unix/sysconf
+++ b/sys/unix/sysconf
@@ -1,29 +1,39 @@
-#
 # NetHack 3.6 sysconf $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
 #
 # Sample sysconf file.
 # The sysconf file is only used if NetHack is compiled with SYSCF defined.
-# This file uses the same syntax as nethack.cf.
+# It can be used to augment or override certain settings compiled into the
+# program.
+#
+# This file can also be used to set local system defaults for run-time
+# options, using the same syntax as an individual user's ./nethackrc file.
 
-# Which users can use WIZARD (debugging) mode (the -D flag).
+# Which users can use debug mode (aka wizard mode; accessed via '-D' command
+# line flag or OPTIONS=playmode:debug in the runtime options config file).
 # A value of * allows anyone to enter debugging mode.
 WIZARDS=root games
 
-# Users allowed to use the ! (shell escape) command or to suspend the game.
-# Uses the same syntax as the WIZARDS option above.
-#SHELLERS=
-
-# Show debugging information originating from these source files.
-# Use '*' for all, or list source files separated by spaces.
-# Only available if game has been compiled with DEBUG.
-#DEBUGFILES=*
-
-# Users allowed to use #exploremode. Same syntax as WIZARDS above.
+# Which users can use explore mode (aka discover mode; accessed via '-X'
+# command line flag or OPTIONS=playmode:explore in runtime options file or
+# via '#exploremode' command during normal play).  Same syntax as WIZARDS.
 EXPLORERS=*
 
+# Users allowed to use the '!' (shell escape) and '^Z' (suspend process)
+# commands to temporarily leave the game and enter a shell process.
+# (To resume play, use the shell command 'exit' (for most shells) to
+# return from '!' or the shell command 'fg' to return from '^Z'.
+# For the typical multi-user system where players have access to a shell
+# prompt when logged in and run the game from their own username, a value
+# of 'SHELLERS=*' is appropriate.  However, some inexperienced players
+# occasionally get stuck outside the game by accidentally typing '!' or
+# '^Z' during play and not knowing how to go back.)
+# Uses the same syntax as the WIZARDS and EXPLORERS options above.
+#SHELLERS=
+
 # Show debugging information originating from these source files.
 # Use '*' for all, or list source files separated by spaces.
-# Only available if game has been compiled with DEBUG.
+# Only available if game has been compiled with DEBUG, and can be
+# overridden via DEBUGFILES environment variable.
 #DEBUGFILES=*
 
 # Limit the number of simultaneous games (see also nethack.sh).
@@ -36,7 +46,8 @@ MAXPLAYERS=10
 # If not null, displayed at the end of a panic-save sequence.
 #RECOVER=Run the recover program.
 
-# Uncomment the next line to disable the SEDUCE option.
+# Uncomment the next line to disable the SEDUCE option, causing succubi and
+# incubi to use nypmhs' charm behavior rather than their own seduce behavior.
 #SEDUCE=0
 
 # Uncomment to disable savefile UID checking.
@@ -69,3 +80,11 @@ GREPPATH=/bin/grep
 # 2 - high priority.  Non-zero priority methods are tried in order.
 PANICTRACE_GDB=1
 PANICTRACE_LIBC=2
+
+# Ordinary run-time options can be set here to override the builtin-in
+# default values.  Unlike the SYSCF values above, individual users can
+# still choose their own option settings via NETHACKOPTIONS in their
+# environment or via ~/.nethackrc run-time configuration file.
+#OPTIONS=!autopickup,fruit:tomato,symset:DECgraphics
+
+#eof

diff --git a/sys/vms/Install.vms b/sys/vms/Install.vms
index ccdfa31118bafddccfdf12cdd08f04a9047201bd..eabe762a972ab0351e03f9bc6159194ce3ceb3ea 100644 (file)
--- a/sys/vms/Install.vms
+++ b/sys/vms/Install.vms
@@ -129,7 +129,7 @@
 
 Notes:
 
-0.  Versions 3.5.0 was never publicly released.
+0.  Version 3.5.x was never publicly released.
 
 1.  Save files and bones files from 3.4.x and earlier versions
     will not work with 3.6.0. The scoreboard file (RECORD) from