summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-09-20 18:24:18 +0000
committerKarl Berry <karl@freefriends.org>2008-09-20 18:24:18 +0000
commitd455ba9e671341c0d21b433ef73540e7655b20a6 (patch)
treec8a4eddf609ed93c0fac0b76ca9a5532616c7078 /Master/texmf
parent939f4c88e783054e9fab1efb39d417efe1ce5e89 (diff)
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
Diffstat (limited to 'Master/texmf')
-rw-r--r--Master/texmf/web2c/texmf.cnf15
1 files changed, 12 insertions, 3 deletions
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.