mention the envvars read by install-tl to specify directories

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

2 files changed, 40 insertions, 23 deletions

diff --git a/Master/install-tl b/Master/install-tl
index dd94bc0722e..94104569aa9 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1183,9 +1183,9 @@ sub set_platforms_supported {
 #   TEXLIVE_INSTALL_TEXMFSYSVAR    $TEXDIR/texmf-var
 #   TEXLIVE_INSTALL_TEXMFSYSCONFIG $TEXDIR/texmf-config
 #   TEXLIVE_INSTALL_TEXMFLOCAL     $tex_prefix/texmf-local
+#   TEXLIVE_INSTALL_TEXMFHOME      '$HOME/texmf'
 #   TEXLIVE_INSTALL_TEXMFVAR       ~/.texlive2010/texmf-var
 #   TEXLIVE_INSTALL_TEXMFCONFIG    ~/.texlive2010/texmf-config
-#   TEXLIVE_INSTALL_TEXMFHOME      '$HOME/texmf'
 
 sub set_texlive_default_dirs {
   my $tex_prefix = $vars{'in_place'} ? abs_path($::installerdir)
@@ -1219,7 +1219,7 @@ sub set_texlive_default_dirs {
 
   my $texmfhome = getenv('TEXLIVE_INSTALL_TEXMFHOME');
   $texmfhome ||= "~";
-  $vars{'TEXMFHOME'}="$texmfhome/texmf";
+  $vars{'TEXMFHOME'} = "$texmfhome/texmf";
 
   # use the $texmfhome value just computed for these.
   my $yyyy = $TeXLive::TLConfig::ReleaseYear;
@@ -2425,6 +2425,8 @@ Omit creating the ConTeXt cache.  This is useful for redistributors.
 
 =item C<TEXLIVE_INSTALL_PREFIX>
 
+=item C<TEXLIVE_INSTALL_TEXDIR>
+
 =item C<TEXLIVE_INSTALL_TEXMFCONFIG>
 
 =item C<TEXLIVE_INSTALL_TEXMFHOME>
@@ -2437,7 +2439,11 @@ Omit creating the ConTeXt cache.  This is useful for redistributors.
 
 =item C<TEXLIVE_INSTALL_TEXMFVAR>
 
-Specify the respective directories.
+Specify the respective directories.  C<TEXLIVE_INSTALL_PREFIX> defaults
+to C</usr/local/texlive>, while C<TEXLIVE_INSTALL_TEXDIR> defaults to
+the release directory within that prefix, e.g.,
+C</usr/local/texlive/2014>.  All the defaults can be seen by running the
+installer interactively and then typing C<D> for the directory menu.
 
 =item C<NOPERLDOC>
 
diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
index 42b95593c9b..36ec40b0f28 100644
--- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
@@ -783,24 +783,35 @@ at the package level.
 \label{sec:directories}
 
 The default layout is described in section~\ref{sec:texmftrees},
-\p.\pageref{sec:texmftrees}. The default location of
-\dirname{TEXDIR} is \dirname{/usr/local/texlive/2014} on Unix
-and |%SystemDrive%\texlive\2014| on Windows.
-Thus, by default, you will have parallel \TL\ installations, one for
-each release, and can switch between them merely by altering your
-search path.
-
-This can be overridden by setting \dirname{TEXDIR} in the installer.
-The main reason to change it is if you lack write permission for the
-default location. You don't have to be root or administrator to install
-\TL, but you do need write access to the target directory.
-
-A reasonable alternative choice is a directory under your home directory,
-especially if you will be the sole user. Use
-`|~|' to indicate this, as in `|~/texlive/2014|'.
+\p.\pageref{sec:texmftrees}.  The default installation directory is
+\dirname{/usr/local/texlive/2014} on Unix and
+|%SystemDrive%\texlive\2014| on Windows.  This arrangement enables
+having many parallel \TL\ installations, such as one for each release
+(typically by year, as here), and you can switch between them merely by
+altering your search path.
+
+That installation directory can be overridden by setting the so-called
+\dirname{TEXDIR} in the installer.  The \GUI\ screen for this and other
+options is shown in figure~\ref{fig:gui-main}.  The most common reasons
+to change it are either lacking enough disk space in that partition (the
+full \TL\ needs several gigabytes), or lacking write permission for the
+default location (you don't have to be root or administrator to install
+\TL, but you do need write access to the target directory).
+
+The installation directories can also be changed by setting a variety of
+environment variables before running the installer (most likely,
+\envname{TEXLIVE\_INSTALL\_PREFIX} or
+\envname{TEXLIVE\_INSTALL\_TEXDIR}); see the documentation from
+|install-tl --help| (available online at
+\url{http://tug.org/texlive/doc/install-tl.html}) for the full list and
+more details.
+
+A reasonable alternative destination is a directory under your home,
+especially if you will be the sole user. Use `|~|' to indicate this, as
+in `|~/texlive/2014|'.
 
 We recommend including the year in the name, to enable keeping different
-releases of \TL{} side by side.  (You may wish to also have a
+releases of \TL{} side by side.  (You may wish to also maintain a
 version-independent name, such as \dirname{/usr/local/texlive-cur}, via a
 symbolic link, which you can then repoint after testing the new release.)
 
@@ -3413,12 +3424,12 @@ Lua\TeX: Notable changes and fixes were made to font loading and
 hyphenation.  The biggest addition is a new engine variant,
 \code{luajittex} (\url{http://foundry.supelec.fr/projects/luajittex})
 and its siblings \code{texluajit} and \code{texluajitc}.  This uses a
-just-in-time Lua compiler (detailed TUGboat article at
-\url{http://tug.org/TUGboat/tb34-1/tb106scarso.pdf}).  \code{luajittex} is
-still in development, is not available on all platforms, and is
+just-in-time Lua compiler (detailed \textsl{TUGboat} article at
+\url{http://tug.org/TUGboat/tb34-1/tb106scarso.pdf}).  \code{luajittex}
+is still in development, is not available on all platforms, and is
 considerably less stable than \code{luatex}.  Neither we nor its
 developers recommend using it except for the specific purpose of
-experimenting with jit on Lua code. 
+experimenting with jit on Lua code.
 
 \XeTeX: The same image formats are now supported on all platforms
 (including Mac); avoid Unicode compatibility decomposition fallback (but