doc updates, force CPU=i386 (from Jukka Salmi, mail to karl 13 Aug 2009 01:12:49)

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

2 files changed, 11 insertions, 12 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 31e7b5d65bd..af672f8aa99 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -663,7 +663,7 @@ sub handle_execute_actions {
 #   unless --force given
 #
 # tlmgr remove --no-depends-at-all foo bar baz
-#   willabsolutely only install foo bar baz not even taking .ARCH into
+#   will absolutely only install foo bar baz not even taking .ARCH into
 #   account
 #
 sub action_remove {
@@ -948,7 +948,7 @@ sub action_show {
   return;
 }
 
-#  SYMLINKS
+#  PATH
 #
 sub action_path {
   my $what = shift @ARGV;
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index af41e4d73b2..03a695eee03 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -172,20 +172,19 @@ Windows and we set the global variable C<$::_platform_> to C<win32>.
 Otherwise we call C<config.guess>.  The output of C<config.guess>
 is filtered as described below.
 
-CPU type is determined by a regexp.  And it's necessary to
-C<s/i.86/i386/>.
+CPU type is determined by a regexp, and any C</^i.86/> name is replaced
+by C<i386>.
 
-For OS we need a list because we probably have something like
-C<linux-gnu> but we need C<linux>.  This list might/should contain OSs
-which are not currently supported.  The list currently supports all
-platforms supported by TeX Live 2007 plus Cygwin.
+For OS we need a list because what's returned is not likely to match our
+historical names, e.g., C<config.guess> returns C<linux-gnu> but we need
+C<linux>.  This list might/should contain OSs which are not currently
+supported.
 
 If a particular platform is not found in this list we use the regexp
 C</.*-(.*$)/> as a last resort and hope it provides something useful.
 
-The result is stored in a global variable C<$::_platform_>.  If you call
-C<platform> repeatedly, only the first call of C<platform> will access
-the HD/CD/DVD.
+The result is stored in a global variable C<$::_platform_>, and
+subsequent calls just return that value.
 
 =cut
 
@@ -219,7 +218,7 @@ sub platform {
       if ($OS eq "darwin") {
         $CPU = "universal"; # TL provides universal binaries
       } elsif ($CPU =~ /^i.86$/) {
-        $CPU =~ s/i.86/i386/;
+        $CPU =~ "i386";  # 586, 686, whatever
       }
       unless (defined $OS) {
         ($OS = $guessed_platform) =~ s/.*-(.*)/$1/;