doc,sync

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

3 files changed, 37 insertions, 39 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 6ba987e36b0..9367edccc69 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -9459,32 +9459,32 @@ The allowed keys are:
 
 =over 4
 
-=item C<auto-remove>, value 0 or 1 (default 1), same as command-line
+=item C<auto-remove => 0 or 1 (default 1), same as command-line
 option.
 
-=item C<gui-expertmode>, value 0 or 1 (default 1).
+=item C<gui-expertmode => 0 or 1 (default 1).
 This switches between the full GUI and a simplified GUI with only the
 most common settings.
 
-=item C<gui-lang> I<llcode>, with a language code value as with the
+=item C<gui-lang => I<llcode>, with a language code value as with the
 command-line option.
 
-=item C<no-checksums>, value 0 or 1 (default 0, see below).
+=item C<no-checksums => 0 or 1 (default 0, see below).
 
-=item C<persistent-downloads>, value 0 or 1 (default 1), same as
+=item C<persistent-downloads => 0 or 1 (default 1), same as
 command-line option.
 
-=item C<require-verification>, value 0 or 1 (default 0), same as
+=item C<require-verification => 0 or 1 (default 0), same as
 command-line option.
 
-=item C<tkfontscale>, value any float.
-Controls the scaling of fonts in the Tk based frontends.
+=item C<tkfontscale => I<floating-point number> (default 1.0);
+scaling factor for fonts in the Tk-based frontends.
 
-=item C<update-exclude>, value: comma-separated list of packages
-(no space allowed). Same as the command line option C<--exclude>
-for the action C<update>.
+=item C<update-exclude => I<comma-separated list of packages>
+(no spaces allowed). Same as the command line option C<--exclude>
+for the C<update> action.
 
-=item C<verify-downloads>, value 0 or 1 (default 1), same as
+=item C<verify-downloads => 0 or 1 (default 1), same as
 command-line option.
 
 =back
@@ -9493,32 +9493,29 @@ The system-wide config file can contain one additional key:
 
 =over 4
 
-=item C<allowed-actions> I<action1> [,I<action>,...]
-The value is a comma-separated list of C<tlmgr> actions which are
-allowed to be executed when C<tlmgr> is invoked in system mode (that is,
-without C<--usermode>).
-
-This allows distributors to include the C<tlmgr> in their packaging, but
-allow only a restricted set of actions that do not interfere with their
-distro package manager.  For native TeX Live installations, it doesn't
-make sense to set this.
+=item C<allowed-actions => I<action1>[,I<action2>,...]
+The value is a comma-separated list (no spaces) of C<tlmgr> actions
+which are allowed to be executed when C<tlmgr> is invoked in system mode
+(that is, without C<--usermode>). This allows distributors to include
+C<tlmgr> in their packaging, but allow only a restricted set of actions
+that do not interfere with their distro package manager. For native TeX
+Live installations, it doesn't make sense to set this.
 
 =back
 
-The C<no-checksums> key needs more explanation.  By default, package
-checksums computed and stored on the server (in the TLPDB) are compared
-to checksums computed locally after downloading.  C<no-checksums>
-disables this process.
-
-The checksum algorithm is SHA-512.  Your system must have one of (looked
-for in this order) the Perl C<Digest::SHA> module, the C<openssl>
-program (L<https://openssl.org>), the C<sha512sum> program (from GNU
-Coreutils, L<https://www.gnu.org/software/coreutils>), or finally the
-C<shasum> program (just to support old Macs).  If none of these are
-available, a warning is issued and C<tlmgr> proceeds without checking
-checksums.  (Incidentally, other SHA implementations, such as the pure
-Perl and pure Lua modules, are much too slow to be usable in our
-context.)  C<no-checksums> avoids the warning.
+Finally, the C<no-checksums> key needs more explanation. By default,
+package checksums computed and stored on the server (in the TLPDB) are
+compared to checksums computed locally after downloading.
+C<no-checksums> disables this process. The checksum algorithm is
+SHA-512. Your system must have one of (looked for in this order) the
+Perl C<Digest::SHA> module, the C<openssl> program
+(L<https://openssl.org>), the C<sha512sum> program (from GNU Coreutils,
+L<https://www.gnu.org/software/coreutils>), or finally the C<shasum>
+program (just to support old Macs). If none of these are available, a
+warning is issued and C<tlmgr> proceeds without checking checksums.
+C<no-checksums> avoids the warning. (Incidentally, other SHA
+implementations, such as the pure Perl and pure Lua modules, are much
+too slow to be usable in our context.)
 
 =head1 CRYPTOGRAPHIC VERIFICATION
 
@@ -9653,7 +9650,6 @@ just as in normal mode.
 
 In user mode, these actions operate only on the user tree's
 configuration files and/or C<texlive.tlpdb>.
-creates configuration files in user tree
 
 =head1 MULTIPLE REPOSITORIES
 
diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx
index 845144a1e6a..256b7f66bbc 100755
--- a/Master/tlpkg/bin/c2lx
+++ b/Master/tlpkg/bin/c2lx
@@ -29,7 +29,8 @@ elif test "x$1" = x3; then
   pkgs="l3kernel l3packages l3experimental l3build l3backend"
 elif test "x$1" = xjxu; then
   shift; label=jxu
-  pkgs="beaulivre colorist einfart lebhart minimalist simplivre"
+  pkgs="beaulivre colorist einfart lebhart mindflow minimalist"
+  pkgs="$pkgs projlib simplivre"
 else
   echo "$0: unknown latex or group type: $1 (one of: e dev 3 jxu)" >&2
   exit 1
diff --git a/Master/tlpkg/bin/tl-check-fmtshare b/Master/tlpkg/bin/tl-check-fmtshare
index 593b2205a2b..e8e9297b375 100755
--- a/Master/tlpkg/bin/tl-check-fmtshare
+++ b/Master/tlpkg/bin/tl-check-fmtshare
@@ -272,8 +272,9 @@ for fmt in $fmts; do
   echo "$0: running on $remotesys: $remotecmd" >$rfot
   ssh -n $remotesys "$remotecmd" </dev/null >>$rfot 2>&1
   if test $? -ne 0; then
-    echo "$0: fmt load failed on $remotesys: $fmt" >&2
-    echo "$0: see transcript: $rfot" >&2
+    echo "$0: *** fmt load failed on $remotesys: $fmt" >&2
+    echo "$0: *** see transcript: $rfot" >&2
+    cat $rfot >&2
     exit 1
   else
     echo "$0: fmt load ok on $remotesys: $fmt"