update fmtutil/updmap{,-sys,-user} man pages for 2017

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

12 files changed, 254 insertions, 105 deletions

diff --git a/Master/texmf-dist/doc/man/man1/Makefile b/Master/texmf-dist/doc/man/man1/Makefile
index 03669e4ccb7..e8c32bbf205 100644
--- a/Master/texmf-dist/doc/man/man1/Makefile
+++ b/Master/texmf-dist/doc/man/man1/Makefile
@@ -55,6 +55,9 @@ man1/ebb.man1.pdf: man1/ebb.1 man1/extractbb.1
 man1/fmtutil-sys.man1.pdf: man1/fmtutil-sys.1 man1/fmtutil.1
 	$(MKPDF)
 
+man1/fmtutil-user.man1.pdf: man1/fmtutil-user.1 man1/fmtutil.1
+	$(MKPDF)
+
 man1/inimf.man1.pdf: man1/inimf.1 man1/mf.1
 	$(MKPDF)
 
@@ -109,5 +112,8 @@ man1/texluac.man1.pdf: man1/texluac.1 man1/luatex.1
 man1/updmap-sys.man1.pdf: man1/updmap-sys.1 man1/updmap.1
 	$(MKPDF)
 
+man1/updmap-user.man1.pdf: man1/updmap-user.1 man1/updmap.1
+	$(MKPDF)
+
 man1/xdvipdfmx.man1.pdf: man1/xdvipdfmx.1 man1/dvipdfmx.1
 	$(MKPDF)
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
index 6084bc07852..cbcf0177334 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/fmtutil-sys.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil-user.1 b/Master/texmf-dist/doc/man/man1/fmtutil-user.1
new file mode 100644
index 00000000000..71c6a947903
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/fmtutil-user.1
@@ -0,0 +1 @@
+.so man1/fmtutil.1
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf
new file mode 100644
index 00000000000..d5f4fc57333
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/fmtutil-user.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil.1 b/Master/texmf-dist/doc/man/man1/fmtutil.1
index 1b4357cdfa9..c3b39ec2193 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil.1
+++ b/Master/texmf-dist/doc/man/man1/fmtutil.1
@@ -1,65 +1,90 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.5.
-.TH FMTUTIL "1" "April 2015" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH FMTUTIL "1" "April 2017" "TeX Live" "User Commands"
 .SH NAME
-fmtutil \- manage TeX formats, Metafont bases and Metapost mems, per-user
+fmtutil \- manage TeX formats and Metafont bases, per-user
 .br
-fmtutil-sys \- manage TeX formats, Metafont bases and Metapost mems, system-wide
+fmtutil-sys \- manage TeX formats and Metafont bases, system-wide
 .br
-mktexfmt \- create a TeX format, Metafont base, or Metapost mem
+mktexfmt \- create a TeX format or Metafont base
 .SH SYNOPSIS
 .B fmtutil
-[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+[\fI\,-user|-sys\/\fR] [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
 .B fmtutil-sys
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
+.B fmtutil-user
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
 .B mktexfmt
-\fI\,FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT\/\fR
+\fI\,FORMAT.fmt|BASE.base|FMTNAME.EXT\/\fR
 .SH DESCRIPTION
-fmtutil version svn36788 (2015\-04\-13 00:53:26 +0900)
+fmtutil version r43794 (2017\-04\-15 02:12:54 +0200)
 .PP
-Rebuild and manage TeX formats, Metafont bases and MetaPost mems.
+Rebuild and manage TeX fmts and Metafont bases, collectively called
+"formats" here. (MetaPost no longer uses the past\-equivalent "mems".)
 .PP
 If the command name ends in mktexfmt, only one format can be created.
 The only options supported are \fB\-\-help\fR and \fB\-\-version\fR, and the command
-line must consist of either a format name, with its extension, or a
-plain name that is passed as the argument to \fB\-\-byfmt\fR (see below).  The
-full name of the generated file (if any) is written to stdout, and
-nothing else.
+line must be either a format name, with extension, or a plain name that
+is passed as the argument to \fB\-\-byfmt\fR (see below).  The full name of the
+generated file (if any) is written to stdout, and nothing else.
+.PP
+If not operating in mktexfmt mode, exactly one command must be given,
+extensions should generally not be specified, no non\-option arguments
+are allowed, and multiple formats can be generated, as follows.
 .PP
-If not operating in mktexfmt mode, the command line can be more general,
-and multiple formats can be generated, as follows.
+By default, the return status is zero if all formats requested are
+successfully built, else nonzero.
 .SH OPTIONS
 .TP
+\fB\-\-sys\fR
+use TEXMFSYS{VAR,CONFIG}
+.TP
+\fB\-\-user\fR
+use TEXMF{VAR,CONFIG}
+.TP
 \fB\-\-cnffile\fR FILE
 read FILE instead of fmtutil.cnf
 (can be given multiple times, in which case
 all the files are used)
-.HP
-\fB\-\-fmtdir\fR DIRECTORY
+.TP
+\fB\-\-fmtdir\fR DIR
+write formats under DIR instead of TEXMF[SYS]VAR
 .TP
 \fB\-\-no\-engine\-subdir\fR
 don't use engine\-specific subdir of the fmtdir
-.TP
-\fB\-\-no\-error\-if\-no\-format\fR
-exit successfully if no format is selected
+.HP
+\fB\-\-no\-error\-if\-no\-format\fR exit successfully if no format is selected
 .TP
 \fB\-\-no\-error\-if\-no\-engine\fR=\fI\,ENGINE1\/\fR,ENGINE2,...
-exit successfully even if the required engine
+exit successfully even if a required engine
 .IP
 is missing, if it is included in the list.
 .TP
+\fB\-\-no\-strict\fR
+exit successfully even if a format fails to build
+.TP
+\fB\-\-nohash\fR
+don't update ls\-R files
+.TP
+\fB\-\-recorder\fR
+pass the \fB\-recorder\fR option and save .fls files
+.TP
 \fB\-\-quiet\fR
 be silent
 .TP
-\fB\-\-test\fR
-(not implemented, just for compatibility)
+\fB\-\-catcfg\fR
+(does nothing, exists for compatibility)
 .TP
 \fB\-\-dolinks\fR
-(not implemented, just for compatibility)
+(does nothing, exists for compatibility)
 .TP
 \fB\-\-force\fR
-(not implemented, just for compatibility)
+(does nothing, exists for compatibility)
+.TP
+\fB\-\-test\fR
+(does nothing, exists for compatibility)
 .SS "Commands:"
 .TP
 \fB\-\-all\fR
@@ -71,30 +96,29 @@ create all missing format files
 \fB\-\-refresh\fR
 recreate only existing format files
 .TP
-\fB\-\-byengine\fR ENGINENAME
-(re)create formats using ENGINENAME
+\fB\-\-byengine\fR ENGINE
+(re)create formats built with ENGINE
 .TP
-\fB\-\-byfmt\fR FORMATNAME
-(re)create format for FORMATNAME
+\fB\-\-byfmt\fR FORMAT
+(re)create format FORMAT
 .TP
 \fB\-\-byhyphen\fR HYPHENFILE
 (re)create formats that depend on HYPHENFILE
 .TP
-\fB\-\-enablefmt\fR FORMATNAME
-enable formatname in config file
+\fB\-\-enablefmt\fR
+FORMAT[/ENGINE] enable FORMAT, as built with ENGINE
 .TP
-\fB\-\-disablefmt\fR FORMATNAME
-disable formatname in config file
+\fB\-\-disablefmt\fR FORMAT[/ENGINE] disable FORMAT, as built with ENGINE
+If multiple formats have the same name and
+.IP
+different engines, \fI\,/ENGINE\/\fP specifier is required.
 .TP
 \fB\-\-listcfg\fR
 list (enabled and disabled) configurations,
 filtered to available formats
 .TP
-\fB\-\-catcfg\fR
-output the content of the config file
-.TP
-\fB\-\-showhyphen\fR FORMATNAME
-print name of hyphenfile for format FORMATNAME
+\fB\-\-showhyphen\fR FORMAT
+print name of hyphen file for FORMAT
 .TP
 \fB\-\-version\fR
 show version information and exit
@@ -124,7 +148,7 @@ TEXMFSYSVAR    \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/fmtutil.cnf\/\fP
 TEXMFLOCAL     \fI\,$TEXLIVE/texmf\-local/web2c/fmtutil.cnf\/\fP
 TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
 .IP
-For fmtutil:
+For fmtutil\-user:
 TEXMFCONFIG    $HOME/.texliveYYYY/texmf\-config/web2c/fmtutil.cnf
 TEXMFVAR       $HOME/.texliveYYYY/texmf\-var/web2c/fmtutil.cnf
 TEXMFHOME      \fI\,$HOME/texmf/web2c/fmtutil.cnf\/\fP
@@ -139,7 +163,19 @@ TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
 According to the actions, fmtutil might write to one of the given files
 or create a new fmtutil.cnf, described further below.
 .PP
-Where changes are saved:
+Where formats are written:
+.IP
+By default, format files are (re)written in TEXMFSYSVAR/ENGINE by
+fmtutil\-sys, and TEXMFVAR/ENGINE by fmtutil, where \fI\,/ENGINE\/\fP is a
+subdirectory named for the engine used, such as "pdftex".
+.IP
+If the \fB\-\-fmtdir\fR=\fI\,DIR\/\fR option is specified, DIR is used instead of
+TEXMF[SYS]VAR, but the \fI\,/ENGINE\/\fP subdir is still used by default.
+.IP
+In any case, if the \fB\-\-no\-engine\-subdir\fR option is specified, the
+\fI\,/ENGINE\/\fP subdir is omitted.
+.PP
+Where configuration changes are saved:
 .IP
 If config files are given on the command line, then the first one
 given will be used to save any changes from \fB\-\-enable\fR or \fB\-\-disable\fR.
@@ -156,8 +192,8 @@ new config file is created in \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP.
 .IP
 In general, the idea is that if a given config file is not writable, a
 higher\-level one can be used.  That way, the distribution's settings
-can be overridden for system\-wide using TEXMFLOCAL, and then system
-settings can be overridden again for a particular using using TEXMFHOME.
+can be overridden system\-wide using TEXMFLOCAL, and system settings
+can be overridden again in a particular user's TEXMFHOME.
 .PP
 Resolving multiple definitions of a format:
 .IP
@@ -167,30 +203,45 @@ coming from the first\-listed fmtutil.cnf is used.
 Disabling formats:
 .IP
 fmtutil.cnf files with higher priority (listed earlier) can disable
-formats mentioned in lower priority (listed later) fmtutil.cnf files by
-writing, e.g.,
+formats in lower priority (listed later) fmtutil.cnf files by
+writing a line like
 .IP
 #! <fmtname> <enginename> <hyphen> <args>
-.IP
+.TP
 in the higher\-priority fmtutil.cnf file.
+The #! must be at the
+.IP
+beginning of the line, with at least one space or tab afterward, and
+there must be whitespace between each word on the list.
 .IP
-As an example, suppose you have want to disable the luajitlatex format.
-You can create the file \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP with the content
+For example, you can disable the luajitlatex format by creating
+the file \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP with the line
 .IP
 #! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
 .IP
-and call fmtutil.
+(As it happens, the luajittex\-related formats are precisely why the
+\fB\-\-no\-error\-if\-no\-engine\fR option exists, since luajittex cannot be
+compiled on all platforms.)
 .PP
-fmtutil vs. fmtutil\-sys (fmtutil \fB\-\-sys\fR):
+fmtutil\-user (fmtutil \fB\-user\fR) vs. fmtutil\-sys (fmtutil \fB\-sys\fR):
 .IP
-When fmtutil\-sys is run or the command line option \fB\-\-sys\fR is used,
+When fmtutil\-sys is run or the command line option \fB\-sys\fR is used,
 TEXMFSYSCONFIG and TEXMFSYSVAR are used instead of TEXMFCONFIG and
 TEXMFVAR, respectively.  This is the primary difference between
-fmtutil\-sys and fmtutil.
+fmtutil\-sys and fmtutil\-user.
+.IP
+See http://tug.org/texlive/scripts\-sys\-user.html for details.
 .IP
 Other locations may be used if you give them on the command line, or
 these trees don't exist, or you are not using the original TeX Live.
+.PP
+Supporting development binaries
+.IP
+If an engine name ends with "\-dev", formats are created in
+the respective directory with the \fB\-dev\fR stripped.  This allows for
+easily running development binaries in parallel with the released
+binaries.
 .SH "REPORTING BUGS"
-Report bugs to: tex\-k@tug.org
+Report bugs to: tex\-live@tug.org
 .br
 TeX Live home page: <http://tug.org/texlive/>
diff --git a/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf b/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
index 20cf3e78d81..ae88c05d095 100644
--- a/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/fmtutil.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf b/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
index 32b8b506bb5..895e633e37c 100644
--- a/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/mktexfmt.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
index 063c7cb0bdc..783e6846da3 100644
--- a/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap-sys.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap-user.1 b/Master/texmf-dist/doc/man/man1/updmap-user.1
new file mode 100644
index 00000000000..07038dda3c4
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/updmap-user.1
@@ -0,0 +1 @@
+.so man1/updmap.1
diff --git a/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf
new file mode 100644
index 00000000000..0233ad4d63a
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/updmap-user.man1.pdf
diff --git a/Master/texmf-dist/doc/man/man1/updmap.1 b/Master/texmf-dist/doc/man/man1/updmap.1
index c72ae139fec..bcf72298139 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.1
+++ b/Master/texmf-dist/doc/man/man1/updmap.1
@@ -1,33 +1,60 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.45.1.
-.TH UPDMAP "1" "May 2014" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH UPDMAP "1" "April 2017" "TeX Live" "User Commands"
 .SH NAME
 updmap \- manage TeX font maps, per-user
 .br
 updmap-sys \- manage TeX font maps, system-wide
 .SH SYNOPSIS
 .B updmap
+[\fI\,-user|-sys\/\fR] [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
+.B updmap-user
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
 .B updmap-sys
 [\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .SH DESCRIPTION
-updmap version svn33988 (2014\-05\-12 15:39:32 +0900)
+updmap version r43794 (2017\-04\-15 02:12:54 +0200)
 .PP
-Update the default font map files used by pdftex, dvips, and dvipdfm(x),
-and optionally pxdvi, as determined by all configuration files updmap.cfg
-(the ones returned by running "kpsewhich \fB\-\-all\fR updmap.cfg", but see below).
+Update the default font map files used by pdftex (pdftex.map), dvips
+(psfonts.map), and dvipdfm(x), and optionally pxdvi, as determined by
+all configuration files updmap.cfg (the ones returned by running
+"kpsewhich \fB\-\-all\fR updmap.cfg", but see below).
 .PP
 Among other things, these map files are used to determine which fonts
 should be used as bitmaps and which as outlines, and to determine which
-font files are included in the PDF or PostScript output.
+font files are included, typically subsetted, in the PDF or PostScript output.
 .PP
-updmap\-sys is intended to affect the system\-wide configuration, while
-updmap affects personal configuration files only, overriding the system
-files.  As a consequence, once updmap has been run, even a single time,
+updmap\-sys (or updmap \fB\-sys\fR) is intended to affect the system\-wide
+configuration, while updmap\-user (or updmap \fB\-user\fR) 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.)
 .PP
+See http://tug.org/texlive/scripts\-sys\-user.html for details.
+.PP
 By default, the TeX filename database (ls\-R) is also updated.
+.PP
+The updmap system is regrettably complicated, for both inherent and
+historical reasons.  A general overview:
+.PP
+\- updmap.cfg files are mainly about listing other files, namely the
+.IP
+font\-specific .maps, in which each line gives information about a
+different TeX (.tfm) font.
+.PP
+\- updmap reads the updmap.cfg files and then concatenates the
+.IP
+contents of those .map files into the main output files: psfonts.map
+for dvips and pdftex.map for pdftex and dvipdfmx.
+.PP
+\- The updmap.cfg files themselves are created and updated at package
+.IP
+installation time, by the system installer or the package manager or
+by hand, and not (by default) by updmap.
+.PP
+Good luck.
 .SH OPTIONS
 .TP
 \fB\-\-cnffile\fR FILE
@@ -65,6 +92,9 @@ do not run texhash
 \fB\-\-sys\fR
 affect system\-wide files (equivalent to updmap\-sys)
 .TP
+\fB\-\-user\fR
+affect personal files (equivalent to updmap\-user)
+.TP
 \fB\-n\fR, \fB\-\-dry\-run\fR
 only show the configuration, no output
 .TP
@@ -105,20 +135,46 @@ add "Map MAPFILE" to updmap.cfg
 disable MAPFILE, of whatever type
 .TP
 \fB\-\-listmaps\fR
-list all active and inactive maps
+list all maps (details below)
 .TP
 \fB\-\-listavailablemaps\fR
-same as \fB\-\-listmaps\fR, but without
-unavailable map files
+list available maps (details below)
 .TP
 \fB\-\-syncwithtrees\fR
 disable unavailable map files in updmap.cfg
 .PP
-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 bitmap fonts.  So, MixedMap is used
-for fonts that are available as both Type 1 and Metafont.
+The main output:
+.IP
+The main output of updmap is the files containing the individual font
+map lines which the drivers (dvips, pdftex, etc.) read to handle fonts.
+.IP
+The map files for dvips (psfonts.map) and pdftex and dvipdfmx
+(pdftex.map) are written to TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/.
+.IP
+In addition, information about Kanji fonts is written to
+TEXMFVAR/fonts/map/updmap/dvipdfmx/kanjix.map, and optionally to
+TEXMFVAR/fonts/map/updmap/pxdvi/xdvi\-ptex.map.  These are for Kanji
+only and are not like other map files.  dvipdfmx reads pdftex.map for
+the map entries for non\-Kanji fonts.
+.IP
+If no option is given, so the invocation is just "updmap\-user" or
+"updmap\-sys", these output files are always recreated.
+.IP
+Otherwise, if an option such as \fB\-\-enable\fR or \fB\-\-disable\fR is given, the
+output files are recreated if the list of enabled map files (from
+updmap.cfg) has changed.  The \fB\-\-force\fR option overrides this,
+always recreating the output files.
+.PP
+Explanation of the map types:
+.IP
+The normal type is Map.
+.IP
+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
+bitmap fonts.  So, MixedMap is used for fonts that are available as
+both Type 1 and Metafont.
+.IP
 KanjiMap entries are added to psfonts_t1.map and kanjix.map.
 .PP
 Explanation of the OPTION names for \fB\-\-showoptions\fR, \fB\-\-showoption\fR, \fB\-\-setoption\fR:
@@ -143,10 +199,19 @@ true,false  (default false)
 .IP
 Whether maps for pxdvi (Japanese\-patched xdvi) are under updmap's control.
 .TP
-kanjiEmbed
+jaEmbed
 (any string)
 .TP
-kanjiVariant
+jaVariant
+(any string)
+.TP
+scEmbed
+(any string)
+.TP
+tcEmbed
+(any string)
+.TP
+koEmbed
 (any string)
 .IP
 See below.
@@ -177,21 +242,24 @@ file which the programs read, so they can be overridden by specifying
 command\-line options or configuration files to the programs, as
 explained at the beginning of updmap.cfg.
 .IP
-The options kanjiEmbed and kanjiVariant specify special replacements
-in the map lines.  If a map contains the string @kanjiEmbed@, then
-this will be replaced by the value of that option; similarly for
-kanjiVariant.  In this way, users of Japanese TeX can select different
-fonts to be included in the final output.
+The options jaEmbed and jaVariant (formerly kanjiEmbed and kanjiVariant)
+specify special replacements in the map lines.  If a map contains the
+string @jaEmbed@, then this will be replaced by the value of that option;
+similarly for jaVariant.  In this way, users of Japanese TeX can select
+different fonts to be included in the final output.  The counterpart for
+Simplified Chinese, Traditional Chinese and Korean fonts are
+scEmbed, tcEmbed and koEmbed respectively.
 .SH ENVIRONMENT
 .PP
 Explanation of trees and files normally used:
 .IP
-If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
-times), its value(s) are used.  Otherwise, updmap reads all the
-updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
-order returned by kpsewhich.
+If \fB\-\-cnffile\fR is specified on the command line (can be given multiple
+times), its value(s) is(are) used.  Otherwise, updmap reads all the
+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg',
+in the order returned by kpsewhich (which is the order of trees
+defined in texmf.cnf).
 .IP
-In any case, if multiple updmap.cfg files are found, all the maps
+In either case, if multiple updmap.cfg files are found, all the maps
 mentioned in all the updmap.cfg files are merged.
 .IP
 Thus, if updmap.cfg files are present in all trees, and the default
@@ -205,7 +273,7 @@ TEXMFSYSVAR    \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg\/\fP
 TEXMFLOCAL     \fI\,$TEXLIVE/texmf\-local/web2c/updmap.cfg\/\fP
 TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\/\fP
 .IP
-For updmap:
+For updmap\-user:
 TEXMFCONFIG    $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
 TEXMFVAR       $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
 TEXMFHOME      \fI\,$HOME/texmf/web2c/updmap.cfg\/\fP
@@ -220,25 +288,31 @@ TEXMFDIST      \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg\/\fP
 According to the actions, updmap might write to one of the given files
 or create a new updmap.cfg, described further below.
 .PP
-Where changes are saved:
+Where and which updmap.cfg changes are saved:
+.IP
+When no options are given, the updmap.cfg file(s) are only read, not
+written.  It's when an option \fB\-\-setoption\fR, \fB\-\-enable\fR or \fB\-\-disable\fR is
+specified that an updmap.cfg needs to be updated.  In this case:
+.IP
+1) If config files are given on the command line, then the first one
+given is used to save any such changes.
 .IP
-If config files are given on the command line, then the first one
-given will be used to save any changes from \fB\-\-setoption\fR, \fB\-\-enable\fR
-or \fB\-\-disable\fR.  If the config files are taken from kpsewhich output,
-then the algorithm is more complex:
+2) If the config files are taken from kpsewhich output, then the
+algorithm is more complex:
 .IP
