TL docs: installation chapter almost done

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

6 files changed, 289 insertions, 294 deletions

diff --git a/Master/texmf-doc/source/texlive/texlive-en/Makefile b/Master/texmf-doc/source/texlive/texlive-en/Makefile
index d95224d48e9..e67703c545f 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/Makefile
+++ b/Master/texmf-doc/source/texlive/texlive-en/Makefile
@@ -47,7 +47,7 @@ install:
 	for f in $(instfiles); do \
 	  cmp -s $$f $$instdir/$$f && rm -v $$f && continue; \
 	  mv -v $$f $$instdir/$$f; \
-	done; echo "$$instdir"
+	done; \
 	lang=$(lang); \
 	tldir=`pwd | sed 's,.*/,,'`; \
 	instdir=$(insttop)/$$lang/$$tldir; \
diff --git a/Master/texmf-doc/source/texlive/texlive-en/install-w32-main.png b/Master/texmf-doc/source/texlive/texlive-en/install-w32-main.png
index 56cbd802ee3..9f37e74532a 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/install-w32-main.png
+++ b/Master/texmf-doc/source/texlive/texlive-en/install-w32-main.png
diff --git a/Master/texmf-doc/source/texlive/texlive-en/installation.tex b/Master/texmf-doc/source/texlive/texlive-en/installation.tex
index 1bc6553d1d0..cb47a31bae1 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/installation.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/installation.tex
@@ -3,32 +3,90 @@
 
 \subsection{Starting the installer}
 \label{sec:inst_start}
-First, get the \TL{} \DVD{} or the \TK{} \DVD, or the net installer,
+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 \dirname{texlive}
+\begin{description}
+\item [\TeX{} Collection \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
+\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 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{}
-  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 \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}
+\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.
+\end{description}
 
 \subsubsection{Unix/Linux}
+
+\begin{figure}[tb]
+\begin{boxedverbatim}
+======================> TeX Live installation procedure <=====================
+
+=======> Note: Letters/digits in <angle brackets> indicate menu items <=======
+=======>       for commands or configurable options                   <=======
+
+
+ Detected platform: Intel x86 with GNU/Linux
+
+ <B> binary systems: 1 out of 16
+
+ <S> Installation scheme (scheme-full)
+
+ Customizing installation scheme:
+   <C> standard collections
+   <L> language collections
+   83 collections out of 84, disk space required: 1666 MB
+
+ <D> directories:
+   TEXDIR (the main TeX directory):
+     !! 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
+   [X] install macro/font doc tree
+   [X] install macro/font source tree
+   [ ] create symlinks in standard directories
+
+ <V> Install for running from DVD
+
+Other actions:
+ <I> start installation to HD
+ <H> help
+ <Q> quit
+
+Enter command:
+\end{boxedverbatim}
+\caption{Main text installer screen (Linux)}\label{fig:text_main}
+\end{figure}
+
+\begin{figure}[tb]
+\tlpng{install-w32-main}{\linewidth}
+\caption{Main \GUI{} installer screen (Windows)}\label{fig:gui_main}
+\end{figure}
+
 \noindent
 Below, \texttt{>} denotes the shell prompt; user input is
 \Ucom{\texttt{bold}}.
