apa6 (15feb12)

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

18 files changed, 203 insertions, 798 deletions

diff --git a/Master/texmf-dist/doc/latex/apa6/README b/Master/texmf-dist/doc/latex/apa6/README
index 177b96eb4cd..c2f15405114 100644
--- a/Master/texmf-dist/doc/latex/apa6/README
+++ b/Master/texmf-dist/doc/latex/apa6/README
@@ -3,7 +3,7 @@
 apa6 - A LaTeX class for formatting documents in compliance with the
 American Psychological Association's Publication Manual, 6th edition
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/doc/latex/apa6/README.txt b/Master/texmf-dist/doc/latex/apa6/README.txt
index 177b96eb4cd..c2f15405114 100644
--- a/Master/texmf-dist/doc/latex/apa6/README.txt
+++ b/Master/texmf-dist/doc/latex/apa6/README.txt
@@ -3,7 +3,7 @@
 apa6 - A LaTeX class for formatting documents in compliance with the
 American Psychological Association's Publication Manual, 6th edition
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
diff --git a/Master/texmf-dist/doc/latex/apa6/apa6.pdf b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
index 277b54a39be..7768b19a44b 100644
--- a/Master/texmf-dist/doc/latex/apa6/apa6.pdf
+++ b/Master/texmf-dist/doc/latex/apa6/apa6.pdf
diff --git a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
index 708a74fe79c..22b1c3abcb7 100644
--- a/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
+++ b/Master/texmf-dist/doc/latex/apa6/pseudoTeX/apa6.ptex
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -234,7 +234,7 @@
 
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -259,6 +259,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
index 7ee48be62cc..971ca77ebea 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
+++ b/Master/texmf-dist/doc/latex/apa6/samples/bibliography.bib
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -138,6 +138,20 @@ cortex: {B}eyond dichotomies},
   pages = {301--321}
 }
 
+@ARTICLE{MayerInPressA,
+  author = {Mayer, Richard E.},
+  title = {Fake article to illustrate in-press citations},
+  journal = {Journal of Cognitive Psychology},
+  year = {in press}
+}
+
+@ARTICLE{MayerInPressB,
+  author = {Mayer, Richard E.},
+  title = {Second fake article to illustrate in-press citations},
+  journal = {Journal of Educational Psychology},
+  year = {in press}
+}
+
 @ARTICLE{Mayer2008a,
   author = {Mayer, Richard E.},
   title = {Applying the science of learning: {E}vidence-based principles for
@@ -176,7 +190,7 @@ the design of multimedia instruction},
 }
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -201,6 +215,7 @@ the design of multimedia instruction},
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
index 834b23d9d09..fd3cfa80a6c 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/longsample.tex
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -185,7 +185,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 \end{document}
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -210,6 +210,7 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
index 66447831b7f..73c26b5bddf 100644
--- a/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
+++ b/Master/texmf-dist/doc/latex/apa6/samples/shortsample.tex
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -122,7 +122,7 @@ skill in interpreting the results for the masses.
 \end{document}
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -147,6 +147,7 @@ skill in interpreting the results for the masses.
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.dtx b/Master/texmf-dist/source/latex/apa6/apa6.dtx
index 265c0f55608..9a35171b4ec 100644
--- a/Master/texmf-dist/source/latex/apa6/apa6.dtx
+++ b/Master/texmf-dist/source/latex/apa6/apa6.dtx
@@ -4,11 +4,11 @@
 %                                                                           %
 %    CHANGE THESE VALUES WITH EACH NEW RELEASE:                             %
 %                                                                           %
-%<class>\ProvidesClass{apa6}[2012/01/16 v1.13 APA formatting (6th edition)]
+%<class>\ProvidesClass{apa6}[2012/02/15 v1.2 APA formatting (6th edition)]
 %                                                                           %
 %<*internal>                                                                %
-\def\apaSixVersionDate{2012/01/16}
-\def\apaSixVersionNumber{1.13}
+\def\apaSixVersionDate{2012/02/15}
+\def\apaSixVersionNumber{1.2}
 %                                                                           %
 %                                                                           %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20,7 +20,7 @@
 apa6 - A LaTeX class for formatting documents in compliance with the
 American Psychological Association's Publication Manual, 6th edition
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -64,7 +64,7 @@ details.
 apa6 - A LaTeX class for formatting documents in compliance with the
 American Psychological Association's Publication Manual, 6th edition
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -84,7 +84,7 @@ by, the American Psychological Association.
 \endpreamble
 \postamble
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -109,6 +109,7 @@ and the derived files           apa6.ins,
                                 apa6.pdf,
                                 README.txt,
                                 APAamerican.txt,
+                                APAbritish.txt,
                                 APAdutch.txt,
                                 APAenglish.txt,
                                 APAgerman.txt,
@@ -129,6 +130,7 @@ and the derived files           apa6.ins,
 \usedir{tex/latex/apa6/config}
 \generate{
   \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}}
+  \file{./config/APAbritish.txt}{\from{\jobname.dtx}{british}}
   \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}}
   \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}}
   \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}}
@@ -238,6 +240,11 @@ and the derived files           apa6.ins,
 % \changes{v1.13}{2012/01/16}{Increased spacing on top and bottom of
 % tables (below caption and above table notes, if present)}
 %
