doc changes

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

1 files changed, 15 insertions, 11 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 0ef2c5cb5f7..a3948cc50e0 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1084,27 +1084,31 @@ sub do_texmf_cnf {
       push @newtmf, $line;
     }
   }
+  my $TMF;
   if (!$vars{'from_dvd'}) {
-    open(TMF,">$vars{'TEXDIR'}/texmf.cnf")
-        or die("Can't open $vars{'TEXDIR'}/texmf.cnf for writing: $!\n");
+    $TMF = ">$vars{'TEXDIR'}/texmf.cnf";
+    open(TMF, $TMF) || die "open($TMF) failed: $!\n";
     print TMF <<EOF;
-%
 % This is the texmf.cnf file which contains only changes from the
-% distributed texmf.cnf in texmf/web2c/texmf.cnf
-% Please do NOT change values in texmf/web2c/texmf.cnf, they will be
-% overwritten by later updates.
-% If you want to configure something to a value different from the one
-% in texmf/web2c/texmf.cnf, just put the changed value here.
+% texmf.cnf distributed for the release of year YYYY, which is in
+% TLROOT/YYYY/texmf/web2c/texmf.cnf.
+% 
+% Please do NOT change values in this YYYY/texmf/web2c/texmf.cnf file,
+% as they may be overwritten by later updates of the kpathsea
+% package(s).
+% 
+% Instead, if you want to configure something to a value different from
+% the one in texmf/web2c/texmf.cnf, just put the changed value here.
 %
 EOF
 ;
     foreach (@changedtmf) { print TMF; }
   } else {
-    open(TMF,">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
-        or die("Can't open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n");
+    $TMF = ">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf";
+    open (TMF, $TMF) || die "open($TMF) failed: $!\n";
     foreach (@newtmf) { print TMF; }
   }
-  close(TMF);
+  close(TMF) || warn "close($TMF) failed: $!";
 }
 
 #