summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/build-aux/config.guess4
-rwxr-xr-xBuild/source/libs/freetype2/freetype-src/builds/unix/config.guess4
-rwxr-xr-xBuild/source/libs/icu/icu-src/source/config.guess4
-rw-r--r--Build/source/utils/asymptote/config.guess4
-rw-r--r--Master/doc.html2
-rw-r--r--Master/texmf-dist/doc/man/man1/tlmgr.199
-rw-r--r--Master/texmf-dist/doc/man/man1/tlmgr.man1.pdfbin95315 -> 95665 bytes
-rwxr-xr-xMaster/tlpkg/installer/config.guess4
-rw-r--r--Master/tlpkg/installer/ctan-mirrors.pl6
9 files changed, 70 insertions, 57 deletions
diff --git a/Build/source/build-aux/config.guess b/Build/source/build-aux/config.guess
index 3ef33381eaa..faa63aa9429 100755
--- a/Build/source/build-aux/config.guess
+++ b/Build/source/build-aux/config.guess
@@ -1335,13 +1335,13 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
index 3ef33381eaa..faa63aa9429 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
@@ -1335,13 +1335,13 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
diff --git a/Build/source/libs/icu/icu-src/source/config.guess b/Build/source/libs/icu/icu-src/source/config.guess
index 3ef33381eaa..faa63aa9429 100755
--- a/Build/source/libs/icu/icu-src/source/config.guess
+++ b/Build/source/libs/icu/icu-src/source/config.guess
@@ -1335,13 +1335,13 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
diff --git a/Build/source/utils/asymptote/config.guess b/Build/source/utils/asymptote/config.guess
index 3ef33381eaa..faa63aa9429 100644
--- a/Build/source/utils/asymptote/config.guess
+++ b/Build/source/utils/asymptote/config.guess
@@ -1335,13 +1335,13 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
diff --git a/Master/doc.html b/Master/doc.html
index 00cd4fe1429..18ae848992f 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -4720,7 +4720,7 @@ Identify draft copies
</small></li>
<li><b><a href="texmf-dist/doc/latex/draftfigure">draftfigure</a></b>:<small>
-A package to replace figures with a white box and additional features.
+Replace figures with a white box and additional features.
<a href="texmf-dist/doc/latex/draftfigure/draftfigure.pdf">draftfigure.pdf</a>.
</small></li>
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index 4d5138ac327..8d33fd40422 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "TLMGR 1"
-.TH TLMGR 1 "2017-05-11" "perl v5.24.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2017-05-13" "perl v5.24.1" "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
@@ -610,9 +610,12 @@ category, short and long description, sizes, installation status, and TeX Live
revision number. If \fIpkg\fR is not locally installed, searches in the
remote installation source.
.PP
-For normal packages (not collections or schemes), the sizes of the
-four groups of files (run/src/doc/bin files) are shown. For collections
-and schemes the \fBaccumulated\fR size including depending packages.
+For normal packages (not collections or schemes), the sizes of the four
+groups of files (run/src/doc/bin files) are shown separately. For
+collections, the cumulative size is shown, including all
+directly-dependent packages (but not dependent collections). For
+schemes, the cumulative size is also shown, including all
+directly-dependent collections and packages.
.PP
If \fIpkg\fR is not found locally or remotely, the search action is used
and lists matching packages and files.
@@ -792,7 +795,8 @@ Its value is an integer. If the \f(CW\*(C`autobackup\*(C'\fR value is \f(CW\*(C
backups are removed. If \f(CW\*(C`autobackup\*(C'\fR is 0 or more, it specifies the
number of backups to keep. Thus, backups are disabled if the value is
0. In the \f(CW\*(C`\-\-clean\*(C'\fR mode of the \f(CW\*(C`backup\*(C'\fR action this option also
-specifies the number to be kept.
+specifies the number to be kept. The default value is 1, so that
+backups are made, but only one backup is kept.
.PP
To setup \f(CW\*(C`autobackup\*(C'\fR to \f(CW\*(C`\-1\*(C'\fR on the command line, use:
.PP
@@ -808,13 +812,14 @@ The \f(CW\*(C`sys_bin\*(C'\fR, \f(CW\*(C`sys_man\*(C'\fR, and \f(CW\*(C`sys_info
Unix-like systems to control the generation of links for executables,
info files and man pages. See the \f(CW\*(C`path\*(C'\fR action for details.
.PP
-The last three options control behavior on Windows installations. If
-\&\f(CW\*(C`desktop_integration\*(C'\fR is set, then some packages will install items in
-a sub-folder of the Start menu for \f(CW\*(C`tlmgr gui\*(C'\fR, documentation, etc. If
-\&\f(CW\*(C`fileassocs\*(C'\fR is set, Windows file associations are made (see also the
-\&\f(CW\*(C`postaction\*(C'\fR action). Finally, if \f(CW\*(C`multiuser\*(C'\fR is set, then adaptions
-to the registry and the menus are done for all users on the system
-instead of only the current user. All three options are on by default.
+The last three options also affect behavior on Windows installations.
+If \f(CW\*(C`desktop_integration\*(C'\fR is set, then some packages will install items
+in a sub-folder of the Start menu for \f(CW\*(C`tlmgr gui\*(C'\fR, documentation, etc.
+If \f(CW\*(C`fileassocs\*(C'\fR is set, Windows file associations are made (see also
+the \f(CW\*(C`postaction\*(C'\fR action). Finally, if \f(CW\*(C`multiuser\*(C'\fR is set, then
+adaptions to the registry and the menus are done for all users on the
+system instead of only the current user. All three options are on by
+default.
.SS "paper"
.IX Subsection "paper"
.IP "\fBpaper [a4|letter]\fR" 4
@@ -954,20 +959,29 @@ Remove each \fIpkg\fR specified. Removing a collection removes all package
dependencies (unless \f(CW\*(C`\-\-no\-depends\*(C'\fR is specified), but not any
collection dependencies of that collection. However, when removing a
package, dependencies are never removed. Options:
-.IP "\fB\-\-backup\fR and \fB\-\-backupdir\fR \fIdirectory\fR" 4
-.IX Item "--backup and --backupdir directory"
-These two options control the creation of backups of packages \fIbefore\fR
-removal; that is, backup of packages as currently installed. If
-neither of these options are given, no backup package will be saved. If
-\&\f(CW\*(C`\-\-backupdir\*(C'\fR is given and specifies a writable directory then a backup
-will be made in that location. If only \f(CW\*(C`\-\-backup\*(C'\fR is given, then a
-backup will be made to the directory previously set via the \f(CW\*(C`option\*(C'\fR
-action (see below). If both are given then a backup will be made to the
-specified \fIdirectory\fR.
+.IP "\fB\-\-backup\fR" 4
+.IX Item "--backup"
+.PD 0
+.IP "\fB\-\-backupdir\fR \fIdirectory\fR" 4
+.IX Item "--backupdir directory"
+.PD
+These options behave just as with the \*(L"update\*(R" action (q.v.), except
+they apply to making backups of packages before they are removed. The
+default is to make such a backup, that is, to save a copy of packages
+before removal.
+.Sp
+See \*(L"update\*(R" action for more.
.Sp
-You can set options via the \f(CW\*(C`option\*(C'\fR action to automatically create
-backups for all packages, and/or keep only a certain number of
-backups. Please see the \f(CW\*(C`option\*(C'\fR action for details.
+neither option is given, no backup will be made. If \f(CW\*(C`\-\-backupdir\*(C'\fR is
+given and specifies a writable directory then a backup will be made in
+that location. If only \f(CW\*(C`\-\-backup\*(C'\fR is given, then a backup will be made
+to the directory previously set via the \f(CW\*(C`option\*(C'\fR action (see below). If
+both are given then a backup will be made to the specified \fIdirectory\fR.
+.Sp
+You can set options via the \f(CW\*(C`option\*(C'\fR action to automatically make
+backups for all packages, and/or keep only a certain number of backups.
+Please see the \f(CW\*(C`option\*(C'\fR action for details. The default is to make one
+backup.
.Sp
The \f(CW\*(C`restore\*(C'\fR action explains how to restore from a backup.
.IP "\fB\-\-no\-depends\fR" 4
@@ -1273,28 +1287,31 @@ installation with the server's idea of what is available:
.Vb 1
\& tlmgr update \-\-reinstall\-forcibly\-removed \-\-all
.Ve
-.IP "\fB\-\-backup\fR and \fB\-\-backupdir\fR \fIdirectory\fR" 4
-.IX Item "--backup and --backupdir directory"
+.IP "\fB\-\-backup\fR" 4
+.IX Item "--backup"
+.PD 0
+.IP "\fB\-\-backupdir\fR \fIdirectory\fR" 4
+.IX Item "--backupdir directory"
+.PD
These two options control the creation of backups of packages \fIbefore\fR
updating; that is, backup of packages as currently installed. If
-neither of these options are given, no backup package will be saved. If
-\&\f(CW\*(C`\-\-backupdir\*(C'\fR is given and specifies a writable directory then a backup
-will be made in that location. If only \f(CW\*(C`\-\-backup\*(C'\fR is given, then a
-backup will be made to the directory previously set via the \f(CW\*(C`option\*(C'\fR
-action (see below). If both are given then a backup will be made to the
-specified \fIdirectory\fR.
+neither options is given, no backup will made saved. If \f(CW\*(C`\-\-backupdir\*(C'\fR
+is given and specifies a writable directory then a backup will be made
+in that location. If only \f(CW\*(C`\-\-backup\*(C'\fR is given, then a backup will be
+made to the directory previously set via the \*(L"option\*(R" action (see
+below). If both are given then a backup will be made to the specified
+\&\fIdirectory\fR.
.Sp
-You can set options via the \f(CW\*(C`option\*(C'\fR action to automatically create
-backups for all packages, and/or keep only a certain number of
-backups. Please see the \f(CW\*(C`option\*(C'\fR action for details.
+You can also set options via the \f(CW\*(C`/option\*(C'\fR action to automatically make
+backups for all packages, and/or keep only a certain number of backups.
.Sp
\&\f(CW\*(C`tlmgr\*(C'\fR always makes a temporary backup when updating packages, in case
of download or other failure during an update. In contrast, the purpose
-of this \f(CW\*(C`\-\-backup\*(C'\fR option is to allow you to save a persistent backup
-in case the actual \fIcontent\fR of the update causes problems, e.g.,
-introduces an incompatibility.
+of this \f(CW\*(C`\-\-backup\*(C'\fR option is to save a persistent backup in case the
+actual \fIcontent\fR of the update causes problems, e.g., introduces an TeX
+incompatibility.
.Sp
-The \f(CW\*(C`restore\*(C'\fR action explains how to restore from a backup.
+The \*(L"restore\*(R" action explains how to restore from a backup.
.IP "\fB\-\-no\-depends\fR" 4
.IX Item "--no-depends"
If you call for updating a package normally all depending packages
@@ -1951,4 +1968,4 @@ This script and its documentation were written for the TeX Live
distribution (<http://tug.org/texlive>) and both are licensed under the
\&\s-1GNU\s0 General Public License Version 2 or later.
.PP
-\&\f(CW$Id:\fR tlmgr.pl 44289 2017\-05\-11 02:41:34Z preining $
+\&\f(CW$Id:\fR tlmgr.pl 44325 2017\-05\-13 23:31:11Z karl $
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index de2977a3254..c45cc7ddf72 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
Binary files differ
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess
index 3ef33381eaa..faa63aa9429 100755
--- a/Master/tlpkg/installer/config.guess
+++ b/Master/tlpkg/installer/config.guess
@@ -1335,13 +1335,13 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
- NEO-?:NONSTOP_KERNEL:*:*)
+ NEO-*:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-*:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 0f78e07281d..c3476ffe802 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -17,15 +17,13 @@ $mirrors = {
'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
'http://mirrors.ustc.edu.cn/CTAN/' => 1
},
- 'India' => {
- 'http://ctan.imsc.res.in/' => 1
- },
'Iran' => {
'http://ctan.asis.io/' => 1,
'http://ctan.um.ac.ir/' => 1,
'http://ctan.yazd.ac.ir/' => 1
},
'Japan' => {
+ 'ftp://ftp.kddilabs.jp/CTAN/' => 1,
'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
'http://ftp.jaist.ac.jp/pub/CTAN/' => 1
},
@@ -74,7 +72,6 @@ $mirrors = {
'ftp://ftp.tu-chemnitz.de/pub/tex/' => 1,
'http://ctan.space-pro.be/tex-archive/' => 1,
'http://ftp.fau.de/ctan/' => 1,
- 'http://mirror.physik-pool.tu-berlin.de/tex-archive/' => 1,
'http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/' => 1,
'http://www.bothelp.net/mirrors/ctan/' => 1
},
@@ -146,7 +143,6 @@ $mirrors = {
},
'USA' => {
'http://ctan.mackichan.com/' => 1,
- 'http://ctan.math.washington.edu/tex-archive/' => 1,
'http://ctan.mirrors.hoobly.com/' => 1,
'http://ctan.sharelatex.com/tex-archive/' => 1,
'http://mirror.hmc.edu/ctan/' => 1,