tl-update-auto

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

3 files changed, 180 insertions, 101 deletions

diff --git a/Master/doc.html b/Master/doc.html
index ed1f3c9f2be..22344f88829 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -5939,7 +5939,7 @@ Typeset exercises, problems, etc. and their answers
 
 <li><b><a href="texmf-dist/doc/latex/exercisebank">exercisebank</a></b>:<small>
 Creating and managing exercises, and reusing them as composed sets
-<a href="texmf-dist/doc/latex/exercisebank/exercisebank.pdf">exercisebank.pdf</a>.
+<a href="texmf-dist/doc/latex/exercisebank/exercisebank-doc.pdf">exercisebank-doc.pdf</a>.
 </small></li>
 
 <li><b><a href="texmf-dist/doc/latex/exercises">exercises</a></b>:<small>
@@ -8410,10 +8410,10 @@ Metafont version of tiles in the style of Slavik Jablan
 
 <li><b><a href="texmf-dist/doc/latex/jacow">jacow</a></b>:<small>
 The "jacow.cls" class is used for submissions to the proceedings of conferences on JACoW.org
+<a href="texmf-dist/doc/latex/jacow/JACoW_A4_LaTeX.pdf">JACoW_A4_LaTeX.pdf</a>,
+<a href="texmf-dist/doc/latex/jacow/JACoW_US_LaTeX.pdf">JACoW_US_LaTeX.pdf</a>,
 <a href="texmf-dist/doc/latex/jacow/JACpic_mc.pdf">JACpic_mc.pdf</a>,
