Master/setuptl updates

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

13 files changed, 47 insertions, 45 deletions

diff --git a/Master/setuptl/TLPM/blng.pm b/Master/setuptl/TLPM/blng.pm
index f8940cc5705..ed087b0f322 100644
--- a/Master/setuptl/TLPM/blng.pm
+++ b/Master/setuptl/TLPM/blng.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # blng [-pf] <name>
diff --git a/Master/setuptl/TLPM/check.pm b/Master/setuptl/TLPM/check.pm
index b5273b8cd31..74fc45d66b4 100644
--- a/Master/setuptl/TLPM/check.pm
+++ b/Master/setuptl/TLPM/check.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # check [-pf]
diff --git a/Master/setuptl/TLPM/cmdl.pm b/Master/setuptl/TLPM/cmdl.pm
index b654736c471..93bc67497e0 100644
--- a/Master/setuptl/TLPM/cmdl.pm
+++ b/Master/setuptl/TLPM/cmdl.pm
@@ -1,10 +1,10 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # cmdline parsing
 
-# since I can't rely on windows shell behaviour, I make all the parsing 
-# on my own. some day I'd like to use native shell for u*x though...
+# Since I can't rely on windows shell behaviour, I make all the parsing 
+# on my own. Some day I'd like to use native shell for u*x, though.
 
 sub resolve_env # resolve environment variables
 {
diff --git a/Master/setuptl/TLPM/common.pm b/Master/setuptl/TLPM/common.pm
index 9f7770baa65..c3da31d5077 100644
--- a/Master/setuptl/TLPM/common.pm
+++ b/Master/setuptl/TLPM/common.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # common procedures; 
@@ -186,7 +186,7 @@ sub one_or_more
  'wrong_cmd'      => sub {$warning -> ("Unknown command '$_[0]'. Type '$_[1]'");     -13},
  'wrong_syn'      => sub {$warning -> ("Incorrect phrase '$_[0]'");                  -14},
  'wrong_reg'      => sub {$warning -> ("Incorrect expression '$_[0]'");              -15},
- 'not_supp'       => sub {$warning -> ("Sorry, $_[0] not yet supported");            -16}
+# 'not_supp'       => sub {$warning -> ("Sorry, $_[0] not yet supported");            -16}
 );
 
 # date handling
@@ -215,7 +215,7 @@ sub percent
 
 sub relax
 {
-      return; # not zero
+      return; # not zero!
 }
 
 1;
diff --git a/Master/setuptl/TLPM/constants.pm b/Master/setuptl/TLPM/constants.pm
index 6359e84cb05..e0ff1069127 100644
--- a/Master/setuptl/TLPM/constants.pm
+++ b/Master/setuptl/TLPM/constants.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # widely used constants
@@ -90,7 +90,7 @@ $reg_empty   = qr/\A\s*\z/o;
 $, = "\n";
 $| = 1;
 
-# formatting
+# message/log formatting
 
 $row_length = 80;
 $row_skip   = 42;
diff --git a/Master/setuptl/TLPM/help.pm b/Master/setuptl/TLPM/help.pm
index ec3b0a45b6e..b8dc62535a7 100644
--- a/Master/setuptl/TLPM/help.pm
+++ b/Master/setuptl/TLPM/help.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # help
@@ -38,28 +38,30 @@ Public Domain, P.Jackowski\@gust.org.pl",
 
 * About TLPM
 TLPM (TeX Live Package Manager) helps to search, trace dependencies, and 
-install TeX Live packages. It works with TeX Live 2004-2006. Initially, TLPM 
-was just my private Perl script for controlling the mass of TeX Live packages 
-repository. Since there were no win-installer on TeX Live 2004, TLPM became a 
-rescue solution. Starting from version 2.11, TLPM works, with some 
-restrictions, under Unix shells as well.
-
-Since there is no consistent versioning system withing TeX Live distribution, 
-TLPM does NOT support upgrades or downgrades, neither of packages, nor of the 
-entire distribution. TLPM fully relies on the information retrieved from the 
-TPM files (actually from text files stored in the 'texmf/lists' directory). 
-If you don't trust TPMs, do NOT trust TLPM either!
+install TeX Live packages. It works with TeX Live 2004, 2005, 2006/07 
+editions. Initially, TLPM was just my private Perl script for controlling the 
+mass of TeX Live packages repository. Since there were no win-installer on 
+TeX Live 2004, TLPM became a rescue solution. Starting from version 2.11, 
+TLPM works, with some restrictions, under Unix shells as well.
 
 All the configuration is beyond the scope of TLPM functionality. TLPM doesn't 
 perform any post-installation actions such as setting of environment 
 variables, building formats or updating fontmap files. All those actions are 
 accomplished by a pretty nice TLPMGUI front-end written by Tomek \\{}Luczak.
 
