tl-update-auto

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

2 files changed, 41 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.1 b/Master/texmf-dist/doc/man/man1/tlmgr.1
index 847836e7978..fe112943068 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.1
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.1
@@ -744,24 +744,30 @@ The \f(CW\*(C`remove\*(C'\fR argument requires a key id and removes the requeste
 from the local keyring.
 .SS "option"
 .IX Subsection "option"
-.IP "\fBoption [show]\fR" 4
-.IX Item "option [show]"
+.IP "\fBoption [\-\-json] [show]\fR" 4
+.IX Item "option [--json] [show]"
 .PD 0
-.IP "\fBoption showall\fR" 4
-.IX Item "option showall"
+.IP "\fBoption [\-\-json] showall\fR" 4
+.IX Item "option [--json] showall"
 .IP "\fBoption \f(BIkey\fB [\f(BIvalue\fB]\fR" 4
 .IX Item "option key [value]"
 .PD
 .PP
-The first form shows the global TeX Live settings currently saved in the
-\&\s-1TLPDB\s0 with a short description and the \f(CW\*(C`key\*(C'\fR used for changing it in
-parentheses.
+The first form, \f(CW\*(C`show\*(C'\fR, shows the global TeX Live settings currently
+saved in the \s-1TLPDB\s0 with a short description and the \f(CW\*(C`key\*(C'\fR used for
+changing it in parentheses.
 .PP
-The second form is similar, but also shows options which can be defined
-but are not currently set to any value.
+The second form, \f(CW\*(C`showall\*(C'\fR, is similar, but also shows options which
+can be defined but are not currently set to any value.
 .PP
-In the third form, if \fIvalue\fR is not given, the setting for \fIkey\fR is
-displayed.  If \fIvalue\fR is present, \fIkey\fR is set to \fIvalue\fR.
+Both \f(CW\*(C`show...\*(C'\fR forms take an option \f(CW\*(C`\-\-json\*(C'\fR, which dumps the option
+information in \s-1JSON\s0 format.  In this case, both forms dump the same
+data. For the format of the \s-1JSON\s0 output see
+\&\f(CW\*(C`tlpkg/doc/JSON\-formats.txt\*(C'\fR, format definition \f(CW\*(C`TLOPTION\*(C'\fR.
+.PP
+In the third form, with \fIkey\fR, if \fIvalue\fR is not given, the setting
+for \fIkey\fR is displayed.  If \fIvalue\fR is present, \fIkey\fR is set to
+\&\fIvalue\fR.
 .PP
 Possible values for \fIkey\fR are (run \f(CW\*(C`tlmgr option showall\*(C'\fR for
 the definitive list):
@@ -792,21 +798,22 @@ get further updates from the Internet, after originally installing from
 .PP
 The \f(CW\*(C`install\-tl\*(C'\fR documentation has more information about the possible
 values for \f(CW\*(C`repository\*(C'\fR.  (For backward compatibility, \f(CW\*(C`location\*(C'\fR can
-be used as alternative name for \f(CW\*(C`repository\*(C'\fR.)
+be used as a synonym for \f(CW\*(C`repository\*(C'\fR.)
 .PP
 If \f(CW\*(C`formats\*(C'\fR is set (this is the default), then formats are regenerated
 when either the engine or the format files have changed.  Disable this
-only when you know what you are doing.
+only when you know how and want to regenerate formats yourself.
 .PP
 The \f(CW\*(C`postcode\*(C'\fR option controls execution of per-package
 postinstallation action code.  It is set by default, and again disabling
-is not likely to be of interest except perhaps to developers.
+is not likely to be of interest except to developers doing debugging.
 .PP
 The \f(CW\*(C`docfiles\*(C'\fR and \f(CW\*(C`srcfiles\*(C'\fR options control the installation of
-their respective files of a package. By default both are enabled (1).
-Either or both can be disabled (set to 0) if disk space is limited or
-for minimal testing installations, etc.  When disabled, the respective
-files are not downloaded at all.
+their respective file groups (documentation, sources; grouping is
+approximate) per package. By default both are enabled (1).  Either or
+both can be disabled (set to 0) if disk space is limited or for minimal
+testing installations, etc.  When disabled, the respective files are not
+downloaded at all.
 .PP
 The options \f(CW\*(C`autobackup\*(C'\fR and \f(CW\*(C`backupdir\*(C'\fR determine the defaults for
 the actions \f(CW\*(C`update\*(C'\fR, \f(CW\*(C`backup\*(C'\fR and \f(CW\*(C`restore\*(C'\fR.  These three actions
@@ -828,22 +835,21 @@ To setup \f(CW\*(C`autobackup\*(C'\fR to \f(CW\*(C`\-1\*(C'\fR on the command li
 \&  tlmgr option \-\- autobackup \-1
 .Ve
 .PP
-The \f(CW\*(C`\-\-\*(C'\fR avoids having the \f(CW\*(C`\-1\*(C'\fR treated as an option.  (\f(CW\*(C`\-\-\*(C'\fR stops
-parsing for options at the point where it appears; this is a general
-feature across most Unix programs.)
-.PP
-The \f(CW\*(C`sys_bin\*(C'\fR, \f(CW\*(C`sys_man\*(C'\fR, and \f(CW\*(C`sys_info\*(C'\fR options are used on
-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 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.
+The \f(CW\*(C`\-\-\*(C'\fR avoids having the \f(CW\*(C`\-1\*(C'\fR treated as an option.  (The \f(CW\*(C`\-\-\*(C'\fR
+stops parsing for options at the point where it appears; this is a
+general feature across most Unix programs.)
+.PP
+The \f(CW\*(C`sys_bin\*(C'\fR, \f(CW\*(C`sys_man\*(C'\fR, and \f(CW\*(C`sys_info\*(C'\fR options are used on Unix
+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 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
@@ -2021,4 +2027,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 45788 2017\-11\-14 00:49:39Z karl $
+\&\f(CW$Id:\fR tlmgr.pl 45806 2017\-11\-14 21:16:47Z karl $
diff --git a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
index f4ca0c802db..f459830f513 100644
--- a/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/tlmgr.man1.pdf