--install_mode and --debug, for Staszel

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

2 files changed, 27 insertions, 10 deletions

diff --git a/Master/texmf-doc/source/english/texlive-en/Makefile b/Master/texmf-doc/source/english/texlive-en/Makefile
index 391b6c933f0..951d667a705 100644
--- a/Master/texmf-doc/source/english/texlive-en/Makefile
+++ b/Master/texmf-doc/source/english/texlive-en/Makefile
@@ -11,6 +11,7 @@ pdf:
 	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
 	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
 	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
+	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
 
 html:  
 	rm -f *.aux *.toc *.lof *.lot *.xref* *.tmp *.out *.4tc
diff --git a/Master/texmf-doc/source/english/texlive-en/live.tex b/Master/texmf-doc/source/english/texlive-en/live.tex
index 012b05b1ef9..404dce12c35 100644
--- a/Master/texmf-doc/source/english/texlive-en/live.tex
+++ b/Master/texmf-doc/source/english/texlive-en/live.tex
@@ -1209,23 +1209,39 @@ and \acro{MS-DOS} are not supported.
 
 \subsection{Installing \protect\TeX\protect\ Live to disk}
 
-After inserting the \TL{} CD into the \acro{CD} drive, autostart should
+After inserting the \TL{} \acro{CD} into the \acro{CD} drive, autostart should
 activate \cmdname{tlpmgui}. If it does not, click \guiseq{Start\arw Run}, 
 then type \verb|<drive letter>:\setuptl\tplmgui.exe| (or 
 \verb|<drive letter>:\texlive\setuptl\tplmgui.exe| if you are 
-installing from the TeX Collection DVD), where \verb|<drive letter>| 
-is the drive letter with the TeX Live CD (or TeX Collection DVD), and
-then click OK.
+installing from the \TeX\ Collection \acro{DVD}), where \verb|<drive letter>| 
+is the drive letter with the \TeX\ Live \acro{CD} (or TeX Collection
+\acro{DVD}), and then click \acro{OK}.
 
 The installation window titled \guiseq{TeX Live installation and maintenance
 utility} should open. It contains the following sections: \guiseq{Main
 customization}, \guiseq{Install}, \guiseq{Select a scheme}, \guiseq{Select
 systems}, \guiseq{Directories} and \guiseq{Options}.
 
-In the \guiseq{Directories} section the installation drive (directory) next 
-to the \guiseq{CD/DVD} button should be displayed (e.g., \texttt{F:/} or \texttt{F:/texlive/} for the DVD), but 
-if it is not, then click the \guiseq{CD/DVD} button and select the \acro{CD/DVD}
-drive, with the \TL{} CD (or TeX Collection DVD).
+By default, \cmdname{tlpmgui} tries to detect if \TeX{} is already
+installed and depending on the result starts either in fresh
+installation or maintenance mode.  If you have \TeX{} already installed
+but want to install the new version nevertheless, you can use
+\texttt{tlpmgui~--install-mode} to force instalation mode; but you
+should know what you are doing, as the new \TL{} installation will
+override the environment variables and other settings of the existing
+installation; reverting to your old installation is not automatically
+supported.
+
+Diagnostic information is collected by \cmdname{tlpmgui} in a log file
+which is deleted at the end of the run, along with any other temporary
+files.  Invoking with \texttt{--debug} displays the names and contents
+of all \cmdname{tlpmgui} temporary files in a separate window.
+
+In the \guiseq{Directories} section the installation drive (directory)
+next to the \guiseq{CD/DVD} button should be displayed (e.g.,
+\texttt{F:/} or \texttt{F:/texlive/} for the \acro{DVD}), but if it is not,
+then click the \guiseq{CD/DVD} button and select the \acro{CD/DVD}
+drive, with the \TL{} \acro{CD} (or \TeX\ Collection \acro{DVD}).
 
 The directory in which you wish to install the software can be set by
 clicking the \guiseq{TLroot} button. This directory will be set as
@@ -1276,7 +1292,7 @@ these operations are done there, some of them can be lengthy. So please wait
 until you see a statement about the successfully finished installation.
 
 The shortcut for \cmdname{tlpmgui} (and also \cmdname{dviout}, if installed)
-will be added to the \guiseq{Start\arw Programs\arw TeXLive2007} menu.
+will be added to the menu \guiseq{Start\arw Programs\arw TeXLive2007}.
 
 If it is needed (Win9x/WinME), you will be asked to reboot your computer.
 
@@ -1347,7 +1363,7 @@ conveniently view PS/PDF files. \cmdname{GSView} is available from
 
 \section{Maintenance of the installation in Windows}
 
-If you have TeX Live installed, you can use \cmdname{tlpmgui} again
+If you have \TeX\ Live installed, you can use \cmdname{tlpmgui} again
 for modifying and maintaining your installation.
 
 \subsection{Adding/removing packages}