1 files changed, 21 insertions, 20 deletions
diff --git a/Master/texmf/tex/generic/config/language.dat b/Master/texmf/tex/generic/config/language.dat
index 8a517c5d069..629335fe259 100644
--- a/Master/texmf/tex/generic/config/language.dat
+++ b/Master/texmf/tex/generic/config/language.dat
@@ -1,37 +1,36 @@
-% Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Tue Jun  1 04:08:47 2010
-% $Id: language.us 18641 2010-05-31 09:58:18Z mpg $
+% Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Sat Jun  5 03:54:02 2010
+% $Id: language.us 18738 2010-06-04 17:18:14Z karl $
 % language.us (and the start of language.dat)
 % - initial hyphenation patterns.
 % Created long ago by Sebastian Rahtz and others.  Public domain.
 %
-% DO NOT EDIT THIS FILE (language.dat)! It is generated by tlmgr by
-% concatenating language.us with entries from the various packages.
+% DO NOT EDIT THIS FILE (language.dat)! It is generated by tlmgr.
 %
-% The premade texmf/tex/generic/config/language.dat (where you might be
-% reading this) in the distribution is a copy of this generated file with
-% all languages enabled.  It is used when the user asks to run live
-% (install option R).
+% The premade texmf/tex/generic/config/language.dat* files (where you
+% might be reading this) in the distribution was generated with all
+% languages enabled.  It is used when running live.
 %
 % To enable or disable languages, there are two options:
 % - if the language is provided by a TeX Live package, you can
 %   (un)install the corresponding package using tlmgr. Examples:
 %     tlmgr install hyphen-french
 %     tlmgr remove hyphen-english
-% - in any case, you can use a local configuration file:
+% - in any case, you can use local configuration files:
 %     TEXMFLOCAL/tex/generic/config/language-local.dat
-%   with the same format as the present file, then regenerate this file
-%   and rebuild the formats.  See the manual of tlmgr (try 'man tlmgr'
-%   or 'texdoc tlmgr'), section "generate" for details.
+%     TEXMFLOCAL/tex/generic/config/language-local.dat.lua
+%     TEXMFLOCAL/tex/generic/config/language-local.def
+%   See the tlmgr documentation (try `man tlmgr' or `texdoc tlmgr'),
+%   section "generate" for details.
 %
-% The preferred comment for actual language lines is %!. Do not use %!
-% for textual comments like this. This is to be able to separate
-% textual comments from commented-out language in such a way that
-% automatic parsing by programs is possible, so that
+% The preferred comment for actual language lines in language.dat and
+% language.us is %!. Do not use %!  for textual comments like this. This
+% is to be able to separate textual comments from commented-out language
+% in such a way that automatic parsing by programs is possible, so that
 % we can present the user with `all possible languages'.
 % 
-% *PLEASE*, keep english as the default (first) here, and let it refer
-% to hyphen.tex (not, e.g., ushyph.tex), and do not change the
-% hyphen.tex file, or name some other file hyphen.tex.  hyphen.tex must
+% We must keep english as the default (first) here, and let it refer to
+% hyphen.tex (not anything else), and do not change the hyphen.tex file,
+% or name some other file hyphen.tex.  In other words, hyphen.tex must
 % remain the original file from Knuth, and it must be \language0.  This
 % is one important aspect of ensuring that the original, frozen TeX
 % always produces the same line and page breaks.
@@ -46,7 +45,9 @@ english		hyphen.tex  % do not change!
 =american
 %
 % ushyphmax.tex, on the other hand, includes Gerard Kuiken's additional
-% patterns; it is not frozen.  It is provided by the hyphen-english package.
+% patterns; it is not frozen.  It is provided by the hyphen-english
+% package, not listed here.  Also, in hyph-utf8 and current TL, it has
+% been renamed to hyph-en-us.tex, along with other *hyph-en-us.* files.
 %
 % FYI, ushyph.tex is Dr. Kuiken's smaller set of patterns; with today's
 % large memories, there is no reason to use it, and we don't list it here.