Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020

diff --cc doc/Guidebook.mn
Simple merge

diff --cc doc/Guidebook.tex
Simple merge

diff --cc doc/fixes37.0
Simple merge

diff --cc doc/makedefs.txt
index 97a1f0ac7c339fcc426f65138a0a7739e4cffb35,08ca2c9ef554c1a01823d94776a3811d86e28730..8d6c85bc111dc33d04b24095eb0e1672e39ba2a3
--- 1/doc/makedefs.txt
--- 2/doc/makedefs.txt
+++ b/doc/makedefs.txt
@@@ -30,20 -30,16 +30,20 @@@ SHORT COMMAND
                through the same logic as that used by the --grep  command;  see
                the MDGREP FUNCTIONS section below for details.
  
-        -m     Generate monster.c.
- 
-        -v     Generate  date.h and options file. It will read dat/gitinfo.txt,
 -       -m     Generate  date.h and options file. It will read dat/gitinfo.txt,
++       -c     Generate  date.h and options file. It will read dat/gitinfo.txt,
++              only if it is present, to obtain githash= and gitbranch=
++               info and include related preprocessor #defines in date.h file.
                only if it is present, to obtain githash= and gitbranch=
                 info and include related preprocessor #defines in date.h file.
  
         -p     Generate pm.h
  
-        -q     Generate quest.dat.
- 
 -       -q     Generate the rumors file.
 +       -r     Generate the rumors file.
 +
 +       -s     Generate the bogusmon , engrave and epitaphfiles.
  
+        -s     Generate the bogusmon , engrave and epitaphfiles.
+ 
         -h     Generate the oracles file.
  
         -z     Generate vis_tab.c and vis_tab.h.
@@@ -148,4 -144,4 +148,5 @@@ COPYRIGH
  
  
  
- NETHACK                           25 May 2015                      MAKEDEFS(6)
++
+ NETHACK                           1 Jan 2020                       MAKEDEFS(6)

diff --cc include/patchlevel.h
Simple merge

diff --cc src/options.c
Simple merge