doc changes

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

3 files changed, 29 insertions, 63 deletions

diff --git a/Master/texmf/tex/generic/config/language.us b/Master/texmf/tex/generic/config/language.us
index e2db43028f8..bbc9db38ead 100644
--- a/Master/texmf/tex/generic/config/language.us
+++ b/Master/texmf/tex/generic/config/language.us
@@ -3,34 +3,33 @@
 % - 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.
diff --git a/Master/texmf/tex/generic/config/language.us.def b/Master/texmf/tex/generic/config/language.us.def
index d37ae49ce9b..45b7cc51c7b 100644
--- a/Master/texmf/tex/generic/config/language.us.def
+++ b/Master/texmf/tex/generic/config/language.us.def
@@ -1,29 +1,13 @@
 %% e-TeX V2.0;2
-
 % Note: the first line of this file must match the corresponding line
 % in "etex.src" and "etexdefs.lib", otherwise fallback will be used.
 
-% This is the header for "language.def", e-TeX's language definition file.
 % $Id$
+% language.us.def (and the start of language.def)
+% - initial hyphenation patterns.
 
-% DO NOT EDIT THIS FILE (language.def)! It is generated by tlmgr by
-% concatenating language.us with entries from the various packages.
-%
-% The premade texmf/tex/generic/config/language.def (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).
-%
-% 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:
-%     TEXMFLOCAL/tex/generic/config/language-local.def
-%   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.
+% DO NOT EDIT THIS FILE (language.def)! It is generated by tlmgr.
+% See language.dat (or language.us) for more information.
 
 % It is explicitly permitted to augment this file by adding additional
 % \addlanguage ... commands AFTER the first (\addlanguage {USenglish})
diff --git a/Master/texmf/tex/generic/config/language.us.lua b/Master/texmf/tex/generic/config/language.us.lua
index b2e27bd8162..be349b42026 100644
--- a/Master/texmf/tex/generic/config/language.us.lua
+++ b/Master/texmf/tex/generic/config/language.us.lua
@@ -6,36 +6,19 @@ language.us.dat (and the start of language.dat.lua), used by:
 
 See luatex-hyphen.pdf (currently part of the hyph-utf8 package) for details.
 
-DO NOT EDIT THIS FILE (language.dat.lua)! It is generated by tlmgr by
-concatenating language.us with entries from the various packages.
-
-The premade texmf/tex/generic/config/language.dat.lua (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).
-
-To add or remove entries in this file, 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:
-    TEXMFLOCAL/tex/generic/config/language-local.dat.lua
-  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.
+DO NOT EDIT THIS FILE (language.dat.lua)! It is generated by tlmgr.
+See language.dat (or language.us) for more information.
 
 Warning: formats using this file also use one of language.dat or
-language.def. Make sure to update them accordingly. The interaction
-between these files is documented in luatex-hyphen.pdf, but here is a
-summary:
-- a language must be mentionned in language.dat or language.def to be
+language.def. Update them accordingly. The interaction between these
+files is documented in luatex-hyphen.pdf, but here is a summary:
+- a language must be mentioned in language.dat or language.def to be
 available; if, in addition, it is:
-  - not mentionned in language.dat.lua, then it is dumped in the format;
-  - mentionned in language.dat.lua with a special="disabed:<reason>'
-  key, then it is not available at all;
+  - not mentioned in language.dat.lua, then it is dumped in the format;
+  - mentioned in language.dat.lua with a key special="disabled:<reason>",
+    then it is not available at all;
   - mentioned in language.dat.lua with a normal entry, then it will not
-  be dumped in the format, but loaded at runtime when activated.
+    be dumped in the format, but loaded at runtime when activated.
 ]]
 
 return {