Misc minor updates

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

3 files changed, 70 insertions, 56 deletions

diff --git a/Build/source/doc/Makefile.am b/Build/source/doc/Makefile.am
index 7f400822dec..7068d55a86f 100644
--- a/Build/source/doc/Makefile.am
+++ b/Build/source/doc/Makefile.am
@@ -6,9 +6,9 @@
 ## The info files
 info_TEXINFOS = tlbuild.texi
 tlbuild_TEXINFOS = build-tools.txt \
-  tlbuild-incl/install-tl.texi tlbuild-incl/install-tl.texi
+  tlbuild-incl/install-tl.texi tlbuild-incl/tlmgr.texi
 
-EXTRA_DIST = build-tools.txt splitinfo.gawk
+EXTRA_DIST = splitinfo.gawk
 
 # no reasonable way to avoid it with the pod doc.
 MAKEINFOFLAGS = --set INFO_SPECIAL_CHARS_WARNING=0
diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in
index 60e055e8f02..be32f0b630d 100644
--- a/Build/source/doc/Makefile.in
+++ b/Build/source/doc/Makefile.in
@@ -431,9 +431,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 info_TEXINFOS = tlbuild.texi
 tlbuild_TEXINFOS = build-tools.txt \
-  tlbuild-incl/install-tl.texi tlbuild-incl/install-tl.texi
+  tlbuild-incl/install-tl.texi tlbuild-incl/tlmgr.texi
 
-EXTRA_DIST = build-tools.txt splitinfo.gawk
+EXTRA_DIST = splitinfo.gawk
 
 # no reasonable way to avoid it with the pod doc.
 MAKEINFOFLAGS = --set INFO_SPECIAL_CHARS_WARNING=0
diff --git a/Build/source/texk/texlive/tl_scripts/updmap.1 b/Build/source/texk/texlive/tl_scripts/updmap.1
index 5bc81acc69d..c72ae139fec 100644
--- a/Build/source/texk/texlive/tl_scripts/updmap.1
+++ b/Build/source/texk/texlive/tl_scripts/updmap.1
@@ -1,17 +1,17 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.9.
-.TH UPDMAP "1" "August 2012" "TeX Live" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.45.1.
+.TH UPDMAP "1" "May 2014" "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
-[\fIOPTION\fR] ... [\fICOMMAND\fR]
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .br
 .B updmap-sys
-[\fIOPTION\fR] ... [\fICOMMAND\fR]
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
 .SH DESCRIPTION
-updmap (TeX Live, multi) version $Id: updmap.pl 27264 2012\-07\-31 05:10:29Z preining $
+updmap version svn33988 (2014\-05\-12 15:39:32 +0900)
 .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
@@ -21,6 +21,12 @@ 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.
 .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,
+running updmap\-sys no longer has any effect.  (updmap\-sys issues a
+warning in this situation.)
+.PP
 By default, the TeX filename database (ls\-R) is also updated.
 .SH OPTIONS
 .TP
@@ -56,6 +62,9 @@ do not recreate map files
 \fB\-\-nohash\fR
 do not run texhash
 .TP
+\fB\-\-sys\fR
+affect system\-wide files (equivalent to updmap\-sys)
+.TP
 \fB\-n\fR, \fB\-\-dry\-run\fR
 only show the configuration, no output
 .TP
@@ -115,22 +124,22 @@ KanjiMap entries are added to psfonts_t1.map and kanjix.map.
 Explanation of the OPTION names for \fB\-\-showoptions\fR, \fB\-\-showoption\fR, \fB\-\-setoption\fR:
 .TP
 dvipsPreferOutline
-true|false  (default true)
+true,false  (default true)
 .IP
 Whether dvips uses bitmaps or outlines, when both are available.
 .TP
 dvipsDownloadBase35
-true|false  (default true)
+true,false  (default true)
 .IP
 Whether dvips includes the standard 35 PostScript fonts in its output.
 .TP
 pdftexDownloadBase14