-1) If \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP or \fI\,$TEXMFHOME/web2c/updmap.cfg\/\fP
+2a) If \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP or \fI\,$TEXMFHOME/web2c/updmap.cfg\/\fP
 appears in the list of used files, then the one listed first by
 kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
 updmap.cfg), is used.
 .IP
-2) If neither of the above two are present and changes are made, a
+2b) If neither of the above two are present and changes are made, a
 new config file is created in \fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP.
 .IP
-In general, the idea is that if a given config file is not writable, a
-higher\-level one can be used.  That way, the distribution's settings
-can be overridden for system\-wide using TEXMFLOCAL, and then system
-settings can be overridden again for a particular using using TEXMFHOME.
+In general, the idea is that if the user cannot write to a given
+config file, a higher\-level one can be used.  That way, the
+distribution's settings can be overridden system\-wide using
+TEXMFLOCAL, and system settings can be overridden again in a
+particular user's TEXMFHOME.
 .PP
 Resolving multiple definitions of a font:
 .IP
@@ -258,8 +332,12 @@ writing, e.g.,
 or
 .IP
 #! MixedMap mapname.map
-.IP
+.TP
 in the higher\-priority updmap.cfg file.
+(The #! must be at the
+.IP
+beginning of the line, with at least one space or tab afterward, and
+whitespace between each word on the list.)
 .IP
 As an example, suppose you have a copy of MathTime Pro fonts
 and want to disable the Belleek version of the fonts; that is,