-<a href="texmf-dist/doc/latex/jacow/LaTeX-A4-JACoW.pdf">LaTeX-A4-JACoW.pdf</a>,
-<a href="texmf-dist/doc/latex/jacow/LaTeX-Letter-JACoW.pdf">LaTeX-Letter-JACoW.pdf</a>,
-<a href="texmf-dist/doc/latex/jacow/jacow-collaboration-2016.pdf">jacow-collaboration-2016.pdf</a>.
+<a href="texmf-dist/doc/latex/jacow/jacow-collaboration-2018.pdf">jacow-collaboration-2018.pdf</a>.
 </small></li>
 
 <li><b><a href="texmf-dist/doc/otherformats/jadetex/base">jadetex</a></b>:<small>
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index 9ae836e6e1f..a6fd20240fa 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 "2018-04-02" "perl v5.26.1" "User Contributed Perl Documentation"
+.TH TLMGR 1 "2018-04-04" "perl v5.26.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
@@ -138,7 +138,7 @@
 tlmgr \- the native TeX Live Manager
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-tlmgr [\fIoption\fR]... \fIaction\fR [\fIoption\fR]... [\fIoperand\fR]...
+tlmgr [\fIoption\fR...] \fIaction\fR [\fIoption\fR...] [\fIoperand\fR]...
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 \&\fBtlmgr\fR manages an existing TeX Live installation, both packages and
@@ -323,23 +323,30 @@ variable and \f(CW\*(C`perldoc\*(C'\fR will not be used.
 Gives version information (same as \f(CW\*(C`\-\-version\*(C'\fR).
 .PP
 If \f(CW\*(C`\-v\*(C'\fR has been given the revisions of the used modules are reported, too.
-.SS "backup [\-\-clean[=\fIN\fP]] [\-\-backupdir \fIdir\fP] [\-\-all | \fIpkg\fP]..."
-.IX Subsection "backup [--clean[=N]] [--backupdir dir] [--all | pkg]..."
+.SS "backup"
+.IX Subsection "backup"
+.IP "\fBbackup [\f(BIoption\fB...] \-\-all\fR" 4
+.IX Item "backup [option...] --all"
+.PD 0
+.IP "\fBbackup [\f(BIoption\fB...] \f(BIpkg\fB...\fR" 4
+.IX Item "backup [option...] pkg..."
+.PD
 If the \f(CW\*(C`\-\-clean\*(C'\fR option is not specified, this action makes a backup of
 the given packages, or all packages given \f(CW\*(C`\-\-all\*(C'\fR. These backups are
 saved to the value of the \f(CW\*(C`\-\-backupdir\*(C'\fR option, if that is an existing and
 writable directory. If \f(CW\*(C`\-\-backupdir\*(C'\fR is not given, the \f(CW\*(C`backupdir\*(C'\fR
 option setting in the \s-1TLPDB\s0 is used, if present.  If both are missing,
 no backups are made.
-.PP
+.Sp
 If the \f(CW\*(C`\-\-clean\*(C'\fR option is specified, backups are pruned (removed)
 instead of saved. The optional integer value \fIN\fR may be specified to
 set the number of backups that will be retained when cleaning. If \f(CW\*(C`N\*(C'\fR
 is not given, the value of the \f(CW\*(C`autobackup\*(C'\fR option is used. If both are
 missing, an error is issued. For more details of backup pruning, see
 the \f(CW\*(C`option\*(C'\fR action.
-.PP
+.Sp
 Options:
+.RS 4
 .IP "\fB\-\-backupdir\fR \fIdirectory\fR" 4
 .IX Item "--backupdir directory"
 Overrides the \f(CW\*(C`backupdir\*(C'\fR option setting in the \s-1TLPDB.\s0
@@ -360,14 +367,15 @@ of packages together with this option, as desired.
 .IX Item "--dry-run"
 Nothing is actually backed up or removed; instead, the actions to be
 performed are written to the terminal.
+.RE
+.RS 4
+.RE
 .SS "candidates \fIpkg\fP"
 .IX Subsection "candidates pkg"
-.IP "\fBcandidates \f(BIpkg\fB\fR" 4
-.IX Item "candidates pkg"
 Shows the available candidate repositories for package \fIpkg\fR.
 See \*(L"\s-1MULTIPLE REPOSITORIES\*(R"\s0 below.
-.SS "check [\fIoption\fP]... [files|depends|executes|runfiles|all]"
-.IX Subsection "check [option]... [files|depends|executes|runfiles|all]"
+.SS "check [\fIoption\fP...] [files|depends|executes|runfiles|all]"
+.IX Subsection "check [option...] [files|depends|executes|runfiles|all]"
 Executes one (or all) check(s) on the consistency of the installation.
 .IP "\fBfiles\fR" 4
 .IX Item "files"
@@ -395,39 +403,43 @@ Options:
 .IX Item "--use-svn"
 Use the output of \f(CW\*(C`svn status\*(C'\fR instead of listing the files; for
 checking the \s-1TL\s0 development repository.
-.SS "conf [texmf|tlmgr|updmap [\-\-conffile \fIfile\fP] [\-\-delete] [\fIkey\fP [\fIvalue\fP]]]"
-.IX Subsection "conf [texmf|tlmgr|updmap [--conffile file] [--delete] [key [value]]]"
-.SS "conf auxtrees [\-\-conffile \fIfile\fP] [show|add|delete] [\fIvalue\fP]"
-.IX Subsection "conf auxtrees [--conffile file] [show|add|delete] [value]"
+.SS "conf"
+.IX Subsection "conf"
+.IP "\fBconf [texmf|tlmgr|updmap [\-\-conffile \f(BIfile\fB] [\-\-delete] [\f(BIkey\fB [\f(BIvalue\fB]]]\fR" 4
+.IX Item "conf [texmf|tlmgr|updmap [--conffile file] [--delete] [key [value]]]"
+.PD 0
+.IP "\fBconf auxtrees [\-\-conffile \f(BIfile\fB] [show|add|delete] [\f(BIvalue\fB]\fR" 4
+.IX Item "conf auxtrees [--conffile file] [show|add|delete] [value]"
+.PD
 With only \f(CW\*(C`conf\*(C'\fR, show general configuration information for TeX Live,
 including active configuration files, path settings, and more.  This is
 like running \f(CW\*(C`texconfig conf\*(C'\fR, but works on all supported platforms.
-.PP
+.Sp
 With one of \f(CW\*(C`conf texmf\*(C'\fR, \f(CW\*(C`conf tlmgr\*(C'\fR, or \f(CW\*(C`conf updmap\*(C'\fR, shows all
 key/value pairs (i.e., all settings) as saved in \f(CW\*(C`ROOT/texmf.cnf\*(C'\fR, the
 user-specific \f(CW\*(C`tlmgr\*(C'\fR configuration file (see below), or the first
 found (via \f(CW\*(C`kpsewhich\*(C'\fR) \f(CW\*(C`updmap.cfg\*(C'\fR file, respectively.
-.PP
+.Sp
 If \fIkey\fR is given in addition, shows the value of only that \fIkey\fR in
 the respective file.  If option \fI\-\-delete\fR is also given, the value in
 the given configuration file is entirely removed (not just commented
 out).
-.PP
+.Sp
 If \fIvalue\fR is given in addition, \fIkey\fR is set to \fIvalue\fR in the 
 respective file.  \fINo error checking is done!\fR
-.PP
+.Sp
 The \f(CW\*(C`PATH\*(C'\fR value shown by \f(CW\*(C`conf\*(C'\fR is as used by \f(CW\*(C`tlmgr\*(C'\fR.  The
 directory in which the \f(CW\*(C`tlmgr\*(C'\fR executable is found is automatically
 prepended to the \s-1PATH\s0 value inherited from the environment.
-.PP
+.Sp
 Here is a practical example of changing configuration values. If the
 execution of (some or all) system commands via \f(CW\*(C`\ewrite18\*(C'\fR was left
 enabled during installation, you can disable it afterwards:
-.PP
+.Sp
 .Vb 1
 \&  tlmgr conf texmf shell_escape 0
 .Ve
-.PP
+.Sp
 The subcommand \f(CW\*(C`auxtrees\*(C'\fR allows adding and removing arbitrary
 additional texmf trees, completely under user control.  \f(CW\*(C`auxtrees show\*(C'\fR
 shows the list of additional trees, \f(CW\*(C`auxtrees add\*(C'\fR \fItree\fR adds a tree
@@ -436,21 +448,21 @@ to the list, and \f(CW\*(C`auxtrees remove\*(C'\fR \fItree\fR removes a tree fro
 might not be found if the \f(CW\*(C`ls\-R\*(C'\fR becomes stale). This works by
 manipulating the Kpathsea variable \f(CW\*(C`TEXMFAUXTREES\*(C'\fR, in
 \&\f(CW\*(C`ROOT/texmf.cnf\*(C'\fR.  Example:
-.PP
+.Sp
 .Vb 2
 \&  tlmgr conf auxtrees add /quick/test/tree
 \&  tlmgr conf auxtrees remove /quick/test/tree
 .Ve
-.PP
+.Sp
 In all cases the configuration file can be explicitly specified via the
 option \f(CW\*(C`\-\-conffile\*(C'\fR \fIfile\fR, if desired.
-.PP
+.Sp
 Warning: The general facility for changing configuration values is here,
 but tinkering with settings in this way is strongly discouraged.  Again,
 no error checking on either keys or values is done, so any sort of
 breakage is possible.
-.SS "dump-tlpdb [\-\-local|\-\-remote] [\-\-json]"
-.IX Subsection "dump-tlpdb [--local|--remote] [--json]"
+.SS "dump-tlpdb [\fIoption\fP...] [\-\-json]"
+.IX Subsection "dump-tlpdb [option...] [--json]"
 Dump complete local or remote \s-1TLPDB\s0 to standard output, as-is.  The
 output is analogous to the \f(CW\*(C`\-\-machine\-readable\*(C'\fR output; see
 \&\*(L"MACHINE-READABLE \s-1OUTPUT\*(R"\s0 section.
@@ -481,17 +493,17 @@ where \f(CW\*(C`location\-url\*(C'\fR is the literal field name, followed by a t
 \&\fIlocation\fR is the file or url to the repository.
 .PP
 Line endings may be either \s-1LF\s0 or \s-1CRLF\s0 depending on the current platform.
-.SS "generate [\fIoption\fP]... \fIwhat\fP"
-.IX Subsection "generate [option]... what"
-.IP "\fBgenerate language\fR" 4
-.IX Item "generate language"
+.SS "generate"
+.IX Subsection "generate"
+.IP "\fBgenerate [\f(BIoption\fB...] language\fR" 4
+.IX Item "generate [option...] language"
 .PD 0
-.IP "\fBgenerate language.dat\fR" 4
-.IX Item "generate language.dat"
-.IP "\fBgenerate language.def\fR" 4
-.IX Item "generate language.def"
-.IP "\fBgenerate language.dat.lua\fR" 4
-.IX Item "generate language.dat.lua"
+.IP "\fBgenerate [\f(BIoption\fB...] language.dat\fR" 4
+.IX Item "generate [option...] language.dat"
+.IP "\fBgenerate [\f(BIoption\fB...] language.def\fR" 4
+.IX Item "generate [option...] language.def"
+.IP "\fBgenerate [\f(BIoption\fB...] language.dat.lua\fR" 4
+.IX Item "generate [option...] language.dat.lua"
 .PD
 .PP
 The \f(CW\*(C`generate\*(C'\fR action overwrites any manual changes made in the
@@ -594,39 +606,48 @@ The respective locations are as follows:
 .SS "gui"
 .IX Subsection "gui"
 Start the graphical user interface. See \fB\s-1GUI\s0\fR below.
-.SS "info [\fIoption\fP...] [collections|schemes|\fIpkg\fP...]"
-.IX Subsection "info [option...] [collections|schemes|pkg...]"
+.SS "info"
+.IX Subsection "info"
+.IP "\fBinfo [\f(BIoption\fB...] \f(BIpkg\fB...\fR" 4
+.IX Item "info [option...] pkg..."
+.PD 0
+.IP "\fBinfo [\f(BIoption\fB...] collections\fR" 4
+.IX Item "info [option...] collections"
+.IP "\fBinfo [\f(BIoption\fB...] schemes\fR" 4
+.IX Item "info [option...] schemes"
+.PD
 With no argument, lists all packages available at the package
 repository, prefixing those already installed with \f(CW\*(C`i\*(C'\fR.
-.PP
+.Sp
 With the single word \f(CW\*(C`collections\*(C'\fR or \f(CW\*(C`schemes\*(C'\fR as the argument, lists
 the request type instead of all packages.
-.PP
+.Sp
 With any other arguments, display information about \fIpkg\fR: the name,
 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
+.Sp
 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
+.Sp
 If \fIpkg\fR is not found locally or remotely, the search action is used
 and lists matching packages and files.
-.PP
+.Sp
 It also displays information taken from the TeX Catalogue, namely the
 package version, date, and license.  Consider these, especially the
 package version, as approximations only, due to timing skew of the
 updates of the different pieces.  By contrast, the \f(CW\*(C`revision\*(C'\fR value
 comes directly from \s-1TL\s0 and is reliable.
-.PP
+.Sp
 The former actions \f(CW\*(C`show\*(C'\fR and \f(CW\*(C`list\*(C'\fR are merged into this action,
 but are still supported for backward compatibility.
-.PP
+.Sp
 Options:
+.RS 4
 .IP "\fB\-\-list\fR" 4
 .IX Item "--list"
 If the option \f(CW\*(C`\-\-list\*(C'\fR is given with a package, the list of contained
@@ -654,13 +675,16 @@ In case \f(CW\*(C`\-\-json\*(C'\fR is specified, the output is a
 a single \f(CW\*(C`TLPOBJ\*(C'\fR but with additional information. For details see
 \&\f(CW\*(C`tlpkg/doc/JSON\-formats.txt\*(C'\fR, format definition: \f(CW\*(C`TLPOBJINFO\*(C'\fR.
 If both \f(CW\*(C`\-\-json\*(C'\fR and \f(CW\*(C`\-\-data\*(C'\fR are given, \f(CW\*(C`\-\-json\*(C'\fR takes precedence.
+.RE
+.RS 4
+.RE
 .SS "init-usertree"
 .IX Subsection "init-usertree"
 Sets up a texmf tree for so-called user mode management, either the
 default user tree (\f(CW\*(C`TEXMFHOME\*(C'\fR), or one specified on the command line
 with \f(CW\*(C`\-\-usertree\*(C'\fR.  See \*(L"\s-1USER MODE\*(R"\s0 below.
-.SS "install [\fIoption\fP]... \fIpkg\fP..."
-.IX Subsection "install [option]... pkg..."
+.SS "install [\fIoption\fP...] \fIpkg\fP..."
+.IX Subsection "install [option...] pkg..."
 Install each \fIpkg\fR given on the command line, if it is not already
 installed.  (It does not touch existing packages; see the \f(CW\*(C`update\*(C'\fR
 action for how to get the latest version of a package.)
@@ -717,19 +741,27 @@ after all.  You can get them by using these options in conjunction with
 .Vb 1
 \&  tlmgr install \-\-reinstall \-\-with\-doc \-\-with\-src fontspec
 .Ve
-.SS "key list|add \fIfile\fP|remove \fIkeyid\fP"
-.IX Subsection "key list|add file|remove keyid"
+.SS "key"
+.IX Subsection "key"
+.IP "\fBkey list\fR" 4
+.IX Item "key list"
+.PD 0
+.IP "\fBkey add \f(BIfile\fB\fR" 4
+.IX Item "key add file"
+.IP "\fBkey remove \f(BIkeyid\fB\fR" 4
+.IX Item "key remove keyid"
+.PD
 The action \f(CW\*(C`key\*(C'\fR allows listing, adding and removing additional \s-1GPG\s0
 keys to the set of trusted keys, that is, those that are used to verify
 the TeX Live databases.
-.PP
+.Sp
 With the \f(CW\*(C`list\*(C'\fR argument, \f(CW\*(C`key\*(C'\fR lists all keys.
-.PP
+.Sp
 The \f(CW\*(C`add\*(C'\fR argument requires another argument, either a filename or
 \&\f(CW\*(C`\-\*(C'\fR for stdin, from which the key is added. The key is added to the
 local keyring \f(CW\*(C`GNUPGHOME/repository\-keys.gpg\*(C'\fR, which is normally)
 \&\f(CW\*(C`tlpkg/gpg/repository\-keys.gpg\*(C'\fR.
-.PP
+.Sp
 The \f(CW\*(C`remove\*(C'\fR argument requires a key id and removes the requested id
 from the local keyring.
 .SS "list"
@@ -881,28 +913,34 @@ Incidentally, this syntax of having a specific program name before the
 \&\f(CW\*(C`texconfig\*(C'\fR script, which supports other configuration settings for
 some programs, notably \f(CW\*(C`dvips\*(C'\fR.  \f(CW\*(C`tlmgr\*(C'\fR does not support those extra
 settings.
-.SS "path [\-\-w32mode=user|admin] [add|remove]"
-.IX Subsection "path [--w32mode=user|admin] [add|remove]"
+.SS "path"
+.IX Subsection "path"
+.IP "\fBpath [\-\-w32mode=user|admin] add\fR" 4
+.IX Item "path [--w32mode=user|admin] add"
+.PD 0
+.IP "\fBpath [\-\-w32mode=user|admin] remove\fR" 4
+.IX Item "path [--w32mode=user|admin] remove"
+.PD
 On Unix, merely adds or removes symlinks for binaries, man pages, and
 info pages in the system directories specified by the respective options
 (see the \*(L"option\*(R" description above).  Does not change any
 initialization files, either system or personal.
-.PP
+.Sp
 On Windows, the registry part where the binary directory is added or
 removed is determined in the following way:
-.PP
+.Sp
 If the user has admin rights, and the option \f(CW\*(C`\-\-w32mode\*(C'\fR is not given,
 the setting \fIw32_multi_user\fR determines the location (i.e., if it is
 on then the system path, otherwise the user path is changed).
-.PP
+.Sp
 If the user has admin rights, and the option \f(CW\*(C`\-\-w32mode\*(C'\fR is given, this
 option determines the path to be adjusted.
-.PP
+.Sp
 If the user does not have admin rights, and the option \f(CW\*(C`\-\-w32mode\*(C'\fR
 is not given, and the setting \fIw32_multi_user\fR is off, the user path
 is changed, while if the setting \fIw32_multi_user\fR is on, a warning is
 issued that the caller does not have enough privileges.
-.PP
+.Sp
 If the user does not have admin rights, and the option \f(CW\*(C`\-\-w32mode\*(C'\fR
 is given, it must be \f(CW\*(C`user\*(C'\fR and the user path will be adjusted. If a
 user without admin rights uses the option \f(CW\*(C`\-\-w32mode admin\*(C'\fR a warning
@@ -928,55 +966,80 @@ the given repository \fIrepo\fR are removed.
 .el .IP "\f(CWpinning remove \f(CIrepo\f(CW \-\-all\fR" 4
 .IX Item "pinning remove repo --all"
 Remove all pinning data for repository \fIrepo\fR.
-.SS "platform list|add|remove \fIplatform\fP..."
-.IX Subsection "platform list|add|remove platform..."
-.SS "platform set \fIplatform\fP"
-.IX Subsection "platform set platform"
-.SS "platform set auto"
-.IX Subsection "platform set auto"
+.SS "platform"
+.IX Subsection "platform"
+.IP "\fBplatform list|add|remove \f(BIplatform\fB...\fR" 4
+.IX Item "platform list|add|remove platform..."
+.PD 0
+.IP "\fBplatform set \f(BIplatform\fB\fR" 4
+.IX Item "platform set platform"
+.IP "\fBplatform set auto\fR" 4
+.IX Item "platform set auto"
+.PD
 \&\f(CW\*(C`platform list\*(C'\fR lists the TeX Live names of all the platforms
 (a.k.a. architectures), (\f(CW\*(C`i386\-linux\*(C'\fR, ...) available at the package
 repository.
-.PP
+.Sp
 \&\f(CW\*(C`platform add\*(C'\fR \fIplatform\fR... adds the executables for each given platform
 \&\fIplatform\fR to the installation from the repository.
-.PP
+.Sp
 \&\f(CW\*(C`platform remove\*(C'\fR \fIplatform\fR... removes the executables for each given 
 platform \fIplatform\fR from the installation, but keeps the currently 
 running platform in any case.
-.PP
+.Sp
 \&\f(CW\*(C`platform set\*(C'\fR \fIplatform\fR switches TeX Live to always use the given
 platform instead of auto detection.
-.PP
+.Sp
 \&\f(CW\*(C`platform set auto\*(C'\fR switches TeX Live to auto detection mode for platform.
-.PP
+.Sp
 Platform detection is needed to select the proper \f(CW\*(C`xz\*(C'\fR, \f(CW\*(C`xzdec\*(C'\fR and 
 \&\f(CW\*(C`wget\*(C'\fR binaries that are shipped with TeX Live.
-.PP
+.Sp
 \&\f(CW\*(C`arch\*(C'\fR is a synonym for \f(CW\*(C`platform\*(C'\fR.
-.PP
+.Sp
 Options:
+.RS 4
 .IP "\fB\-\-dry\-run\fR" 4
 .IX Item "--dry-run"
 Nothing is actually installed; instead, the actions to be performed are
 written to the terminal.
-.SS "postaction [\-\-w32mode=user|admin] [\-\-fileassocmode=1|2] [\-\-all] [install|remove] [shortcut|fileassoc|script] [\fIpkg\fP]..."
-.IX Subsection "postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [pkg]..."
+.RE
+.RS 4
+.RE
+.SS "postaction"
+.IX Subsection "postaction"
+.IP "\fBpostaction [\f(BIoption\fB...] install [shortcut|fileassoc|script] [\f(BIpkg\fB...]\fR" 4
+.IX Item "postaction [option...] install [shortcut|fileassoc|script] [pkg...]"
+.PD 0
+.IP "\fBpostaction [\f(BIoption\fB...] remove [shortcut|fileassoc|script] [\f(BIpkg\fB...]\fR" 4
+.IX Item "postaction [option...] remove [shortcut|fileassoc|script] [pkg...]"
+.PD
 Carry out the postaction \f(CW\*(C`shortcut\*(C'\fR, \f(CW\*(C`fileassoc\*(C'\fR, or \f(CW\*(C`script\*(C'\fR given
 as the second required argument in install or remove mode (which is the
 first required argument), for either the packages given on the command
 line, or for all if \f(CW\*(C`\-\-all\*(C'\fR is given.
-.PP
+.Sp
+Options:
+.RS 4
+.IP "\fB\-\-w32mode=[user|admin]\fR" 4
+.IX Item "--w32mode=[user|admin]"
 If the option \f(CW\*(C`\-\-w32mode\*(C'\fR is given the value \f(CW\*(C`user\*(C'\fR, all actions will
 only be carried out in the user-accessible parts of the
 registry/filesystem, while the value \f(CW\*(C`admin\*(C'\fR selects the system-wide
 parts of the registry for the file associations.  If you do not have
 enough permissions, using \f(CW\*(C`\-\-w32mode=admin\*(C'\fR will not succeed.
-.PP
+.IP "\fB\-\-fileassocmode=[1|2]\fR" 4
+.IX Item "--fileassocmode=[1|2]"
 \&\f(CW\*(C`\-\-fileassocmode\*(C'\fR specifies the action for file associations.  If it is
 set to 1 (the default), only new associations are added; if it is set to
 2, all associations are set to the TeX Live programs.  (See also
 \&\f(CW\*(C`option fileassocs\*(C'\fR.)
+.IP "\fB\-\-all\fR" 4
+.IX Item "--all"
+Carry out the postactions for all packages
+.RE
+.RS 4
+.RE
 .SS "print-platform"
 .IX Subsection "print-platform"
 Print the TeX Live identifier for the detected platform
@@ -986,8 +1049,8 @@ Print the TeX Live identifier for the detected platform
 .IX Subsection "print-platform-info"
 Print the TeX Live platform identifier, \s-1TL\s0 platform long name, and
 original output from guess.
-.SS "remove [\fIoption\fP]... \fIpkg\fP..."
-.IX Subsection "remove [option]... pkg..."
+.SS "remove [\fIoption\fP...] \fIpkg\fP..."
+.IX Subsection "remove [option...] pkg..."
 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
@@ -1060,24 +1123,31 @@ given on the command line, not keeping previous settings
 .Sp
 In all cases, one of the repositories must be tagged as \f(CW\*(C`main\*(C'\fR;
 otherwise, all operations will fail!
-.SS "restore [\-\-json] [\-\-backupdir \fIdir\fP] [\-\-all | \fIpkg\fP [\fIrev\fP]]"
-.IX Subsection "restore [--json] [--backupdir dir] [--all | pkg [rev]]"
+.SS "restore"
+.IX Subsection "restore"
+.IP "\fBrestore [\f(BIoption\fB...] \f(BIpkg\fB [\f(BIrev\fB]\fR" 4
+.IX Item "restore [option...] pkg [rev]"
+.PD 0
+.IP "\fBrestore [\f(BIoption\fB...] \-\-all\fR" 4
+.IX Item "restore [option...] --all"
+.PD
 Restore a package from a previously-made backup.
-.PP
+.Sp
 If \f(CW\*(C`\-\-all\*(C'\fR is given, try to restore the latest revision of all 
 package backups found in the backup directory.
-.PP
+.Sp
 Otherwise, if neither \fIpkg\fR nor \fIrev\fR are given, list the available
 backup revisions for all packages.  With \fIpkg\fR given but no \fIrev\fR,
 list all available backup revisions of \fIpkg\fR.
-.PP
+.Sp
 When listing available packages, \f(CW\*(C`tlmgr\*(C'\fR shows the revision, and in
 parenthesis the creation time if available (in format yyyy-mm-dd hh:mm).
-.PP
+.Sp
 If (and only if) both \fIpkg\fR and a valid revision number \fIrev\fR are
 specified, try to restore the package from the specified backup.
-.PP
+.Sp
 Options:
+.RS 4
 .IP "\fB\-\-all\fR" 4
 .IX Item "--all"
 Try to restore the latest revision of all package backups found in the
@@ -1100,19 +1170,25 @@ When listing backups, the option \f(CW\*(C`\-\-json\*(C'\fR turn on \s-1JSON\s0
 The format is an array of \s-1JSON\s0 objects (\f(CW\*(C`name\*(C'\fR, \f(CW\*(C`rev\*(C'\fR, \f(CW\*(C`date\*(C'\fR).
 For details see \f(CW\*(C`tlpkg/doc/JSON\-formats.txt\*(C'\fR, format definition: \f(CW\*(C`TLBACKUPS\*(C'\fR.
 If both \f(CW\*(C`\-\-json\*(C'\fR and \f(CW\*(C`\-\-data\*(C'\fR are given, \f(CW\*(C`\-\-json\*(C'\fR takes precedence.
-.SS "search [\fIoption\fP...] \fIwhat\fP"
-.IX Subsection "search [option...] what"
-\fIsearch [\fIoption\fI...] \-\-file \fIwhat\fI\fR
-.IX Subsection "search [option...] --file what"
-.PP
-\fIsearch [\fIoption\fI...] \-\-all \fIwhat\fI\fR
-.IX Subsection "search [option...] --all what"
-.PP
+.RE
+.RS 4
+.RE
+.SS "search"
+.IX Subsection "search"
+.IP "\fBsearch [\f(BIoption\fB...] \f(BIwhat\fB\fR" 4
+.IX Item "search [option...] what"
+.PD 0
+.IP "\fBsearch [\f(BIoption\fB...] \-\-file \f(BIwhat\fB\fR" 4
+.IX Item "search [option...] --file what"
+.IP "\fBsearch [\f(BIoption\fB...] \-\-all \f(BIwhat\fB\fR" 4
+.IX Item "search [option...] --all what"
+.PD
 By default, search the names, short descriptions, and long descriptions
 of all locally installed packages for the argument \fIwhat\fR, interpreted
 as a (Perl) regular expression.
-.PP
+.Sp
 Options:
+.RS 4
 .IP "\fB\-\-file\fR" 4
 .IX Item "--file"
 List all filenames containing \fIwhat\fR.
@@ -1129,6 +1205,9 @@ Restrict the search of package names and descriptions (but not
 filenames) to match only full words.  For example, searching for
 \&\f(CW\*(C`table\*(C'\fR with this option will not output packages containing the word
 \&\f(CW\*(C`tables\*(C'\fR (unless they also contain the word \f(CW\*(C`table\*(C'\fR on its own).
+.RE
+.RS 4
+.RE
 .SS "shell"
 .IX Subsection "shell"
 Starts an interactive mode, where tlmgr prompts for commands. This can
@@ -1183,8 +1262,8 @@ Synonym for info.
 .SS "uninstall"
 .IX Subsection "uninstall"
 Synonym for remove.
-.SS "update [\fIoption\fP]... [\fIpkg\fP]..."
-.IX Subsection "update [option]... [pkg]..."
+.SS "update [\fIoption\fP...] [\fIpkg\fP]..."
+.IX Subsection "update [option...] [pkg]..."
 Updates the packages given as arguments to the latest version available
 at the installation source.  Either \f(CW\*(C`\-\-all\*(C'\fR or at least one \fIpkg\fR name
 must be specified.  Options:
@@ -2013,4 +2092,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 47254 2018\-04\-02 23:13:43Z karl $
+\&\f(CW$Id:\fR tlmgr.pl 47278 2018\-04\-04 00:30:22Z preining $
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index bb8fcd62ff9..79ea16e6458 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf