%SystemDrive%, not %PROGRAMFILES%

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

3 files changed, 18 insertions, 22 deletions

diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.html b/Master/texmf/doc/texlive/texlive-en/texlive-en.html
index a43611928c6..4ae05ab7a6c 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.html
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.html
@@ -9,7 +9,7 @@ TeX Live 2009</title>
 <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> 
 <!-- charset=iso-8859-1,html,info,fn-in --> 
 <meta name="src" content="texlive-en.tex"> 
-<meta name="date" content="2009-09-14 00:22:00"> 
+<meta name="date" content="2009-09-22 18:11:00"> 
 <link rel="stylesheet" type="text/css" href="texlive-en.css"> 
 <link rel="stylesheet" type="text/css" href="texlive-en.css" /> 
 <link rel="stylesheet" type="text/css" href="tex-live.css" /> 
@@ -2095,7 +2095,7 @@ href="#x1-100002.3">2.3<!--tex4ht:ref: sec:texmftrees --></a>, p. <a
 href="#x1-100002.3">8<!--tex4ht:ref: sec:texmftrees --></a>. The default location of <span 
 class="ec-lmtt-10">TEXDIR </span>is different between
 Windows (<span class="obeylines-h"><span class="verb"><span 
-class="ec-lmtt-10">%PROGRAMFILES%\texlive\2009</span></span></span>) and Unix (<span 
+class="ec-lmtt-10">%SystemDrive%\texlive\2009</span></span></span>) and Unix (<span 
 class="ec-lmtt-10">/usr/local/texlive/2009</span>).
 <!--l. 754--><p class="indent" >   The main reason to change this default is if you lack write permission for the default location. You don&#8217;t
 have to be root or administrator to install <span class="TEX">T<span 
@@ -2974,14 +2974,13 @@ href="#x1-100002.3">2.3<!--tex4ht:ref: sec:texmftrees --></a>: <span
 class="ec-lmtt-10">TEXMFLOCAL </span>(by default, <span 
 class="ec-lmtt-10">/usr/local/texlive/texmf-local</span>
 or <span class="obeylines-h"><span class="verb"><span 
-class="ec-lmtt-10">C:\Program</span><span 
-class="ec-lmtt-10">&#x00A0;Files\texlive\texmf-local</span></span></span>) is intended for system-wide local fonts and macros; and
-<span 
-class="ec-lmtt-10">TEXMFHOME </span>(by default, <span 
+class="ec-lmtt-10">%SystemDrive%\texlive\texmf-local</span></span></span>) is intended for system-wide local fonts and macros; and <span 
+class="ec-lmtt-10">TEXMFHOME</span>
+(by default, <span 
 class="ec-lmtt-10">$HOME/texmf </span>or <span class="obeylines-h"><span class="verb"><span 
-class="ec-lmtt-10">%USERPROFILE%\texmf</span></span></span>), is for personal fonts and macros. These
-directories are intended to stick around from release to release, and have their content seen automatically by a
-new <span class="TEX">T<span 
+class="ec-lmtt-10">%USERPROFILE%\texmf</span></span></span>), is for personal fonts and macros. These directories are
+intended to stick around from release to release, and have their content seen automatically by a new
+<span class="TEX">T<span 
 class="E">E</span>X</span> Live release. Therefore, it is best to refrain from changing the definition of <span 
 class="ec-lmtt-10">TEXMFLOCAL </span>to
 be too far away from the main <span class="TEX">T<span 
@@ -3933,16 +3932,13 @@ classes of users as unprivileged users and normal users: being an administrator
 exception. Nevertheless, we have made an effort to make <span class="TEX">T<span 
 class="E">E</span>X</span> Live installable without administrative
 privileges.
-<!--l. 1585--><p class="indent" >   If the user is an administrator, shortcuts are created for all users, and the system environment is
-modified. Otherwise, shortcuts and menu entries are created for the current user, and the user
-environment is modified. Use the <span 
-class="ec-lmtt-10">non-admin </span>option to <span 
-class="ec-lmss-10">install-tl </span>if you prefer per-user settings even as an
-administrator.
+<!--l. 1585--><p class="indent" >   If the user is an administrator, there is an option to install for all users. If this option is chosen, shortcuts
+are created for all users, and the system environment is modified. Otherwise, shortcuts and menu entries are
+created for the current user, and the user environment is modified.
 <!--l. 1591--><p class="indent" >   Regardless of administrator status, the default root of <span class="TEX">T<span 
 class="E">E</span>X</span> Live proposed by the installer is always
 under <span class="obeylines-h"><span class="verb"><span 
-class="ec-lmtt-10">%PROGRAMFILES%</span></span></span>. The installer always tests whether the root is writable for the current
+class="ec-lmtt-10">%SystemDrive%</span></span></span>. The installer always tests whether the root is writable for the current
 user.
 <!--l. 1595--><p class="indent" >   A problem may arise if the user is not an administrator and <span class="TEX">T<span 
 class="E">E</span>X</span> already exists in the search path. Since
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
index 174177544a3..ef7ad20f73f 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
index cb9ba823537..b1ce226ae01 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
@@ -748,7 +748,7 @@ at the package level.
 The default layout is described in section~\ref{sec:texmftrees},
 \p.\pageref{sec:texmftrees}. The default location of
 \dirname{TEXDIR} is different between Windows
-(|%PROGRAMFILES%\texlive\2009|) and Unix
+(|%SystemDrive%\texlive\2009|) and Unix
 (\dirname{/usr/local/texlive/2009}).
 
 The main reason to change this default is if you lack write permission
@@ -1104,7 +1104,7 @@ The `old' \ConTeXt{} should run out of the box. The new `Mark IV'
 This is already mentioned implicitly in section~\ref{sec:texmftrees}:
 \dirname{TEXMFLOCAL} (by default,
 \dirname{/usr/local/texlive/texmf-local} or
-\verb|C:\Program Files\texlive\texmf-local|)
+\verb|%SystemDrive%\texlive\texmf-local|)
 is intended for system-wide local fonts and macros; and
 \dirname{TEXMFHOME} (by default, \dirname{$HOME/texmf} or
 \verb|%USERPROFILE%\texmf|), is for personal fonts and macros.  These
@@ -1582,14 +1582,14 @@ these classes of users as unprivileged users and normal users: being an
 administrator is the rule, not the exception. Nevertheless, we have made
 an effort to make \TL{} installable without administrative privileges.
 
-If the user is an administrator, shortcuts are created for all users,
+If the user is an administrator, there is an option to install for all
+users.  If this option is chosen, shortcuts are created for all users,
 and the system environment is modified. Otherwise, shortcuts and menu
 entries are created for the current user, and the user environment is
-modified.  Use the \optname{non-admin} option to \prog{install-tl} if
-you prefer per-user settings even as an administrator.
+modified.
 
 Regardless of administrator status, the default root of \TL{} proposed
-by the installer is always under \verb|%PROGRAMFILES%|. The installer
+by the installer is always under \verb|%SystemDrive%|. The installer
 always tests whether the root is writable for the current user.
 
 A problem may arise if the user is not an administrator and \TeX{}