summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-28 00:47:57 +0000
committerKarl Berry <karl@freefriends.org>2011-05-28 00:47:57 +0000
commit9006e0a513f7bb54243d624f1f437dd795703f3b (patch)
treedb359f6c21c5b9d7a716e259717ac98a04a2cbe3 /Master
parentcb0b51220dfb028490ca4c8898bf4832f1fe7a8a (diff)
2011 in paths, doc updates
git-svn-id: svn://tug.org/texlive/trunk@22631 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf/web2c/texmf.cnf28
1 files changed, 14 insertions, 14 deletions
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 1cb0ee9b369..70b1aeadc34 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -4,8 +4,8 @@
% 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/2010/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2010/texmf.cnf.
+% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -70,14 +70,14 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
% Per-user texmf tree(s) -- organized per the TDS, as usual. To define
% more than one per-user tree, set this to a list of directories in
% braces, as described above. (This used to be HOMETEXMF.) ~ expands
-% to %USERPROFILE% on Window, $HOME otherwise.
+% to %USERPROFILE% on Windows, $HOME otherwise.
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2010/texmf-var
+TEXMFVAR = ~/.texlive2011/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2010/texmf-config
+TEXMFCONFIG = ~/.texlive2011/texmf-config
% List all the texmf trees.
%
@@ -212,9 +212,8 @@ TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}//
TEXINPUTS.ptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
TEXINPUTS.platex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
-% ep(La)TeX.
+% epTeX.
TEXINPUTS.eptex = .;$TEXMF/tex/{ptex,ptexgeneric,plain,generic,}//
-TEXINPUTS.eplatex = .;$TEXMF/tex/{platex,ptexgeneric,latex,generic,}//
% pBibTeX bibliographies and style files.
BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib//
@@ -589,13 +588,14 @@ TEX = etex
% given as command line option or environment variable.
BIBTEX_CSFILE = 88591lat.csf
-% This variable is specific to Windows. It must be set to 0 or 1. It
-% tells script wrappers to use an already installed Perl interpreter if
-% one is found on the search path, in preference to the Perl shipped
-% with TeX Live. Thus, it may be useful if you (a) installed a full
-% Perl distribution for general use, and (b) need to run Perl programs
-% from TL that use additional modules we don't provide. The TL Perl
-% does provide all the standard modules.
+% This variable is specific to Windows. It must be set to 0 or 1. The
+% default is 0. Setting it to 1 tells the Windows script wrappers to
+% use an already installed Perl interpreter if one is found on the
+% search path, in preference to the Perl shipped with TeX Live. Thus,
+% it may be useful if you both (a) installed a full Perl distribution
+% for general use, and (b) need to run Perl programs from TL that use
+% additional modules we don't provide. The TL Perl does provide all the
+% standard Perl modules.
%
%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0