@@ -54,6 +112,13 @@ For a complete listing of the various options:
 > \Ucom{./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
+documentation.
+
 \subsubsection{Windows}
 
 As already noted, the \DVD\ installer will probably start
@@ -86,59 +151,8 @@ For a complete listing of the various options:
 
 \subsubsection{The text installer}
 
-This is the main text mode screen under Unix/Linux:
-
-%\noindent\rule{\textwidth}{.4pt}
-
-\begin{boxedverbatim}
-======================> TeX Live installation procedure <=====================
-
-=======> Note: Letters/digits in <angle brackets> indicate menu items <=======
-=======>       for commands or configurable options                   <=======
-
-
- Detected platform: Intel x86 with GNU/Linux
-
- <B> binary systems: 1 out of 16
-
- <S> Installation scheme (scheme-full)
-
- Customizing installation scheme:
-   <C> standard collections
-   <L> language collections
-   83 collections out of 84, disk space required: 1666 MB
-
- <D> directories:
-   TEXDIR (the main TeX directory):
-     !! 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
-   [X] install macro/font doc tree
-   [X] install macro/font source tree
-   [ ] create symlinks in standard directories
-
- <V> Install for running from DVD
-
-Other actions:
- <I> start installation to HD
- <H> help
- <Q> quit
-
-Enter command:
-\end{boxedverbatim}
-
-%\noindent\rule{\textwidth}{.4pt}
+Figure~\ref{fig:text_main} displays the main text mode screen under
+Unix/Linux:
 
 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
@@ -150,28 +164,22 @@ very barebones Perl (for Windows, a Perl subset is included).
 
 \subsubsection{The graphical installer}
 
-This is what the graphical installer looks like under Windows:
-
-\noindent
-%\includegraphics[width=\linewidth]{install-w32-main.png}
-\tlpng{install-w32-main}{\linewidth}
+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.
 
 \subsection{Running the installer}
+\label{sec:runinstall}
 
 The installer is mostly self-explanatory. Still, a few quick notes
 about the various options and submenus:
 
 \subsubsection{Binary systems menu (Unix/Linux only)}
+\label{sec:binary}
 
-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. This is what the text mode menu looks like:
+\begin{figure}[tbh]
 \begin{boxedverbatim}
 Available sets of binaries:
 ===============================================================================
@@ -192,15 +200,27 @@ Available sets of binaries:
    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.
 
 \subsubsection{Selecting what is going to be installed}
-From the scheme menu, 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.
+\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:
 ===============================================================================
@@ -216,6 +236,13 @@ Select a scheme:
  i [ ] teTeX scheme
  j [ ] XML typesetting scheme
 \end{boxedverbatim}
+\caption{Scheme menu}\label{fig:text_scheme}
+\end{figure}
+
+\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
@@ -223,22 +250,26 @@ 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 the
-screenshot below:
+the gui installer, where you can simply click checkboxes; see
+figure~\ref{fig:gui_collections}.
 
-\noindent
-\tlpng{stdcoll}{.7\linewidth}
-
-If you want more detail, you need run the tlmgr program afterwards,
+If you want more detail, you need run the \prog{tlmgr} program afterwards,
 see....  The installer will take care of appropriate configuration
 of format generation, hyphenation patterns and font-related matters.
 
 \subsubsection{Directories}
+\label{sec:directories}
 
 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 (\dirname{/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})\footnote{It is possible to
+  override these defaults beforehand with environment variables;
+  search the file \filename{install-tl} for
+  \texttt{TEXLIVE\_INSTALL\_}. However, if you want to automate
+  installations then a far better option is to use profiles; see
+  section~\ref{sec:cmdline} under \optname{-profile}.}.
 
 The main reason for changing the proposed directory structure is
 lack of write permissions for the default location. You don't have
@@ -247,7 +278,7 @@ access to the target 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}'.
+`|~|' to indicate this, \emph{e.g.}: `|~/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
@@ -259,15 +290,16 @@ Changing \dirname{TEXDIR} will also change \dirname{TEXMFLOCAL},
 \dirname{TEXMFSYSVAR} and \dirname{TEXMFSYSCONFIG}.
 
 \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
+macro files or packages.  The default value is |~/texmf|.  In
+contrast to \dirname{TEXDIR}, here a |~| 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}
+\label{sec:options}
 
-This is the text-mode Options menu under Unix/Linux:
+\begin{figure}[tbh]
 \begin{boxedverbatim}
 <P> use letter size instead of A4 by default: [ ]
 <F> create all format files:                  [X]
@@ -278,12 +310,16 @@ This is the text-mode Options menu under Unix/Linux:
            manpages to:
                info to:
 \end{boxedverbatim}
+\caption{Options menu (Linux)}\label{fig:text_options}
+\end{figure}
+
+Figure~\ref{fig:text_options} displays the text mode options menu.
 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
+  will be generated in 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.
@@ -296,18 +332,23 @@ Three options require some explanation:
   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
+  with this option.  It is 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}
 
+Now when all these settings are to your liking, you can type `I' to
+start the installation process. When it is done, skip to
+section~\ref{sec:postinstall} to read what else needs to be done, if
+anything.
+
 \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
-
+Typing `V' to select this option. This changes the main menu into something
+like figure~\ref{fig:main_fromdvd}.
+\begin{figure}[tbh]
 \begin{boxedverbatim}
 ======================> TeX Live installation procedure <=====================
 
