up to page 12 ...

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

2 files changed, 209 insertions, 206 deletions

diff --git a/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty b/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
index f95632a3e1e..74b23879e92 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
+++ b/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
@@ -171,6 +171,7 @@
 \providecommand*{\CD}{\acro{CD}\xspace}
 \providecommand*{\CTAN}{\acro{CTAN}\xspace}
 \providecommand*{\DVD}{\acro{DVD}\xspace}
+\providecommand*{\GNU}{\acro{GNU}\xspace}
 \providecommand*{\ISO}{\acro{ISO}\xspace}
 \providecommand*{\HTML}{\acro{HTML}\xspace}
 \providecommand*{\MacOSX}{Mac\,\acro{OS\,X}\xspace}
diff --git a/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex b/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
index 7c5c8192037..23eb509e709 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/texlive-en.tex
@@ -32,7 +32,7 @@
 \subsection{\TeX\ Live and the \TeX\ Collection}
 
 This document describes the main features of the \TL{} software
-distribution\Dash \TeX{} and related programs for \acro{GNU}/Linux
+distribution\Dash \TeX{} and related programs for \GNU/Linux
 and other Unix flavors, \MacOSX, and Windows systems.
 
 You may have acquired \TL{} by downloading, or on the \TK{} \DVD,
@@ -86,10 +86,10 @@ installation sections following, but here is a quick start:
 
 \begin{itemize*}
 
-\item The installation script is named \filename{install-tl}.  It has
-  both a text mode (default for Unix, run \code{tlmgr -gui} to
-  override) and a \GUI{} mode (default for Windows, run \code{tlmgr
-  -no-gui} to override).
+\item The installation script is named \filename{install-tl}.  It can
+  operate in both a \GUI{} mode (default for Windows) and
+  a text mode (default for everything else).  You can force one mode or
+  the other with the options \code{-gui} and \code{-no-gui}, respectively.
 
 \item One of the installed items is a new program, the `\TL\ Manager',
   named \prog{tlmgr}.  Like the installer, it can be used in both \GUI{}
@@ -169,22 +169,22 @@ free to join, start reading, and help out where you can.  Welcome to
 \section{Overview of \protect\TeX\protect\ Live}
 \label{sec:overview-tl}
 
-This section describes the structure and contents of \TL{} and the
-\TK{} of which it is a part.
+This section describes the contents of \TL{} and the \TK{} of which it
+is a part.
 
-\subsection{The \protect\TeX\protect\ Collection: \protect\pkgname{live},
-            \protect\pkgname{protext},
-            \protect\pkgname{Mac\TeX}}
+\subsection{The \protect\TeX\protect\ Collection: \TL, pro\TeX{}t, Mac\TeX}
 \label{sec:tl-coll-dists}
 
 The \TK{} \DVD{} comprises the following:
 
 \begin{description}
 
-\item [live] A complete \TeX{} system which can be run live or
+\item [\TL] A complete \TeX{} system which can be run live or
   installed to disk.
 
-\item [CTAN] A snapshot of the \CTAN{} repository
+\item [Mac\TeX] for \MacOSX, this adds a native \MacOSX\ installer and other
+Mac applications to \TL{}.  Its home page is
+\url{http://www.tug.org/mactex/}.
 
 \item [pro\TeX{}t] An enhancement of the \MIKTEX\ distribution for Windows,
 \ProTeXt\ adds a few extra tools to \MIKTEX, and simplifies
@@ -192,9 +192,7 @@ installation.  It is entirely independent of \TL{}, and has its own
 installation instructions.  The \ProTeXt\ home page is
 \url{http://tug.org/protext}.
 
-\item [Mac\TeX] for \MacOSX adds a native \MacOSX\ installer and other
-Mac applications to \TL{}.  Its home page is
-\url{http://www.tug.org/mactex/}.
+\item [CTAN] A snapshot of the \CTAN{} repository.
 
 \item [\texttt{texmf-extra}] A directory with assorted additional packages.
 
@@ -213,19 +211,14 @@ the \TL{} distribution.  On the \pkgname{live} \DVD, the entire \TL{}
 hierarchy is in a subdirectory \dirname{texlive}, not at the top
 level of the disc.
 
-%\smallskip
-%\begingroup
-%  \renewcommand{\arraystretch}{1.3}  % open up interrow spacing
-%\begin{tabular}{>{\ttfamily}lp{.78\hsize}}
 \begin{ttdescription}
 \item[bin] The \TeX{} system programs, arranged by platform.
 %
-\item[readme.html] Readme html pages in various languages, with a quick
-introduction and useful links
+\item[readme.html] Web pages with a quick introduction and useful links,
+in various languages.
 %
-\item[source] The source of all programs, including the main \Webc{}
-  \TeX{} and \MF{} distributions. These are stored in
-various compressed archives.
+\item[source] The source to all included programs, including the main \Webc{}
+  \TeX{} and \MF{} distributions.
 %
 \item[support] Various auxiliary packages and programs.  These are
   \emph{not} installed automatically.  This includes
@@ -243,10 +236,6 @@ various compressed archives.
   Perl and Ghostscript for Windows, which are invisible outside \TL,
   and a new Windows PostScript viewer PSView.
 \end{ttdescription}
-%\end{tabular}
-%\endgroup
-
-%\smallskip
 
 In addition to the directories above, the installation scripts and
 \filename{README} files (in various languages) are at the top level of
@@ -261,11 +250,23 @@ formats is in \dirname{texmf-dist/doc}.  You can use the
 documentation wherever it is located.  The comprehensive links in
 the top-level file \OnCD{doc.html} may also be helpful.
 
+This \TL\ documentation itself is in \dirname{texmf-doc} and is
+available in several languages:
+
+\begin{itemize}
+\item{Chinese:} \OnCD{texmf-doc/doc/chinese/texlive-zh-cn}
+\item{Czech/Slovak:} \OnCD{texmf-doc/doc/czechslovak/texlive-cz}
+\item{English:} \OnCD{texmf-doc/doc/english/texlive-en}
+\item{French:} \OnCD{texmf-doc/doc/french/texlive-fr}
+\item{German:} \OnCD{texmf-doc/doc/german/texlive-de}
+\item{Polish:} \OnCD{texmf-doc/doc/polish/texlive-pl}
+\item{Russian:} \OnCD{texmf-doc/doc/russian/texlive-ru}
+\end{itemize}
 
 \subsection{Overview of the predefined texmf trees}
 \label{sec:texmftrees}
 
-This section lists all predefined variables specifying texmf trees
+This section lists all predefined variables specifying the texmf trees
 used by the system, and their intended purpose, and the default
 layout of a \TL{} system. The command \texttt{texconfig conf} shows
 you the values of these variables, so that you can easily find out
@@ -282,65 +283,64 @@ how they map to directory names in your installation.
   installation of additional or updated macros, fonts, etc.
 \item [TEXMFHOME] The tree which users can use for their own individual
   installations of additional or updated macros, fonts, etc.
-  The expansion of this variable depends on \verb+$HOME+ by default, % $
-  which dynamically adjusts for each user to an individual
-  directory.
-\item [TEXMFCONFIG] The tree used by te\TeX's utilities
+  The expansion of this variable dynamically adjusts for each user to
+  their own individual directory.
+\item [TEXMFCONFIG] The tree used by the utilities
   \verb+texconfig+, \verb+updmap+, and \verb+fmtutil+ to store modified
-  configuration data.  Under \verb+$HOME+ by default. %$
-\item [TEXMFSYSCONFIG] The tree used by te\TeX's utilities
+  configuration data.  Under \envname{TEXMFHOME} by default.
+\item [TEXMFSYSCONFIG] The tree used by the utilities
   \verb+texconfig-sys+, \verb+updmap-sys+, and \verb+fmtutil-sys+ to
   store modified configuration data.
 \item [TEXMFVAR] The tree used by \verb+texconfig+, \verb+updmap+ and
   \verb+fmtutil+ to store (cached) runtime data such as format files and
-  generated map files.  Under \verb+$HOME+ by default. %$
+  generated map files.  Under \envname{TEXMFHOME} by default.
 \item [TEXMFSYSVAR] The tree used by \verb+texconfig-sys+,
-  \verb+updmap-sys+ and \verb+fmtutil-sys+ to store (cached) runtime
-  data such as format files and generated map files.
+  \verb+updmap-sys+ and \verb+fmtutil-sys+, and also by \verb+tlmgr+, to
+  store (cached) runtime data such as format files and generated map files.
 \end{ttdescription}
 
 \noindent
 The default layout is:
 \begin{description}
-  \item[system-wide root] can span multiple \TL{} releases
+  \item[system-wide root] can span multiple \TL{} releases:
   \begin{ttdescription}
-    \item[2007] A previous release
+    \item[2007] A previous release.
     \begin{ttdescription}
-      \item [] ...
+      \item [...]
     \end{ttdescription}
-    \item[2008] the current release
+    \item[2008] The current release.
     \begin{ttdescription}
       \item [bin] ~
       \begin{ttdescription}
-        \item [i386-linux] Linux binaries
-        \item [...] ...
+        \item [i386-linux] \GNU/Linux binaries
+        \item [...]
         \item [universal-darwin] \MacOSX binaries
         \item [win32] Windows binaries
       \end{ttdescription}
-      \item [TEXMFMAIN] \textit{i.e.} \dirname{texmf}
-      \item [TEXMFDIST] \textit{i.e.} \dirname{texmf-dist}
-      \item [TEXMFDOC] \textit{i.e.} \dirname{texmf-doc}
-      \item [TEXMFSYSVAR] \textit{i.e.} \dirname{texmf-var}
-      \item [TEXMFSYSCONFIG] \textit{i.e.} \dirname{texmf-config}
+      \item [texmf] This is \envname{TEXMFMAIN}.
+      \item [texmf-dist] \envname{TEXMFDIST}
+      \item [texmf-doc] \envname{TEXMFDOC}
+      \item [texmf-var] \envname{TEXMFSYSVAR}
+      \item [texmf-config] \envname{TEXMFSYSCONFIG}
     \end{ttdescription}
-    \item [TEXMFLOCAL] \textit{i.e.} \dirname{texmf-local}, can be
+    \item [texmf-local] \envname{TEXMFLOCAL}, intended to be
       retained from release to release
   \end{ttdescription}
-  \item[user's home] \textit{i.e.} \texttt{\$HOME} or
-      \texttt{\%USERPROFILE\%}
+  \item[user's home] (\texttt{\$HOME} or
+      \texttt{\%USERPROFILE\%})
     \begin{ttdescription}
-      \item[.texlive2007] Private generated and configuration data
-        for a previous release
+      \item[.texlive2007] Privately generated and configuration data
+        for a previous release.
       \begin{ttdescription}
-        \item [] ...
+        \item [...]
       \end{ttdescription}
-      \item[.texlive2008] Private generated and configuration data
-        for the current release
+      \item[.texlive2008] Privately generated and configuration data
+        for the current release.
       \begin{ttdescription}
-        \item [TEXMFVAR] \textit{i.e.} \dirname{texmf-var}
-        \item [TEXMFCONFIG] \textit{i.e.} \dirname{texmf-config}
+        \item [texmf-var] \envname{TEXMFVAR}
+        \item [texmf-config] \envname{TEXMFCONFIG}
       \end{ttdescription}
-    \item[TEXMFHOME] \textit{i.e.} \dirname{texmf} Private macros
+    \item[texmf] \envname{TEXMFHOME} Personal macros.
       \textit{etc.}
   \end{ttdescription}
 \end{description}
@@ -349,9 +349,9 @@ The default layout is:
 \subsection{Extensions to \protect\TeX}
 \label{sec:tex-extensions}
 
-\TeX{} itself is frozen, apart from rare bug fixes. It is still
-present in \TL, and will remain so in the foreseeable future.  \TL{}
-contains several extended versions of \TeX:
+\TeX{} itself is frozen, apart from rare bug fixes. It is still present
+in \TL\ as the program \prog{tex}, and will remain so in the
+foreseeable future.  \TL{} contains several extended versions of \TeX:
 
 \begin{description}
 
@@ -363,25 +363,25 @@ classes of marks, additional debugging features, and more) and the
 \OnCD{texmf-dist/doc/etex/base/etex_man.pdf}.
 
 \item [pdf\TeX] builds on the \eTeX\ extensions, adding support for
-  writing \acro{PDF} output as well as \dvi{}.  See
-  \OnCD{texmf/doc/pdftex/manual/} for the manual, and
-  \OnCD{texmf/doc/pdftex/manual/samplepdf/samplepdf.tex}.
-  \emph{This is the default program for all formats except plain
-    \TeX.}
-
-\item [Lua\TeX] (see \url{http://www.luatex.org/} and
-  \OnCD{texmf-dist/doc/luatex/luatexref-t.pdf}) is the designated
-  successor of pdf\TeX, with which it should be
-  backward-compatible. It should also supersede Aleph, see
-  below. The incorporated Lua interpreter (see
-  \url{http://www.lua.org/}) enables elegant solutions for many
-  thorny \TeX{} problems. When called as \filename{texlua}, it
-  functions as a standalone Lua interpreter, and is already used as
-  such within \TL.
-
-\item [\XeTeX] adds support for Unicode input, OpenType- and system
-  fonts, using third-party libraries.  See
-  \url{http://scripts.sil.org/xetex}.
+writing \acro{PDF} output as well as \dvi{}.  This is the program
+invoked for most formats, e.g., \prog{etex}, \prog{latex},
+\prog{pdflatex}.  See \url{http://www.pdftex.org/}.
+\OnCD{texmf/doc/pdftex/manual/} for the manual, and
+\OnCD{texmf/doc/pdftex/manual/samplepdf/samplepdf.tex} for example usage
+of some of its features.
+
+\item [Lua\TeX] is the designated successor of pdf\TeX, with which it
+is intended to be backward-compatible. It should also supersede Aleph,
+see below. The incorporated Lua interpreter (see
+\url{http://www.lua.org/}) enables elegant solutions for many thorny
+\TeX{} problems. When called as \filename{texlua}, it functions as a
+standalone Lua interpreter, and is already used as such within \TL.  See
+\url{http://www.luatex.org/} and
+\OnCD{texmf-dist/doc/luatex/luatexref-t.pdf}.
+
+\item [\XeTeX] adds support for Unicode input and OpenType- and system
+fonts, implemented using standard third-party libraries.  See
+\url{http://scripts.sil.org/xetex}.
 
 \item [\OMEGA\ (Omega)] is based on Unicode (16-bit characters), thus
 supports working with almost all the world's scripts simultaneously. It
@@ -425,52 +425,53 @@ utilities.
 
 \item [lacheck] \LaTeX{} syntax checker.
 
-\item [texexec / texmfstart] Con\TeX{}t and \acro{PDF} processor.
+\item [texexec, texmfstart] Con\TeX{}t and \acro{PDF} processor.
 
-\item [tex4ht] \TeX{} to \acro{HTML} converter.
+\item [tex4ht] \TeX{} to \acro{HTML} (and \acro{XML} and more) converter.
 
 \end{cmddescription}
 
 
 \subsection{Fonts in \protect\TL}
 \label{sec:tl-fonts}
-\TL{} also comes with more and more high-quality scalable fonts
-built-in: check \emph{e.g.} the \CTAN{} catalogue. Most fonts listed
-there are available as a \TL{} package. Check also
-\dirname{texmf-doc/english/free-math-fonts-survey}.
+
+\TL{} comes with many high-quality scalable fonts.  See
+\OnCD{texmf-doc/english/free-math-fonts-survey} for some, and
+\url{http://tug.org/fonts} for more.
+
 
 \section{Installation}
 \label{sec:install}
 
 \subsection{Starting the installer}
 \label{sec:inst_start}
-First, get the \TL{} \DVD{} or the \TK{} \DVD{} or the net installer,
-and locate the installer script: \filename{install-tl} for Unix,
-\filename{install-tl.bat} for Windows:
+
+First, get the \TK{} \DVD{} or download the \TL{} net installer, and
+locate the installer script: \filename{install-tl} for Unix,
+\filename{install-tl.bat} for Windows.
 
 \begin{description}
+\item [Net installer:] Download from \CTAN, under
+\dirname{systems/texlive/tlnet}; the url
+\url{http://mirror.ctan.org/systems/texlive/tlnet} will automatically
+redirect to a nearby, up-to-date, mirror.  You can retrieve either
+\filename{install-tl.zip} which can be used under Unix and Windows and
+\filename{install-unx.tar.gz} which is considerably smaller, but
+Unix-only (including \MacOSX). After unpacking, \filename{install-tl}
+and \filename{install-tl.bat} will be in the \dirname{install-tl}
+subdirectory.
+
 \item [\TeX{} Collection \DVD:] go to its \dirname{texlive}
-  subdirectory. Under Windows, the installer will probably start
-  automatically when you insert the \DVD.
-\item [Net installer:] Download from CTAN, under
-  \dirname{systems/texlive/tlnet}. You can choose between
-  \filename{install-tl.zip} which can be used under Unix and Windows
-  and \filename{install-unx.tar.gz} which is Unix-only (including
-  \MacOSX). After unpacking, \filename{install-tl} and
-  \filename{install-tl.bat} will be in the \dirname{install-tl}
-  subdirectory.
-\item [Downloadable \TeX{} Live \ISO{} image:] Download from CTAN,
-  under \dirname{systems/texlive/Images}. Since even the compressed
-  image is about 1 GB in size, you should not use this option
-  without good reason. Under most Unices, including Linux and
-  \MacOSX, you can mount the image directly. Otherwise, burn the
-  image to a physical \DVD\ and mount it. The installer scripts
-  \filename{install-tl} and \filename{install-tl.bat} will be in the
-  root. Under Windows, the installer will probably start
-  automatically when you insert the \DVD.
+subdirectory. Under Windows, the installer should start automatically
+when you insert the \DVD.  You can get the \DVD\ by becoming a member of
+a \TeX\ user group (highly recommended,
+\url{http://tug.org/usergroups.html}), or purchasing it separately
+(\url{http://tug.org/store}), or burning your own from the \ISO\
+image (\url{http://tug.org/texlive/acquire.html}).
+
 \end{description}
 
-\subsubsection{Unix/Linux}
+\subsubsection{Unix}
 
 \begin{figure}[tb]
 \begin{boxedverbatim}
@@ -520,7 +521,7 @@ Other actions:
 
 Enter command:
 \end{boxedverbatim}
-\caption{Main text installer screen (Linux)}\label{fig:text_main}
+\caption{Main text installer screen (\GNU/Linux)}\label{fig:text_main}
 \end{figure}
 
 \begin{figure}[tb]
@@ -531,60 +532,58 @@ Enter command:
 \noindent
 Below, \texttt{>} denotes the shell prompt; user input is
 \Ucom{\texttt{bold}}.
-Starting under Unix/Linux from an xterm or other terminal:
-
-\begin{alltt}
-> \Ucom{./install-tl}
-\end{alltt}
-or
+Starting in a terminal window on a Unix-compatible system, the simplest
+way:
 \begin{alltt}
+> \Ucom{cd /path/to/installer}
 > \Ucom{perl install-tl}
 \end{alltt}
-if you are in the installer directory, otherwise
-\begin{alltt}
-> \Ucom{<path_to_installer>/install-tl}
-\end{alltt}
-For \GUI\ mode, use
+
+(Or you can invoke \Ucom{perl /path/to/installer/install-tl}, or
+\Ucom{./install-tl} if it stayed executable, etc.; we won't repeat all
+these variations.)
+
+To install in \GUI\ mode (you'll need the \dirname{Perl/TK} module), use:
 \begin{alltt}
-> \Ucom{./install-tl -gui}
+> \Ucom{perl install-tl -gui}
 \end{alltt}
+
 For a complete listing of the various options:
 \begin{alltt}
-> \Ucom{./install-tl -help}
+> \Ucom{perl install-tl -help}
 \end{alltt}
 
-\textbf{Warning.} Your \code{umask} at the time of installation will
-be respected by the \TL{} installer.  Therefore, if you want your
-installation to be usable by users other than you, make sure your
-setting is sufficiently permissive, for instance, \code{umask 002}.
-For more information about \code{umask}, consult your system
+\textbf{Warning about Unix permissions:} Your \code{umask} at the time
+of installation will be respected by the \TL{} installer.  Therefore, if
+you want your installation to be usable by users other than you, make
+sure your setting is sufficiently permissive, for instance, \code{umask
+002}.  For more information about \code{umask}, consult your system
 documentation.
 
-\subsubsection{Windows}
 
-As already noted, the \DVD\ installer will probably start
-automatically when you put the \DVD\ in the \DVD-drive. If not, or
-if you use the net installer, you can double-click \filename{install-tl.bat}.
+\subsubsection{Windows}
 
-You can also start the installer from the command-prompt:
-Below, \texttt{>} denotes the prompt; user input is
-\Ucom{\texttt{bold}}.
+If you are using the net installer, or the \DVD\ installer failed to
+start automatically, double-click \filename{install-tl.bat}.
 
+You can also start the installer from the command-prompt.  Below,
+\texttt{>} denotes the prompt; user input is \Ucom{\texttt{bold}}.  If
+you are in the installer directory, run just:
 \begin{alltt}
 > \Ucom{install-tl}
 \end{alltt}
-if you are in the installer directory, otherwise
-\begin{alltt}
-> \Ucom{D:\bs{}install-tl}
-\end{alltt}
-for the downloadable \ISO, if \texttt{D:} is the optical drive, or
+
+Or you can invoke it with an absolute location, such as:
 \begin{alltt}
 > \Ucom{D:\bs{}texlive\bs{}install-tl}
 \end{alltt}
-for the \TK\ \DVD. For text mode, use
+for the \TK\ \DVD, supposing that \dirname{D:} is the optical drive.
+
+To install in text mode, use:
 \begin{alltt}
 > \Ucom{install-tl -no-gui}
 \end{alltt}
+
 For a complete listing of the various options:
 \begin{alltt}
 > \Ucom{install-tl -help}
@@ -593,11 +592,13 @@ For a complete listing of the various options:
 \subsubsection{The text installer}
 
 Figure~\ref{fig:text_main} displays the main text mode screen under
-Unix/Linux.
+Unix.
 
-You cannot tab around checkboxes or input fields. You just have to
-type something at the prompt and press the Enter key, and then the
-entire terminal screen will be rewritten, with adjusted content.
+This is only a command-line installer; there is no cursor support at
+all.  For instance, you cannot tab around checkboxes or input fields.
+You just have to type something (case-sensitive) at the prompt and press
+the Enter key, and then the entire terminal screen will be rewritten,
+with adjusted content.
 
 The text installer interface is this primitive for a reason: it
 is designed to run on as many platforms as possible, even with a
@@ -605,19 +606,18 @@ very barebones Perl (for Windows, a Perl subset is included).
 
 \subsubsection{The graphical installer}
 
-Figure~\ref{fig:gui_main} displays the graphical installer under Windows.
-
-Most differences in available options are due to
-this screenshot being from Windows, and the text screen above being
-from Linux.
+Figure~\ref{fig:gui_main} displays the graphical installer under
+Windows.  Most differences in available options are due to this
+screenshot being from Windows, and the previous text screen being
+from \GNU/Linux.
 
 \subsection{Running the installer}
 \label{sec:runinstall}
 
-The installer is mostly self-explanatory. Still, a few quick notes
-about the various options and submenus:
+The installer is intended to be mostly self-explanatory. Still, a few
+quick notes about the various options and submenus:
 
-\subsubsection{Binary systems menu (Unix/Linux only)}
+\subsubsection{Binary systems menu (Unix only)}
 \label{sec:binary}
 
 \begin{figure}[tbh]
@@ -625,42 +625,35 @@ about the various options and submenus:
 Available sets of binaries:
 ===============================================================================
 
-   a [ ] alpha-linux:     DEC Alpha with GNU/Linux
-   b [ ] amd64-freebsd:   x86_64 with FreeBSD
-   c [ ] hppa-hpux:       HP-UX
-   d [ ] i386-freebsd:    Intel x86 with FreeBSD
-   e [X] i386-linux:      Intel x86 with GNU/Linux
-   f [ ] i386-openbsd:    Intel x86 with OpenBSD
-   g [ ] i386-solaris:    Intel x86 with Sun Solaris
-   h [ ] mips-irix:       SGI IRIX
-   i [ ] powerpc-aix:     PowerPC with AIX
-   j [ ] powerpc-linux:   PowerPC with GNU/Linux
-   k [ ] sparc-linux:     Sparc with GNU/Linux
-   l [ ] sparc-solaris:   Sparc with Solaris
-   m [ ] universal-darwin: universal binaries for MacOSX/Darwin
-   o [ ] win32:           Windows
-   p [ ] x86_64-linux:    x86_64 with GNU/Linux
+   a [ ] alpha-linux      DEC Alpha with GNU/Linux
+   b [ ] amd64-freebsd    x86_64 with FreeBSD
+   c [ ] hppa-hpux        HP-UX
+   d [ ] i386-freebsd     Intel x86 with FreeBSD
+   e [X] i386-linux       Intel x86 with GNU/Linux
+   f [ ] i386-openbsd     Intel x86 with OpenBSD
+   g [ ] i386-solaris     Intel x86 with Sun Solaris
+   h [ ] mips-irix        SGI IRIX
+   i [ ] powerpc-aix      PowerPC with AIX
+   j [ ] powerpc-linux    PowerPC with GNU/Linux
+   k [ ] sparc-linux      Sparc with GNU/Linux
+   l [ ] sparc-solaris    Sparc with Solaris
+   m [ ] universal-darwin universal binaries for MacOSX/Darwin
+   o [ ] win32            Windows
+   p [ ] x86_64-linux     x86_64 with GNU/Linux
 \end{boxedverbatim}
 \caption{Binaries menu}\label{fig:bin_text}
 \end{figure}
 
 Figure~\ref{fig:bin_text} displays the text mode binaries menu.  By
-default, only the binaries for your current platform will be
-installed.  From this menu, you can select installation of binaries
-for other architectures as well.  This can be useful if you are
-sharing a \TeX\ tree across a network of heterogenous machines, or
-for a dual-boot system.
+default, only the binaries for your current platform will be installed.
+From this menu, you can select installation of binaries for other
+architectures as well.  This can be useful if you are sharing a \TeX\
+tree across a network of heterogenous machines, or for a dual-boot
+system.
 
 \subsubsection{Selecting what is going to be installed}
 \label{sec:components}
 
-From the scheme menu, see figure~\ref{fig:text_scheme}, you can
-choose an overall set of package collections.  The default
-\optname{full} scheme installs everything available, but you can
-also choose the \optname{basic} scheme for a minimal system, or
-\optname{medium} or \optname{teTeX} to get something in between.
-There are also various specialized and country-specific schemes.
-
 \begin{figure}[tbh]
 \begin{boxedverbatim}
 Select a scheme:
@@ -680,24 +673,33 @@ Select a scheme:
 \caption{Scheme menu}\label{fig:text_scheme}
 \end{figure}
 
+Figure~\ref{fig:text_scheme} display the \TL\ scheme menu; from here,
+you choose an overall set of package collections.  The default
+\optname{full} scheme installs everything available, but you can also
+choose the \optname{basic} scheme for a small system, \optname{minimal}
+for testing purposes, and \optname{medium} or \optname{teTeX} to get
+something in between.  There are also various specialized and
+country-specific schemes.
+
 \begin{figure}[tbh]
 \tlpng{stdcoll}{.7\linewidth}
 \caption{Collections menu (Linux)}\label{fig:gui_collections}
 \end{figure}
 
-You can refine your selection with the `standard collections' and
-`language collections' menus.  Collections are one level more
-detailed than schemes\Dash collections consist of one or more
-packages, where packages (the lowest level grouping in \TL) contain
-the actual \TeX\ macro files, font families, and so on.  In these
-submenus, selection letters are case-sensitive\Dash unless you run
-the \GUI{} installer, where you can simply click checkboxes; see
-figure~\ref{fig:gui_collections}.
+You can refine your scheme selection with the `standard collections' and
+`language collections' menus (figure~\ref{fig:gui_collections, in \GUI\
+mode for a change)}.  
+
+Collections are one level more detailed than schemes\Dash in essence, a
+scheme consists of several collections, a collection consists of one or
+more packages, and a package (the lowest level grouping in \TL) contains
+the actual \TeX\ macro files, font files, and so on.
 
-If you want more detail, you need run the \prog{tlmgr} program
-afterwards, see section~\ref{sec:tlmgr}.  The installer will take
-care of appropriate configuration of format generation, hyphenation
-patterns and font-related matters.
+If you want more control than the collections menus provide, you need to
+run the \prog{tlmgr} program afterwards (see section~\ref{sec:tlmgr});
+there you can control the installation at the package level.  The
+installer will take care of appropriate configuration of format
+generation, hyphenation patterns and font-related matters.
 
 \subsubsection{Directories}
 \label{sec:directories}
@@ -705,7 +707,7 @@ patterns and font-related matters.
 The default layout is described in section~\ref{sec:texmftrees},
 \p.\pageref{sec:texmftrees}. The default location of
 \dirname{TEXDIR} is different for Windows
-(|%PROGRAMFILES%\texlive\2008|) and for Unix/Linux
+(|%PROGRAMFILES%\texlive\2008|) and for Unix
 (\dirname{/usr/local/texlive/2008})\footnote{It is possible to
   override these defaults beforehand with environment variables;
   search the file \filename{install-tl} for
@@ -768,7 +770,7 @@ Three options require some explanation:
 \item[install font/macro source tree:] These are mostly
   \LaTeX{} \filename{.dtx} files, from which both \filename{.sty} files
   and documentation are generated. It is ok to uncheck this.
-\item[create symlinks in standard directories] (Unix/Linux only):
+\item[create symlinks in standard directories] (Unix only):
   this option bypasses the need to change environment
   variables. Without this option, \TL{} directories have to be added
   to \envname{PATH}, \envname{MANPATH} and \envname{INFOPATH}. You will
@@ -834,12 +836,12 @@ The installer will still create various directories and
 configuration files, but won't copy \dirname{texmf},
 \dirname{texmf-dist} or \dirname{texmf-doc} to harddisk.
 
-Post-install configuration for Unix/Linux will be slightly more
+Post-install configuration for Unix will be slightly more
 complicated, see section~\ref{sec:postinstall}, because now the
 directory layout deviates from the default.
 
 Due to time constraints, this option didn't make it into the \GUI{}
-installer, but it is available both for Unix/Linux and for
+installer, but it is available both for Unix and for
 Windows. Windows users have to start the installer from a command
 prompt, see section~\ref{sec:cmdline}.
 
@@ -939,7 +941,7 @@ For Windows, the installer takes care of everything.
 If you elected to create symlinks in standard directories then there
 is no need to edit environment variables.
 
-\subsubsection{Environment variables for Unix/Linux}
+\subsubsection{Environment variables for Unix}
 \label{sec:env}
 
 The directory of the binaries for your platform should be added to
@@ -1188,7 +1190,7 @@ are a guest on somebody else's system then you might prefer
 something with minimal side-effects.
 
 In the root of the \TL{} \DVD, or the \dirname{texlive} subdirectory
-of the \TK{} \DVD, are a \filename{tl-portable} script (Unix/Linux)
+of the \TK{} \DVD, are a \filename{tl-portable} script (Unix)
 and a \filename{tl-portable.bat} batchfile (Windows) which start up
 a secondary shell/command prompt with environment settings suitable
 for accessing the \TL{} on the \DVD.
@@ -1560,7 +1562,7 @@ described in the documentation of the individual packages and of \Webc{}
 itself.  However, knowing a few principles governing the whole family of
 programs will help you take advantage of your \Webc{} installation.
 
-All programs honor these standard \acro{GNU} options:
+All programs honor these standard \GNU options:
 \begin{ttdescription}
 \item[-{}-help] print basic usage summary.
 \item[-{}-verbose] print detailed progress report.
@@ -1863,7 +1865,7 @@ just runs the command
 cd \var{/your/texmf/root} && \path|\|ls -1LAR ./ >ls-R
 \end{alltt}
 presuming your system's \code{ls} produces the right output format
-(\acro{GNU} \code{ls} is all right).  To ensure that the database is
+(\GNU \code{ls} is all right).  To ensure that the database is
 always up-to-date, it is easiest to rebuild it regularly via
 \code{cron}, so that it is automatically updated when the installed
 files change, such as after installing or updating a \LaTeX{} package.
@@ -2252,8 +2254,8 @@ distribution.
 You will need at least 100 megabytes of disk space to compile all of
 \TeX{} and its support programs. You'll also need an \acro{ANSI} C
 compiler, a \cmdname{make} utility, a lexical scanner, and a parser
-generator. We recommend the \acro{GNU} version of these programs
-(\cmdname{gcc}, \acro{GNU} \cmdname{make}, \cmdname{m4}, \cmdname{flex},
+generator. We recommend the \GNU version of these programs
+(\cmdname{gcc}, \GNU \cmdname{make}, \cmdname{m4}, \cmdname{flex},
 \cmdname{bison}).  You may be able to work with other C compilers and
 \cmdname{make} programs, but you will need a good understanding of
 building Unix programs to sort out problems.
@@ -2286,7 +2288,7 @@ stands for the directory you chose):
   \dirname{$TEXDIR/share/texmf}          & main tree with fonts,\\
                                          & \qquad macros, etc\\
   \dirname{$TEXDIR/man}                  & Unix manual pages\\
-  \dirname{$TEXDIR/info}                 & \acro{GNU} style Info manuals\\
+  \dirname{$TEXDIR/info}                 & \GNU style Info manuals\\
   \dirname{$TEXDIR/bin/$PLATFORM}        & binaries\\
 \end{tabular}
 %$
@@ -2315,7 +2317,7 @@ Alternatively, you want to log all the output, as in:
 \end{alltt}
 
 Before you believe that everything went ok, please check the log file
-for errors: \acro{GNU} \cmdname{make} always uses the string \samp{***}
+for errors: \GNU \cmdname{make} always uses the string \samp{***}
 whenever a command fails.  Also, check if all the programs were built:
 
 \begin{alltt}
@@ -2788,7 +2790,7 @@ provide a stable development foundation for future years.
 
 Finally, in May 2006 Thomas Esser announced that he would no longer be
 updating te\TeX{} (\url{http://tug.org/tetex}).  As a result, there was
-been a surge of interest in \TL{}, especially among \acro{GNU}/Linux
+been a surge of interest in \TL{}, especially among \GNU/Linux
 distributors.  (There is a new \texttt{tetex} installation scheme in
 \TL{}, which provides an approximate equivalent.)  We hope this will
 eventually translate to improvements in the \TeX\ environment for