summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-13 23:29:25 +0000
committerKarl Berry <karl@freefriends.org>2016-04-13 23:29:25 +0000
commitcf982311824934d7400d56ab07c93e8556de4592 (patch)
treec4a913ae5c91e421b0f4afba335ff73213380a31
parent4f1866f03ec88d94b78ca954bd3f3b7b40ed168b (diff)
wording, doc
git-svn-id: svn://tug.org/texlive/trunk@40495 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl10
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl4
2 files changed, 8 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 238919c9e99..0574f527235 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -500,7 +500,9 @@ if ($opt_profile eq "") {
# The "make Karl happy" case, check that we are not running install-tl
# from the same tree where tlmgr is hanging around
my $install_tl_root = abs_path($::installerdir);
- my $tlpdboldpath = "$dn/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName";
+ my $tlpdboldpath
+ = $dn .
+ "/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName";
if (-r $tlpdboldpath && $dn ne $install_tl_root) {
debug ("found old installation in $dn\n");
push @runargs, "-old-installation-found=$dn";
@@ -2401,9 +2403,9 @@ LWP and persistent connections, use C<--no-persistent-downloads>.
=item B<--no-verify-downloads>
-By default, if a GnuPG C<gpg> binary is found in the path, downloads are
-verified against a cryptographic signature. This option allows to
-disable it.
+By default, if a GnuPG C<gpg> binary is found in PATH, downloads are
+verified against a cryptographic signature. This option disables
+such verification.
=item B<-portable>
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index dd70436f1b6..586bcbb69ed 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -281,7 +281,7 @@ sub binary_menu {
}
other_options qw(- + R Q diskspace);
- my $answer = prompt 'Enter letter(s) to select platforms';
+ my $answer = prompt 'Enter letter(s) to (de)select platforms';
my @keystrokes=string_to_list $answer;
@@ -435,7 +435,7 @@ sub collection_menu {
##</cols=1>
other_options qw(- + R Q diskspace);
- my $answer = prompt 'Enter letter(s) to select collection(s)';
+ my $answer = prompt 'Enter letter(s) to (de)select collection(s)';
my @keystrokes=string_to_list $answer;