etoolbox (10mar15)

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

3 files changed, 53 insertions, 45 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/README b/Master/texmf-dist/doc/latex/etoolbox/README
index db96fdfc6cb..a2af5e0fcc6 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/README
+++ b/Master/texmf-dist/doc/latex/etoolbox/README
@@ -1,39 +1,37 @@
-$Id: README,v 2.1 2011/01/03 19:14:10 lehman stable $
+# About
 
-ABOUT
-
-The etoolbox package is a toolbox of programming facilities geared
+The `etoolbox` package is a toolbox of programming facilities geared
 primarily towards LaTeX class and package authors. It provides LaTeX
 frontends to some of the new primitives provided by e-TeX as well as
 some generic tools which are not related to e-TeX but match the
 profile of this package. The package is work in progress. Note that
 previous versions of this package were released under the name
-elatex.
+`elatex`.
 
-LICENSE
+#License
 
-Copyright (c) 2007-2010 Philipp Lehman. This package is author-
-maintained. Permission is granted to copy, distribute and/or modify
-this software under the terms of the LaTeX Project Public License
-(LPPL), version 1.3. This software is provided 'as is', without
-warranty of any kind, either expressed or implied, including, but
-not limited to, the implied warranties of merchantability and
-fitness for a particular purpose.
+Copyright (c) 2007-2010 Philipp Lehman, 2015 Joseph Wright.
+Permission is granted to copy, distribute and/or modify this
+software under the terms of the LaTeX Project Public License (LPPL),
+version 1.3c or any later version. This software is provided 'as
+is', without warranty of any kind, either expressed or implied,
+including, but not limited to, the implied warranties of
+merchantability and fitness for a particular purpose.
 
-REQUIREMENTS
+#Requirements
 
-- e-TeX
-- etex.sty
+ - e-TeX
+ - etex.sty
 
-AUTOMATIC INSTALLATION
+#Automatic installation
 
-TeX Live: The etoolbox package is included in TeX Live.
+TeX Live: The `etoolbox` package is included in TeX Live.
           Use the TeX Live package manager to install it.
 
-MiKTeX:   The etoolbox package is included in MiKTeX.
+MiKTeX:   The `etoolbox` package is included in MiKTeX.
           Use the MiKTeX package manager to install it.
 
-SEMI-AUTOMATIC INSTALLATION
+#Semi-automatic installation
 
 1. Download the file
 
@@ -42,43 +40,51 @@ SEMI-AUTOMATIC INSTALLATION
 2. Unpack the archive in the root directory of the local TeX
    installation tree, for example
 
-	/usr/local/share/texmf/
+        /usr/local/share/texmf/
+    
    or
-	/usr/share/texmf-local/
+
+        /usr/share/texmf-local/
+
    or
-	C:\Local TeX Files\
+
+        C:\Local TeX Files\
 
 3. Update the file hash tables (also known as the file name
    database).
    
-   On teTeX and TeX Live systems, run texhash as root ('sudo
-   texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command
+   On teTeX and TeX Live systems, run `texhash` as root (`sudo
+   texhash`). On MiKTeX, run `initexmf --update-fndb` in a command
    window or use the 'Refresh FNDB' button of the MiKTeX Options
    window.
 
-MANUAL INSTALLATION
+#Manual installation
 
-1. Copy the files 'etoolbox.sty' and 'etoolbox.def' to
+1. Copy the files `etoolbox.sty` and `etoolbox.def` to
 
-	<TEXMFLOCAL>/tex/latex/etoolbox/
+        <TEXMFLOCAL>/tex/latex/etoolbox/
 
-   where <TEXMFLOCAL> denotes the root of the local TeX installation
+   where `<TEXMFLOCAL>` denotes the root of the local TeX installation
    tree, for example
 
-	/usr/local/share/texmf/
+        /usr/local/share/texmf/
+
    or
-	/usr/share/texmf-local/
+
+        /usr/share/texmf-local/
+
    or
-	C:\Local TeX Files\
 
-2. The file 'etoolbox.pdf' goes to
+        C:\Local TeX Files\
+
+2. The file `etoolbox.pdf` goes to
 
-	<TEXMFLOCAL>/doc/latex/etoolbox/
+        <TEXMFLOCAL>/doc/latex/etoolbox/
 
 3. Update the file hash tables (also known as the file name
    database).
 
-   On teTeX and TeX Live systems, run texhash as root ('sudo
-   texhash'). On MiKTeX, run 'initexmf --update-fndb' in a command
+   On teTeX and TeX Live systems, run `texhash` as root (`sudo
+   texhash`). On MiKTeX, run `initexmf --update-fndb` in a command
    window or use the 'Refresh FNDB' button of the MiKTeX Options
    window.
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 78f8d15be9d..796e4b407aa 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
index 728f3d9dec1..d6af82b08ba 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
@@ -1,4 +1,3 @@
-% $Id: etoolbox.tex,v 2.1 2011/01/03 19:14:10 lehman stable $
 \documentclass{ltxdockit}[2010/09/26]
 \usepackage[latin9]{inputenc}
 \usepackage[american]{babel}
@@ -8,21 +7,19 @@
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
-\rcsid{$Id: etoolbox.tex,v 2.1 2011/01/03 19:14:10 lehman stable $}
-
 \titlepage{%
   title={The \sty{etoolbox} Package},
   subtitle={An \etex Toolbox for Class and Package Authors},
   url={http://www.ctan.org/tex-archive/macros/latex/contrib/etoolbox/},
-  author={Philipp Lehman},
-  email={plehman@gmx.net},
-  revision={\rcsrevision},
-  date={\rcstoday}}
+  author={Philipp Lehman, Joseph Wright},
+  email={joseph.wright@morningstar2.co.uk},
+  revision={v2.1a},
+  date={2015/03/10}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
   pdfsubject={An e-TeX Toolbox for Class and Package Authors},
-  pdfauthor={Philipp Lehman},
+  pdfauthor={Philipp Lehman, Joseph Wright},
   pdfkeywords={tex, e-tex, latex, class, package, programming}}
 
 \begin{document}
@@ -39,7 +36,7 @@ The \sty{etoolbox} package is a toolbox of programming tools geared primarily to
 
 \subsection{License}
 
-Copyright \textcopyright\ 2007--2011 Philipp Lehman. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3.\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt} This package is author"=maintained.
+Copyright \textcopyright\ 2007--2011 Philipp Lehman, 2015 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or later.\fnurl{http://www.latex-project.org/lppl.txt}
 
 \section{User Commands}
 \label{use}
@@ -1269,6 +1266,11 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.1a}{2015-03-10}
+\item New maintainer: Joseph  Wright
+\item Skip loading \sty{etex} package with newer \latex kernel releases
+\end{release}
+
 \begin{release}{2.1}{2011-01-03}
 \item Added \cmd{AtBeginEnvironment}\see{use:env}
 \item Added \cmd{AtEndEnvironment}\see{use:env}