updmap doc regen

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

4 files changed, 32 insertions, 27 deletions

diff --git a/Master/texmf/doc/man/man1/updmap-sys.man1.pdf b/Master/texmf/doc/man/man1/updmap-sys.man1.pdf
index bd3366d5410..fb87dbd51c6 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 56cac72cb38..41b80248ec3 100644
--- a/Master/texmf/doc/man/man1/updmap.1
+++ b/Master/texmf/doc/man/man1/updmap.1
@@ -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 26881 2012\-06\-10 01:18:51Z karl $
+updmap (TeX Live, multi) version $Id: updmap.pl 26891 2012\-06\-10 22:41:49Z 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,16 +168,18 @@ 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, 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
+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
+order returned by kpsewhich, with one exception: an updmap.cfg found
+in TEXMFLOCAL is given higher priority than the updmap.cfg in
+TEXMFMAIN, to ensure that local adjustments by administrators take
+precedence over what is shipped in TeX Live.
+.IP
+In any 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
 layout is used as shipped with TeX Live, the following files are
-read in the given order.
+read, in the given order.
 .nf
 .IP
 For updmap\-sys:
@@ -200,10 +202,10 @@ TEXMFDIST      $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
 (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
+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 that
 updmap\-local.cfg is used instead.  In this case, updmap recognizes the
 previous syntax for disabling map files in updmap\-local.cfg (this
 syntax is different from what is used now).
@@ -224,11 +226,11 @@ updmap.cfg), is used.
 2) If neither of the above two are present and changes are made, a
 new config file is created in $TEXMFCONFIG/web2c/updmap.cfg.
 .IP
-Multiple definitions of a font:
+Resolving multiple definitions of a font:
 .IP
 If a font is defined in more than one map file, then the definition
 coming from the first\-listed updmap.cfg is used.  If a font is
-defined multiple times in the same map file, one is chosen
+defined multiple times within the same map file, one is chosen
 arbitrarily.  In both cases a warning is issued.
 .IP
 Disabling maps:
diff --git a/Master/texmf/doc/man/man1/updmap.man1.pdf b/Master/texmf/doc/man/man1/updmap.man1.pdf
index 347ca2c5cd3..12d6c9327f6 100644
--- a/Master/texmf/doc/man/man1/updmap.man1.pdf
+++ b/Master/texmf/doc/man/man1/updmap.man1.pdf
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap.pl
index 08822b6debc..7df639072f9 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # mupdmap: utility to maintain map files for outline fonts.
-# $Id: updmap.pl 26881 2012-06-10 01:18:51Z karl $
+# $Id: updmap.pl 26891 2012-06-10 22:41:49Z karl $
 # 
 # Copyright 2011, 2012 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
@@ -33,7 +33,7 @@ BEGIN {
 }
 
 
-my $version = '$Id: updmap.pl 26881 2012-06-10 01:18:51Z karl $';
+my $version = '$Id: updmap.pl 26891 2012-06-10 22:41:49Z karl $';
 
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
@@ -2048,16 +2048,18 @@ Explanation of trees and files normally used:
 
   If --cnffile 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 -all 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 
+  updmap.cfg files found by running \`kpsewhich -all updmap.cfg', in the
+  order returned by kpsewhich, with one exception: an updmap.cfg found
+  in TEXMFLOCAL is given higher priority than the updmap.cfg in
+  TEXMFMAIN, to ensure that local adjustments by administrators take
+  precedence over what is shipped in TeX Live.
+
+  In any case, if multiple updmap.cfg files are found, all the maps
   mentioned in all the updmap.cfg files are merged.
 
   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.
+  read, in the given order.
   
   For updmap-sys:
   TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
@@ -2078,10 +2080,10 @@ Explanation of trees and files normally used:
   
   (where YYYY is the TeX Live release version).
   
-  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
+  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 that
   updmap-local.cfg is used instead.  In this case, updmap recognizes the
   previous syntax for disabling map files in updmap-local.cfg (this
   syntax is different from what is used now).
@@ -2093,6 +2095,7 @@ Explanation of trees and files normally used:
   line, then the first one given will be used to save any changes from
   --setoption, --enable or --disable.  If the config files are taken
   from kpsewhich output, then the algorithm is more complex:
+
     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 --all (equivalently, the one returned by kpsewhich
@@ -2101,10 +2104,10 @@ Explanation of trees and files normally used:
     2) If neither of the above two are present and changes are made, a
     new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg.
 
-  Multiple definitions of a font:
+  Resolving multiple definitions of a font:
     If a font is defined in more than one map file, then the definition
     coming from the first-listed updmap.cfg is used.  If a font is
-    defined multiple times in the same map file, one is chosen
+    defined multiple times within the same map file, one is chosen
     arbitrarily.  In both cases a warning is issued.
 
   Disabling maps: