never use perldoc on w32

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

1 files changed, 11 insertions, 11 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index d67f5f5599a..b721173b8f8 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -130,15 +130,15 @@ if (!defined($action) && !$opt_help) {
   die "$0: missing action; try --help if you need it.\n";
 }
 
-# Often Windows will not have perldoc, but some Unix-based
-# installations may lack it also.  We want to use it if we have it, to
-# get ASCII emphasis.
 if ($opt_help) {
-  if (TeXLive::TLUtils::which("perldoc")) {
-    pod2usage(-exitstatus => 0, -verbose => 2);
-  } else {
-    pod2usage(-exitstatus => 0, -verbose => 2, -noperldoc => 1);
-  }
+  # perldoc does ASCII emphasis on the output, so it's nice to use it.
+  # But not all Unix platforms have it, and on Windows our Config.pm
+  # can apparently interfere, so always skip it there.
+  my @noperldoc = ();
+  if (win32() || ! TeXLive::TLUtils::which("perldoc")) {
+    @noperldoc = ("-noperldoc", "1");
+  }
+  pod2usage("-exitstatus" => 0, "-verbose" => 2, @noperldoc);
 }
 
 # besides doing normal logging if -logfile is specified, we try to log
@@ -2567,9 +2567,9 @@ written to the terminal.  This is a more detailed report than C<--list>.
 
 =item B<--force>
 
-If updates to the tlmgr itself (and the underlying infrastructure) are 
-present tlmgr will bail out and not perform the update unless this option
-is given (or B<--list> is given).
+If updates to tlmgr itself (that is, the infrastructure packages) are
+present, tlmgr will not perform the update unless this option (or
+C<--list>) is given.
 
 =item B<--no-remove>