/home/texlive/karl/Master/tlpkg/bin/tl-update-auto

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

3 files changed, 21 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index 04e3e408c84..3e67b9f3e2c 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TLMGR 1"
-.TH TLMGR 1 "2015-01-08" "perl v5.20.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2015-04-12" "perl v5.20.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -460,8 +460,6 @@ Line endings may be either \s-1LF\s0 or \s-1CRLF\s0 depending on the current pla
 .IX Item "generate language.def"
 .IP "\fBgenerate language.dat.lua\fR" 4
 .IX Item "generate language.dat.lua"
-.IP "\fBgenerate fmtutil\fR" 4
-.IX Item "generate fmtutil"
 .PD
 .PP
 The \f(CW\*(C`generate\*(C'\fR action overwrites any manual changes made in the
@@ -473,39 +471,42 @@ all of these files.
 For managing your own fonts, please read the \f(CW\*(C`updmap \-\-help\*(C'\fR
 information and/or <http://tug.org/fonts/fontinstall.html>.
 .PP
+For managing your own formats, please read the \f(CW\*(C`fmtutil \-\-help\*(C'\fR
+information.
+.PP
 In more detail: \f(CW\*(C`generate\*(C'\fR remakes any of the configuration files
-\&\f(CW\*(C`language.dat\*(C'\fR, \f(CW\*(C`language.def\*(C'\fR, \f(CW\*(C`language.dat.lua\*(C'\fR, and
-\&\f(CW\*(C`fmtutil.cnf\*(C'\fR, from the information present in the local \s-1TLPDB,\s0 plus
+\&\f(CW\*(C`language.dat\*(C'\fR, \f(CW\*(C`language.def\*(C'\fR, and \f(CW\*(C`language.dat.lua\*(C'\fR
+from the information present in the local \s-1TLPDB,\s0 plus
 locally-maintained files.
 .PP
 The locally-maintained files are \f(CW\*(C`language\-local.dat\*(C'\fR,
-\&\f(CW\*(C`language\-local.def\*(C'\fR, \f(CW\*(C`language\-local.dat.lua\*(C'\fR, or
-\&\f(CW\*(C`fmtutil\-local.cnf\*(C'\fR, searched for in \f(CW\*(C`TEXMFLOCAL\*(C'\fR in the respective
+\&\f(CW\*(C`language\-local.def\*(C'\fR, or \f(CW\*(C`language\-local.dat.lua\*(C'\fR,
+searched for in \f(CW\*(C`TEXMFLOCAL\*(C'\fR in the respective
 directories.  If local additions are present, the final file is made by
 starting with the main file, omitting any entries that the local file
 specifies to be disabled, and finally appending the local file.
 .PP
-(Historical note: The formerly supported \f(CW\*(C`updmap\-local.cfg\*(C'\fR is no longer
-read, since \f(CW\*(C`updmap\*(C'\fR now supports multiple \f(CW\*(C`updmap.cfg\*(C'\fR files.  Thus,
-local additions can and should be put into an \f(CW\*(C`updmap.cfg\*(C'\fR file in
-\&\f(CW\*(C`TEXMFLOCAL\*(C'\fR.  The \f(CW\*(C`generate updmap\*(C'\fR action no longer exists.)
+(Historical note: The formerly supported \f(CW\*(C`updmap\-local.cfg\*(C'\fR and
+\&\f(CW\*(C`fmtutil\-local.cnf\*(C'\fR are no longer read, since \f(CW\*(C`updmap\*(C'\fR and \f(CW\*(C`fmtutil\*(C'\fR
+now reads and supports multiple configuration files.  Thus,
+local additions can and should be put into an \f(CW\*(C`updmap.cfg\*(C'\fR of \f(CW\*(C`fmtutil.cnf\*(C'\fR
+file in \f(CW\*(C`TEXMFLOCAL\*(C'\fR.  The \f(CW\*(C`generate updmap\*(C'\fR and \f(CW\*(C`generate fmtutil\*(C'\fR actions
+no longer exist.)
 .PP
 Local files specify entries to be disabled with a comment line, namely
 one of these:
 .PP
-.Vb 3
-\&  #!NAME
+.Vb 2
 \&  %!NAME
 \&  \-\-!NAME
 .Ve
 .PP
-where \f(CW\*(C`fmtutil.cnf\*(C'\fR uses \f(CW\*(C`#\*(C'\fR, \f(CW\*(C`language.dat\*(C'\fR and \f(CW\*(C`language.def\*(C'\fR use
-\&\f(CW\*(C`%\*(C'\fR, and \f(CW\*(C`language.dat.lua\*(C'\fR use \f(CW\*(C`\-\-\*(C'\fR.  In all cases, the \fIname\fR is
+where \f(CW\*(C`language.dat\*(C'\fR and \f(CW\*(C`language.def\*(C'\fR use \f(CW\*(C`%\*(C'\fR, 
+and \f(CW\*(C`language.dat.lua\*(C'\fR use \f(CW\*(C`\-\-\*(C'\fR.  In all cases, the \fIname\fR is
 the respective format name or hyphenation pattern identifier.
 Examples:
 .PP
-.Vb 3
-\&  #!pdflatex
+.Vb 2
 \&  %!german
 \&  \-\-!usenglishmax
 .Ve
@@ -553,11 +554,10 @@ succession before invoking these programs.
 .PP
 The respective locations are as follows:
 .PP
-.Vb 4
+.Vb 3
 \&  tex/generic/config/language.dat (and language\-local.dat);
 \&  tex/generic/config/language.def (and language\-local.def);
 \&  tex/generic/config/language.dat.lua (and language\-local.dat.lua);
-\&  web2c/fmtutil.cnf (and fmtutil\-local.cnf);
 .Ve
 .SS "gui"
 .IX Subsection "gui"
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index 33788aae209..3a1e744d4b3 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 0919897af58..8df069c9983 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -9,6 +9,7 @@ $mirrors = {
   'Asia' => {
     'China' => {
       'http://ftp.ctex.org/mirrors/CTAN/' => 1,
+      'http://mirror.bjtu.edu.cn/CTAN/' => 1,
       'http://mirror.neu.edu.cn/CTAN/' => 1,
       'http://mirrors.hustunique.com/CTAN/' => 1,
       'http://mirrors.stuhome.net/CTAN/' => 1,
@@ -30,6 +31,7 @@ $mirrors = {
     'Japan' => {
       'ftp://ftp.kddilabs.jp/CTAN/' => 1,
       'ftp://ftp.riken.go.jp/pub/tex-archive/' => 1,
+      'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
       'http://ftp.jaist.ac.jp/pub/CTAN/' => 1
     },
     'Korea' => {
@@ -102,7 +104,6 @@ $mirrors = {
       'http://ctan.mirror.garr.it/mirrors/CTAN/' => 1
     },
     'Netherlands' => {
-      'http://ctan.cs.uu.nl/' => 1,
       'http://ftp.snt.utwente.nl/pub/software/tex/' => 1
     },
     'Norway' => {