-true|false   (default true)
+true,false   (default true)
 .IP
 Whether pdftex includes the standard 14 PDF fonts in its output.
 .TP
 pxdviUse
-true|false  (default false)
+true,false  (default false)
 .IP
 Whether maps for pxdvi (Japanese\-patched xdvi) are under updmap's control.
 .TP
@@ -143,13 +152,24 @@ kanjiVariant
 See below.
 .TP
 LW35
-URWkb|URW|ADOBEkb|ADOBE  (default URWkb)
+URWkb,URW,ADOBEkb,ADOBE  (default URWkb)
 .IP
 Adapt the font and file names of the standard 35 PostScript fonts.
-URWkb    URW fonts with "berry" filenames    (e.g. uhvbo8ac.pfb)
-URW      URW fonts with "vendor" filenames   (e.g. n019064l.pfb)
-ADOBEkb  Adobe fonts with "berry" filenames  (e.g. phvbo8an.pfb)
-ADOBE    Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
+.nf
+.TP
+URWkb
+URW fonts with "berry" filenames    (e.g. uhvbo8ac.pfb)
+.TP
+URW
+URW fonts with "vendor" filenames   (e.g. n019064l.pfb)
+.fi
+.TP
+ADOBEkb
+Adobe fonts with "berry" filenames  (e.g. phvbo8an.pfb)
+.TP
+ADOBE
+Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
+.fi
 .IP
 These options are only read and acted on by updmap; dvips, pdftex, etc.,
 do not know anything about them.  They work by changing the default map
@@ -169,10 +189,7 @@ Explanation of trees and files normally used:
 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 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.
+order returned by kpsewhich.
 .IP
 In any case, if multiple updmap.cfg files are found, all the maps
 mentioned in all the updmap.cfg files are merged.
@@ -183,56 +200,53 @@ 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
+TEXMFSYSCONFIG \fI\,$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\/\fP
+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:
 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
+TEXMFHOME      \fI\,$HOME/texmf/web2c/updmap.cfg\/\fP
+TEXMFSYSCONFIG \fI\,$TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg\/\fP
+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
 (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 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).
-.IP
 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:
 .IP
-Where changes are saved: 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:
+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:
 .IP
-1) If $TEXMFCONFIG/web2c/updmap.cfg or $TEXMFHOME/web2c/updmap.cfg
+1) 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
-new config file is created in $TEXMFCONFIG/web2c/updmap.cfg.
+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.
+.PP
 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 within the same map file, one is chosen
 arbitrarily.  In both cases a warning is issued.
-.IP
+.PP
 Disabling maps:
 .IP
 updmap.cfg files with higher priority (listed earlier) can disable
@@ -250,39 +264,39 @@ in the higher\-priority updmap.cfg file.
 As an example, suppose you have a copy of MathTime Pro fonts
 and want to disable the Belleek version of the fonts; that is,
 disable the map belleek.map.  You can create the file
-$TEXMFCONFIG/web2c/updmap.cfg with the content
+\fI\,$TEXMFCONFIG/web2c/updmap.cfg\/\fP with the content
 .IP
 #! Map belleek.map
 Map mt\-plus.map
 Map mt\-yy.map
 .IP
 and call updmap.
-.IP
+.PP
 updmap writes the map files for dvips (psfonts.map) and pdftex
 (pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/
 directories.
-.IP
+.PP
 The log file is written to TEXMFVAR/web2c/updmap.log.
-.IP
+.PP
 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.
-.IP
+.PP
 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.
-.IP
+.PP
 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
 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 updmap.cfg.
+instructions, read the beginning of the main updmap.cfg.
 .SH FILES
 Configuration and input files:
 .IP "\fIupdmap\&.cfg\fP"
 Main configuration file\&.  In
-\fItexmf/web2c\fP by default, but may be located elsewhere
+\fItexmf-dist/web2c\fP by default, but may be located elsewhere
 depending on your distribution\&.  Each texmf tree read should have its
 own \fIupdmap.cfg\fP.
 .IP "\fIdvips35\&.map\fP"