summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-29 21:33:24 +0000
committerKarl Berry <karl@freefriends.org>2011-05-29 21:33:24 +0000
commitfae331c59a74d5d3269925ffd29f7c15a98c8a18 (patch)
tree1a5c5ef6bc23474832b7c99facce76ee45b2fb9a
parent8ce68d290b0fe52c9f918db9b41098c914067447 (diff)
2010 -> 2011
git-svn-id: svn://tug.org/texlive/trunk@22671 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf/doc/texlive/texlive-en/texlive-en.html56
-rw-r--r--Master/texmf/doc/texlive/texlive-en/texlive-en.pdfbin959317 -> 959312 bytes
-rw-r--r--Master/texmf/doc/texlive/texlive-en/texlive-en.tex52
3 files changed, 54 insertions, 54 deletions
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.html b/Master/texmf/doc/texlive/texlive-en/texlive-en.html
index e78ed9ef4e2..cf432681101 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 2011</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="2011-05-29 01:30:00">
+<meta name="date" content="2011-05-29 23:33: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" >
@@ -703,12 +703,12 @@ class="description">can span multiple <span class="TEX">T<span
class="E">E</span>X</span> Live releases:
<dl class="list2"><dt class="list">
<span
-class="ec-lmtt-10">2009</span> </dt><dd
+class="ec-lmtt-10">2010</span> </dt><dd
class="list">
<!--l. 330--><p class="noindent" >A previous release.
</dd><dt class="list">
<span
-class="ec-lmtt-10">2010</span> </dt><dd
+class="ec-lmtt-10">2011</span> </dt><dd
class="list">
<!--l. 331--><p class="noindent" >The current release.
<dl class="list3"><dt class="list">
@@ -787,12 +787,12 @@ class="ec-lmtt-10">$HOME </span>or <span
class="ec-lmtt-10">%USERPROFILE%</span>)
<dl class="list2"><dt class="list">
<span
-class="ec-lmtt-10">.texlive2009</span> </dt><dd
+class="ec-lmtt-10">.texlive2010</span> </dt><dd
class="list">
<!--l. 351--><p class="noindent" >Privately generated and configuration data for a previous release.
</dd><dt class="list">
<span
-class="ec-lmtt-10">.texlive2010</span> </dt><dd
+class="ec-lmtt-10">.texlive2011</span> </dt><dd
class="list">
<!--l. 353--><p class="noindent" >Privately generated and configuration data for the current release.
<dl class="list3"><dt class="list">
@@ -1214,7 +1214,7 @@ class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;Installing</span><span
class="ec-lmtt-8">&#x00A0;TeX</span><span
class="ec-lmtt-8">&#x00A0;Live</span><span
-class="ec-lmtt-8">&#x00A0;2010</span><span
+class="ec-lmtt-8">&#x00A0;2011</span><span
class="ec-lmtt-8">&#x00A0;from:</span><span
class="ec-lmtt-8">&#x00A0;...</span><br class="fancyvrb" /><a
id="x1-19004r2"></a><span
@@ -1336,7 +1336,7 @@ class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;</span><span
-class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2010</span><br class="fancyvrb" /><a
+class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2011</span><br class="fancyvrb" /><a
id="x1-19038r19"></a><span
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;</span><span
@@ -2057,9 +2057,9 @@ level.
href="#x1-110002.3">2.3<!--tex4ht:ref: sec:texmftrees --></a>, p. <a
href="#x1-110002.3">8<!--tex4ht:ref: sec:texmftrees --></a>. The default location of <span
class="ec-lmtt-10">TEXDIR </span>is <span
-class="ec-lmtt-10">/usr/local/texlive/2010</span>
+class="ec-lmtt-10">/usr/local/texlive/2011</span>
on Unix and <span class="obeylines-h"><span class="verb"><span
-class="ec-lmtt-10">%SystemDrive%\texlive\2010</span></span></span> on Windows.
+class="ec-lmtt-10">%SystemDrive%\texlive\2011</span></span></span> on Windows.
<!--l. 792--><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
class="E">E</span>X</span> Live, but you do need write access to the target
@@ -2067,7 +2067,7 @@ directory.
<!--l. 796--><p class="indent" > A reasonable alternative choice is a directory under your home directory, especially if you will be the sole
user. Use &#8216;<span class="obeylines-h"><span class="verb"><span
class="ec-lmtt-10">~</span></span></span>&#8217; to indicate this, as in &#8216;<span class="obeylines-h"><span class="verb"><span
-class="ec-lmtt-10">~/texlive/2010</span></span></span>&#8217;.
+class="ec-lmtt-10">~/texlive/2011</span></span></span>&#8217;.
<!--l. 800--><p class="indent" > We recommend including the year in the name, to enable keeping different releases of <span class="TEX">T<span
class="E">E</span>X</span> Live side by
side. (You may wish to make a version-independent name such as <span
@@ -2499,19 +2499,19 @@ add would look like this:
<div class="fancyvrb" id="fancyvrb5"><a
id="x1-32002r1"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
-class="ec-lmtt-9">&#x00A0;PATH=/usr/local/texlive/2010/bin/i386-linux:$PATH;</span><span
+class="ec-lmtt-9">&#x00A0;PATH=/usr/local/texlive/2011/bin/i386-linux:$PATH;</span><span
class="ec-lmtt-9">&#x00A0;export</span><span
class="ec-lmtt-9">&#x00A0;PATH</span>
<br class="fancyvrb" /><a
id="x1-32004r2"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
-class="ec-lmtt-9">&#x00A0;MANPATH=/usr/local/texlive/2010/texmf/doc/man:$MANPATH;</span><span
+class="ec-lmtt-9">&#x00A0;MANPATH=/usr/local/texlive/2011/texmf/doc/man:$MANPATH;</span><span
class="ec-lmtt-9">&#x00A0;export</span><span
class="ec-lmtt-9">&#x00A0;MANPATH</span>
<br class="fancyvrb" /><a
id="x1-32006r3"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
-class="ec-lmtt-9">&#x00A0;INFOPATH=/usr/local/texlive/2010/texmf/doc/info:$INFOPATH;</span><span
+class="ec-lmtt-9">&#x00A0;INFOPATH=/usr/local/texlive/2011/texmf/doc/info:$INFOPATH;</span><span
class="ec-lmtt-9">&#x00A0;export</span><span
class="ec-lmtt-9">&#x00A0;INFOPATH</span></div>
<!--l. 1010--><p class="indent" > For csh or tcsh, the file to edit is typically <span
@@ -2523,18 +2523,18 @@ like:
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;setenv</span><span
class="ec-lmtt-9">&#x00A0;PATH</span><span
-class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2010/bin/i386-linux:$PATH</span><br class="fancyvrb" /><a
+class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2011/bin/i386-linux:$PATH</span><br class="fancyvrb" /><a
id="x1-32010r2"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;setenv</span><span
class="ec-lmtt-9">&#x00A0;MANPATH</span><span
-class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2010/texmf/doc/man:$MANPATH</span>
+class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2011/texmf/doc/man:$MANPATH</span>
<br class="fancyvrb" /><a
id="x1-32012r3"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;setenv</span><span
class="ec-lmtt-9">&#x00A0;INFOPATH</span><span
-class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2010/texmf/doc/info:$INFOPATH</span></div>
+class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2011/texmf/doc/info:$INFOPATH</span></div>
<!--l. 1019--><p class="indent" > If you already have settings somewhere in your &#8220;dot&#8221; files, naturally the <span class="TEX">T<span
class="E">E</span>X</span> Live&#x00A0;directories should
simply be merged in as appropriate.
@@ -2552,7 +2552,7 @@ such as
id="x1-33002r1"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;MANPATH_MAP</span><span
-class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2010/bin/i386-linux</span><span
+class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2011/bin/i386-linux</span><span
class="ec-lmtt-9">&#x00A0;\</span><br class="fancyvrb" /><a
id="x1-33004r2"></a><span
class="ec-lmtt-9">&#x00A0;</span><span
@@ -2568,7 +2568,7 @@ class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;</span><span
class="ec-lmtt-9">&#x00A0;</span><span
-class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2010/texmf/doc/man</span></div>
+class="ec-lmtt-9">&#x00A0;/usr/local/texlive/2011/texmf/doc/man</span></div>
<!--l. 1038--><p class="indent" > And 2)&#x00A0;check for a file <span
class="ec-lmtt-10">/etc/environment </span>which may define the search path and other default environment
variables.
@@ -2775,14 +2775,14 @@ class="ec-lmtt-10">TeX</span><span
class="ec-lmtt-10">&#x00A0;3.1415926</span><span
class="ec-lmtt-10">&#x00A0;(TeX</span><span
class="ec-lmtt-10">&#x00A0;Live</span><span
-class="ec-lmtt-10">&#x00A0;2010)</span>
+class="ec-lmtt-10">&#x00A0;...)</span>
<br /><span
class="ec-lmtt-10">kpathsea</span><span
class="ec-lmtt-10">&#x00A0;version</span><span
-class="ec-lmtt-10">&#x00A0;6.0.0</span>
+class="ec-lmtt-10">&#x00A0;6.0.1</span>
<br /><span
class="ec-lmtt-10">Copyright</span><span
-class="ec-lmtt-10">&#x00A0;2010</span><span
+class="ec-lmtt-10">&#x00A0;...</span><span
class="ec-lmtt-10">&#x00A0;D.E.</span><span
class="ec-lmtt-10">&#x00A0;Knuth.</span>
<br /><span
@@ -2806,10 +2806,10 @@ class="ec-lmtk-10">latex</span><span
class="ec-lmtk-10">&#x00A0;sample2e.tex</span>
<br /><span
class="ec-lmtt-10">pdfTeX</span><span
-class="ec-lmtt-10">&#x00A0;3.1415926-1.40.11-2.2</span><span
+class="ec-lmtt-10">&#x00A0;3.1415926-...</span><span
class="ec-lmtt-10">&#x00A0;(TeX</span><span
class="ec-lmtt-10">&#x00A0;Live</span><span
-class="ec-lmtt-10">&#x00A0;2010)</span>
+class="ec-lmtt-10">&#x00A0;...)</span>
<br /><span
class="ec-lmtt-10">...</span>
<br /><span
@@ -3335,7 +3335,7 @@ class="ec-lmtk-10">&#x00A0;-gui</span>
</div> or in Windows via the Start menu: <span
class="ec-lmtt-10">Start</span>, <span
class="ec-lmtt-10">Programs</span>, <span
-class="ec-lmtt-10">TeX Live 2010</span>, <span
+class="ec-lmtt-10">TeX Live 2011</span>, <span
class="ec-lmtt-10">TeX Live Manager</span>. After clicking
&#8216;Load&#8217; it displays a list of available and installed packages. This assumes of course that the installation source
is valid and reachable.
@@ -3441,7 +3441,7 @@ class="ec-lmtt-8">&#x00A0;mktexlsr</span>
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;mktexlsr:</span><span
class="ec-lmtt-8">&#x00A0;Updating</span><span
-class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2010/texmf/ls-R...</span><br class="fancyvrb" /><a
+class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2011/texmf/ls-R...</span><br class="fancyvrb" /><a
id="x1-47024r12"></a><span
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;...</span><br class="fancyvrb" /><a
@@ -3463,7 +3463,7 @@ class="ec-lmtt-8">&#x00A0;xelatex.log.</span><br class="fancyvrb" /><a
id="x1-47032r16"></a><span
class="ec-lmtt-8">&#x00A0;</span><span
class="ec-lmtt-8">&#x00A0;fmtutil:</span><span
-class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2010/texmf-var/web2c/xetex/xelatex.fmt</span><span
+class="ec-lmtt-8">&#x00A0;/usr/local/texlive/2011/texmf-var/web2c/xetex/xelatex.fmt</span><span
class="ec-lmtt-8">&#x00A0;installed.</span></div>
<!--l. 1541--><p class="indent" > As you can see, <span
class="ec-lmss-10">tlmgr </span>installs dependencies, and takes care of any necessary post-install actions, including
@@ -4036,10 +4036,10 @@ path used to look for these files is named <span
class="ec-lmtt-10">TEXMFCNF</span>, but we do not recommend setting this (or any)
environment variable.
<!--l. 1899--><p class="indent" > Instead, normal installation results in a file <span
-class="ec-lmtt-10">.../2010/texmf.cnf</span>. If you must make changes to the
+class="ec-lmtt-10">.../2011/texmf.cnf</span>. If you must make changes to the
defaults (not normally necessary), this is the place to put them. The main configuration file is in
<span
-class="ec-lmtt-10">.../2010/texmf/web2c/texmf.cnf</span>. You should not edit this latter file, as your changes will be lost when the
+class="ec-lmtt-10">.../2011/texmf/web2c/texmf.cnf</span>. You should not edit this latter file, as your changes will be lost when the
distributed version is updated.
<!--l. 1906--><p class="indent" > <span
class="ec-lmri-10">All </span><span
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
index 1d43c63d0b9..b89ea5e3f49 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.pdf
Binary files differ
diff --git a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
index 34963339ca9..4899b584001 100644
--- a/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf/doc/texlive/texlive-en/texlive-en.tex
@@ -327,8 +327,8 @@ The default layout is:
\begin{description}
\item[system-wide root] can span multiple \TL{} releases:
\begin{ttdescription}
- \item[2009] A previous release.
- \item[2010] The current release.
+ \item[2010] A previous release.
+ \item[2011] The current release.
\begin{ttdescription}
\item [bin] ~
\begin{ttdescription}
@@ -348,9 +348,9 @@ The default layout is:
\item[user's home] (\texttt{\$HOME} or
\texttt{\%USERPROFILE\%})
\begin{ttdescription}
- \item[.texlive2009] Privately generated and configuration data
- for a previous release.
\item[.texlive2010] Privately generated and configuration data
+ for a previous release.
+ \item[.texlive2011] Privately generated and configuration data
for the current release.
\begin{ttdescription}
\item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE}
@@ -589,7 +589,7 @@ For a complete listing of the various options:
\begin{figure}[tb]
\begin{boxedverbatim}
-Installing TeX Live 2010 from: ...
+Installing TeX Live 2011 from: ...
Platform: i386-linux => 'Intel x86 with GNU/Linux'
Distribution: inst (compressed)
...
@@ -606,7 +606,7 @@ Distribution: inst (compressed)
<D> directories:
TEXDIR (the main TeX directory):
- /usr/local/texlive/2010
+ /usr/local/texlive/2011
...
<O> options:
@@ -786,8 +786,8 @@ 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 \dirname{/usr/local/texlive/2010} on Unix
-and |%SystemDrive%\texlive\2010| on Windows.
+\dirname{TEXDIR} is \dirname{/usr/local/texlive/2011} on Unix
+and |%SystemDrive%\texlive\2011| on Windows.
The main reason to change this default is if you lack write permission
for the default location. You don't have to be root or administrator to
@@ -795,7 +795,7 @@ 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/2010|'.
+`|~|' to indicate this, as in `|~/texlive/2011|'.
We recommend including the year in the name, to enable keeping different
releases of \TL{} side by side. (You may wish to make a
@@ -1002,18 +1002,18 @@ might be \filename{$HOME/.profile} (or another file sourced by
\filename{.profile}, and the lines to add would look like this:
\begin{sverbatim}
-PATH=/usr/local/texlive/2010/bin/i386-linux:$PATH; export PATH
-MANPATH=/usr/local/texlive/2010/texmf/doc/man:$MANPATH; export MANPATH
-INFOPATH=/usr/local/texlive/2010/texmf/doc/info:$INFOPATH; export INFOPATH
+PATH=/usr/local/texlive/2011/bin/i386-linux:$PATH; export PATH
+MANPATH=/usr/local/texlive/2011/texmf/doc/man:$MANPATH; export MANPATH
+INFOPATH=/usr/local/texlive/2011/texmf/doc/info:$INFOPATH; export INFOPATH
\end{sverbatim}
For csh or tcsh, the file to edit is typically \filename{$HOME/.cshrc}, and
the lines to add might look like:
\begin{sverbatim}
-setenv PATH /usr/local/texlive/2010/bin/i386-linux:$PATH
-setenv MANPATH /usr/local/texlive/2010/texmf/doc/man:$MANPATH
-setenv INFOPATH /usr/local/texlive/2010/texmf/doc/info:$INFOPATH
+setenv PATH /usr/local/texlive/2011/bin/i386-linux:$PATH
+setenv MANPATH /usr/local/texlive/2011/texmf/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2011/texmf/doc/info:$INFOPATH
\end{sverbatim}
If you already have settings somewhere in your ``dot'' files, naturally
@@ -1031,8 +1031,8 @@ Our two hints are: 1)~you may want to check for a file
\filename{/etc/manpath.config} and, if present, add lines such as
\begin{sverbatim}
-MANPATH_MAP /usr/local/texlive/2010/bin/i386-linux \
- /usr/local/texlive/2010/texmf/doc/man
+MANPATH_MAP /usr/local/texlive/2011/bin/i386-linux \
+ /usr/local/texlive/2011/texmf/doc/man
\end{sverbatim}
And 2)~check for a file \filename{/etc/environment} which may define the
@@ -1187,9 +1187,9 @@ the principles are the same.
place:
\begin{alltt}
> \Ucom{tex -{}-version}
-TeX 3.1415926 (TeX Live 2010)
-kpathsea version 6.0.0
-Copyright 2010 D.E. Knuth.
+TeX 3.1415926 (TeX Live ...)
+kpathsea version 6.0.1
+Copyright ... D.E. Knuth.
...
\end{alltt}
If this comes back with `command not found' instead of version and
@@ -1200,7 +1200,7 @@ the environment-setting information on \p.\pageref{sec:env}.
\item Process a basic \LaTeX{} file:
\begin{alltt}
> \Ucom{latex sample2e.tex}
-pdfTeX 3.1415926-1.40.11-2.2 (TeX Live 2010)
+pdfTeX 3.1415926-... (TeX Live ...)
...
Output written on sample2e.dvi (3 pages, 7484 bytes).
Transcript written on sample2e.log.
@@ -1489,7 +1489,7 @@ include:
> \Ucom{tlmgr -gui}
\end{alltt}
or in Windows via the Start menu: \texttt{Start}, \texttt{Programs},
-\texttt{TeX Live 2010}, \texttt{TeX Live Manager}. After clicking `Load'
+\texttt{TeX Live 2011}, \texttt{TeX Live Manager}. After clicking `Load'
it displays a list of available and installed packages. This assumes of
course that the installation source is valid and reachable.
@@ -1530,12 +1530,12 @@ running post install action for xetex
install: xetex-def
...
running mktexlsr
-mktexlsr: Updating /usr/local/texlive/2010/texmf/ls-R...
+mktexlsr: Updating /usr/local/texlive/2011/texmf/ls-R...
...
running fmtutil-sys --missing
...
Transcript written on xelatex.log.
-fmtutil: /usr/local/texlive/2010/texmf-var/web2c/xetex/xelatex.fmt installed.
+fmtutil: /usr/local/texlive/2011/texmf-var/web2c/xetex/xelatex.fmt installed.
\end{fverbatim}
As you can see, \prog{tlmgr} installs dependencies, and takes care of any
@@ -1897,9 +1897,9 @@ for these files is named \envname{TEXMFCNF}, but we do not recommend
setting this (or any) environment variable.
Instead, normal installation results in a file
-\file{.../2010/texmf.cnf}. If you must make changes to the defaults
+\file{.../2011/texmf.cnf}. If you must make changes to the defaults
(not normally necessary), this is the place to put them. The main
-configuration file is in \file{.../2010/texmf/web2c/texmf.cnf}. You
+configuration file is in \file{.../2011/texmf/web2c/texmf.cnf}. You
should not edit this latter file, as your changes will be lost when the
distributed version is updated.