@@ -338,6 +379,9 @@ Other actions:
  <H> help
  <Q> quit
 \end{boxedverbatim}
+\caption{The main menu with \optname{from DVD}
+  set}\label{fig:main_fromdvd}
+\end{figure}
 
 Note the changes: all options about what to install have
 disappeared, and the directories section now talks about
@@ -349,21 +393,20 @@ 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
-complicated, see ..., because now the directory layout deviates
-from the default.
+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
 Windows. Windows users have to start the installer from a command
-prompt, see ...
+prompt, see section~\ref{sec:cmdline}.
 
 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}
+system's configuration, but doesn't allow any configuration either.
 
 \subsection{Command-line install options}
+\label{sec:cmdline}
 
 Type
 \begin{alltt}
@@ -382,12 +425,37 @@ interesting ones:
 \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}).
+  (\texttt{nl}), Polish (\texttt{pl}) and Slovenian
+  (\texttt{sl}). The installer tries to determine the right language
+  itself but if it fails, or if the right language is not available,
+  then it uses English as a fallback.
 \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.
+  \dirname{tlpkg} subdirectory of your installation. An
+  example profile:
+  \begin{fverbatim}
+# texlive.profile written on Wed Jul  9 16:13:44 2008 UTC
+# it will NOT be overwritten and reflects only the
+# installation profile at installation time
+selected_scheme scheme-basic
+TEXDIR /usr/local/texlive/2008
+TEXDIRW /usr/local/texlive/2008
+TEXDIRW /usr/local/texlive/2008
+TEXMFHOME ~/texmf
+TEXMFLOCAL /usr/local/texlive/texmf-local
+TEXMFSYSCONFIG /usr/local/texlive/2008/texmf-config
+TEXMFSYSVAR /usr/local/texlive/2008/texmf-var
+collection-basic 1
+collection-latex 1
+option_doc 0
+option_fmt 0
+option_letter 0
+option_src 0
+option_symlinks 0
+  \end{fverbatim}
+  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}
@@ -413,188 +481,138 @@ CTAN path (the list of CTAN mirrors is maintained at
 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{Post-install actions}
+\label{sec:postinstall}
 
-% 
-\subsection{Portable \protect\TL{} on DVD and USB (Unix)}
-\label{sec:portable-unix}
+Some post-install may be required.
 
-\def\runlive{% text repeated in windows section
-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:tl-coll-dists},
-\p.\pageref{sec:tl-coll-dists}).
-}
-
-\def\startinst{% repeated in other subsections
-To start, you mount the \CD{} or \DVD{}, with Rock Ridge extensions
-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{bold}}.)
-\begin{alltt}
-> \Ucom{mount -t iso9660 /dev/cdrom /mnt/cdrom}
-\end{alltt}
+\subsubsection{Windows}
 
-\noindent Change the current directory to the mount point:
-\begin{alltt}
-> \Ucom{cd /mnt/cdrom}
-\end{alltt}
+For Windows, the installer takes care of everything.
 
-\noindent (Under \MacOSX, the directory is typically under
-\dirname{/Volumes}, and the media will be mounted automatically.)
+\subsubsection{If symlinks were created}
 
-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.
+If you elected to create symlinks in standard directories then there
+is no need to edit environment variables.
 
-}
+\subsubsection{Environment variables for Unix/Linux}
 
-\runlive
-\startinst
+The directory of the binaries for your platform should be added to
+the searchpath. Each supported platform has its own subdirectory
+under \dirname{TEXDIR/bin}. See figure~\ref{fig:bin_text} for the
+list of subdirectories and corresponding platforms.
 
-Then, in a terminal, run this command:
+You might as well also add the \TeX{} info- and manpage directories
+to their respective searchpaths. A couple of examples:
 
-\begin{alltt}
-> \Ucom{sh tl-portable.sh}
-\end{alltt}
+For Bash or another Bourne-compatible shell and Intel x86
+GNU/Linux and a default directory setup, the file to edit might be
+\verb|$HOME/.profile| or \verb|$HOME/.bash_profile|, and the lines
+to add might look like
 
-This \filename{tl-portable.sh} script is at the top level of the
-distribution.  It starts up a secondary shell with the necessary
-environment settings.  When it runs for the first time, some files will
-be generated in a directory \dirname{~/.texlive2008}.  On subsequent
-runs, though, it will start almost instantaneously.
+\begin{verbatim}
+PATH=/usr/local/texlive/2008/bin/i386-linux:$PATH
+export PATH
+MANPATH=/usr/local/texlive/2008/texmf/doc/man:$MANPATH
+export MANPATH
+INFOPATH=/usr/local/texlive/2008/texmf/doc/info:$INFOPATH
+export INFOPATH
+\end{verbatim}
 
-You can run several parallel \TL{} sessions this way, each in a
-different terminal.
+For csh or tcsh, the file to edit might be \verb|$HOME/.cshrc| and
+the lines to add might look like:
 
-You can also use \filename{tl-portable.sh} to run \TL{} on a \acro{USB}
-stick.  In this case, copy all the top-level files and the contents of
-the \dirname{bin}, \dirname{texmf}, \dirname{texmf-dist}, and
-\dirname{tlpkg} directories (at least) to the stick.  A
-\dirname{texmf-local} directory on the stick will also be found and
-used.  Then run \filename{tl-portable.sh} from the root of the stick, as
-above.  In this case, the script will notice that the stick is writable
-and use it for generated files.  You could probably burn the resulting contents
-of the stick back to \DVD{} if that's more convenient to (for example) give
-to others.
-
-\def\textifindoubt{%
-If in doubt, please ask any local system gurus to help you with
-problems; for example, the way to mount the \TL{} media, which
-directory or directories to use, and precise details of the changes to
-your personal initialization files can and do vary from site to site.
-}
-
-
-
-% 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
-\envname{PATH}, so the newly-installed programs can be found.  The
-architecture names are listed in table~\ref{tab:archlist},
-\p.\pageref{tab:archlist}, or you can simply list the directory
-\dirname{TEXDIR/bin}.
-
-The syntax for doing this, and the initialization file to use, depends
-on your shell.  If you use a Bourne-compatible shell (\cmdname{sh},
-\cmdname{bash}, \cmdname{ksh}, et al.), put the following into your
-\filename{$HOME/.profile} file:
+\begin{verbatim}
+setenv PATH /usr/local/texlive/2008/bin/i386-freebsd:$PATH
+setenv MANPATH /usr/local/texlive/2008/texmf/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2008/texmf/doc/info:$INFOPATH
+\end{verbatim}
 
-\begin{alltt}
-PATH=/usr/local/texlive/2007/bin/\var{archname}:$PATH; export PATH
-\end{alltt}
+\subsubsection{Environment variables: global configuration}
 
-\noindent For C shell-compatible shells (\cmdname{csh}, \cmdname{tcsh}),
-put the following into your \filename{$HOME/.cshrc} file:
-\begin{alltt}
-setenv PATH /usr/local/texlive/2007/bin/\var{archname}:$PATH
-\end{alltt}
+If you want to make these changes globally, or at least for a
+default new user, then you are on your own; there is just too much
+variation between systems in how and where these things are
+configured. You may also want to check for a file
+\filename{/etc/manpath.config} and, if present, add lines such as
 
-After the main installation has completed, and environment variables
-have been set, the last step is to run \cmdname{texconfig} or
-\cmdname{texconfig-sys} to customize your installation to your needs.
-This is explained in section~\ref{sec:texconfig},
-\p.\pageref{sec:texconfig}.
+\begin{verbatim}
+MANPATH_MAP /usr/local/texlive/2008/bin/i386-linux \
+            /usr/local/texlive/2008/texmf/doc/man
+\end{verbatim}
 
-Here is a minimal annotated example which accepts the default
-directories and installs binaries for the current system only.  Thus,
-only one command is needed, \Ucom{i} for install.  The \texttt{>} is the
-shell prompt as usual.
+\subsubsection{When running from DVD}
+
+Normally, a \TL{} program consults a file \filename{texmf.cnf} for
+the location of the various trees. It looks for this file in a
+series of locations relative to its own location. However, this
+scheme breaks down when the program in on the \DVD{}: the \DVD{} is
+read-only, but some of the paths to be recorded in
+\filename{texmf.cnf} are only known at installation time. The fix is
+to define an environment \envname{TEXMFCNF} variable which tells
+\TL{} programs in what directory to find this \filename{texmf.cnf}.
+
+At the end of the installation, the installer should have printed a
+message to what value \envname{TEXMFCNF} should be set. In
+case you missed it: this value is \verb|TEXMFSYSVAR/web2c|. The
+default for this is
+\dirname{/usr/local/texlive/2008/texmf-var/web2c}.
+\begin{verbatim}
+TEXMFCNF=/usr/local/texlive/2008/texmf-var/web2c
+export TEXMFCNF
+\end{verbatim}
+or, for [t]csh:
+\begin{verbatim}
+setenv TEXMFCNF /usr/local/texlive/2008/texmf-var/web2c
+\end{verbatim}
 
-\begin{alltt}
-> \Ucom{sh install-tl.sh}
-\Ucom{i}                         # perform installation
-> \Ucom{texconfig} ...           # see section \ref{sec:texconfig}
-# New PATH element, with GNU/Linux as the example:
-> \Ucom{PATH=/usr/local/texlive/2007/bin/i386-linux:\$PATH; export PATH}
-\end{alltt}
+\subsubsection{ConTeXt Mark IV}
 
-If your Unix system supports the \cmdname{manpath} command (type \code{man
-manpath} to learn more), you can make the \TL\ manual pages available
-system-wide via the normal \cmdname{man} command by editing the file
-\filename{/etc/manpath.config}; you might need root permissions for this.
-With the following entry in \filename{/etc/manpath.config} the \TL\
-manual pages will be found at their original places within the \TL\ tree
-(adapt the binary path for your system architecture):
+The `old' ConTeXt should run out of the box. The new mkiv ConTeXt
+will require manual setup; see
+\url{http://wiki.contextgarden.net/Running_Mark_IV}
 
-\begin{verbatim}
-MANPATH_MAP /usr/local/texlive/2007/bin/i386-linux \
-            /usr/local/texlive/2007/texmf/doc/man
-\end{verbatim}
+\subsection{Portable \protect\TL{} on DVD and USB (Unix)}
+\label{sec:portable-unix}
 
-\textifindoubt
+The running from \DVD{} option described in
+section~\ref{sec:fromdvd} is fine if for your own system, but if you
+are a guest on somebody else's system then might prefer something
+which interferes as little as possible with that system.
 
+....
 
-\subsubsection{Non-interactive installation}
-\label{sec:noninteractive-install}
+Then, in a terminal, run this command:
 
-It is possible to override the default directories with environment
-variables, and then install non-interactively.  Example:
 \begin{alltt}
-> \Ucom{TEXLIVE_INSTALL_PREFIX=/opt/texlive}
-> \Ucom{export TEXLIVE_INSTALL_PREFIX}
-> \Ucom{echo i | sh install-tl.sh}
+> \Ucom{sh tl-portable}
 \end{alltt}
 
-The \envname{TEXLIVE\_INSTALL\_PREFIX} variable overrides the default
-location of \dirname{/usr/local/texlive}, leaving all else
-unchanged---so with the above invocation, the main installation will go
-to \dirname{/opt/texlive/2007}.
-
-In the usual Unix way, the final \Ucom{echo i} can be replaced by any
-sequence of input commands via a here document, so any sequence of
-commands can be scripted.
+This \filename{tl-portable} script is at the top level of the
+distribution.  It starts up a secondary shell with the necessary
+environment settings.  When it runs for the first time, some files will
+be generated in a directory |~/.texlive2008|.  On subsequent
+runs, though, it will start almost instantaneously.
 
-Here are all the possible overrides:
+You can run several parallel \TL{} sessions this way, each in a
+different terminal.
 
-\begin{ttdescription}
-\item [TEXLIVE\_INSTALL\_PREFIX]
-      Override \dirname{/usr/local/texlive}.
-\item [TEXLIVE\_INSTALL\_TEXDIR]
-      Override \dirname{\$TEXLIVE_INSTALL_PREFIX}/2007.
-\item [TEXLIVE\_INSTALL\_TEXMFLOCAL]
-      Override \dirname{\$TEXLIVE_INSTALL_PREFIX/texmf-var}.
-\item [TEXLIVE\_INSTALL\_TEXMFSYSVAR]
-      Override \dirname{\$TEXLIVE_INSTALL_TEXDIR/texmf-var}.
-\item [TEXLIVE\_INSTALL\_TEXMFHOME]
-      Override \dirname{\$HOME/texmf}.
-\end{ttdescription}
+You can also use \filename{tl-portable} to run \TL{} on a
+\acro{USB} stick.  In this case, copy all the top-level files and
+the contents of the \dirname{bin}, \dirname{texmf},
+\dirname{texmf-dist}, and \dirname{tlpkg} directories (at least) to
+the stick. This may take quite a while! If you are copying to a
+\acro{FAT32}-formatted \acro{USB} stick, make sure to dereference
+symbolic links (\code{cp -L}).  A \dirname{texmf-local} directory on
+the stick will also be found and used.
+
+Then run \filename{tl-portable} from the root of the stick, as
+above.  In this case, the script will notice that the stick is
+writable and use it for generated files.  You could probably burn
+the resulting contents of the stick back to \DVD{} if that is more
+convenient to (for example) give to others.
 
-It would be better to support a standard \acro{GNU}-style
-\filename{configure} with options, instead of these environment
-variables.  Volunteers are welcome!
 
 \subsection{Testing the installation}
 \label{sec:test-install}
diff --git a/Master/texmf-doc/source/texlive/texlive-en/live.tex b/Master/texmf-doc/source/texlive/texlive-en/live.tex
index e40508a2ca6..e0c64d730dd 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/live.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/live.tex
@@ -31,7 +31,7 @@
 \input{installation}
 \input{maintenance}
 \input{macosx}
-\input{windows}
+%\input{windows}
 \input{web2c}
 \input{acknowledgements}
 \input{releasehist}
diff --git a/Master/texmf-doc/source/texlive/texlive-en/maintenance.tex b/Master/texmf-doc/source/texlive/texlive-en/maintenance.tex
index 0d48dba7b0e..5acbb3cc129 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/maintenance.tex
+++ b/Master/texmf-doc/source/texlive/texlive-en/maintenance.tex
@@ -1,29 +1,5 @@
-\section{Post-installation}
-\label{sec:postinstall}
-
-After the main installation is done, for any operating system, the
-remaining steps are to configure the system for your local needs, and
-perform some basic tests.
-
-Another sort of post-installation is to acquire packages, fonts, or
-programs that were not included in \TL{}.  The basic idea is to
-install such additions in the \envname{TEXMFLOCAL} tree (if you
-installed to disk), or \envname{TEXMFSYSVAR} (if you are running live).
-See the ``Installation directories'' option on \p.\pageref{text:instdir}.
-
-Unfortunately, the details can and do vary widely, and so we do not attempt to
-address them here.  Here are some external links to descriptions:
-\begin{itemize*}
-\item
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages}
-\item
-\url{http://www.ctan.org/installationadvice}
-\item
-\url{http://www.ctan.org/tex-archive/info/beginlatex/html/chapter5.html#pkginst}
-\item
-\url{http://www.ctan.org/tex-archive/info/Type1fonts} for
-installation information for fonts in particular.
-\end{itemize*}
+\section{Managing your installation}
+\label{sec:manage}
 
 
 % 
@@ -33,7 +9,7 @@ You can add individual packages or collections from the current
 distribution to an existing non-\TL{} setup, or an earlier
 \TL{} installation.
 
-\startinst
+%\startinst
 
 Run the installation script \filename{install-pkg.sh} (not
 \filename{install-tl.sh}, which is intended for complete installations
@@ -140,7 +116,7 @@ plain \TeX\ macros:
 
 \end{enumerate}
 
-\textifindoubt
+%\textifindoubt
 
 
 \subsection{The \protect\cmdname{texconfig} program}
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 4175544bbcf..d5a5bfea37b 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
+++ b/Master/texmf-doc/source/texlive/texlive-en/tex-live.sty
@@ -64,9 +64,10 @@
 \renewcommand{\topfraction}{0.85}
 \renewcommand{\floatpagefraction}{0.86}
 \renewcommand{\textfraction}{0.1}
+\renewcommand{\abovecaptionskip}{4pt}
 \renewcommand{\belowcaptionskip}{4pt}
-\setcounter{tocdepth}{2}
-\setcounter{secnumdepth}{2}
+\setcounter{tocdepth}{3}
+\setcounter{secnumdepth}{3}
 \setcounter{topnumber}{5}
 \setcounter{totalnumber}{5}
 %