+Since there is no (not yet) consistent versioning system within TeX Live 
+distribution, TLPM does NOT support upgrades or downgrades, neither of 
+packages, nor of the entire distribution. TLPM fully relies on the 
+information retrieved from the TPM files (actually from text files stored in 
+the 'texmf/lists' directory). If you don't trust TPMs, do NOT trust TLPM 
+either!
+
 * Usage
-TLPM tries to detect the CD/DVD drive with TeX Live disk automagically. If 
-the magic fails, TLPM prompts to provide a mounting point, unless one use the 
-'--source' command-line option or the 'tl_source' environment variable (which 
-might be useful while installing from local hard drive resources).
+TLPM tries to detect the CD/DVD drive with TeX Live disk automagically (this 
+heuristic is performed not performed on Unix shells). If the magic fails, 
+TLPM prompts to provide a mounting point, unless one use the '--source' 
+command-line option or the 'tl_source' environment variable, which might be 
+useful while installing TeX Live from local hard drive resources.
 
 The target installation directory can be specified with the '--directory' 
 command-line option or the 'tl_target' environment variable. If both are 
@@ -82,7 +84,7 @@ TLPM is self documented -- 'help [<command>]' informs about usage details.
 TLPM respects quotations (both double quotes and single quotes) used in command
 line. Quotation is necessary while using path names with spaces (strongly not
 recommended!) or other strange characters that may conflict with the command
-syntax. If so, please quote the entire phrase. Whenever analysing the command,
+syntax. If so, please quote the entire phrase. Whenever analyzing the command,
 TLPM also resolves environment variables expressed as '%variable%' or '\$variable'.
 
 To ensure possibly similar behaviour for different platforms, TLPM interprets 
@@ -111,7 +113,7 @@ Bugs reports and comments are welcome (tlpmgui\@gust.org.pl)
 30.09.2005, 1.04 -- tiny changes in CD detection routine
 05.10.2005, 2.00 -- general rework; mostly in messaging system and installation;
                     now TLPM supports also TeX Live DVD (slooow...)
-06.10.2005, 2.01 -- again, changes in CD/DVD detction routine because of removing
+06.10.2005, 2.01 -- again, changes in CD/DVD detection routine because of removing
                     tlpm(gui) stuff from TL root directory
 08.10.2005, 2.02 -- bugfix; while removing standalone packages, uninstall
                     routine was performed twice
@@ -122,7 +124,7 @@ Bugs reports and comments are welcome (tlpmgui\@gust.org.pl)
 13.10.2005, 2.06 -- experimental progress info while installing from DVD
 14.10.2005, 2.07 -- progress info while installing from CD and DVD
                     and --quiet option for 'inst' command
-25.10.2005, 2.08 -- give up to with hanging on DVD instalation under Win98;
+25.10.2005, 2.08 -- give up to with hanging on DVD installation under Win98;
                     just note added
 26.10.2005, 2.09 -- yet another slight correction
 27.10.2005, 2.10 -- Karl confirmed that 'texlive2005' directory
@@ -130,14 +132,15 @@ Bugs reports and comments are welcome (tlpmgui\@gust.org.pl)
 19.03.2006, 2.11 -- some experimental rework; allows to extract binaries for other 
                     platforms, can work under Linux, prompts for source drive
                     or mounting point unless found automatically
-23.04.2006, 2.12 -- addedd installation from DVD support for Linux; still slow,
+23.04.2006, 2.12 -- added installation from DVD support for Linux; still slow,
                     as in Windows
 08.05.2006, 2.13 -- bugfix; changes 2.12 spoil installation from cd
 04.06.2006, 2.14 -- code commented
-07.01.2007, 2.15 -- help update for TL2006
+07.01.2007, 2.15 -- help update for TeX Live 2006/07 edition
 08.01.2007, 2.16 -- bugfix; typing 'version' command was causing a program crash;
                     there is no such a command available anymore; program version
                     is displayed in the banner and command prompt
+09.01.2007, 2.17 -- code comments, readme changes
 
 * Known issues
 1. Installation from DVD is much slower than from CD. Sorry...
@@ -162,8 +165,7 @@ Hardly reproducable...
 tlpm [platforms] [-s \<source\>] [-d \<target\>] [-b \<batch\>]
 
 DESCRIPTION:
-TLPM help searching for, installing and uninstalling TeX Live packages. It
-should be used in conjunction with the TeX Live 2004-2006 CD/DVD.
+TLPM help searching for, installing and uninstalling TeX Live packages.
 
 COMMANDS:
 list              list packages or files with names matching the given phrase
diff --git a/Master/setuptl/TLPM/incl.pm b/Master/setuptl/TLPM/incl.pm
index 909f0a6d069..fdf7601a7f3 100644
--- a/Master/setuptl/TLPM/incl.pm
+++ b/Master/setuptl/TLPM/incl.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # incl <pkg> [-pfer] <mask>
diff --git a/Master/setuptl/TLPM/info.pm b/Master/setuptl/TLPM/info.pm
index 7bafa216191..d9902491f31 100644
--- a/Master/setuptl/TLPM/info.pm
+++ b/Master/setuptl/TLPM/info.pm
@@ -1,8 +1,8 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # info <pkg>
-# retrieve package info from .tpm file
+# retrieve info about the paqckage from .tpm file
 
 sub info
 {
diff --git a/Master/setuptl/TLPM/inst.pm b/Master/setuptl/TLPM/inst.pm
index 896d50e8ad3..9aabd3a4174 100644
--- a/Master/setuptl/TLPM/inst.pm
+++ b/Master/setuptl/TLPM/inst.pm
@@ -1,4 +1,4 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # inst <pkg> [-jrou]
diff --git a/Master/setuptl/TLPM/list.pm b/Master/setuptl/TLPM/list.pm
index 3a8d24bfcdf..0721f47d7db 100644
--- a/Master/setuptl/TLPM/list.pm
+++ b/Master/setuptl/TLPM/list.pm
@@ -1,8 +1,8 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # list [-pfe] <mask>
-# display a list of packages matching <mask>
+# list packages matching <mask>
 
 sub list
 {
diff --git a/Master/setuptl/TLPM/pkg.pm b/Master/setuptl/TLPM/pkg.pm
index def04a44d21..1a969f355e5 100644
--- a/Master/setuptl/TLPM/pkg.pm
+++ b/Master/setuptl/TLPM/pkg.pm
@@ -1,7 +1,7 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
-# reading packages (internal functions)
+# packages handling
 
 # here the main work starts
 
diff --git a/Master/setuptl/TLPM/reg.pm b/Master/setuptl/TLPM/reg.pm
index ce59a7f27a6..c9cd74b4066 100644
--- a/Master/setuptl/TLPM/reg.pm
+++ b/Master/setuptl/TLPM/reg.pm
@@ -1,7 +1,7 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
-# regexpresions and masks related functions
+# regexp and mask related functions
 
 $chr_star = '*';
 $reg_star = qr/.*?/o;
diff --git a/Master/setuptl/TLPM/uninst.pm b/Master/setuptl/TLPM/uninst.pm
index b70982465ad..1f789e896fb 100644
--- a/Master/setuptl/TLPM/uninst.pm
+++ b/Master/setuptl/TLPM/uninst.pm
@@ -1,8 +1,8 @@
-# This file belongs to TLPM v2.16, TeX Live Package Manager
+# This file belongs to TLPM v2.17, TeX Live Package Manager
 # Public Domain, P.Jackowski@gust.org.pl
 
 # uninst <pkg> [-rjF] [dir]
-# remove given package respecting dependencies
+# uninstall given package respecting dependencies
 
 sub uninst
 {