regen updmap doc

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

3 files changed, 35 insertions, 7 deletions

diff --git a/Master/texmf/doc/man/man1/updmap-sys.man1.pdf b/Master/texmf/doc/man/man1/updmap-sys.man1.pdf
index 5c700c4c04c..bd3366d5410 100644
--- a/Master/texmf/doc/man/man1/updmap-sys.man1.pdf
+++ b/Master/texmf/doc/man/man1/updmap-sys.man1.pdf
diff --git a/Master/texmf/doc/man/man1/updmap.1 b/Master/texmf/doc/man/man1/updmap.1
index e4a89cdefef..56cac72cb38 100644
--- a/Master/texmf/doc/man/man1/updmap.1
+++ b/Master/texmf/doc/man/man1/updmap.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.10.
 .TH UPDMAP "1" "June 2012" "TeX Live" "User Commands"
 .SH NAME
 updmap \- manage TeX font maps, per-user
@@ -11,7 +11,7 @@ updmap-sys \- manage TeX font maps, system-wide
 .B updmap-sys
 [\fIOPTION\fR] ... [\fICOMMAND\fR]
 .SH DESCRIPTION
-updmap (TeX Live, multi) version $Id: updmap.pl 26778 2012\-06\-01 17:36:30Z karl $
+updmap (TeX Live, multi) version $Id: updmap.pl 26881 2012\-06\-10 01:18:51Z karl $
 .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
@@ -168,11 +168,39 @@ 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 multiple updmap.cfg files are
-found, all the maps mentioned in all the updmap.cfg files are merged.
+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in
+the order returned by kpsewhich, with the exception that a file found
+in TEXMFLOCAL is moved above the one in TEXMFMAIN, to make sure that
+local adjustments by admins take precedence over what is shipped in
+TeX Live. If multiple updmap.cfg files are found, all the maps
+mentioned in all the updmap.cfg files are merged.
 .IP
-There is one exception to keep upgradability from earlier versions of
+Thus, if updmap.cfg files are present in all trees, and the default
+layout is used as shipped with TeX Live, the following files are
+read in the given order.
+.nf
+.IP
+For updmap\-sys:
+TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+TEXMFSYSVAR    $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+TEXMFLOCAL     $TEXLIVE/texmf\-local/web2c/updmap.cfg
+TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+TEXMFDIST      $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+.IP
+For updmap:
+TEXMFCONFIG    $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
+TEXMFVAR       $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
+TEXMFHOME      $HOME/texmf/web2c/updmap.cfg
+TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+TEXMFSYSVAR    $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+TEXMFLOCAL     $TEXLIVE/texmf\-local/web2c/updmap.cfg
+TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+TEXMFDIST      $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+.IP
+(where YYYY is the TeX Live release version).
+.fi
+.IP
+There is another exception to keep upgradability from earlier versions of
 TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists (formerly
 used by tlmgr to merge local fonts), then the file
 TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and the
@@ -188,7 +216,7 @@ 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:
 .IP
-1) If $TEXMFHOME/web2c/updmap.cfg or $TEXMFCONFIG/web2c/updmap.cfg
+1) If $TEXMFCONFIG/web2c/updmap.cfg or $TEXMFHOME/web2c/updmap.cfg
 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.
diff --git a/Master/texmf/doc/man/man1/updmap.man1.pdf b/Master/texmf/doc/man/man1/updmap.man1.pdf
index 58805dd3b0b..347ca2c5cd3 100644
--- a/Master/texmf/doc/man/man1/updmap.man1.pdf
+++ b/Master/texmf/doc/man/man1/updmap.man1.pdf