updmap-user warning, doc tweaks for https

git-svn-id: svn://tug.org/texlive/trunk@59062 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 45 insertions, 22 deletions

diff --git a/Master/texmf-dist/scripts/texlive/Makefile b/Master/texmf-dist/scripts/texlive/Makefile
index c784104cc0b..2342ce96a49 100644
--- a/Master/texmf-dist/scripts/texlive/Makefile
+++ b/Master/texmf-dist/scripts/texlive/Makefile
@@ -2,11 +2,32 @@
 # Public domain.
 
 test_tlmgr_html = /tmp/tlmgr.html
-live_tlmgr_html = /home/httpd/html/texlive/doc/tlmgr.html 
+htmldir = /home/httpd/html/texlive/doc
 
 test-html:
 	pod2html --cachedir=/tmp tlmgr.pl >$(test_tlmgr_html)
-	diff $(live_tlmgr_html) $(test_tlmgr_html)
+	diff $(htmldir)/tlmgr.html $(test_tlmgr_html)
 	
 install-html:
-	mv $(test_tlmgr_html) $(live_tlmgr_html)
+	mv $(test_tlmgr_html) $(htmldir)/tlmgr.html
+
+# testing.
+uhelp:
+	./updmap.pl --help
+fhelp:
+	./fmtutil.pl --help
+
+# remake fmtutil/updmap doc from --help; see Master/tlpkg/doc/releng.txt.
+# assume $W is a TL build tree.
+INSTALL_DATA = cp -p
+man2html = groff -mandoc -Thtml
+#
+man1 = ../../doc/man/man1
+#
+install:
+	$(MAKE) -C $(W)/texk/texlive/tl_support xupdmap.1 xfmtutil.1
+	$(INSTALL_DATA) /tmp/xupdmap.1 $(man1)/updmap.1
+	$(INSTALL_DATA) /tmp/xfmtutil.1 $(man1)/fmtutil.1
+	$(man2html) $(man1)/updmap.1 >$(htmldir)/updmap.html
+	$(man2html) $(man1)/fmtutil.1 >$(htmldir)/fmtutil.html
+	$(MAKE) -C $(man1)/..
diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl
index 48e1d3e588e..7b9b9281ca8 100755
--- a/Master/texmf-dist/scripts/texlive/updmap.pl
+++ b/Master/texmf-dist/scripts/texlive/updmap.pl
@@ -1338,26 +1338,28 @@ sub mkMaps {
     }
   }
 
-  # all kind of warning messages
+  # all kinds of warning messages
   if ($first_time_creation_in_usermode) {
     print_and_log("
 *************************************************************
 *                                                           *
 * WARNING: you are switching to updmap's per-user mappings. *
-*            Please read the following explanations.        *
+*         Please read the following warnings!               *
 *                                                           *
 *************************************************************
 
-You have run updmap-user (as opposed to updmap-sys) for the first time; this
-has created configuration files which are local to your personal account.
+You have run updmap-user (as opposed to updmap-sys) for the first time;
+this has created configuration files which are local to your personal account.
 
-Any changes in system map files will *not* be automatically reflected in
-your files; furthermore, running updmap-sys will no longer have any
-effect for you.  As a consequence, you have to rerun updmap-user yourself
-after any change in the system directories; for example, if a new font
-package is added.
+From now on, any changes in system map files will *not* be automatically
+reflected in your files; furthermore, running updmap-sys (as is done
+automatically) will no longer have any effect for you.
 
-See http://tug.org/texlive/scripts-sys-user.html for details.
+As a consequence, you yourself have to rerun updmap-user yourself after
+any change in the *system* directories! For example, if a new font
+package is added or existing mappings change, which happens frequently.
+
+See https://tug.org/texlive/scripts-sys-user.html for details.
 
 If you want to undo this, remove the files mentioned above.
 
@@ -2274,11 +2276,11 @@ font files are included, typically subsetted, in the PDF or PostScript output.
 updmap-sys (or updmap -sys) is intended to affect the system-wide 
 configuration, while updmap-user (or updmap -user) affects personal
 configuration files only, overriding the system files.  
-As a consequence, once updmap-user has been run, even a single time,
-running updmap-sys no longer has any effect.  (updmap-sys issues a
-warning in this situation.)
 
-See http://tug.org/texlive/scripts-sys-user.html for details.
+As a consequence, once updmap-user has been run, even a single time,
+running updmap-sys no longer has any effect.  updmap-sys issues a
+warning about this, since it is rarely desirable.
+See https://tug.org/texlive/scripts-sys-user.html for details.
 
 By default, the TeX filename database (ls-R) is also updated.
 
@@ -2300,7 +2302,7 @@ Good luck.
 Options:
   --cnffile FILE            read FILE for the updmap configuration 
                              (can be given multiple times, in which case
-                             all the files are used)
+                              all the files are used)
   --dvipdfmxoutputdir DIR   specify output directory (dvipdfm(x) syntax)
   --dvipsoutputdir DIR      specify output directory (dvips syntax)
   --pdftexoutputdir DIR     specify output directory (pdftex syntax)
@@ -2309,7 +2311,7 @@ Options:
   --copy                    cp generic files rather than using symlinks
   --force                   recreate files even if config hasn't changed
   --nomkmap                 do not recreate map files
-  --nohash                  do not run texhash
+  --nohash                  do not run mktexlsr (a.k.a. texhash)
   --sys                     affect system-wide files (equivalent to updmap-sys)
   --user                    affect personal files (equivalent to updmap-user)
   -n, --dry-run             only show the configuration, no output
@@ -2360,7 +2362,7 @@ Explanation of the map types:
   
   The only difference between Map and MixedMap is that MixedMap entries
   are not added to psfonts_pk.map.  The purpose is to help users with
-  devices that render Type 1 outline fonts worse than mode-tuned Type 1
+  devices that render Type 1 outline fonts worse than mode-tuned Type 3
   bitmap fonts.  So, MixedMap is used for fonts that are available as
   both Type 1 and Metafont.
 
@@ -2522,11 +2524,11 @@ will be read and written, give the -n option (or read the source).
 The log file is written to TEXMFVAR/web2c/updmap.log.
 
 For step-by-step instructions on making new fonts known to TeX, read
-http://tug.org/fonts/fontinstall.html.  For even more terse
+https://tug.org/fonts/fontinstall.html.  For even more terse
 instructions, read the beginning of the main updmap.cfg file.
 
 Report bugs to: tex-live\@tug.org
-TeX Live home page: <http://tug.org/texlive/>
+TeX Live home page: <https://tug.org/texlive/>
 EOF
 ;
   print &version();