summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-09 01:15:14 +0000
committerKarl Berry <karl@freefriends.org>2010-01-09 01:15:14 +0000
commit7cd0f845c957c591ad6d4443831ba9fa29a686ca (patch)
treea45137c5ef5c9387fa833306ce64c76d6ebe5367 /Master/texmf
parent43f08b017db5addf1e5620f5cddc262d21bfc43c (diff)
wording
git-svn-id: svn://tug.org/texlive/trunk@16644 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl33
1 files changed, 19 insertions, 14 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 332a4910846..bc1894d7a0d 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -390,7 +390,7 @@ sub execute_action {
my $mothership = $1;
my $mothertlp = $localtlpdb->get_package($mothership);
if (!defined($mothertlp)) {
- tlwarn("We are trying to add ${type} files to a not existing package $mothership!\n");
+ tlwarn("We are trying to add ${type} files to a nonexistent package $mothership!\n");
tlwarn("Trying to continue!\n");
# the best we can do is rename that package to $mothername and add it!
$tlpobj->name($mothership);
@@ -581,7 +581,7 @@ sub handle_execute_actions
# here we check whether an engine is updated
my %foo = %{$::execute_actions{'enable'}{'formats'}{$m}};
if (!defined($foo{'name'}) || !defined($foo{'engine'})) {
- tlwarn("Very strange error, please report " . %foo);
+ tlwarn("tlmgr: Very strange error, please report ", %foo);
} else {
$format_to_engine{$m} = $foo{'engine'};
if ($foo{'name'} eq $foo{'engine'}) {
@@ -986,7 +986,7 @@ sub action_show {
sub action_path {
my $what = shift @ARGV;
if (!defined($what) || ($what !~ m/^(add|remove)$/i)) {
- tlwarn("action path needs one argument, either add or remove\n");
+ tlwarn("tlmgr: action path needs one argument, either add or remove\n");
return;
}
init_local_db();
@@ -1140,8 +1140,8 @@ sub action_restore {
my $ob = abs_path($opts{"backupdir"});
$ob && ($opts{"backupdir"} = $ob);
if (! -d $opts{"backupdir"}) {
- tlwarn ("backupdir argument $opts{'backupdir'} is not a directory.\n");
- tlwarn ("Don't know from where to restore backups, terminating.\n");
+ tlwarn ("tlmgr: backupdir argument $opts{'backupdir'} is not a directory.\n");
+ tlwarn ("Don't know from where to restore backups, goodbye.\n");
exit 1;
}
} else {
@@ -3002,12 +3002,13 @@ sub action_generate {
}
if ($opts{"rebuild-sys"}) {
if ($ldat =~ m/^[[:space:]]*$/) {
- tlwarn("Cannot find language.dat, not updating formats based on it.\n");
+ tlwarn("Cannot find language.dat, not updating formats using it.\n");
} else {
do_cmd_and_check("fmtutil-sys --byhyphen $ldat");
}
} else {
- info("To make the newly-generated language.dat take effect, run fmtutil-sys --byhyphen $ldat.\n");
+ info("To make the newly-generated language.dat take effect,"
+ . " run fmtutil-sys --byhyphen $ldat.\n");
}
}
if ($what =~ m/^language(\.def)?$/i) {
@@ -3017,12 +3018,13 @@ sub action_generate {
TeXLive::TLUtils::create_language_def($localtlpdb, $dest, $localconf);
if ($opts{"rebuild-sys"}) {
if ($ldef =~ m/^[[:space:]]*$/) {
- tlwarn("Cannot find language.def, not updating formats based on it.\n");
+ tlwarn("Cannot find language.def, not updating formats using it.\n");
} else {
do_cmd_and_check("fmtutil-sys --byhyphen $ldef");
}
} else {
- info("To make the newly-generated language.def take effect, run fmtutil-sys --byhyphen $ldef.\n");
+ info("To make the newly-generated language.def take effect,"
+ . " run fmtutil-sys --byhyphen $ldef.\n");
}
}
@@ -3035,7 +3037,8 @@ sub action_generate {
if ($opts{"rebuild-sys"}) {
do_cmd_and_check("fmtutil-sys --all");
} else {
- info("To make the newly-generated fmtutil.cnf take effect, run fmtutil-sys --all.\n");
+ info("To make the newly-generated fmtutil.cnf take effect,"
+ . " run fmtutil-sys --all.\n");
}
} elsif ($what =~ m/^updmap$/i) {
@@ -3047,7 +3050,8 @@ sub action_generate {
if ($opts{"rebuild-sys"}) {
do_cmd_and_check("updmap-sys");
} else {
- info("To make the newly-generated updmap.cfg take effect, run updmap-sys.\n");
+ info("To make the newly-generated updmap.cfg take effect,"
+ . " run updmap-sys.\n");
}
} else {
@@ -5111,9 +5115,10 @@ C<fmtutil-sys --byhyphen .../language.dat> after C<generate language.dat>,
and
C<fmtutil-sys --byhyphen .../language.def> after C<generate language.def>.
-This is necessary to actually make the changes take effect.
-This is not done by default since those calls are lengthy processes and
-one might want to made several changes before running these programs.
+These subsequent calls cause the newly-generated files to actually take
+effect. This is not done by default since those calls are lengthy
+processes and one might want to made several related changes in
+succession before invoking these programs.
=back