@@ -272,16 +350,26 @@ Map mt\-yy.map
 .IP
 and call updmap.
 .PP
-updmap writes the map files for dvips (psfonts.map) and pdftex
-(pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/
-directories.
-.PP
-The log file is written to TEXMFVAR/web2c/updmap.log.
+Listing of maps:
+.IP
+The two options \fB\-\-listmaps\fR and \fB\-\-listavailablemaps\fR list all maps
+defined in any of the updmap.cfg files (for \fB\-\-listmaps\fR), and
+only those actually found on the system (for \fB\-\-listavailablemaps\fR).
+The output format is one line per font map, with the following
+fields separated by tabs: map, type (Map, MixedMap, KanjiMap),
+status (enabled, disabled), origin (the updmap.cfg file where
+it is mentioned, or 'builtin' for the three basic maps).
+.IP
+In the case of \fB\-\-listmaps\fR there can be one additional fields
+(again separated by tab) containing '(not available)' for those
+map files that cannot be found.
 .PP
+updmap\-user vs. updmap\-sys:
+.IP
 When updmap\-sys is run, TEXMFSYSCONFIG and TEXMFSYSVAR are used
-instead of TEXMFCONFIG and TEXMFVAR, respectively.  This is the only
-difference between updmap\-sys and updmap.
-.PP
+instead of TEXMFCONFIG and TEXMFVAR, respectively.  This is the
+primary difference between updmap\-sys and updmap\-user.
+.IP
 Other locations may be used if you give them on the command line, or
 these trees don't exist, or you are not using the original TeX Live.
 .PP
@@ -289,9 +377,11 @@ To see the precise locations of the various files that
 will be read and written, give the \fB\-n\fR option (or read the source).
 .SH EXAMPLES
 .PP
+The log file is written to TEXMFVAR/web2c/updmap.log.
+.PP
 For step\-by\-step instructions on making new fonts known to TeX, read
 http://tug.org/fonts/fontinstall.html.  For even more terse
-instructions, read the beginning of the main updmap.cfg.
+instructions, read the beginning of the main updmap.cfg file.
 .SH FILES
 Configuration and input files:
 .IP "\fIupdmap\&.cfg\fP"
@@ -369,6 +459,6 @@ of \fIpsfonts\&.map\fP\&.
 Loads \fIpsfonts_t1\&.map\fP instead
 of \fIpsfonts\&.map\fP\&.
 .SH "REPORTING BUGS"
-Report bugs to: tex\-k@tug.org
+Report bugs to: tex\-live@tug.org
 .br
 TeX Live home page: <http://tug.org/texlive/>
diff --git a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
index dac75dfea66..648d42886ae 100644
--- a/Master/texmf-dist/doc/man/man1/updmap.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/updmap.man1.pdf