doc

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

3 files changed, 17 insertions, 9 deletions

diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index bcf764ae183..ec2161d9c09 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -6,9 +6,11 @@ Karl Berry, 2010.)
 choosing. In this order:
   <ol>
   <li>If the environment variable <tt>TEXLIVE_DOWNLOADER</tt> is
-      defined, use it; abort on failure if it doesn't work.
+      defined, use it; abort if the specified program doesn't work.
+      Possible values: <tt>curl</tt>, <tt>wget</tt>.
   <li>If the environment variable <tt>TL_DOWNLOAD_PROGRAM</tt> is
-      defined, use it; abort on failure if it doesn't work.
+      defined (can be any value), use it together with
+      <tt>TL_DOWNLOAD_ARGS</tt>; abort if it doesn't work.
   <li>If LWP is available and working, use that (by far the most
       efficient method, as it supports persistent downloads).
   <li>If curl is available (from the system) and working, use that.
@@ -22,7 +24,8 @@ choosing. In this order:
   intermediate rollback containers were always created with xz. Now:
   <ol>
   <li>If the environment variable <tt>TEXLIVE_COMPRESSOR</tt> is
-      defined, use it; abort on failure if it doesn't work.
+      defined, use it; abort if it doesn't work. Possible values:
+      <tt>lz4</tt>, <tt>gzip</tt>, <tt>xz</tt>.
   <li>If lz4 is available (either from the system or TL) and working, use that.
   <li>If gzip is available (from the system) and working, use that.
   <li>If xz is available (either from the system or TL) and working, use that.
@@ -35,7 +38,7 @@ choosing. In this order:
   repository of the form <tt>user@machine:/path/to/tlnet</tt> is now
   supported; the url-like forms
   <tt>scp://user@machine/path/to/tlnet</tt> and
-  <tt>scp://user@machine/path/to/tlnet</tt> are equivalent. ssh-agent
+  <tt>ssh://user@machine/path/to/tlnet</tt> are equivalent. ssh-agent
   is strongly recommended!
 
 <p><b>tlmgr 47303 (released 14apr18):</b>
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 6209b028841..1033d4c106f 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2324,6 +2324,9 @@ gives the TeX Live platform name, used as the extension on our
 executables.  If a program is not present in the TeX Live tree, we also
 check along PATH (without the platform extension.)
 
+Check many different downloads and compressors to determine what is
+working.
+
 Return 0 if failure, nonzero if success.
 
 =cut
@@ -2573,13 +2576,14 @@ Try to download the file given in C<$relpath> from C<$TeXLiveURL>
 into C<$destination>, which can be either
 a filename of simply C<|>. In the latter case a file handle is returned.
 
-Downloading honors two environment variables: C<TL_DOWNLOAD_PROGRAM> and
-C<TL_DOWNLOAD_ARGS>. The former overrides the above specification
-devolving to C<wget>, and the latter overrides the default wget
-arguments.
+Downloading first checks for the environment variable C<TL_DOWNLOADER>,
+which takes various built-in values. If not set, the next check is fr
+C<TL_DOWNLOAD_PROGRAM> and C<TL_DOWNLOAD_ARGS>. The former overrides the
+above specification devolving to C<wget>, and the latter overrides the
+default wget arguments.
 
 C<TL_DOWNLOAD_ARGS> must be defined so that the file the output goes to
-is the first argument after the C<TL_DOWNLOAD_ARGS>.  Thus, typically it
+is the first argument after the C<TL_DOWNLOAD_ARGS>.  Thus, for wget it
 would end in C<-O>.  Use with care.
 
 =cut
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8c96208ee41..77050c585c7 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1741,6 +1741,7 @@ $standardtex
  'luapackageloader', '\.lua|' . $standardtex,
  'luatexko',    '\.lua|' . $standardtex,
  'luatodonotes','\.lua|' . $standardtex, 
+ 'luavlna',	'luavlna.*\.lua|' . $standardtex, 
  'luaxml',      '\.lua|' . $standardtex,
  'lyluatex',	'\.sty',	# not *.cls
  'magyar',      'NULL',  # do not install in runtime, conflicts with babel