Edits in overview- and install sections

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

6 files changed, 140 insertions, 52 deletions

diff --git a/Master/texmf-doc/doc/english/texlive-en/stdcoll.png b/Master/texmf-doc/doc/english/texlive-en/stdcoll.png
new file mode 100644
index 00000000000..16a699ba3c6
--- /dev/null
+++ b/Master/texmf-doc/doc/english/texlive-en/stdcoll.png
diff --git a/Master/texmf-doc/source/english/texlive-en/install-w32-main.png b/Master/texmf-doc/source/english/texlive-en/install-w32-main.png
index 3117a49089b..56cbd802ee3 120000..100644
--- a/Master/texmf-doc/source/english/texlive-en/install-w32-main.png
+++ b/Master/texmf-doc/source/english/texlive-en/install-w32-main.png
diff --git a/Master/texmf-doc/source/english/texlive-en/installation.tex b/Master/texmf-doc/source/english/texlive-en/installation.tex
index 29027fd8715..fde98f59eec 100644
--- a/Master/texmf-doc/source/english/texlive-en/installation.tex
+++ b/Master/texmf-doc/source/english/texlive-en/installation.tex
@@ -2,8 +2,9 @@
 \label{sec:install}
 
 \subsection{Starting the installer}
-First, get and locate the installer, install-tl for Unix,
-install-tl.bat for Windows:
+\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:
 
 \begin{itemize}
 \item For the \TK{} \DVD, go to its texlive- or texlive2008
@@ -25,7 +26,6 @@ install-tl.bat for Windows:
 \end{itemize}
 
 \subsubsection{Unix/Linux}
-
 \noindent
 Below, \texttt{>} denotes the shell prompt; user input is
 \Ucom{\texttt{underlined}}.
@@ -34,6 +34,10 @@ Starting under Unix/Linux from a terminal emulator:
 \begin{alltt}
 > \Ucom{./install-tl}
 \end{alltt}
+or
+\begin{alltt}
+> \Ucom{perl install-tl}
+\end{alltt}
 if you are in the installer directory, otherwise
 \begin{alltt}
 > \Ucom{<path_to_installer>/install-tl}
@@ -66,7 +70,7 @@ if you are in the installer directory, otherwise
 \end{alltt}
 for the downloadable iso, if \texttt{D:} is the optical drive, or
 \begin{alltt}
-> \Ucom{D:\bs{}texlive\bs install-tl}
+> \Ucom{D:\bs{}texlive\bs{}install-tl}
 \end{alltt}
 for the \TK\ \DVD. For text mode, use
 \begin{alltt}
@@ -139,7 +143,7 @@ very barebones Perl (for Windows, a Perl subset is included).
 
 \subsubsection{The graphical installer}
 
-This is what the graphical installer looks like:
+This is what the graphical installer looks like under Windows:
 
 \noindent
 %\includegraphics[width=\linewidth]{install-w32-main.png}
@@ -149,17 +153,93 @@ Most differences in available options are due to
 this screenshot being from Windows, and the text screen above being
 from Linux.
 
-% de diverse submenus
+\subsection{Running the installer}
+
+The installer is mostly self-explanatory. Still, a few quick notes
+about the various options and submenus:
+
+\subsubsection{Binary systems menu (Unix/Linux only)}
 
-There is no submenu for selecting other platforms, the default
-directories are appropriate for Windows rather than for Unix, and
-there is no symlinks option.
+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{verbatim}
+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
+\end{verbatim}
+
+\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.
 
-You find three submenus for selecting what you want to install: you
-can select a scheme, which is a very global way to tell the
-installer what you want, and you can refine this choice in the
-standard collections- and language collections menus. If you want
-more detail, you need run the tlmgr program afterwards.
+\begin{verbatim}
+Select a scheme:
+===============================================================================
+
+ a [ ] TeX Live basic scheme
+ b [ ] TeX Live scheme for ConTeXt
+ c [X] TeX Live full scheme
+ d [ ] GUST TeX Live scheme
+ e [ ] GUTenberg TeX Live scheme
+ f [ ] TeX Live medium scheme
+ g [ ] TeX Live minimal scheme
+ h [ ] TeX Live for Omega users
+ i [ ] teTeX scheme
+ j [ ] XML typesetting scheme
+\end{verbatim}
+
+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 the
+screenshot below:
+
+\noindent
+\tlpng{stdcoll}{\linewidth}
+
+If you want more detail, you need run the tlmgr program afterwards,
+see....  The installer will take care of appropriate configuration
+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}).
+
+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
 
 
 \subsection{Installing from source}
@@ -333,39 +413,6 @@ i & Perform the installation.\\
 
 Here are further details on each option.
 
-\textbf{\optname{p} -- Current platform.}  Since the installation script
-automatically guesses which platform you're running on, it is usually
-unnecessary to use this option.  It's there in case you need to override
-the automatic detection.
-
-\textbf{\optname{b} -- Binary architectures.}  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
-(or omit installing the current platform).  This can be useful if you are
-sharing a \TeX\ tree across a network of heterogenous machines.  For a
-list of the supported architectures, see table~\ref{tab:archlist},
-\p.\pageref{tab:archlist}.
-
-\textbf{\optname{s} -- Base installation scheme.}  From this menu, you
-can choose an overall set of package collections, called a ``scheme''.
-The default \optname{full} scheme installs everything available, but you
-can also choose the \optname{basic} scheme for a minimal system, or
-\optname{medium} to get something in between.  There are also specific
-sets for Omega and \acro{XML}.
-
-\textbf{\optname{c} -- Individual collections.}  From this menu, you can
-override the scheme's set of collections to install.  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 this menu,
-selection letters are case-sensitive.
-
-\textbf{\optname{l} -- Language collections}.  This menu has the same
-basic purpose as \Ucom{c}, to override the collection set in the chosen
-scheme.  In this case, the collections are specifically for different
-languages.  Selection letters are case-sensitive here too.  Here is a
-list of the language collections in \TL:
-
 % xx really should generate list from texmf/tpm/collection/tex-lang*
 % a la install-tl.sh.
 \begin{tabbing}
diff --git a/Master/texmf-doc/source/english/texlive-en/overview.tex b/Master/texmf-doc/source/english/texlive-en/overview.tex
index 939e9038b16..cdbbbcb8a67 100644
--- a/Master/texmf-doc/source/english/texlive-en/overview.tex
+++ b/Master/texmf-doc/source/english/texlive-en/overview.tex
@@ -112,14 +112,15 @@ 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. 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.
+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.
 
 \begin{ttdescription}
 \item [TEXMFMAIN] The tree which holds vital parts of the system
-  such as helper scripts (e.g., \verb+web2c/mktexdir+), pool files and
+  such as helper scripts (e.g., \verb+web2c/mktexdir+) and
   other support files.
 \item [TEXMFDIST] The tree which holds the main set of macro packages,
   fonts, etc., as originally distributed.
@@ -144,6 +145,45 @@ find out how they map to directory names in your installation.
   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
+  \begin{ttdescription}
+    \item[2007] A previous release
+    \begin{ttdescription}
+      \item [] ...
+    \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}
+    \end{ttdescription}
+    \item [TEXMFLOCAL] \textit{i.e.} \texttt{texmf-local}, can be
+      retained from release to release
+  \end{ttdescription}
+  \item[user's home] \textit{i.e.} \texttt{\$HOME} or
+      \texttt{\%USERPROFILE\%}
+    \begin{ttdescription}
+      \item[.texlive2007] Private generated and configuration data
+        for a previous release
+      \begin{ttdescription}
+        \item [] ...
+      \end{ttdescription}
+      \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}
+      \end{ttdescription}
+    \item[TEXMFHOME] \textit{i.e.} \texttt{texmf} Private macros
+      \textit{etc.}
+  \end{ttdescription}
+\end{description}
+
 For more discussion of \texttt{texconfig} and related utilities, please
 see section~\ref{sec:texconfig}, \p.\pageref{sec:texconfig}.
 
diff --git a/Master/texmf-doc/source/english/texlive-en/stdcoll.png b/Master/texmf-doc/source/english/texlive-en/stdcoll.png
new file mode 100644
index 00000000000..16a699ba3c6
--- /dev/null
+++ b/Master/texmf-doc/source/english/texlive-en/stdcoll.png
diff --git a/Master/texmf-doc/source/english/texlive-en/tex-live.sty b/Master/texmf-doc/source/english/texlive-en/tex-live.sty
index ada0d4059d8..d12c5d7386e 100644
--- a/Master/texmf-doc/source/english/texlive-en/tex-live.sty
+++ b/Master/texmf-doc/source/english/texlive-en/tex-live.sty
@@ -66,6 +66,7 @@
 \renewcommand{\textfraction}{0.1}
 \renewcommand{\belowcaptionskip}{4pt}
 \setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{2}
 \setcounter{topnumber}{5}
 \setcounter{totalnumber}{5}
 %