FAQ-en update (8apr10)

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

8 files changed, 26 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog b/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
index 5f199c96636..1edad153a74 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
+++ b/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
@@ -1,5 +1,14 @@
+2010-04-08  Robin Fairbairns  <rf10@beret.cl.cam.ac.uk>
+
+	* faq-adj-types.tex (subsection{Typesetting specialities}): editorial
+	 in q-makeindex (including two separate texindex entries in list)
+
+	* dirctan.tex: add catalogue link idxtex to glo+idxtex
+
 2010-04-06  Robin Fairbairns  <rf10@beret.cl.cam.ac.uk>
 
+	* texfaq2html, sanitize.pl: update
+
 	* sanitize-beta.pl (sanitize_line): massive shambles in [lr]brace
 
 	* faq-mac-prog.tex (subsection{"Generic" macros and techniques}):
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex b/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
index 2b951fa65a9..b5dafd0855b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
@@ -1,4 +1,4 @@
-% $Id: dirctan.tex,v 1.223 2010/03/23 18:39:39 rf10 Exp rf10 $
+% $Id: dirctan.tex,v 1.224 2010/04/07 23:22:40 rf10 Exp rf10 $
 %
 % protect ourself against being read twice
 \csname readCTANdirs\endcsname
@@ -402,7 +402,7 @@
 \CTANdirectory{germbib}{biblio/bibtex/contrib/germbib}
 \CTANdirectory{gfs}{info/examples/FirstSteps} % gratzer's
 \CTANdirectory*{ghostscript}{support/ghostscript}
-\CTANdirectory{glo+idxtex}{indexing/glo+idxtex}
+\CTANdirectory{glo+idxtex}{indexing/glo+idxtex}[idxtex]
 \CTANdirectory{gnuplot}{graphics/gnuplot}
 \CTANdirectory{go}{fonts/go}
 \CTANdirectory{gothic}{fonts/gothic}
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/faq-adj-types.tex b/Master/texmf-dist/doc/generic/FAQ-en/faq-adj-types.tex
index c2b15511a78..f6c70ed9849 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/faq-adj-types.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/faq-adj-types.tex
@@ -1,4 +1,4 @@
-% $Id: faq-adj-types.tex,v 1.9 2010/04/06 18:35:09 rf10 Exp rf10 $
+% $Id: faq-adj-types.tex,v 1.10 2010/04/07 23:22:40 rf10 Exp rf10 $
 
 \section{Adjusting the typesetting}
 
@@ -2590,15 +2590,14 @@ The following programs are available:
   macro packages other than \LaTeX{}, such as \nothtml{\Eplain\ (}%
   \Qref{Eplain}{Q-eplain}\nothtml{)}, and \TeX{} (whose macros can
   be used independently with \plaintex{}).
-\item[idxtex] for \LaTeX{} under \acro{VMS}, which comes with a
-  glossary-maker called \Package{glotex}.
-\item[texindex] A witty little shell/\ProgName{sed}-script-based
-  utility for \LaTeX{} under Unix.
-  
-  The \Qref*{Texinfo}{Q-texinfo} system also uses a program
+\item[idxtex] for \LaTeX{} under \acro{VMS}; \ProgName{idxtex} comes
+  with a glossary-maker \ProgName{glotex}.
+\item[texindex(1)] A witty little shell-script using \ProgName{sed}
+  and \ProgName{awk}; designed for \LaTeX{} under Unix.
+\item[texindex(2)] The \Qref*{Texinfo}{Q-texinfo} system also offers a program
   \ProgName{texindex}, whose source is to be found in the
   \ProgName{texinfo} distribution.  The \Package{ltxindex} package
-  provides macros to allow \LaTeX{} users to use \emph{this}
+  provides macros that enable \LaTeX{} users to use this
   \ProgName{texindex}.
 \item[xindy] arose from frustration at the difficulty of making a
   multi-language version of \ProgName{makeindex}.  It is designed to
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/gather-faqbody.tex b/Master/texmf-dist/doc/generic/FAQ-en/gather-faqbody.tex
index 625797b2b9e..069fa1b7c95 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/gather-faqbody.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/gather-faqbody.tex
@@ -1,4 +1,4 @@
-\def\faqfileversion{3.19d}    \def\faqfiledate{2010-04-02}
+\def\faqfileversion{3.19d}    \def\faqfiledate{2010-04-07}
 %
 % The above line defines the file version and date, and must remain
 % the first line with any `assignment' in the file, or things will
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
index e520837782a..aff723691c9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
@@ -20,14 +20,14 @@ to be included into the document at the next run.
   macro packages other than LaTeX, such as 
   <a href="FAQ-eplain.html">Eplain</a>, and TeX (whose macros can
   be used independently with Plain TeX).
-<dt>idxtex<dd> for LaTeX under VMS, which comes with a
-  glossary-maker called <i>glotex</i>.
-<dt>texindex<dd> A witty little shell/<i>sed</i>-script-based
-  utility for LaTeX under Unix.
-<p/>  The <a href="FAQ-texinfo.html">Texinfo</a> system also uses a program
+<dt>idxtex<dd> for LaTeX under VMS; <i>idxtex</i> comes
+  with a glossary-maker <i>glotex</i>.
+<dt>texindex(1)<dd> A witty little shell-script using <i>sed</i>
+  and <i>awk</i>; designed for LaTeX under Unix.
+<dt>texindex(2)<dd> The <a href="FAQ-texinfo.html">Texinfo</a> system also offers a program
   <i>texindex</i>, whose source is to be found in the
   <i>texinfo</i> distribution.  The <i>ltxindex</i> package
-  provides macros to allow LaTeX users to use <em>this</em>
+  provides macros that enable LaTeX users to use this
   <i>texindex</i>.
 <dt>xindy<dd> arose from frustration at the difficulty of making a
   multi-language version of <i>makeindex</i>.  It is designed to
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/index.html b/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
index c403c5952d3..1cc2e3273b6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
@@ -543,6 +543,6 @@ remains.
    "<a href="FAQ-noans.html">Improving the FAQ</a>" or
    "<a href="FAQ-newans.html">Extending the FAQ</a>". 
 <p>
-   This is FAQ version 3.19d, last modified on 2010-04-02.
+   This is FAQ version 3.19d, last modified on 2010-04-07.
 </address>
 </body></html>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf b/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
index f39fd337ff2..124b110f160 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
+++ b/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf b/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf
index 1fd63431298..62765734cfd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf
+++ b/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf