TeXLive docs: mostly installation.tex

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

5 files changed, 252 insertions, 307 deletions

diff --git a/Master/texmf-doc/source/texlive/texlive-en/installation.tex b/Master/texmf-doc/source/texlive/texlive-en/installation.tex
index fde98f59eec..1bc6553d1d0 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/installation.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/installation.tex
@@ -3,33 +3,36 @@
 
 \subsection{Starting the installer}
 \label{sec:inst_start}
-First, get \TL, \TK{} or the net installer, and locate the installer
-script: install-tl for Unix, install-tl.bat for Windows:
+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:
 
 \begin{itemize}
-\item For the \TK{} \DVD, go to its texlive- or texlive2008
+\item For the \TK{} \DVD, go to its \dirname{texlive}
   subdirectory. Under Windows, the installer will probably start
   automatically when you insert the \DVD.
 \item The net installer can be downloaded from CTAN, under
-  systems/texlive/tlnet. You can choose between install-tl.zip which
-  can be used under Unix and Windows and install-unx.tar.gz which is
-  Unix-only (including \MacOSX). Unpack it and go to the install-tl
+  \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 You can also download an iso image from CTAN. However, even
+\item You can also download an \ISO{} image from CTAN. However, even
   the compressed image is about 1 GB in size. So use one of the other
-  options unless you have a good reason for preferring the iso
+  options unless you have a good reason for preferring the \ISO{}
   image. 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 install-tl and
-  install-tl.bat will be in the root. Under Windows, the installer
+  \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.
 \end{itemize}
 
 \subsubsection{Unix/Linux}
 \noindent
 Below, \texttt{>} denotes the shell prompt; user input is
-\Ucom{\texttt{underlined}}.
-Starting under Unix/Linux from a terminal emulator:
+\Ucom{\texttt{bold}}.
+Starting under Unix/Linux from an xterm or other terminal:
 
 \begin{alltt}
 > \Ucom{./install-tl}
@@ -55,11 +58,11 @@ For a complete listing of the various options:
 
 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 install-tl.bat.
+if you use the net installer, you can 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{underlined}}.
+\Ucom{\texttt{bold}}.
 
 \begin{alltt}
 > \Ucom{install-tl}
@@ -68,7 +71,7 @@ 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
+for the downloadable \ISO, if \texttt{D:} is the optical drive, or
 \begin{alltt}
 > \Ucom{D:\bs{}texlive\bs{}install-tl}
 \end{alltt}
@@ -85,7 +88,9 @@ For a complete listing of the various options:
 
 This is the main text mode screen under Unix/Linux:
 
-\begin{verbatim}
+%\noindent\rule{\textwidth}{.4pt}
+
+\begin{boxedverbatim}
 ======================> TeX Live installation procedure <=====================
 
 =======> Note: Letters/digits in <angle brackets> indicate menu items <=======
@@ -131,7 +136,9 @@ Other actions:
  <Q> quit
 
 Enter command:
-\end{verbatim}
+\end{boxedverbatim}
+
+%\noindent\rule{\textwidth}{.4pt}
 
 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
@@ -165,7 +172,7 @@ 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. This is what the text mode menu looks like:
-\begin{verbatim}
+\begin{boxedverbatim}
 Available sets of binaries:
 ===============================================================================
 
@@ -184,7 +191,7 @@ Available sets of binaries:
    m [ ] universal-darwin: universal binaries for MacOSX/Darwin
    o [ ] win32:           Windows
    p [ ] x86_64-linux:    x86_64 with GNU/Linux
-\end{verbatim}
+\end{boxedverbatim}
 
 \subsubsection{Selecting what is going to be installed}
 From the scheme menu, you can choose an overall set of package
@@ -194,7 +201,7 @@ minimal system, or \optname{medium} or \optname{teTeX} to get
 something in between.  There are also various specialized and
 country-specific schemes.
 
-\begin{verbatim}
+\begin{boxedverbatim}
 Select a scheme:
 ===============================================================================
 
@@ -208,7 +215,7 @@ Select a scheme:
  h [ ] TeX Live for Omega users
  i [ ] teTeX scheme
  j [ ] XML typesetting scheme
-\end{verbatim}
+\end{boxedverbatim}
 
 You can refine your selection with the `standard collections' and
 `language collections' menus.  Collections are one level more
@@ -220,7 +227,7 @@ the gui installer, where you can simply click checkboxes. See the
 screenshot below:
 
 \noindent
-\tlpng{stdcoll}{\linewidth}
+\tlpng{stdcoll}{.7\linewidth}
 
 If you want more detail, you need run the tlmgr program afterwards,
 see....  The installer will take care of appropriate configuration
@@ -229,64 +236,191 @@ of format generation, hyphenation patterns and font-related matters.
 \subsubsection{Directories}
 
 The default layout is described in section~\ref{sec:texmftrees},
-\p.\pageref{sec:texmftrees}. The default location of \texttt{TEXDIR}
-is different for Windows (\texttt{\%PROGRAMFILES\%\bs texlive\bs
-2008}) and for Unix/Linux (\texttt{/usr/local/texlive/2008}).
+\p.\pageref{sec:texmftrees}. The default location of \dirname{TEXDIR}
+is different for Windows (|%PROGRAMFILES%\texlive\2008|) and
+for Unix/Linux (\dirname{/usr/local/texlive/2008}).
 
 The main reason for changing the proposed directory structure is
 lack of write permissions for the default location. You don't have
 to be root or adminstrator to install \TL, but you do need write
 access to the target directory.
 
-A logical
-alternate choice is under your home directory
+A logical alternate choice is a directory under your home directory,
+especially if you will be the sole user. Type
+`\dirname{~}' to indicate this, \emph{e.g.}: `\dirname{~/texlive/2008}'.
 
+We recommend including the year in the name, to enable keeping
+different releases of \TL{} side by side.  (You may wish to make a
+version-independent name such \dirname{/usr/local/texlive-cur} via a
+symbolic link, which you can then update after testing the new
+release.)
 
-\subsection{Installing from source}
+Changing \dirname{TEXDIR} will also change \dirname{TEXMFLOCAL},
+\dirname{TEXMFSYSVAR} and \dirname{TEXMFSYSCONFIG}.
 
-As long as your platform has a decent Perl, you will be able to
-install everything \emph{except} the binaries. It is probably a good
-idea to uncheck the option to create all format files. Afterwards,
-unpack source.tar.bzip2 from the source subdirectory and run the
-Build script in the root of the unpacked archive. Don't forget to
-read the README in the same directory.
+\dirname{TEXMFHOME} is the recommended location for personal
+macro files or packages.  The default value is \dirname{~/texmf}.  In
+contrast to \dirname{TEXDIR}, here a \path|~| is preserved in the
+newly-written configuration files, since it usefully refers to the home
+directory of each individual running \TeX.  It expands to
+\verb|$HOME| on Unix and \verb|%USERPROFILE%| on Windows.
+
+\subsubsection{Options}
+
+This is the text-mode Options menu under Unix/Linux:
+\begin{boxedverbatim}
+<P> use letter size instead of A4 by default: [ ]
+<F> create all format files:                  [X]
+<D> install font/macro doc tree:              [X]
+<S> install font/macro source tree:           [X]
+<L> create symlinks in standard directories:  [ ]
+           binaries to:
+           manpages to:
+               info to:
+\end{boxedverbatim}
+Three options require some explanation:
+\begin{description}
+\item[create all format files:] Although unnecessary format files
+  take time to generate and disk space to store, it is still
+  recommended to check this option: if you don't, then format files
+  will be generated people's private \dirname{TEXMFVAR} tree, and
+  won't be updated automatically if binaries or hyphenation patterns
+  etc. are updated, and they may end up with incompatible format
+  files.
+\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):
+  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
+  need write permissions to the target directories.  It is not
+  advisable to overwrite a \TeX\ system that came with your system
+  with this option.  It's intended primarily for creating the links
+  in standard directories that are known to users, such as
+  \dirname{/usr/local/bin}, which don't already contain any
+  \TeX\ files.
+\end{description}
+
+\subsubsection{Set up for running from \DVD{} (text mode only)}
+\label{sec:fromdvd}
+
+Typing `V' to select this option changes the main menu to something
+like
+
+\begin{boxedverbatim}
+======================> TeX Live installation procedure <=====================
 
-\subsection{Starting the installer}
+=======> Note: Letters/digits in <angle brackets> indicate menu items <=======
+=======>       for commands or configurable options                   <=======
 
-The installer is called
-http://www.ctan.org/tex-archive/systems/texlive/tlnet/tldev/
+ <D> directories:
+   TEXDIRW (Writable root):
+     !! default location: /usr/local/texlive/2008
+     !! is not writable, please select a different one!
+   TEXMFLOCAL (directory for site-wide local files):
+     /usr/local/texlive/texmf-local
+   TEXMFSYSVAR (directory for variable and automatically generated data):
+     /usr/local/texlive/2008/texmf-var
+   TEXMFSYSCONFIG (directory for local config):
+     /usr/local/texlive/2008/texmf-config
+   TEXMFHOME (directory for user-specific files):
+     ~/texmf
 
+ <O> options:
+   [ ] use letter size instead of A4 by default
+   [X] create all format files
 
-As introduced in section~\ref{sec:basic} (\p.\pageref{sec:basic}),
-\TL{} has three principal uses:
+ <V> set up for installing to hard disk
 
-\begin{enumerate}
-\item Run directly from media.
-\item Install to disk.
-\item Integrate a particular package or collection into your existing
-\TeX{} installation.
-\end{enumerate}
+Other actions:
+ <I> start installation for running from DVD
+ <H> help
+ <Q> quit
+\end{boxedverbatim}
+
+Note the changes: all options about what to install have
+disappeared, and the directories section now talks about
+\dirname{TEXDIRW} or writable root. The symlinks option has also
+disappeared.
 
-\noindent The following sections describes the Unix-specific procedures
-for each of these.
+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.
 
-\ifSingleColumn \begin{figure}[ht]\noindent \fi
-\begin{warningbox}
-\textbf{Warning: } The \TK{} \CD{}s and \DVD{} are in ISO 9660 (High Sierra)
-format, \emph{with} Rock Ridge (and Joliet, for Windows)
-extensions. Therefore, in order to take full advantage of the \TK{}
-under Unix, your system needs to be able to use the Rock Ridge
-extensions.  Please consult the documentation for your \cmdname{mount}
-command to see how to do this.  If you have several different machines
-on a local network, you may be able to mount the discs on one which
-does support Rock Ridge, and use this with the others.
+Post-install configuration for Unix/Linux will be slightly more
+complicated, see ..., because now the directory layout deviates
+from the default.
 
-\leavevmode\quad Modern systems should be able to use the discs without
-problems.  If troubles, let us know.  The discussion below assumes you
-have been able to mount the \CD{}s with full Rock Ridge compatibility.
-\end{warningbox}
-\ifSingleColumn\end{figure}\fi
+Due to time constraints, this option didn't make it into the \GUI{}
+installer, but it is available both for Unix/Linux and for
+Windows. Windows users have to start the installer from a command
+prompt, see ...
 
+Section \ref{sec:portable-unix} describes a more strictly portable
+way to run \TL, which doesn't make or require changes in the
+system's configuration.
+
+\subsection{Manual post-install actions}
+
+\subsection{Command-line install options}
+
+Type
+\begin{alltt}
+> \Ucom{install-tl -help}
+\end{alltt}
+for a listing of command-line options. These are the more
+interesting ones:
+
+\begin{ttdescription}
+\item[-gui] If possible, use the \GUI{} installer. This requires the
+  Perl/Tk module (\url{http://tug.org/texlive/distro.html#perltk});
+  if Perl/Tk is not available, installation continues in text mode.
+\item[-no-gui] Force using the text mode installer, even under
+  Windows, \emph{e.g.} because you want a `from \DVD' installation,
+  which is not available in \GUI{} mode.
+\item[-lang \textit{2-letter code}] Specify the installer interface
+  language. Currently supported languages: English (\texttt{en},
+  default), German (\texttt{de}), French (\texttt{fr}), Dutch
+  (\texttt{nl}), Polish (\texttt{pl}) and Slovenian (\texttt{sl}).
+\item[-profile \textit{profile}] The installer writes a file
+  \filename{texlive.profile} to the \dirname{2008/tlpkg}- or
+  \dirname{tlpkg} subdirectory of your installation. With a copy of
+  this file, you can install in batchmode on subsequent systems,
+  reproducing the choices you made for the original installation.
+\item [-location \textit{url/path}] Specify a non-default source for
+  packages; see below.
+\end{ttdescription}
+
+\subsubsection{The \optname{location} parameter}
+
+The argument can be an \texttt{ftp:} or \texttt{http:} url, but also
+a local \texttt{file:/} url, and even a plain path. If the given
+argument is on a local drive (either a path or a \texttt{file:/}
+url), the installation type (compressed or live) is automatically
+determined: if an \dirname{archive} subdirectory with
+\filename{.tar.lzma} files is found then it will be used, even if
+uncompressed files are available as well.
+
+When giving an \texttt{http:} or \texttt{ftp:} location,
+trailing `\texttt{/}' characters and/or a trailing `\texttt{/tlpkg}'
+component are ignored.  For example, you could choose a particular
+CTAN mirror with something like:
+\url{http://ctan.example.org/tex-archive/texlive/tlnet/2008},
+substituting of course a proper hostname and its particular top-level
+CTAN path (the list of CTAN mirrors is maintained at
+\url{http://ctan.org/mirrors}). The default is to pick a mirror
+automatically, using \url{http://mirror.ctan.org}; one mirror is
+used for the entire download.
+
+\subsection{Installing from source}
+
+As long as your platform has a decent Perl, you will be able to
+install everything \emph{except} the binaries. It is probably a good
+idea to uncheck the option to create all format files. Afterwards,
+unpack source.tar.bzip2 from the source subdirectory and run the
+Build script in the root of the unpacked archive. Don't forget to
+read the \filename{README} in the same directory.
 
 % 
 \subsection{Portable \protect\TL{} on DVD and USB (Unix)}
@@ -296,8 +430,8 @@ have been able to mount the \CD{}s with full Rock Ridge compatibility.
 It is possible to use the \TeX{} system directly from the \pkgname{live}
 \DVD{}, without installing the distribution to hard disk.  (Thus the
 name \TeX\ `Live', in fact.)  It is \emph{not} possible to run \TeX{}
-directly from the other \CD{}s (see section~\ref{sec:multiple-dist},
-\p.\pageref{sec:multiple-dist}).
+directly from the other \CD{}s (see section~\ref{sec:tl-coll-dists},
+\p.\pageref{sec:tl-coll-dists}).
 }
 
 \def\startinst{% repeated in other subsections
@@ -306,7 +440,7 @@ enabled.  The exact command to do this varies from system to system; the
 following works under \acro{GNU}/Linux, except the name of the device
 (\filename{/dev/cdrom}, here) may vary. (All our examples will use
 \texttt{>} as the shell prompt; user input is
-\Ucom{\texttt{underlined}}.)
+\Ucom{\texttt{bold}}.)
 \begin{alltt}
 > \Ucom{mount -t iso9660 /dev/cdrom /mnt/cdrom}
 \end{alltt}
@@ -365,174 +499,6 @@ your personal initialization files can and do vary from site to site.
 
 
 
-% 
-\subsection{Installing \protect\TeX\protect\ Live to disk}
-\label{sec:install-disk}
-
-It is possible, indeed typical, to install the \TL{} distribution to
-hard disk.  This can be done from either the \pkgname{live} or
-\pkgname{inst} distributions.  (See section~\ref{sec:multiple-dist},
-\p.\pageref{sec:multiple-dist}, for an explanation of the different
-distributions.)
-
-\startinst
-
-Run the installation script \filename{install-tl.sh}:
-\begin{alltt}
-> \Ucom{sh install-tl.sh}\\
-Welcome to TeX Live...
-\end{alltt}
-
-\noindent After various greeting messages and a list of the main menu
-options, the installation will ask you to enter a command.  Do this by
-typing the desired character and hitting return; don't type the angle
-brackets shown.  Either uppercase or lowercase is ok; we'll use
-lowercase in our examples.
-
-Table~\ref{tab:main-menu-options} briefly lists the options in the main
-menu.  The order in which you select the options makes little
-difference, except that \Ucom{i} must be last.  It's reasonable to go
-through them in the order presented here.
-
-% apparently here.sty [H] doesn't support table*.
-\begin{table}[H]
-\caption{Main menu options for the installation.}
-\label{tab:main-menu-options}
-\begin{tabular}{>{\ttfamily}ll}
-p & The platform you are running on.\\
-b & The architectures for which to install binaries.\\
-s & The base installation scheme to use (minimal, recommended,
-          full, etc.)\\
-c & Override the base scheme for individual collections.\\
-l & Override for language collections.\\
-d & Directories in which to install.\\
-o & Other options.\\
-i & Perform the installation.\\
-\end{tabular}
-\end{table}
-
-Here are further details on each option.
-
-% xx really should generate list from texmf/tpm/collection/tex-lang*
-% a la install-tl.sh.
-\begin{tabbing}
-\hspace{.25\linewidth} \=
-\hspace{.25\linewidth} \=
-\hspace{.25\linewidth} \=
-\hspace{.25\linewidth} \kill
-(some) African scripts \>
-Arabic \>
-Armenian \>
-Chinese\,Japanese\,Korean \\
-Croatian \>
-Cyrillic \>
-Czech/Slovak \>
-Danish \\
-Dutch \>
-Finnish \>
-French \>
-German \\
-Greek \>
-Hebrew \>
-Hungarian \>
-Indic \\
-Italian \>
-Latin \>
-Manju \>
-Mongolian \\
-Norwegian \>
-Polish \>
-Portuguese \>
-Spanish \\
-Swedish \>
-Tibetan \>
-\acro{UK} English \>
-Vietnamese \\
-\end{tabbing}
-
-\noindent Language collections typically include fonts, macros,
-hyphenation patterns, and other support files.  (For instance,
-\pkgname{frenchle.sty} is installed if you select the \optname{French}
-collection.)  In addition, installing a language collection will alter
-the \filename{language.dat} configuration file controlling which
-hyphenation patterns are loaded.
-
-\textbf{\optname{d} -- Installation directories}.  The following
-directories can be changed here:
-\label{text:instdir}
-
-\begin{ttdescription}
-\item [TEXDIR] The top-level directory under which
-everything else will be installed.  The default value is
-\dirname{/usr/local/texlive/2007}, and is often changed.  We recommend
-including the year in the name, to keep different releases of \TL{}
-separate.  (You may wish to make a version-independent name such
-\dirname{/usr/local/texlive-cur} via a symbolic link, which you can then
-update after testing the new release.)
-
-Under \MacOSX, the usual frontends look for \TeX{} in
-\dirname{/usr/local/teTeX}, so you may wish to install \TL{} there.
-
-If you use a \path|~| in this value, it is immediately expanded to your
-home directory (and this is reflected in the prompt).  The expanded
-value is also used in the custom configuration files written by the
-installer.
-
-\item [TEXMFLOCAL] This tree is the recommended location to for any
-locally-created or installed packages or configuration files.  The
-default value is \dirname{/usr/local/texlive/texmf-local}, independent
-of the current \TL{} release.
-
-\item [TEXMFSYSVAR] This tree is where \cmdname{texconfig-sys} puts
-files that \emph{are} version-specific.  The default value is
-\dirname{TEXDIR/texmf-var}, and there's generally no reason to change
-it.  See section~\ref{sec:texconfig}, \p.\pageref{sec:texconfig} for
-more information.
-
-\item [TEXMFHOME] This tree is the recommended location for personal
-macro files or packages.  The default value is \dirname{~/texmf}.  In
-contrast to \dirname{TEXDIR}, here a \path|~| is preserved in the
-newly-written configuration files, since it usefully refers to the home
-directory of each individual running \TeX.  It expands to
-\filename{\$HOME} on Unix and \filename{\%USERPROFILE\%} on Windows.
-
-\end{ttdescription}
-
-\textbf{\optname{o} -- Other options.}  From this menu, you can select
-the following general options:
-
-\begin{ttdescription}
-\item [a] Specify an alternate directory for generated fonts.
-The default is to use the \envname{TEXMFVAR} tree, as explained above.
-Setting this is useful if you plan to mount the main tree read-only, and
-therefore you need another location (perhaps host-specific) for
-dynamically created fonts.
-
-\item [l] Create symbolic links for the binaries, man pages,
-and\slash or \acro{GNU} Info files in other locations.  For example, you may
-wish to make the man pages available under \dirname{/usr/local/man} and
-the Info files available under \dirname{/usr/local/info}.  (Of course
-you need appropriate privileges to write in the specified directories.)
-
-It is not advisable to overwrite a \TeX\ system that came with your
-system with this option.  It's intended primarily for creating the links
-in standard directories that are known to users, such as
-\dirname{/usr/local/bin}, which don't already contain any \TeX\ files.
-
-\item [d] Skip installation of the font/macro documentation tree.
-This is useful if you need to save space, or if you've previously
-installed the documentation elsewhere.
-
-\item [s] Skip installation of the main font/macro source
-tree.  This is useful if you are arranging to share that tree between
-machines and\slash or architectures in some other way, such as \acro{NFS}.
-
-\end{ttdescription}
-
-\textbf{i -- Perform installation.}  When you're satisfied with your
-configuration options, enter \Ucom{i} to actually do the installation
-from the media to your chosen locations.
-
 % text is similar to above, but no TEXMFSYSVAR, so we have to write out.
 After the installation completes, your next step is to include the
 architecture-specific subdirectory of \dirname{TEXDIR/bin} in your
@@ -590,30 +556,6 @@ MANPATH_MAP /usr/local/texlive/2007/bin/i386-linux \
 
 \textifindoubt
 
-\begin{table*}[ht]
-\caption[Supported system architectures.]{Supported system
-architectures.}
-\label{tab:archlist}
-\begin{tabular}{>{\ttfamily}ll}
-alpha-linux	   & HP Alpha GNU/Linux   \\
-hppa-hpux          & HPPA HP-UX	  \\
-i386-darwin        & x86 \MacOSX    \\
-i386-freebsd       & x86 FreeBSD    \\
-i386-linux         & x86 GNU/Linux  \\
-i386-openbsd       & x86 OpenBSD   \\
-i386-solaris       & x86 Solaris    \\
-mips-irix          & SGI IRIX             \\
-powerpc-aix        & IBM RS/6000 AIX      \\
-powerpc-darwin     & PowerPC \MacOSX      \\
-powerpc-linux      & PowerPC GNU/Linux      \\
-sparc-linux        & Sun Sparc GNU/Linux  \\
-sparc-solaris      & Sun Sparc Solaris    \\
-win32		   & Windows (32-bit)     \\
-x86\_64-linux      & x86 64-bit GNU/Linux \\
-\hline
-\end{tabular}
-\end{table*}
-
 
 \subsubsection{Non-interactive installation}
 \label{sec:noninteractive-install}
diff --git a/Master/texmf-doc/source/texlive/texlive-en/intro.tex b/Master/texmf-doc/source/texlive/texlive-en/intro.tex
index 300cdb1b43e..c4d1474b5fd 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/intro.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/intro.tex
@@ -9,7 +9,7 @@ and other Unix flavors, \MacOSX, and Windows systems.
 
 You may have acquired \TL{} by downloading, or on the \TK{} \DVD,
 which \TeX{} usergroups distribute among their members. Section
-\ref{sec:multiple-dist} briefly describes the contents of this \DVD.
+\ref{sec:tl-coll-dists} briefly describes the contents of this \DVD.
 Both \TL{} and the \TK{} are cooperative efforts by the \TeX{} user
 groups. This document mainly describes \TL{} itself.
 
@@ -38,7 +38,7 @@ restriction, Windows requires less special treatment compared to
 Linux and Unix. There are no 64-bit executables for Windows, but the
 32-bit executables should run on 64-bit systems.
 
-See section~\ref{sec:multiple-dist} for alternate solutions
+See section~\ref{sec:tl-coll-dists} for alternate solutions
 for Windows and \MacOSX.
 
 \subsection{Basic usage of \protect\TL{}}
diff --git a/Master/texmf-doc/source/texlive/texlive-en/overview.tex b/Master/texmf-doc/source/texlive/texlive-en/overview.tex
index cdbbbcb8a67..13d97f925b8 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/overview.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/overview.tex
@@ -7,10 +7,10 @@
 This section describes the structure and contents of \TL{} and the
 \TK{} of which it is a part.
 
-\subsection{Multiple distributions: \protect\pkgname{live},
+\subsection{The \protect\TeX\protect\ Collection: \protect\pkgname{live},
             \protect\pkgname{protext},
             \protect\pkgname{Mac\TeX}}
-\label{sec:multiple-dist}
+\label{sec:tl-coll-dists}
 
 The \TK{} \DVD{} comprises the following:
 
@@ -33,12 +33,12 @@ The \ProTeXt\ home page is \url{http://tug.org/protext}.
 
 \end{description}
 
-\CTAN{}, \pkgname{protext}, Mac\TeX, and \texttt{texmf-extra} do not follow
+\CTAN{}, \pkgname{protext}, Mac\TeX, and \dirname{texmf-extra} do not follow
 the same copying conditions as \TL{}, so be careful when redistributing or
 modifying.
 
 \noindent You can tell which type of distribution you're in by
-looking for a \texttt{release-texlive.txt} file at the top of the
+looking for a \filename{release-texlive.txt} file at the top of the
 \TL{} directory.  This file also contains the \TL{} release date.
 
 Naturally, each user group chooses what to distribute to its own members.
@@ -48,7 +48,7 @@ Naturally, each user group chooses what to distribute to its own members.
 
 Here is a brief listing and description of the top level directories in
 the \TL{} distribution.  On the \pkgname{live} \DVD, the entire \TL{}
-hierarchy is in a subdirectory \dirname{texliveYYYY}, not at the top
+hierarchy is in a subdirectory \dirname{texlive}, not at the top
 level of the disc.
 
 %\smallskip
@@ -69,22 +69,13 @@ various compressed archives.
   \emph{not} installed automatically.  This includes
   assorted editors and \TeX\ shells.
 %
-\item[texmf] Tree for the programs, along with their support files and
-  documentation.  Does not include \TeX\ formats and packages.
-  (\texttt{TEXMFMAIN} in the next section.)
+\item[texmf] See \dirname{TEXMFMAIN} below.
 %
-\item[texmf-dist] The main tree of formats and packages.
-  (\texttt{TEXMFDIST} in the next section.)
+\item[texmf-dist] See \dirname{TEXMFDIST} below.
 %
 \item[texmf-doc] Tree for self-contained pure documentation, arranged by
   language.
 %
-\item[texmf-var] This is not strictly part of the distribution, but will
-  be located next to the above texmf trees in a default
-  installation; it can be located elsewhere. This tree contains
-  files which are automatically generated and stored.
-  (\texttt{TEXMFSYSVAR} in the next section.)
-%
 \item[tlpkg] Scripts, programs and data for managing the
   installation. It also contains private copies of
   Perl and Ghostscript for Windows, which are invisible outside \TL,
@@ -99,29 +90,30 @@ In addition to the directories above, the installation scripts and
 \filename{README} files (in various languages) are at the top level of
 the distribution.
 
-The \dirname{texmf-doc} directory contains only documentation, but
-it does not contain all the documentation.  The documentation for the
-programs (manuals, man pages, Info files) is in \dirname{texmf/doc},
-since the programs are in \dirname{texmf}.  Similarly, the documentation
-for \TeX\ packages and formats is in \dirname{texmf-dist/doc}.  You can
-use the \cmdname{texdoc} or \cmdname{texdoctk} programs to find any
-documentation wherever it's located.  The comprehensive links in the
-top-level file \OnCD{doc.html} may also be helpful.
+The \dirname{texmf-doc} directory contains documentation which does
+not belong to any particular package or program.  The documentation
+for the programs (manuals, man pages, Info files) is in
+\dirname{texmf/doc}.  The documentation for \TeX\ packages and
+formats is in \dirname{texmf-dist/doc}.  You can use the
+\cmdname{texdoc} or \cmdname{texdoctk} programs to find any
+documentation wherever it is located.  The comprehensive links in
+the top-level file \OnCD{doc.html} may also be helpful.
 
 
 \subsection{Overview of the predefined texmf trees}
 \label{sec:texmftrees}
 
 This section lists all predefined variables specifying texmf trees
-used by the system, and their intended purpose, and their default
-layout. The command \texttt{texconfig conf} shows you the values of
-these variables, so that you can easily find out how they map to
-directory names in your installation.
+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
+how they map to directory names in your installation.
 
 \begin{ttdescription}
 \item [TEXMFMAIN] The tree which holds vital parts of the system
-  such as helper scripts (e.g., \verb+web2c/mktexdir+) and
-  other support files.
+  such as helper scripts (e.g., \verb+web2c/mktexdir+) and other
+  support files and their documentation.  Does not include
+  \TeX\ formats and packages.
 \item [TEXMFDIST] The tree which holds the main set of macro packages,
   fonts, etc., as originally distributed.
 \item [TEXMFLOCAL] The tree which administrators can use for system-wide
@@ -156,13 +148,20 @@ The default layout is:
     \end{ttdescription}
     \item[2008] the current release
     \begin{ttdescription}
-      \item [TEXMFMAIN] \textit{i.e.} \texttt{texmf}
-      \item [TEXMFDIST] \textit{i.e.} \texttt{texmf-dist}
-      \item [TEXMFDOC] \textit{i.e.} \texttt{texmf-doc}
-      \item [TEXMFSYSVAR] \textit{i.e.} \texttt{texmf-var}
-      \item [TEXMFSYSCONFIG] \textit{i.e.} \texttt{texmf-config}
+      \item [bin] ~
+      \begin{ttdescription}
+        \item [i386-linux] 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}
     \end{ttdescription}
-    \item [TEXMFLOCAL] \textit{i.e.} \texttt{texmf-local}, can be
+    \item [TEXMFLOCAL] \textit{i.e.} \dirname{texmf-local}, can be
       retained from release to release
   \end{ttdescription}
   \item[user's home] \textit{i.e.} \texttt{\$HOME} or
@@ -176,10 +175,10 @@ The default layout is:
       \item[.texlive2008] Private generated and configuration data
         for the current release
       \begin{ttdescription}
-        \item [TEXMFVAR] \textit{i.e.} \texttt{texmf-var}
-        \item [TEXMFCONFIG] \textit{i.e.} \texttt{texmf-config}
+        \item [TEXMFVAR] \textit{i.e.} \dirname{texmf-var}
+        \item [TEXMFCONFIG] \textit{i.e.} \dirname{texmf-config}
       \end{ttdescription}
-    \item[TEXMFHOME] \textit{i.e.} \texttt{texmf} Private macros
+    \item[TEXMFHOME] \textit{i.e.} \dirname{texmf} Private macros
       \textit{etc.}
   \end{ttdescription}
 \end{description}
@@ -191,7 +190,7 @@ see section~\ref{sec:texconfig}, \p.\pageref{sec:texconfig}.
 \subsection{Extensions to \protect\TeX}
 \label{sec:tex-extensions}
 
-\TeX{} itself is frozed, apart from rare bug fixes. It is still
+\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:
 
@@ -205,10 +204,11 @@ 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}.  This is the
-default program for all formats except plain \TeX.
+  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
@@ -216,7 +216,7 @@ default program for all formats except plain \TeX.
   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 \texttt{texlua}, it
+  thorny \TeX{} problems. When called as \filename{texlua}, it
   functions as a standalone Lua interpreter, and is already used as
   such within \TL.
 
diff --git a/Master/texmf-doc/source/texlive/texlive-en/releasehist.tex b/Master/texmf-doc/source/texlive/texlive-en/releasehist.tex
index c4eb705a50b..5d750bd76b0 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/releasehist.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/releasehist.tex
@@ -60,7 +60,7 @@ programs. An important goal was integration of the source back with
 In 2003, with the continuing flood of updates and additions, we found
 that \TL{} had grown so large it could no longer be contained on a
 single \CD, so we split it into three different distributions (see
-section~\ref{sec:multiple-dist}, \p.\pageref{sec:multiple-dist}).  In
+section~\ref{sec:tl-coll-dists}, \p.\pageref{sec:tl-coll-dists}).  In
 addition:
 
 \begin{itemize*}
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 d12c5d7386e..4175544bbcf 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
+++ b/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
@@ -94,8 +94,10 @@
 \newcommand{\ttvar}[1]{\texttt{\var{#1}}}
 %
 % underlined command input.
-\def\Ucom#1{%
-   \uline{\rule[-.2\baselineskip]{0pt}{.9\baselineskip}\ttfamily #1}}
+%\def\Ucom#1{%
+%   \uline{\rule[-.2\baselineskip]{0pt}{.9\baselineskip}\ttfamily #1}}
+% bold command input
+\def\Ucom#1{{\bfseries\ttfamily #1}}
 %
 % \CDref is for url's with a #, where we need to write the target url and
 % displayed url separately in the input, due to catcode madness.
@@ -166,6 +168,7 @@
 \providecommand*{\CD}{\acro{CD}\xspace}
 \providecommand*{\CTAN}{\acro{CTAN}\xspace}
 \providecommand*{\DVD}{\acro{DVD}\xspace}
+\providecommand*{\ISO}{\acro{ISO}\xspace}
 \providecommand*{\HTML}{\acro{HTML}\xspace}
 \providecommand*{\MacOSX}{Mac\,\acro{OS\,X}\xspace}
 \providecommand*{\PS}{Post\-Script\xspace}