reword a couple messages

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

2 files changed, 13 insertions, 14 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 1e412518a42..2b59c1b2331 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -3,11 +3,10 @@
 # 
 # Copyright 2007, 2008, 2009, 2010, 2011
 # Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg.
-#
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
-# Be careful when changing wording: Every normal informational message
+# Be careful when changing wording: *every* normal informational message
 # output here must be recognized by the long grep in tl-update-tlnet.
 #
 # TODO:
@@ -796,7 +795,7 @@ operations might be disturbed.\n\n";
   # Step 4: run the programs
 
   if (!$vars{'in_place'}) {
-    info("running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf\n");
+    info("running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf...\n");
     system('mktexlsr', "$TEXDIR/texmf-dist", "$TEXDIR/texmf");
   }
 
@@ -805,7 +804,7 @@ operations might be disturbed.\n\n";
   # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
   # the code from the various generate-*.pl scripts
 
-  info("writing fmtutil.cnf data to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
+  info("writing fmtutil.cnf to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
   TeXLive::TLUtils::create_fmtutil($usedtlpdb,
     "$TEXMFSYSVAR/web2c/fmtutil.cnf",
     "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
@@ -816,22 +815,22 @@ operations might be disturbed.\n\n";
     "$TEXMFSYSCONFIG/web2c/updmap.cfg",
     "$TEXMFLOCAL/web2c/updmap-local.cfg");
 
-  info("writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
+  info("writing language.dat to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
   TeXLive::TLUtils::create_language_dat($usedtlpdb,
     "$TEXMFSYSVAR/tex/generic/config/language.dat",
     "$TEXMFLOCAL/tex/generic/config/language-local.dat");
 
-  info("writing language.def data to $TEXMFSYSVAR/tex/generic/config/language.def\n");
+  info("writing language.def to $TEXMFSYSVAR/tex/generic/config/language.def\n");
   TeXLive::TLUtils::create_language_def($usedtlpdb,
     "$TEXMFSYSVAR/tex/generic/config/language.def",
     "$TEXMFLOCAL/tex/generic/config/language-local.def");
 
-  info("writing language.dat.lua data to $TEXMFSYSVAR/tex/generic/config/language.dat.lua\n");
+  info("writing language.dat.lua to $TEXMFSYSVAR/tex/generic/config/language.dat.lua\n");
   TeXLive::TLUtils::create_language_lua($usedtlpdb,
     "$TEXMFSYSVAR/tex/generic/config/language.dat.lua",
     "$TEXMFLOCAL/tex/generic/config/language-local.dat.lua");
 
-  info("running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG\n");
+  info("running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG...\n");
   system("mktexlsr", $TEXMFSYSVAR, $TEXMFSYSCONFIG);
 
   info("running updmap-sys...");
@@ -852,7 +851,7 @@ operations might be disturbed.\n\n";
   }
 
   # now rerun mktexlsr for updmap-sys and tlmgr paper letter updates.
-  info("re-running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG\n");
+  info("re-running mktexlsr $TEXMFSYSVAR $TEXMFSYSCONFIG...\n");
   system("mktexlsr", $TEXMFSYSVAR, $TEXMFSYSCONFIG);
 
   # luatex/context
@@ -1834,8 +1833,8 @@ sub welcome {
 
  See
    $::vars{'TEXDIR'}/index.html
- for links to documentation.  The TeX Live web site (http://tug.org/texlive/)
- contains updates and corrections.
+ for links to documentation.  The TeX Live web site
+ contains updates and corrections: http://tug.org/texlive.
 
  TeX Live is a joint project of the TeX user groups around the world;
  please consider supporting it by joining the group best for you. The
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index ae65da4d44c..5c78f5edcaf 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -138,9 +138,9 @@ unexpected_output=`cat install.log \
   | grep -Ev '^(re-)?running mktexlsr' \
   | grep -Ev '^mktexlsr: Updating ' \
   | grep -Ev '^mktexlsr: Done' \
-  | grep -Ev '^writing fmtutil.cnf data to' \
+  | grep -Ev '^writing fmtutil.cnf to' \
   | grep -Ev '^writing updmap.cfg to' \
-  | grep -Ev '^writing language.(dat|def|dat.lua) data to' \
+  | grep -Ev '^writing language.(dat|def|dat.lua) to' \
   | grep -Ev '^pre-generating all format file' \
   | grep -Ev '^making ConTeXt MkIV cache' \
   | grep -Ev '^running ' \
@@ -148,7 +148,7 @@ unexpected_output=`cat install.log \
   | grep -Ev '^finished ' \
   | grep -Ev '^ See' \
   | grep -Ev '^  .*/index.html' \
-  | grep -Ev '^ for links to documentati' \
+  | grep -Ev '^ for links to documentation' \
   | grep -Ev '^ contains updates' \
   | grep -Ev '^ TeX Live is a joint project of the TeX user groups' \
   | grep -Ev '^ please consider supporting it by joining the group b' \