bring tl english html/pdf up to date

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

2 files changed, 16 insertions, 15 deletions

diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.html b/Master/texmf/doc/texlive/texlive-en/texlive-en.html
index d9f91b6f9cf..97f2e26ef64 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.html
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.html
@@ -9,7 +9,7 @@ TeX Live 2010</title>
 <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> 
 <!-- charset=iso-8859-1,html,info,fn-in --> 
 <meta name="src" content="texlive-en.tex"> 
-<meta name="date" content="2010-06-20 01:52:00"> 
+<meta name="date" content="2010-06-25 02:05:00"> 
 <link rel="stylesheet" type="text/css" href="texlive-en.css"> 
 <link rel="stylesheet" type="text/css" href="texlive-en.css" /> 
 <link rel="stylesheet" type="text/css" href="tex-live.css" /> 
@@ -2358,9 +2358,10 @@ class="ec-lmtt-10">sl </span>(Slovenian), <span
 class="ec-lmtt-10">sr </span>(Serbian), <span 
 class="ec-lmtt-10">vi </span>(Vietnamese),
      <span 
-class="ec-lmtt-10">zh-cn </span>(Chinese), <span 
-class="ec-lmtt-10">zh-tw </span>(Chinese/Taiwan). The installer tries to automatically determine the right
-     language but if it fails, or if the right language is not available, then it uses English as a fallback.
+class="ec-lmtt-10">zh-cn </span>(Simplified Chinese), <span 
+class="ec-lmtt-10">zh-tw </span>(Traditional Chinese). The installer tries to automatically
+     determine the right language but if it fails, or if the right language is not available, then it uses
+     English as a fallback.
      </dd><dt class="list">
  <span 
 class="ec-lmtt-10">-profile </span><span 
@@ -2439,9 +2440,9 @@ an example, the file to edit might be <span
 class="ec-lmtt-10">$HOME/.profile </span>(or another file sourced by <span 
 class="ec-lmtt-10">.profile</span>, and the lines to
 add would look like this:
-<!--l. 971--><p class="indent" >
                                                                                      
                                                                                      
+<!--l. 971--><p class="indent" >
    <div class="fancyvrb" id="fancyvrb5"><a 
  id="x1-34002r1"></a><span 
 class="ec-lmtt-9">&#x00A0;</span><span 
@@ -2564,6 +2565,8 @@ class="ec-lmtt-10">~ </span>is your home directory.
      <li 
   class="enumerate" id="x1-36008x2">Run <span 
 class="ec-lmtk-10">fc-cache -fv</span>.</li></ol>
+                                                                                     
+                                                                                     
 <!--l. 1042--><p class="noindent" >
    <h5 class="subsubsectionHead"><span class="titlemark">3.4.6   </span> <a 
  id="x1-370003.4.6"></a>Con<span class="TEX">T<span 
@@ -2584,8 +2587,6 @@ class="ec-lmtt-9">&#x00A0;--generate</span><br class="fancyvrb" /><a
 class="ec-lmtt-9">&#x00A0;</span><span 
 class="ec-lmtt-9">&#x00A0;context</span><span 
 class="ec-lmtt-9">&#x00A0;--make</span></div>
-                                                                                     
-                                                                                     
 <!--l. 1053--><p class="noindent" >The resulting files are stored under <span 
 class="ec-lmtt-10">TEXMFVAR</span>.
 <!--l. 1055--><p class="indent" >   For more information, see <a 
@@ -2685,6 +2686,8 @@ class="ec-lmtt-9">&#x00A0;"heap_chunk_in_mb"=dword:ffffff00</span></div>
 class="ec-lmtt-10">regedit /s moremem.reg </span>as administrator. (If you want to change memory
 only for the current user instead of system-wide, use <span 
 class="ec-lmtt-10">HKEY_CURRENT_USER</span>.)
+                                                                                     
+                                                                                     
 <!--l. 1131--><p class="noindent" >
    <h4 class="subsectionHead"><span class="titlemark">3.5   </span> <a 
  id="x1-410003.5"></a>Testing the installation</h4>
@@ -2699,8 +2702,6 @@ interface, but the principles are the same.
      <li 
   class="enumerate" id="x1-41002x1">Make sure that you can run the <span 
 class="ec-lmss-10">tex </span>program in the first place: <div class="alltt">
-                                                                                     
-                                                                                     
      <!--l. 1146--><p class="noindent" ><div class="obeylines-v">
      <span 
 class="ec-lmtt-10">&#x003E;</span><span 
@@ -2808,6 +2809,8 @@ class="ec-lmtt-10">display</span>&#8217;.
      </li>
      <li 
   class="enumerate" id="x1-41008x4">Create a PostScript file for printing or display: <div class="alltt">
+                                                                                     
+                                                                                     
      <!--l. 1185--><p class="noindent" ><div class="obeylines-v">
      <span 
 class="ec-lmtt-10">&#x003E;</span><span 
@@ -2829,8 +2832,6 @@ class="ec-lmtt-10">&#x003E;</span><span
 class="ec-lmtt-10">&#x00A0;</span><span 
 class="ec-lmtk-10">pdflatex</span><span 
 class="ec-lmtk-10">&#x00A0;sample2e.tex</span>
-                                                                                     
-                                                                                     
 </div>
      </div>
      </li>
@@ -2904,6 +2905,8 @@ class="ec-lmtt-10">tex story.tex</span>&#8217;.</dd></dl>
   class="enumerate" id="x1-41016x8">If you have installed the <span 
 class="ec-lmtt-10">xetex </span>package, you can test its access to system fonts as follows:
      <div class="alltt">
+                                                                                     
+                                                                                     
      <!--l. 1223--><p class="noindent" ><div class="obeylines-v">
      <span 
 class="ec-lmtt-10">&#x003E;</span><span 
@@ -2939,8 +2942,6 @@ class="E">E</span>X</span> Live. See
      Section&#x00A0;<a 
 href="#x1-360003.4.5">3.4.5<!--tex4ht:ref: sec:font-conf-xetex --></a>.
      </li></ol>
-                                                                                     
-                                                                                     
 <!--l. 1237--><p class="noindent" >
    <h4 class="subsectionHead"><span class="titlemark">3.6   </span> <a 
  id="x1-420003.6"></a>Links for additional downloadable software</h4>
@@ -3048,6 +3049,8 @@ class="ec-lmtt-10">http://www.winedt.com</span></a>.
 class="ec-lmss-10">WinShell </span>is available from <a 
 href="http://www.winshell.de" class="url" ><span 
 class="ec-lmtt-10">http://www.winshell.de</span></a>.</li></ul>
+                                                                                     
+                                                                                     
      </dd></dl>
 <!--l. 1278--><p class="noindent" >For a much longer list of packages and programs, see <a 
 href="http://tug.org/interest.html" class="url" ><span 
@@ -3077,8 +3080,6 @@ class="ec-lmtt-9">&#x00A0;</span><span
 class="ec-lmtt-9">&#x00A0;TEXMFLOCAL</span><span 
 class="ec-lmtt-9">&#x00A0;=</span><span 
 class="ec-lmtt-9">&#x00A0;$SELFAUTOPARENT/../texmf-local</span></div>
-                                                                                     
-                                                                                     
 <!--l. 1297--><p class="noindent" >This means that adding the directory for <span class="TEX">T<span 
 class="E">E</span>X</span> Live executables for their platform to their search path is sufficient
 to get a working setup.
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
index 1fb4ec0f506..3819ca4aee8 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf