1 files changed, 69 insertions, 33 deletions
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
index b035c70cc61..b369322b9c5 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
@@ -628,6 +628,7 @@ recommended:
 \item \filename{ncurses} [provides the \code{clear} command used by the installer]
 \end{itemize*}
 
+
 \subsubsection{The text installer}
 
 Figure~\ref{fig:text-main} displays the main text mode screen under
@@ -791,13 +792,7 @@ directory of any individual running \TeX.  It expands to
 \dirname{$HOME} on Unix and \verb|%USERPROFILE%| on Windows.
 
 \dirname{TEXMFVAR} is the location for storing cached runtime data
-specific to each user.  This includes the \ConTeXt\ Mk\acro{IV} cache, which
-is created at installation time.  xxxx
-\subsubsection{\ConTeXt{} Mark IV}
-
-xxxxThe `old' \ConTeXt{} should run out of the box. The new `Mark IV'
-\ConTeXt{} will require manual setup; see
-\url{http://wiki.contextgarden.net/Running_Mark_IV}.
+specific to each user, including the \ConTeXt\ Mk\acro{IV} cache.
 
 
 \subsubsection{Options}
@@ -1050,6 +1045,7 @@ programs, such as the standard \MacOSX\ \code{man}, will automatically
 find that, obviating the need for any man page setup.
 
 
+\htmlanchor{xetexfontconfig}
 \subsubsection{Font configuration for \XeTeX}
 \label{sec:font-conf-xetex}
 
@@ -1078,36 +1074,22 @@ to you as an individual \XeTeX{} user:
 \end{enumerate*}
 
 
-\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 a program is run from \DVD{}: the \DVD{} is read-only. Some of the
-paths to be recorded in \filename{texmf.cnf} are only known at
-installation time, so this file cannot be on the \DVD{} and must be
-placed somewhere else. This makes it necessary to define an environment
-\envname{TEXMFCNF} variable which tells \TL{} programs in what directory
-to find this \filename{texmf.cnf}.  It is also still necessary to modify
-the \envname{PATH} environment variable, as described before.
+\subsubsection{\ConTeXt{} Mark IV}
+\label{sec:context-mkiv}
 
-At the end of the installation, the installer should have printed a
-message giving the value to which \envname{TEXMFCNF} should be set. In
-case you missed it: this value is \dirname{$TEXMFSYSVAR/web2c}. For the
-default, \dirname{/usr/local/texlive/2010/texmf-var/web2c}, you need the
-lines
+The `old' \ConTeXt{} (Mark \acro{II}) should run out of the box after
+\TL{} installation. The `new' Lua\TeX-based \ConTeXt{} Mark \acro{IV}
+requires manual setup.  After installation, each Mk\acro{IV} user must
+run:
 \begin{sverbatim}
-TEXMFCNF=/usr/local/texlive/2010/texmf-var/web2c; export TEXMFCNF
-\end{sverbatim}
-or, for [t]csh:
-\begin{sverbatim}
-setenv TEXMFCNF /usr/local/texlive/2010/texmf-var/web2c
+luatools --generate
+context --make
 \end{sverbatim}
+The resulting files are stored under \code{TEXMFVAR}.
 
-This option is most useful when you want to run \TL{} on your own
-system, but don't have enough disk space to install it.  If you want a
-truly `portable' \TL{} that is self-contained, e.g., for a USB stick,
-see section~\ref{sec:portable-tl}.
+For more information, see
+\url{http://wiki.contextgarden.net/Running_Mark_IV} and
+\url{http://wiki.contextgarden.net/TeX_Live_2010}.
 
 
 \subsubsection{Integrating local and personal macros}
@@ -1151,6 +1133,52 @@ If you do need to do this, see
 \url{http://tug.org/fonts/fontinstall.html} for our best effort at
 describing the procedure.
 
+
+\subsubsection{Increasing Cygwin's maximum memory}
+\label{sec:cygwin-maxmem}
+
+Cygwin (see section~\ref{sec:cygwin} for Cygwin installation specifics)
+users may find that they run out of memory when running some of the
+programs shipped with \TL.  For example, \prog{asy} might run out of
+memory if you try to allocate an array of 25,000,000 reals, and Lua\TeX\
+might run out of memory if you try to process a document with a lot of
+big fonts.  If this happens, you can increase the amount of available
+memory by following the instructions in the Cygwin User's Guide
+(\url{http://www.cygwin.com/cygwin-ug-net/setup-maxmem.html}).
+
+\htmlanchor{runningfromdvd}
+\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 a program is run from \DVD{}: the \DVD{} is read-only. Some of the
+paths to be recorded in \filename{texmf.cnf} are only known at
+installation time, so this file cannot be on the \DVD{} and must be
+placed somewhere else. This makes it necessary to define an environment
+\envname{TEXMFCNF} variable which tells \TL{} programs in what directory
+to find this \filename{texmf.cnf}.  It is also still necessary to modify
+the \envname{PATH} environment variable, as described before.
+
+At the end of the installation, the installer should have printed a
+message giving the value to which \envname{TEXMFCNF} should be set. In
+case you missed it: this value is \dirname{$TEXMFSYSVAR/web2c}. For the
+default, \dirname{/usr/local/texlive/2010/texmf-var/web2c}, you need the
+lines
+\begin{sverbatim}
+TEXMFCNF=/usr/local/texlive/2010/texmf-var/web2c; export TEXMFCNF
+\end{sverbatim}
+or, for [t]csh:
+\begin{sverbatim}
+setenv TEXMFCNF /usr/local/texlive/2010/texmf-var/web2c
+\end{sverbatim}
+
+This option is most useful when you want to run \TL{} on your own
+system, but don't have enough disk space to install it.  If you want a
+truly `portable' \TL{} that is self-contained, e.g., for a USB stick,
+see section~\ref{sec:portable-tl}.
+
+
 \subsection{Testing the installation}
 \label{sec:test-install}
 
@@ -1330,6 +1358,7 @@ It also registers an uninstaller \filename{w32unclient}, available
 in the same zip file.  See the web page for more information.
 
 
+\htmlanchor{tlportable}
 \section{Maximally portable \protect\TL{} on DVD and USB}
 \label{sec:portable-tl}
 
@@ -3108,6 +3137,9 @@ by default.  This is so they can now be enabled for use by the
 restricted \cs{write18}.  To change this, the \envname{TEXMFOUTPUT}
 environment variable can be set, or the |openout_any| setting changed.
 
+Xe\TeX\ now supports margin kerning along the same lines as pdf\TeX.
+(Font expansion is not presently supported.)
+
 By default, tlmgr now saves one backup of each package updated
 (\code{tlmgr option autobackup 1}), so broken packages
 updates can be easily reverted with \code{tlmgr restore}.  If
@@ -3120,6 +3152,10 @@ typesetting Japanese; the \BibTeX{}U program for Unicode-enabled
 for checking \AllTeX\ documents; the dvisvgm
 (\url{http://dvisvgm.sourceforge.net}) DVI-to-SVG translator.
 
+Executables for these new platforms are now included: \code{amd64-freebsd},
+\code{amd64-kfreebsd}, \code{i386-freebsd}, \code{i386-kfreebsd},
+\code{x86\_64-darwin}, \code{x86\_64-solaris}.
+
 A change in \TL{} 2009 that we failed to note: numerous \TeX4ht-related
 executables (\url{http://tug.org/tex4ht}) were removed from the binary
 directories.  The generic \code{mk4ht} program can be used to run any of