+% \changes{v1.2}{2012/02/15}{Added `APAbritish.txt' configuration
+% file}
+% \changes{v1.2}{2012/02/15}{Version 6.00 (2012/02/14) or later of the
+% apacite package is now required}
+%
 % \begin{abstract}
 %   The \textit{Publication Manual} of the American Psychological
 %   Association is widely used in the social sciences.  The most
@@ -1085,7 +1092,7 @@ and the derived files           apa6.ins,
  \@ifundefined{def@doc}{%
   \@ifundefined{def@jou}{%
    \def\def@jou{\@joumode}
-   \ClassWarningNoLine{apa6}{Using default mode (jou)}
+   \ClassInfo{apa6}{Using default mode (jou)}
    %\def\def@man{\@manmode}
    %\def\def@doc{\@docmode}
   }{}
@@ -1134,7 +1141,7 @@ and the derived files           apa6.ins,
           }
         }{}
       }
-      \ClassWarningNoLine{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
+      \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
     }{%
       \def\def@biblatex{\@biblatexmode}%  the selected bibliography package is Biblatex
       \RequirePackage[style=apa,sortcites=true,sorting=nyt]{biblatex}
@@ -1143,21 +1150,21 @@ and the derived files           apa6.ins,
       }{%
         \defbibheading{bibliography}{\section*{\newpage\normalfont\refname}}%
       }
-      \ClassWarningNoLine{apa6}{The selected bibliography package, biblatex, has been loaded}
+      \ClassInfo{apa6}{The selected bibliography package, biblatex, has been loaded}
     }
   }{%
     \def\def@natbib{\@natbibmode}%  the selected bibliography package is natbib (with apacite)
     \@ifundefined{def@man}{%         -- thp 2005/07/23
-      \RequirePackage{apacite}[2005/06/08]}
-      {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
-    \ClassWarningNoLine{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded}
+      \RequirePackage[natbibapa]{apacite}[2012/02/14}
+      {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/14]}
+    \ClassInfo{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded}
   }
 }{%
   \def\def@apacite{\@apacitemode}%  the selected bibliography package is apacite
   \@ifundefined{def@man}{%         -- thp 2005/07/23
     \RequirePackage{apacite}[2005/06/08]}
     {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
-  \ClassWarningNoLine{apa6}{The selected bibliography package, apacite, has been loaded}
+  \ClassInfo{apa6}{The selected bibliography package, apacite, has been loaded}
 }
 
 % load the lmodern package (needed for proper watermark font size)
@@ -1183,8 +1190,8 @@ and the derived files           apa6.ins,
 }
 
 %\@ifundefined{def@noapacite}%       -- Philip Kime 2008/12/03
-%  {\ClassWarningNoLine{apa6}{Using BibTeX with apacite for citations and references}}%
-%  {\ClassWarningNoLine{apa6}{apacite not loaded -- User may load BibLaTeX}}
+%  {\ClassInfo{apa6}{Using BibTeX with apacite for citations and references}}%
+%  {\ClassInfo{apa6}{apacite not loaded -- User may load BibLaTeX}}
 
 
 %==== Conditional compilation macros depending on mode ====
@@ -1356,7 +1363,7 @@ and the derived files           apa6.ins,
   {\def\@apaSix@langfile{config/APAamerican.txt}}
   {\def\@apaSix@langfile{config/APA\languagename.txt}}
  \InputIfFileExists{\@apaSix@langfile}{}{%
-  \ClassWarningNoLine{apa6}{Language definition file \@apaSix@langfile\space not found}
+  \ClassInfo{apa6}{Language definition file \@apaSix@langfile\space not found}
  }%
 }
 
@@ -1366,379 +1373,7 @@ and the derived files           apa6.ins,
  \RequirePackage{babel}    % -- thp 2005/07/23, removed options 2005/12/28
 }
 
-%========== Load new apacite =========================
-
-%\@ifundefined{def@noapacite}%       -- Philip Kime 2008/12/03
-%  {%
-%    \@ifundefined{def@man}{%         -- thp 2005/07/23
-%      \RequirePackage{apacite}[2005/06/08]}
-%      {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
-%  }{}
-
-\@ifundefined{def@biblatex}{% BDB
-
-  \@ifundefined{def@natbib}{%
-    \@ifundefined{def@apacite}{}{%
-      % we are using apacite (but not natbib)
-
-        %%%%%%%%%%%% apacite commands %%%%%%%%%%%%%%%%%
-        %%
-        %%  \cite<e.g.,>[p.~11]{vanDijk2001,Ross1987}         =>  (e.g., van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \citeNP<e.g.,>[p.~11]{vanDijk2001,Ross1987}       =>  e.g., van Dijk, 2001; Ross, 1987, p. 11
-        %%  \citeA<e.g.,>[p.~11]{vanDijk2001,Ross1987}        =>  e.g., van Dijk (2001); Ross (1987, p. 11)
-        %%  \citeauthor<e.g.,>[p.~11]{vanDijk2001,Ross1987}   =>  e.g., van Dijk; Ross, p. 11
-        %%  \citeyear<e.g.,>[p.~11]{vanDijk2001,Ross1987}     =>  (e.g., 2001; 1987, p. 11)
-        %%  \citeyearNP<e.g.,>[p.~11]{vanDijk2001,Ross1987}   =>  e.g., 2001; 1987, p. 11
-        %%
-        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-        \@ifundefined{apaSix@maskauthoridentity}%  BDB
-          {%  change masked references to unmasked
-            \providecommand\maskcite\cite
-            \providecommand\maskciteNP\citeNP
-            \providecommand\maskciteA\citeA
-            \providecommand\maskciteauthor\citeauthor
-            \providecommand\maskciteyear\citeyear
-            \providecommand\maskciteyearNP\citeyearNP
-          }{%  mask references to author
-
-            \RequirePackage{substr}  % to allow counting of masked references
-            \newcounter{maskedRefs}
-
-            % \maskcite
-            \newcommand\maskcite{\@ifnextchar<{\maskcite@@also}{\maskcite@@also[]}}
-            \newcommand\maskcite@@also{}
-            \def\maskcite@@also[#1]{\@ifnextchar<{\maskcite@@@also[#1]}{\maskcite@@@also[][#1]}}
-
-            \def\maskcite@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteNP
-            \newcommand\maskciteNP{\@ifnextchar<{\maskciteNP@@also}{\maskciteNP@@also[]}}
-            \newcommand\maskciteNP@@also{}
-            \def\maskciteNP@@also[#1]{\@ifnextchar<{\maskciteNP@@@also[#1]}{\maskciteNP@@@also[][#1]}}
-
-            \def\maskciteNP@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteA
-            \newcommand\maskciteA{\@ifnextchar<{\maskciteA@@also}{\maskciteA@@also[]}}
-            \newcommand\maskciteA@@also{}
-            \def\maskciteA@@also[#1]{\@ifnextchar<{\maskciteA@@@also[#1]}{\maskciteA@@@also[][#1]}}
-
-            \def\maskciteA@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteauthor
-            \newcommand\maskciteauthor{\@ifnextchar<{\maskciteauthor@@also}{\maskciteauthor@@also[]}}
-            \newcommand\maskciteauthor@@also{}
-            \def\maskciteauthor@@also[#1]{\@ifnextchar<{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}}
-
-            \def\maskciteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyear
-            \newcommand\maskciteyear{\@ifnextchar<{\maskciteyear@@also}{\maskciteyear@@also[]}}
-            \newcommand\maskciteyear@@also{}
-            \def\maskciteyear@@also[#1]{\@ifnextchar<{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}}
-
-            \def\maskciteyear@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyearNP
-            \newcommand\maskciteyearNP{\@ifnextchar<{\maskciteyearNP@@also}{\maskciteyearNP@@also[]}}
-            \newcommand\maskciteyearNP@@also{}
-            \def\maskciteyearNP@@also[#1]{\@ifnextchar<{\maskciteyearNP@@@also[#1]}{\maskciteyearNP@@@also[][#1]}}
-
-            \def\maskciteyearNP@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-
-          }
-
-    }
-  }{%
-
-    % we are using apacite + natbib
-
-        %%%%%%%%%%%% natbib commands %%%%%%%%%%%%%%%%%%
-        %%
-        %%  \citep[e.g.,][p.~11]{vanDijk2001,Ross1987}        =>  (e.g., van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \Citep[][p.~11]{vanDijk2001,Ross1987}             =>  Van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \citealp[e.g.,][p.~11]{vanDijk2001,Ross1987}      =>  e.g., van Dijk, 2001; Ross, 1987, p. 11
-        %%  \Citealp[][p.~11]{vanDijk2001,Ross1987}           =>  Van Dijk, 2001; Ross, 1987, p. 11
-        %%  \citet[e.g.,][p.~11]{vanDijk2001,Ross1987}        =>  e.g., van Dijk (2001); Ross (1987, p. 11)
-        %%  \Citet[][p.~11]{vanDijk2001,Ross1987}             =>  Van Dijk (2001); Ross (1987, p. 11)
-        %%  \citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987}   =>  e.g., van Dijk; Ross, p. 11
-        %%  \Citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987}   =>  e.g., Van Dijk; Ross, p. 11
-        %%  \citeyearpar[e.g.,][p.~11]{vanDijk2001,Ross1987}  =>  (e.g., 2001; 1987, p. 11)
-        %%  \citeyear[e.g.,][p.~11]{vanDijk2001,Ross1987}     =>  e.g., 2001; 1987, p. 11
-        %%
-        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-        \@ifundefined{apaSix@maskauthoridentity}%  BDB
-          {%  change masked references to unmasked
-            \providecommand\maskcitep\citep
-            \providecommand\maskCitep\Citep
-            \providecommand\maskcitealp\citealp
-            \providecommand\maskCitealp\Citealp
-            \providecommand\maskcitet\citet
-            \providecommand\maskCitet\Citet
-            \providecommand\maskciteauthor\citeauthor
-            \providecommand\maskCiteauthor\Citeauthor
-            \providecommand\maskciteyearpar\citeyearpar
-            \providecommand\maskciteyear\citeyear
-          }{%  mask references to author
-
-            \RequirePackage{substr}  % to allow counting of masked references
-            \newcounter{maskedRefs}
-
-            % \maskcitep
-            \newcommand\maskcitep{\@ifnextchar[{\maskcitep@@also}{\maskcitep@@also[]}}
-            \newcommand\maskcitep@@also{}
-            \def\maskcitep@@also[#1]{\@ifnextchar[{\maskcitep@@@also[#1]}{\maskcitep@@@also[][#1]}}
-
-            \def\maskcitep@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitep
-            \newcommand\maskCitep{\@ifnextchar[{\maskCitep@@also}{\maskCitep@@also[]}}
-            \newcommand\maskCitep@@also{}
-            \def\maskCitep@@also[#1]{\@ifnextchar[{\maskCitep@@@also[#1]}{\maskCitep@@@also[][#1]}}
-
-            \def\maskCitep@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskcitealp
-            \newcommand\maskcitealp{\@ifnextchar[{\maskcitealp@@also}{\maskcitealp@@also[]}}
-            \newcommand\maskcitealp@@also{}
-            \def\maskcitealp@@also[#1]{\@ifnextchar[{\maskcitealp@@@also[#1]}{\maskcitealp@@@also[][#1]}}
-
-            \def\maskcitealp@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitealp
-            \newcommand\maskCitealp{\@ifnextchar[{\maskCitealp@@also}{\maskCitealp@@also[]}}
-            \newcommand\maskCitealp@@also{}
-            \def\maskCitealp@@also[#1]{\@ifnextchar[{\maskCitealp@@@also[#1]}{\maskCitealp@@@also[][#1]}}
-
-            \def\maskCitealp@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskcitet
-            \newcommand\maskcitet{\@ifnextchar[{\maskcitet@@also}{\maskcitet@@also[]}}
-            \newcommand\maskcitet@@also{}
-            \def\maskcitet@@also[#1]{\@ifnextchar[{\maskcitet@@@also[#1]}{\maskcitet@@@also[][#1]}}
-
-            \def\maskcitet@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitet
-            \newcommand\maskCitet{\@ifnextchar[{\maskCitet@@also}{\maskCitet@@also[]}}
-            \newcommand\maskCitet@@also{}
-            \def\maskCitet@@also[#1]{\@ifnextchar[{\maskCitet@@@also[#1]}{\maskCitet@@@also[][#1]}}
-
-            \def\maskCitet@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteauthor
-            \newcommand\maskciteauthor{\@ifnextchar[{\maskciteauthor@@also}{\maskciteauthor@@also[]}}
-            \newcommand\maskciteauthor@@also{}
-            \def\maskciteauthor@@also[#1]{\@ifnextchar[{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}}
-
-            \def\maskciteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCiteauthor
-            \newcommand\maskCiteauthor{\@ifnextchar[{\maskCiteauthor@@also}{\maskCiteauthor@@also[]}}
-            \newcommand\maskCiteauthor@@also{}
-            \def\maskCiteauthor@@also[#1]{\@ifnextchar[{\maskCiteauthor@@@also[#1]}{\maskCiteauthor@@@also[][#1]}}
-
-            \def\maskCiteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyearpar
-            \newcommand\maskciteyearpar{\@ifnextchar[{\maskciteyearpar@@also}{\maskciteyearpar@@also[]}}
-            \newcommand\maskciteyearpar@@also{}
-            \def\maskciteyearpar@@also[#1]{\@ifnextchar[{\maskciteyearpar@@@also[#1]}{\maskciteyearpar@@@also[][#1]}}
-
-            \def\maskciteyearpar@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyear
-            \newcommand\maskciteyear{\@ifnextchar[{\maskciteyear@@also}{\maskciteyear@@also[]}}
-            \newcommand\maskciteyear@@also{}
-            \def\maskciteyear@@also[#1]{\@ifnextchar[{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}}
-
-            \def\maskciteyear@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-
-          }
-
-  }
-
-}{%
+\@ifundefined{def@biblatex}{}{% BDB
 
   % we are using biblatex
 
@@ -2198,7 +1833,7 @@ and the derived files           apa6.ins,
  \@ifundefined{@abstract}{%
   \ClassWarningNoLine{apa6}{Abstract not defined}}{}
  \@ifundefined{@keywords}{%
-  \ClassWarningNoLine{apa6}{Keywords not defined}}{}
+  \ClassInfo{apa6}{Keywords not defined}}{}
  \@ifundefined{@authorSix}{%                                   % -- thp 2006/01/05
   \@ifundefined{@authorFive}{%                                 % -- thp 2006/01/05
    \@ifundefined{@authorFour}{%
@@ -2684,11 +2319,11 @@ and the derived files           apa6.ins,
 \def\maketitle{
 \@ifundefined{hrm}{}{\hrm}
  \check@author
-% \@ifundefined{s@title}{\ClassWarningNoLine{apa6}{Using title for short title}
+% \@ifundefined{s@title}{\ClassInfo{apa6}{Using title for short title}
 %                        \def\s@title{\@title}
 %                        \markright{\hfill\@title}}%\protect\thepage}}  %% removed rm
 %                       {\markright{\hfill\s@title}}%\protect\thepage}} %% thp 020227
-% \@ifundefined{r@headr}{\ClassWarningNoLine{apa6}{Using short title for running head}
+% \@ifundefined{r@headr}{\ClassInfo{apa6}{Using short title for running head}
 %                        \def\r@headr{\protect\MakeUppercase{\s@title}}}{}
 
 
@@ -2820,7 +2455,7 @@ and the derived files           apa6.ins,
   }{}%
   \raggedright%
   \setlength{\parindent}{0.4in}%
-  \indent%
+%  \indent%
 }
 
 \thispagestyle{titlepage}
@@ -3630,6 +3265,20 @@ and the derived files           apa6.ins,
   pages = {301--321}
 }
 
+@ARTICLE{MayerInPressA,
+  author = {Mayer, Richard E.},
+  title = {Fake article to illustrate in-press citations},
+  journal = {Journal of Cognitive Psychology},
+  year = {in press}
+}
+
+@ARTICLE{MayerInPressB,
+  author = {Mayer, Richard E.},
+  title = {Second fake article to illustrate in-press citations},
+  journal = {Journal of Educational Psychology},
+  year = {in press}
+}
+
 @ARTICLE{Mayer2008a,
   author = {Mayer, Richard E.},
   title = {Applying the science of learning: {E}vidence-based principles for
@@ -4193,6 +3842,21 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
 %\end{macro}
 %
 %
+%\begin{macro}{APAbritish.txt}
+%    \begin{macrocode}
+%<*british>
+\ProvidesFile{APAbritish.txt}[2011/12/10 v1.11 apa6 configuration for British English]
+
+\renewcommand{\rheadname}{Running head}
+\renewcommand{\acksname}{Author Note}
+\renewcommand{\notesname}{Footnotes}
+
+
+%</british>
+%    \end{macrocode}
+%\end{macro}
+%
+%
 %\begin{macro}{APAenglish.txt}
 %    \begin{macrocode}
 %<*english>
diff --git a/Master/texmf-dist/source/latex/apa6/apa6.ins b/Master/texmf-dist/source/latex/apa6/apa6.ins
index 8a3f0a5bba9..315a1627b31 100644
--- a/Master/texmf-dist/source/latex/apa6/apa6.ins
+++ b/Master/texmf-dist/source/latex/apa6/apa6.ins
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -36,7 +36,7 @@
 apa6 - A LaTeX class for formatting documents in compliance with the
 American Psychological Association's Publication Manual, 6th edition
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -56,7 +56,7 @@ by, the American Psychological Association.
 \endpreamble
 \postamble
 
-Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -80,6 +80,7 @@ and the derived files           apa6.ins,
                                 apa6.pdf,
                                 README.txt,
                                 APAamerican.txt,
+                                APAbritish.txt,
                                 APAdutch.txt,
                                 APAenglish.txt,
                                 APAgerman.txt,
@@ -100,6 +101,7 @@ and the derived files           apa6.ins,
 \usedir{tex/latex/apa6/config}
 \generate{
   \file{./config/APAamerican.txt}{\from{\jobname.dtx}{american}}
+  \file{./config/APAbritish.txt}{\from{\jobname.dtx}{british}}
   \file{./config/APAdutch.txt}{\from{\jobname.dtx}{dutch}}
   \file{./config/APAenglish.txt}{\from{\jobname.dtx}{english}}
   \file{./config/APAgerman.txt}{\from{\jobname.dtx}{german}}
@@ -119,7 +121,7 @@ and the derived files           apa6.ins,
 }
 \endbatchfile
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -144,6 +146,7 @@ and the derived files           apa6.ins,
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/apa6.cls b/Master/texmf-dist/tex/latex/apa6/apa6.cls
index 2894b6dae2a..b5e5ac27177 100644
--- a/Master/texmf-dist/tex/latex/apa6/apa6.cls
+++ b/Master/texmf-dist/tex/latex/apa6/apa6.cls
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -27,7 +27,7 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\ProvidesClass{apa6}[2012/01/16 v1.13 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2012/02/15 v1.2 APA formatting (6th edition)]
 \NeedsTeXFormat{LaTeX2e}
 
 \DeclareOption{man}{%
@@ -138,7 +138,7 @@
  \@ifundefined{def@doc}{%
   \@ifundefined{def@jou}{%
    \def\def@jou{\@joumode}
-   \ClassWarningNoLine{apa6}{Using default mode (jou)}
+   \ClassInfo{apa6}{Using default mode (jou)}
    %\def\def@man{\@manmode}
    %\def\def@doc{\@docmode}
   }{}
@@ -184,7 +184,7 @@
           }
         }{}
       }
-      \ClassWarningNoLine{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
+      \ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
     }{%
       \def\def@biblatex{\@biblatexmode}%  the selected bibliography package is Biblatex
       \RequirePackage[style=apa,sortcites=true,sorting=nyt]{biblatex}
@@ -193,21 +193,21 @@
       }{%
         \defbibheading{bibliography}{\section*{\newpage\normalfont\refname}}%
       }
-      \ClassWarningNoLine{apa6}{The selected bibliography package, biblatex, has been loaded}
+      \ClassInfo{apa6}{The selected bibliography package, biblatex, has been loaded}
     }
   }{%
     \def\def@natbib{\@natbibmode}%  the selected bibliography package is natbib (with apacite)
     \@ifundefined{def@man}{%         -- thp 2005/07/23
-      \RequirePackage{apacite}[2005/06/08]}
-      {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
-    \ClassWarningNoLine{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded}
+      \RequirePackage[natbibapa]{apacite}[2012/02/14}
+      {\RequirePackage[natbibapa,bibnewpage]{apacite}[2012/02/14]}
+    \ClassInfo{apa6}{The selected bibliography package, natbib, must be loaded in the preamble; apacite has been loaded}
   }
 }{%
   \def\def@apacite{\@apacitemode}%  the selected bibliography package is apacite
   \@ifundefined{def@man}{%         -- thp 2005/07/23
     \RequirePackage{apacite}[2005/06/08]}
     {\RequirePackage[bibnewpage]{apacite}[2005/06/08]}
-  \ClassWarningNoLine{apa6}{The selected bibliography package, apacite, has been loaded}
+  \ClassInfo{apa6}{The selected bibliography package, apacite, has been loaded}
 }
 
 \@ifundefined{def@nolmodern}{%
@@ -359,7 +359,7 @@
   {\def\@apaSix@langfile{config/APAamerican.txt}}
   {\def\@apaSix@langfile{config/APA\languagename.txt}}
  \InputIfFileExists{\@apaSix@langfile}{}{%
-  \ClassWarningNoLine{apa6}{Language definition file \@apaSix@langfile\space not found}
+  \ClassInfo{apa6}{Language definition file \@apaSix@langfile\space not found}
  }%
 }
 
@@ -368,370 +368,7 @@
  \RequirePackage{babel}    % -- thp 2005/07/23, removed options 2005/12/28
 }
 
-
-
-\@ifundefined{def@biblatex}{% BDB
-
-  \@ifundefined{def@natbib}{%
-    \@ifundefined{def@apacite}{}{%
-      % we are using apacite (but not natbib)
-
-        %%%%%%%%%%%% apacite commands %%%%%%%%%%%%%%%%%
-        %%
-        %%  \cite<e.g.,>[p.~11]{vanDijk2001,Ross1987}         =>  (e.g., van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \citeNP<e.g.,>[p.~11]{vanDijk2001,Ross1987}       =>  e.g., van Dijk, 2001; Ross, 1987, p. 11
-        %%  \citeA<e.g.,>[p.~11]{vanDijk2001,Ross1987}        =>  e.g., van Dijk (2001); Ross (1987, p. 11)
-        %%  \citeauthor<e.g.,>[p.~11]{vanDijk2001,Ross1987}   =>  e.g., van Dijk; Ross, p. 11
-        %%  \citeyear<e.g.,>[p.~11]{vanDijk2001,Ross1987}     =>  (e.g., 2001; 1987, p. 11)
-        %%  \citeyearNP<e.g.,>[p.~11]{vanDijk2001,Ross1987}   =>  e.g., 2001; 1987, p. 11
-        %%
-        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-        \@ifundefined{apaSix@maskauthoridentity}%  BDB
-          {%  change masked references to unmasked
-            \providecommand\maskcite\cite
-            \providecommand\maskciteNP\citeNP
-            \providecommand\maskciteA\citeA
-            \providecommand\maskciteauthor\citeauthor
-            \providecommand\maskciteyear\citeyear
-            \providecommand\maskciteyearNP\citeyearNP
-          }{%  mask references to author
-
-            \RequirePackage{substr}  % to allow counting of masked references
-            \newcounter{maskedRefs}
-
-            % \maskcite
-            \newcommand\maskcite{\@ifnextchar<{\maskcite@@also}{\maskcite@@also[]}}
-            \newcommand\maskcite@@also{}
-            \def\maskcite@@also[#1]{\@ifnextchar<{\maskcite@@@also[#1]}{\maskcite@@@also[][#1]}}
-
-            \def\maskcite@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteNP
-            \newcommand\maskciteNP{\@ifnextchar<{\maskciteNP@@also}{\maskciteNP@@also[]}}
-            \newcommand\maskciteNP@@also{}
-            \def\maskciteNP@@also[#1]{\@ifnextchar<{\maskciteNP@@@also[#1]}{\maskciteNP@@@also[][#1]}}
-
-            \def\maskciteNP@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteA
-            \newcommand\maskciteA{\@ifnextchar<{\maskciteA@@also}{\maskciteA@@also[]}}
-            \newcommand\maskciteA@@also{}
-            \def\maskciteA@@also[#1]{\@ifnextchar<{\maskciteA@@@also[#1]}{\maskciteA@@@also[][#1]}}
-
-            \def\maskciteA@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteauthor
-            \newcommand\maskciteauthor{\@ifnextchar<{\maskciteauthor@@also}{\maskciteauthor@@also[]}}
-            \newcommand\maskciteauthor@@also{}
-            \def\maskciteauthor@@also[#1]{\@ifnextchar<{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}}
-
-            \def\maskciteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyear
-            \newcommand\maskciteyear{\@ifnextchar<{\maskciteyear@@also}{\maskciteyear@@also[]}}
-            \newcommand\maskciteyear@@also{}
-            \def\maskciteyear@@also[#1]{\@ifnextchar<{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}}
-
-            \def\maskciteyear@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyearNP
-            \newcommand\maskciteyearNP{\@ifnextchar<{\maskciteyearNP@@also}{\maskciteyearNP@@also[]}}
-            \newcommand\maskciteyearNP@@also{}
-            \def\maskciteyearNP@@also[#1]{\@ifnextchar<{\maskciteyearNP@@@also[#1]}{\maskciteyearNP@@@also[][#1]}}
-
-            \def\maskciteyearNP@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-          }
-
-    }
-  }{%
-
-    % we are using apacite + natbib
-
-        %%%%%%%%%%%% natbib commands %%%%%%%%%%%%%%%%%%
-        %%
-        %%  \citep[e.g.,][p.~11]{vanDijk2001,Ross1987}        =>  (e.g., van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \Citep[][p.~11]{vanDijk2001,Ross1987}             =>  Van Dijk, 2001; Ross, 1987, p. 11)
-        %%  \citealp[e.g.,][p.~11]{vanDijk2001,Ross1987}      =>  e.g., van Dijk, 2001; Ross, 1987, p. 11
-        %%  \Citealp[][p.~11]{vanDijk2001,Ross1987}           =>  Van Dijk, 2001; Ross, 1987, p. 11
-        %%  \citet[e.g.,][p.~11]{vanDijk2001,Ross1987}        =>  e.g., van Dijk (2001); Ross (1987, p. 11)
-        %%  \Citet[][p.~11]{vanDijk2001,Ross1987}             =>  Van Dijk (2001); Ross (1987, p. 11)
-        %%  \citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987}   =>  e.g., van Dijk; Ross, p. 11
-        %%  \Citeauthor[e.g.,][p.~11]{vanDijk2001,Ross1987}   =>  e.g., Van Dijk; Ross, p. 11
-        %%  \citeyearpar[e.g.,][p.~11]{vanDijk2001,Ross1987}  =>  (e.g., 2001; 1987, p. 11)
-        %%  \citeyear[e.g.,][p.~11]{vanDijk2001,Ross1987}     =>  e.g., 2001; 1987, p. 11
-        %%
-        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-        \@ifundefined{apaSix@maskauthoridentity}%  BDB
-          {%  change masked references to unmasked
-            \providecommand\maskcitep\citep
-            \providecommand\maskCitep\Citep
-            \providecommand\maskcitealp\citealp
-            \providecommand\maskCitealp\Citealp
-            \providecommand\maskcitet\citet
-            \providecommand\maskCitet\Citet
-            \providecommand\maskciteauthor\citeauthor
-            \providecommand\maskCiteauthor\Citeauthor
-            \providecommand\maskciteyearpar\citeyearpar
-            \providecommand\maskciteyear\citeyear
-          }{%  mask references to author
-
-            \RequirePackage{substr}  % to allow counting of masked references
-            \newcounter{maskedRefs}
-
-            % \maskcitep
-            \newcommand\maskcitep{\@ifnextchar[{\maskcitep@@also}{\maskcitep@@also[]}}
-            \newcommand\maskcitep@@also{}
-            \def\maskcitep@@also[#1]{\@ifnextchar[{\maskcitep@@@also[#1]}{\maskcitep@@@also[][#1]}}
-
-            \def\maskcitep@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitep
-            \newcommand\maskCitep{\@ifnextchar[{\maskCitep@@also}{\maskCitep@@also[]}}
-            \newcommand\maskCitep@@also{}
-            \def\maskCitep@@also[#1]{\@ifnextchar[{\maskCitep@@@also[#1]}{\maskCitep@@@also[][#1]}}
-
-            \def\maskCitep@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskcitealp
-            \newcommand\maskcitealp{\@ifnextchar[{\maskcitealp@@also}{\maskcitealp@@also[]}}
-            \newcommand\maskcitealp@@also{}
-            \def\maskcitealp@@also[#1]{\@ifnextchar[{\maskcitealp@@@also[#1]}{\maskcitealp@@@also[][#1]}}
-
-            \def\maskcitealp@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitealp
-            \newcommand\maskCitealp{\@ifnextchar[{\maskCitealp@@also}{\maskCitealp@@also[]}}
-            \newcommand\maskCitealp@@also{}
-            \def\maskCitealp@@also[#1]{\@ifnextchar[{\maskCitealp@@@also[#1]}{\maskCitealp@@@also[][#1]}}
-
-            \def\maskCitealp@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskcitet
-            \newcommand\maskcitet{\@ifnextchar[{\maskcitet@@also}{\maskcitet@@also[]}}
-            \newcommand\maskcitet@@also{}
-            \def\maskcitet@@also[#1]{\@ifnextchar[{\maskcitet@@@also[#1]}{\maskcitet@@@also[][#1]}}
-
-            \def\maskcitet@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCitet
-            \newcommand\maskCitet{\@ifnextchar[{\maskCitet@@also}{\maskCitet@@also[]}}
-            \newcommand\maskCitet@@also{}
-            \def\maskCitet@@also[#1]{\@ifnextchar[{\maskCitet@@@also[#1]}{\maskCitet@@@also[][#1]}}
-
-            \def\maskCitet@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteauthor
-            \newcommand\maskciteauthor{\@ifnextchar[{\maskciteauthor@@also}{\maskciteauthor@@also[]}}
-            \newcommand\maskciteauthor@@also{}
-            \def\maskciteauthor@@also[#1]{\@ifnextchar[{\maskciteauthor@@@also[#1]}{\maskciteauthor@@@also[][#1]}}
-
-            \def\maskciteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskCiteauthor
-            \newcommand\maskCiteauthor{\@ifnextchar[{\maskCiteauthor@@also}{\maskCiteauthor@@also[]}}
-            \newcommand\maskCiteauthor@@also{}
-            \def\maskCiteauthor@@also[#1]{\@ifnextchar[{\maskCiteauthor@@@also[#1]}{\maskCiteauthor@@@also[][#1]}}
-
-            \def\maskCiteauthor@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyearpar
-            \newcommand\maskciteyearpar{\@ifnextchar[{\maskciteyearpar@@also}{\maskciteyearpar@@also[]}}
-            \newcommand\maskciteyearpar@@also{}
-            \def\maskciteyearpar@@also[#1]{\@ifnextchar[{\maskciteyearpar@@@also[#1]}{\maskciteyearpar@@@also[][#1]}}
-
-            \def\maskciteyearpar@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-            % \maskciteyear
-            \newcommand\maskciteyear{\@ifnextchar[{\maskciteyear@@also}{\maskciteyear@@also[]}}
-            \newcommand\maskciteyear@@also{}
-            \def\maskciteyear@@also[#1]{\@ifnextchar[{\maskciteyear@@@also[#1]}{\maskciteyear@@@also[][#1]}}
-
-            \def\maskciteyear@@@also%
-                [#1][#2]#3{%
-                    \setcounter{maskedRefs}{0}%
-                    \SubStringsToCounter{maskedRefs}{,}{#3}%
-                    \addtocounter{maskedRefs}{1}%
-                    \ifnum\value{maskedRefs} = 1%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citation removed for masked review})}%
-                    \else%
-                    \def\apaSix@masked@refs{(\textit{\themaskedRefs\ citations removed for masked review})}%
-                    \fi%
-                    \apaSix@masked@refs%
-            }
-
-          }
-
-  }
-
-}{%
+\@ifundefined{def@biblatex}{}{% BDB
 
   % we are using biblatex
 
@@ -1137,7 +774,7 @@
  \@ifundefined{@abstract}{%
   \ClassWarningNoLine{apa6}{Abstract not defined}}{}
  \@ifundefined{@keywords}{%
-  \ClassWarningNoLine{apa6}{Keywords not defined}}{}
+  \ClassInfo{apa6}{Keywords not defined}}{}
  \@ifundefined{@authorSix}{%                                   % -- thp 2006/01/05
   \@ifundefined{@authorFive}{%                                 % -- thp 2006/01/05
    \@ifundefined{@authorFour}{%
@@ -1585,7 +1222,6 @@
   }{}%
   \raggedright%
   \setlength{\parindent}{0.4in}%
-  \indent%
 }
 
 \thispagestyle{titlepage}
@@ -2086,7 +1722,7 @@
 
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -2111,6 +1747,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
index ce84af37902..9304555f843 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAamerican.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Footnotes}
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
new file mode 100644
index 00000000000..d9b955e824b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAbritish.txt
@@ -0,0 +1,76 @@
+%%
+%% This is file `./config/APAbritish.txt',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% apa6.dtx  (with options: `british')
+%% ----------------------------------------------------------------------
+%% 
+%% apa6 - A LaTeX class for formatting documents in compliance with the
+%% American Psychological Association's Publication Manual, 6th edition
+%% 
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version.  The latest version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% Users may freely modify these files without permission, as long as the
+%% copyright line and this statement are maintained intact.
+%% 
+%% This work is not endorsed by, affiliated with, or probably even known
+%% by, the American Psychological Association.
+%% 
+%% ----------------------------------------------------------------------
+%% 
+\ProvidesFile{APAbritish.txt}[2011/12/10 v1.11 apa6 configuration for British English]
+
+\renewcommand{\rheadname}{Running head}
+\renewcommand{\acksname}{Author Note}
+\renewcommand{\notesname}{Footnotes}
+
+%% 
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version.  The latest version of this license is in the file:
+%% 
+%% http://www.latex-project.org/lppl.txt
+%% 
+%% Users may freely modify these files without permission, as long as the
+%% copyright line and this statement are maintained intact.
+%% 
+%% This work is not endorsed by, affiliated with, or probably even known
+%% by, the American Psychological Association.
+%% 
+%% 
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Brian D. Beitzel.
+%% 
+%% This work consists of the file  apa6.dtx
+%% and the derived files           apa6.ins,
+%%                                 apa6.cls,
+%%                                 apa6.pdf,
+%%                                 README.txt,
+%%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
+%%                                 APAdutch.txt,
+%%                                 APAenglish.txt,
+%%                                 APAgerman.txt,
+%%                                 APAngerman.txt,
+%%                                 APAgreek.txt,
+%%                                 APAendfloat.cfg,
+%%                                 apa6.ptex,
+%%                                 Figure1.pdf,
+%%                                 shortsample.tex,
+%%                                 longsample.tex, and
+%%                                 bibliography.bib.
+%% 
+%%
+%% End of file `./config/APAbritish.txt'.
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
index 7e2f108ca8e..ae4649e8322 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAdutch.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Voetnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
index 478709ba5da..728b65769d6 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAendfloat.cfg
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -99,7 +99,7 @@
  \xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}}
  \xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}%
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -124,6 +124,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
index 1cc9df8929a..635612c3f62 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAenglish.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Footnotes}
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
index 6970e5d62fc..b8fb8b402ef 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgerman.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Fußnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
index 2ae0b48f43d..041e99c698a 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAgreek.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,
diff --git a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
index b3a1dbb1ab8..a205155de2b 100644
--- a/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
+++ b/Master/texmf-dist/tex/latex/apa6/config/APAngerman.txt
@@ -10,7 +10,7 @@
 %% apa6 - A LaTeX class for formatting documents in compliance with the
 %% American Psychological Association's Publication Manual, 6th edition
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,7 +34,7 @@
 \renewcommand{\notesname}{Fußnoten}% Footnotes
 
 %% 
-%% Copyright (C) 2011 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011, 2012 by Brian D. Beitzel <brian at beitzel.com>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either
@@ -59,6 +59,7 @@
 %%                                 apa6.pdf,
 %%                                 README.txt,
 %%                                 APAamerican.txt,
+%%                                 APAbritish.txt,
 %%                                 APAdutch.txt,
 %%                                 APAenglish.txt,
 %%                                 APAgerman.txt,