strongly warn that local edits to the main texmf.cnf will be lost

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

2 files changed, 22 insertions, 13 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 6775f4481a4..99591eb5060 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1194,16 +1194,16 @@ sub do_texmf_cnf {
     $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
-% 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.
+% This texmf.cnf file should contain only your personal changes from the
+% main texmf.cnf.
+% 
+% Do NOT change values in the main file (which is in
+% .../texlive/YYYY/texmf/web2c/texmf.cnf), as YOUR CHANGES WILL BE LOST
+% by later updates.
+% 
+% If you need to make changes to texmf.cnf, put your custom settings in
+% this file instead, which is YYYY/texmf.cnf.  And insert *only* your
+% changed values.
 %
 EOF
 ;
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index ad84e57f01b..b87eb7353b9 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -1,6 +1,12 @@
 % original texmf.cnf -- runtime path configuration file for kpathsea.
 % Public domain.
-%
+% 
+% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
+% updated.  Instead, put your changes -- and only your changes, not an
+% entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
+% this file is installed in /some/path/to/texlive/2008/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2008/texmf.cnf.
+% 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
 %
@@ -387,8 +393,11 @@ FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
 % TeX documentation and source files, for use with kpsewhich.
 % TeX Live has a separate hierarchy with just documentation, texmf-doc,
 % in addition to the doc files in the other hierarchies.
-TEXMFDOCDIR = !!$TEXMFDOC/doc
-TEXDOCS = .;$TEXMF/doc//;$TEXMFDOCDIR//
+% Also, find the English documentation first -- better than random, when
+% there are name collisions.
+% Also, find things from man pages first, same reason.
+TEXMFDOCDIR = $TEXMFDOC/doc{/english,}
+TEXDOCS = .;$TEXMF/doc{/man,}//;$TEXMFDOCDIR//
 TEXSOURCES = .;$TEXMF/source//
 
 % Web and CWeb input paths.