etoolbox (11mar15)

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

7 files changed, 20 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/README b/Master/texmf-dist/doc/latex/etoolbox/README
index a2af5e0fcc6..48de76e1356 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/README
+++ b/Master/texmf-dist/doc/latex/etoolbox/README
@@ -1,4 +1,6 @@
-# About
+# `etoolbox`: e-TeX tools for LaTeX
+
+## About
 
 The `etoolbox` package is a toolbox of programming facilities geared
 primarily towards LaTeX class and package authors. It provides LaTeX
@@ -8,7 +10,7 @@ profile of this package. The package is work in progress. Note that
 previous versions of this package were released under the name
 `elatex`.
 
-#License
+## License
 
 Copyright (c) 2007-2010 Philipp Lehman, 2015 Joseph Wright.
 Permission is granted to copy, distribute and/or modify this
@@ -18,12 +20,12 @@ 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
+ - `etex.sty` (for LaTeX kernel releases prior to 2015)
 
-#Automatic installation
+## Automatic installation
 
 TeX Live: The `etoolbox` package is included in TeX Live.
           Use the TeX Live package manager to install it.
@@ -35,7 +37,7 @@ MiKTeX:   The `etoolbox` package is included in MiKTeX.
 
 1. Download the file
 
-   http://www.ctan.org/tex-archive/install/macros/latex/contrib/etoolbox.tds.zip
+   http://mirror.ctan.org/install/macros/latex/contrib/etoolbox.tds.zip
 
 2. Unpack the archive in the root directory of the local TeX
    installation tree, for example
@@ -58,7 +60,7 @@ MiKTeX:   The `etoolbox` package is included in MiKTeX.
    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
 
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 796e4b407aa..1dd09fd3108 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 d6af82b08ba..9fa5b9fa77d 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
@@ -1,19 +1,18 @@
 \documentclass{ltxdockit}[2010/09/26]
-\usepackage[latin9]{inputenc}
+\usepackage[utf8]{inputenc}
 \usepackage[american]{babel}
 \usepackage[strict]{csquotes}
 \usepackage{shortvrb}
-\MakeAutoQuote{«}{»}
 \MakeAutoQuote*{<}{>}
 \MakeShortVerb{\|}
 
 \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/},
+  url={http://www.ctan.org/pkg/etoolbox/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={v2.1a},
+  revision={v2.1b},
   date={2015/03/10}}
 
 \hypersetup{%
@@ -36,7 +35,7 @@ The \sty{etoolbox} package is a toolbox of programming tools geared primarily to
 
 \subsection{License}
 
-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}
+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/}
 
 \section{User Commands}
 \label{use}
@@ -1266,6 +1265,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.1b}{2015-03-10}
+\item Minor documentation fixes
+\end{release}
+
 \begin{release}{2.1a}{2015-03-10}
 \item New maintainer: Joseph  Wright
 \item Skip loading \sty{etex} package with newer \latex kernel releases
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index 2ba89d44136..53c58cf7c57 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
@@ -1,5 +1,5 @@
 \ProvidesFile{etoolbox.def}
-  [2015/03/10 v2.1a etoolbox debug messages (JAW)]
+  [2015/03/10 v2.1b etoolbox debug messages (JAW)]
 
 \begingroup
 \makeatletter
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
index eb3ee715fd6..ccedf988880 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2015/03/10 v2.1a e-TeX tools for LaTeX (JAW)]
+  [2015/03/10 v2.1b e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
index cdd38c37773..1395f33456d 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
@@ -21,6 +21,7 @@ depend dowith
 depend eijkhout
 depend encxvlna
 depend epigram
+depend etoc
 depend fenixpar
 depend fltpoint
 depend fntproof
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 001d4261064..fece6363304 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -274,7 +274,6 @@ depend esint
 depend esint-type1
 depend etaremune
 depend etextools
-depend etoc
 depend etoolbox
 depend eukdate
 depend europasscv