biblatex (1aug12)

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

6 files changed, 62 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index edf961626e5..a14d8242505 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,3 +1,12 @@
+RELEASE NOTES FOR VERSION 2.1
+
+*  Biber version 1.1 is required for biblatex 2.1
+
+*  Custom data models is now looked for in more places. See PDF
+   documentation. Custom data model conflicts are now better processed by
+   biber.
+*  Some improved localisation (Norwegian) and doc fixes.
+
 RELEASE NOTES FOR VERSION 2.0
 
 *  Biber is now the default backend. Biblatex 2.0 requires biber
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index faf1c40c0c5..074f1392cfc 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index 6516124f689..babaded2a03 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -42,7 +42,7 @@
   url={\biblatexhome},
   author={Philipp Lehman (with Audrey Boruvka, Philip Kime and Joseph Wright)},
   email={},
-  revision={2.0},
+  revision={2.1},
   date={07/2012}}
 
 \hypersetup{%
@@ -154,7 +154,7 @@ Please use the \sty{biblatex} project page on GitHub to report bugs and submit f
 The language modules of this package include contributions by the following contributors (in the order of submission):
 Ignacio Fernández Galván (Spanish),
 Enrico Gregorio (Italian),
-Johannes Wilm (Danish\slash Norwegian),
+Johannes Wilm, Håkon Malmedal (Danish\slash Norwegian),
 Per Starbäck, Carl-Gustav Werner, Filip Åsblom (Swedish),
 Augusto Ritter Stoffel (Brazilian),
 Alexander van Loon (Dutch),
@@ -304,7 +304,7 @@ The \sty{ucs} package provides support for \utf encoded input. Either use \sty{i
 
 It is important to distinguish between \bibtex the program and \bibtex the file format. \sty{biblatex} can be used with or without \bibtex the program since its default backend \biber uses fully supports the \bibtex file format (\file{bib}) and users should be able to move to \sty{biblatex} will little or no changes to their \bibtex data files when using \biber as a backend. If using \bibtex as the data backend, note that you cannot use arbitrary \file{bst} files because the package depends on a special \bibtex interface. When using \bibtex as a backend, \sty{biblatex} uses its own special \file{bst} file only. The entry guide below is backend agnostic unless otherwise stated.
 
-This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \sty{biblatex} and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specfication also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate_datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
+This section describes the default data model defined in the \file{blx-dm.def} file which is part of \path{biblatex}. The data model is defined using the macros documented in \secref{aut:ctm:dm}. It is possible to redefine the data model which both \sty{biblatex} and \biber use so that datasources can contain new entrytypes and fields (which of course will need style support). The data model specification also allows for constraints to be defined so that data sources can be validated against the data model (using \biber's \path{--validate_datamodel} option). Users who want to customise the data model need to look at the \file{blx-dm.def} file and to read \secref{aut:ctm:dm}.
 
 \subsection{Entry Types}
 \label{bib:typ}
@@ -402,7 +402,7 @@ A fallback type for entries which do not fit into any other category. Use the fi
 
 \typeitem{online}
 
-An online resource. \bibfield{author}, \bibfield{editor}, and \bibfield{year} are omissible in terms of \secref{bib:use:key}. This entry type is intended for sources such as web sites which are intrinsicly online resources. Note that all entry types support the \bibfield{url} field. For example, when adding an article from an online journal, it may be preferable to use the \bibtype{article} type and its \bibfield{url} field.
+An online resource. \bibfield{author}, \bibfield{editor}, and \bibfield{year} are omissible in terms of \secref{bib:use:key}. This entry type is intended for sources such as web sites which are intrinsically online resources. Note that all entry types support the \bibfield{url} field. For example, when adding an article from an online journal, it may be preferable to use the \bibtype{article} type and its \bibfield{url} field.
 
 \reqitem{author/editor, title, year/date, url}
 \optitem{subtitle, titleaddon, language, version, note, organization, date, month, year, addendum, pubstate, urldate}
@@ -529,7 +529,7 @@ Works of the visual arts such as paintings, sculpture, and installations.
 
 \typeitem{audio}
 
-Audio recordings, typically on audio \acr{CD}, \acr{DVD}, audio casette, or similar media. See also \bibtype{music}.
+Audio recordings, typically on audio \acr{CD}, \acr{DVD}, audio cassette, or similar media. See also \bibtype{music}.
 
 \typeitem{bibnote}
 
@@ -585,7 +585,7 @@ National and international standards issued by a standards body such as the Inte
 
 \typeitem{video}
 
-Audiovisual recordings, typically on \acr{DVD}, \acr{VHS} casette, or similar media. See also \bibtype{movie}.
+Audiovisual recordings, typically on \acr{DVD}, \acr{VHS} cassette, or similar media. See also \bibtype{movie}.
 
 \end{typelist}
 
@@ -718,19 +718,19 @@ The edition of a printed publication. This must be an integer, not an ordinal. D
 
 \listitem{editor}{name}
 
-The editor(s) of the \bibfield{title}, \bibfield{booktitle}, or \bibfield{maintitle}, depending on the entry type. Use the \bibfield{editortype} field to specifiy the role if it is different from <\texttt{editor}>. See \secref{bib:use:edr} for further hints.
+The editor(s) of the \bibfield{title}, \bibfield{booktitle}, or \bibfield{maintitle}, depending on the entry type. Use the \bibfield{editortype} field to specify the role if it is different from <\texttt{editor}>. See \secref{bib:use:edr} for further hints.
 
 \listitem{editora}{name}
 
-A secondary editor performing a different editorial role, such as compiling, redacting, etc. Use the \bibfield{editoratype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+A secondary editor performing a different editorial role, such as compiling, redacting, etc. Use the \bibfield{editoratype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \listitem{editorb}{name}
 
-Another secondary editor performing a different role. Use the \bibfield{editorbtype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+Another secondary editor performing a different role. Use the \bibfield{editorbtype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \listitem{editorc}{name}
 
-Another secondary editor performing a different role. Use the \bibfield{editorctype} field to specifiy the role. See \secref{bib:use:edr} for further hints.
+Another secondary editor performing a different role. Use the \bibfield{editorctype} field to specify the role. See \secref{bib:use:edr} for further hints.
 
 \fielditem{editortype}{key}
 
@@ -1498,7 +1498,7 @@ This entry will be printed as «\emph{Journal Name}. New ser. 9 (1998)». See \sec
 \label{bib:use:tab1}
 \end{table}
 
-The date fields \bibfield{date}, \bibfield{origdate}, \bibfield{eventdate}, and \bibfield{urldate} require a date specification in \texttt{yyyy-mm-dd} format. Date ranges are given as \texttt{yyyy-mm-dd\slash yyyy-mm-dd}. Partial dates are valid provided that date components are omitted at the end only. You may specify an open ended date range by giving the range separator and omitting the end date (\eg \texttt{yyyy/}). See \tabref{bib:use:tab1} for some examples of valid date specifications and the formatted date autmatically generated by \sty{biblatex}. The formatted date is language specific and will be adapted automatically. If there is no \bibfield{date} field in an entry, \sty{biblatex} will also consider the fields \bibfield{year} and \bibfield{month} for backwards compatibility with traditional \bibtex. Style author should note that date fields like \bibfield{date} or \bibfield{origdate} are only available in the \file{bib} file. All dates are parsed and dissected into their components as the \file{bib} file is processed. The date components are made available to styles by way of the special fields discussed in \secref{aut:bbx:fld:dat}. See this section and \tabref{aut:bbx:fld:tab1} on page~\pageref{aut:bbx:fld:tab1} for further information.
+The date fields \bibfield{date}, \bibfield{origdate}, \bibfield{eventdate}, and \bibfield{urldate} require a date specification in \texttt{yyyy-mm-dd} format. Date ranges are given as \texttt{yyyy-mm-dd\slash yyyy-mm-dd}. Partial dates are valid provided that date components are omitted at the end only. You may specify an open ended date range by giving the range separator and omitting the end date (\eg \texttt{yyyy/}). See \tabref{bib:use:tab1} for some examples of valid date specifications and the formatted date automatically generated by \sty{biblatex}. The formatted date is language specific and will be adapted automatically. If there is no \bibfield{date} field in an entry, \sty{biblatex} will also consider the fields \bibfield{year} and \bibfield{month} for backwards compatibility with traditional \bibtex. Style author should note that date fields like \bibfield{date} or \bibfield{origdate} are only available in the \file{bib} file. All dates are parsed and dissected into their components as the \file{bib} file is processed. The date components are made available to styles by way of the special fields discussed in \secref{aut:bbx:fld:dat}. See this section and \tabref{aut:bbx:fld:tab1} on page~\pageref{aut:bbx:fld:tab1} for further information.
 
 \subsubsection{Months and Journal Issues}
 \label{bib:use:iss}
@@ -2093,7 +2093,7 @@ This option controls how sequences of consecutive pages in the list of back refe
 
 \item[two] Compress any sequence of two or more consecutive pages to a range, \eg the above list is compressed to <1--2, 11--13, 21--24>.
 
-\item[two+] Similar in concept to \opt{two} but a sequence of exactely two consecutive pages is printed using the starting page and the localization string \texttt{sequens}, \eg the above list is compressed to <1\,sq., 11--13, 21--24>.
+\item[two+] Similar in concept to \opt{two} but a sequence of exactly two consecutive pages is printed using the starting page and the localization string \texttt{sequens}, \eg the above list is compressed to <1\,sq., 11--13, 21--24>.
 
 \item[three+] Similar in concept to \opt{two+} but a sequence of exactly three consecutive pages is printed using the starting page and the localization string \texttt{sequentes}, \eg the above list is compressed to <1\,sq., 11\,sqq., 21--24>.
 
@@ -2105,7 +2105,7 @@ All styles support both Arabic and Roman numerals. In order to avoid potentially
 
 \optitem[setonly]{backrefsetstyle}{\opt{setonly}, \opt{memonly}, \opt{setormem}, \opt{setandmem}, \opt{memandset}, \opt{setplusmem}}
 
-This option controls how back references to \bibtype{set} entires and their members are handled. The following options are available:
+This option controls how back references to \bibtype{set} entries and their members are handled. The following options are available:
 
 \begin{valuelist}
 
@@ -2267,7 +2267,7 @@ See \secref{bib:cav:enc} for further instructions concerning the encoding of \fi
 
 \optitem[auto]{texencoding}{\opt{auto}, \prm{encoding}}
 
-Specifies the encoding of the \file{tex} file. This option affects the data transfered from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available:
+Specifies the encoding of the \file{tex} file. This option affects the data transferred from the backend to \sty{biblatex}. When using \biber, this corresponds to \biber's |--bblencoding| option. The following choices are available:
 
 \begin{valuelist}
 
@@ -2450,7 +2450,7 @@ When enabled, sorting names will only use their initials. \BiberOnlyMark This is
 
 \boolitem[false]{terseinits}
 
-This option controls the format of initials generated by \sty{biblatex}. If enabled, initals are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details.
+This option controls the format of initials generated by \sty{biblatex}. If enabled, initials are rendered using a terse format without dots and spaces. For example, the initials of Donald Ervin Knuth would be rendered as <D.~E.> by default, and as <DE> if this option is enabled. \BiberOnlyMark With \biber, the option works by redefining some macros which control the format of initials. See \secref{use:cav:nam} for details.
 
 \boolitem[false]{labelalpha}
 
@@ -2751,7 +2751,7 @@ This style prints the entry key rather than some kind of label. It is intended f
 \subsubsection{Bibliography Styles}
 \label{use:xbx:bbx}
 
-All bibliography styles which come with this package use the same basic format for the individual bibliography entries. They only differ in the kind of label printed in the bibliography and the overall formatting of the list of references. There is a matching bibliography style for every citation style. Note that some bibliography styles are not mentioned below because they simply load a more generic style. For example, the bibligraphy style \texttt{authortitle-comp} will load the \texttt{authortitle} style.
+All bibliography styles which come with this package use the same basic format for the individual bibliography entries. They only differ in the kind of label printed in the bibliography and the overall formatting of the list of references. There is a matching bibliography style for every citation style. Note that some bibliography styles are not mentioned below because they simply load a more generic style. For example, the bibliography style \texttt{authortitle-comp} will load the \texttt{authortitle} style.
 
 \begin{marglist}
 
@@ -2780,7 +2780,7 @@ The following bibliography styles are special purpose styles. They are not inten
 \begin{marglist}
 
 \item[draft]
-This draft style includes the entry keys in the bibliography. The bibligraphy will be sorted by entry key. The style will set the following package options at load time: \kvopt{sorting}{debug}.
+This draft style includes the entry keys in the bibliography. The bibliography will be sorted by entry key. The style will set the following package options at load time: \kvopt{sorting}{debug}.
 
 \item[debug]
 This style prints all bibliographic data in tabular format. It is intended for debugging only and will set the following package options at load time: \kvopt{sorting}{debug}.
@@ -2790,7 +2790,7 @@ This style prints all bibliographic data in tabular format. It is intended for d
 \subsection{Related Entries}
 \label{use:rel}
 
-Almost all bibliography styles require authors to specify certain types of relationship between entries such as «Reprint of», «Reprinted in» etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itseld independently). The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example «Orig. Pub. as». The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples:
+Almost all bibliography styles require authors to specify certain types of relationship between entries such as «Reprint of», «Reprinted in» etc. It is impossible to provide data fields to cover all of these relationships and so \sty{biblatex} provides a general mechanism for this using the entry fields \bibfield{related}, \bibfield{relatedtype} and \bibfield{relatedstring}. A related entry does not need to be cited and does not appear in the bibliography itself (unless of course it is also cited itself independently). The \bibfield{relatedtype} field should specify a localization string which will be printed before the information from the related entries is printed, for example «Orig. Pub. as». The \bibfield{relatedstring} field can be used to override the string determined via \bibfield{relatedtype}. Some examples:
 
 \begin{lstlisting}[style=bibtex]{}
 @Book{key1,
@@ -2947,7 +2947,7 @@ This command prints the bibliography. It takes one optional argument, which is a
 
 \valitem[bibliography/shorthands]{env}{name}
 
-The <high-level> layout of the bibliography and the list of shorthands is controlled by enviroments defined with \cmd{defbibenvironment}. This option selects an environment. The \prm{name} corresponds to the identifier used when defining the environment with \cmd{defbibenvironment}. By default, the \cmd{printbibliography} command uses the identifier \texttt{bibliography}; \cmd{printshorthands} uses \texttt{shorthands}. See also \secref{use:bib:los,use:bib:hdg}.
+The <high-level> layout of the bibliography and the list of shorthands is controlled by environments defined with \cmd{defbibenvironment}. This option selects an environment. The \prm{name} corresponds to the identifier used when defining the environment with \cmd{defbibenvironment}. By default, the \cmd{printbibliography} command uses the identifier \texttt{bibliography}; \cmd{printshorthands} uses \texttt{shorthands}. See also \secref{use:bib:los,use:bib:hdg}.
 
 \valitem[bibliography/shorthands]{heading}{name}
 
@@ -3293,7 +3293,7 @@ See the author guide, in particular \secref{aut:aux:tst,aut:aux:ife}, for furthe
 \subsubsection{Dynamic Entry Sets}
 \label{use:bib:set}
 
-In addition to the \bibtype{set} entry type, \sty{biblatex} also supports dynamic entry sets defined on a per-document\slash per-refsection basis. The following command, which may be used in the dcument preamble or the document body, defines the set \prm{key}:
+In addition to the \bibtype{set} entry type, \sty{biblatex} also supports dynamic entry sets defined on a per-document\slash per-refsection basis. The following command, which may be used in the document preamble or the document body, defines the set \prm{key}:
 
 \begin{ltxsyntax}
 
@@ -4304,7 +4304,7 @@ Whenever a reference to a work which has not been cited before is added, this pr
 
 \paragraph{\biber}
 
-The \sty{biblatex} package uses one auxilliary \file{bcf} file only. Even if there are citation commands in a file included via \cmd{include}, you only need to run \biber on the main \file{bcf} file. All information \biber needs is in the \file{bcf} file, including information about all refsections if using mutiple \env{refsection} environments (see \secref{use:use:mlt}).
+The \sty{biblatex} package uses one auxiliary \file{bcf} file only. Even if there are citation commands in a file included via \cmd{include}, you only need to run \biber on the main \file{bcf} file. All information \biber needs is in the \file{bcf} file, including information about all refsections if using multiple \env{refsection} environments (see \secref{use:use:mlt}).
 
 \paragraph{\bibtex}
 
@@ -4761,7 +4761,7 @@ Expands to \prm{true} if the class would add the bibliography to the table of co
 \subsubsection{Usage with the Memoir Class}
 \label{use:cav:mem}
 
-When using \sty{biblatex} with the \sty{memoir} class, most class facilites for adapting the bibliography have no effect. Use the corresponding facilities of this package instead (\secref{use:bib:bib, use:bib:hdg, use:bib:nts}). Instead of redefining \sty{memoir}'s \cmd{bibsection}, use the \opt{heading} option of \cmd{printbibliography} and \cmd{defbibheading} (\secref{use:bib:bib, use:bib:hdg}). Instead of \cmd{prebibhook} and \cmd{postbibhook}, use the \opt{prenote} and \opt{postnote} options of \cmd{printbibliography} and \cmd{defbibnote} (\secref{use:bib:bib, use:bib:nts}). All default headings are adapted at load-time such that they blend well with the default layout of this class. The default headings \texttt{bibliography} and \texttt{shorthands} (\secref{use:bib:hdg}) are also responsive to \sty{memoir}'s \cmd{bibintoc} and \cmd{nobibintoc} switches. The length register \len{bibitemsep} is used by \sty{biblatex} in a way similar to \sty{memoir} (\secref{use:fmt:len}). This section also introduces some additional length registers which correspond to \sty{memoir}'s \cmd{biblistextra}. Lastly, \cmd{setbiblabel} does not map to a single facility of the \sty{biblatex} package since the style of all labels in the bibliography is controlled by the bibliography style. See \secref{aut:bbx:env} in the author section of this manual for details. If the \sty{memoir} class is detected, \sty{biblatex} will also provide the following additional test which may be useful in custom heading definitions:
+When using \sty{biblatex} with the \sty{memoir} class, most class facilities for adapting the bibliography have no effect. Use the corresponding facilities of this package instead (\secref{use:bib:bib, use:bib:hdg, use:bib:nts}). Instead of redefining \sty{memoir}'s \cmd{bibsection}, use the \opt{heading} option of \cmd{printbibliography} and \cmd{defbibheading} (\secref{use:bib:bib, use:bib:hdg}). Instead of \cmd{prebibhook} and \cmd{postbibhook}, use the \opt{prenote} and \opt{postnote} options of \cmd{printbibliography} and \cmd{defbibnote} (\secref{use:bib:bib, use:bib:nts}). All default headings are adapted at load-time such that they blend well with the default layout of this class. The default headings \texttt{bibliography} and \texttt{shorthands} (\secref{use:bib:hdg}) are also responsive to \sty{memoir}'s \cmd{bibintoc} and \cmd{nobibintoc} switches. The length register \len{bibitemsep} is used by \sty{biblatex} in a way similar to \sty{memoir} (\secref{use:fmt:len}). This section also introduces some additional length registers which correspond to \sty{memoir}'s \cmd{biblistextra}. Lastly, \cmd{setbiblabel} does not map to a single facility of the \sty{biblatex} package since the style of all labels in the bibliography is controlled by the bibliography style. See \secref{aut:bbx:env} in the author section of this manual for details. If the \sty{memoir} class is detected, \sty{biblatex} will also provide the following additional test which may be useful in custom heading definitions:
 
 \begin{ltxsyntax}
 
@@ -4888,7 +4888,7 @@ The delimiters:
       La\delim{~}{a}Vallée\delim{~}{a}Poussin
 \end{namesample}
 %
-Note that \cmd{bibnamedelima/b/i} are inserted by the backend. The backend processes the name parts and takes care of the delimiters between the elements that make up a name part, processing each part individually. In contrast to that, the delimiters between the parts of the complete name (\cmd{bibnamedelimc/d}) are added by name formatting directives at a later point in the processing chain. The spacing and punctuation of initals is also handled by the backend and may be customized by redefining the following three macros:
+Note that \cmd{bibnamedelima/b/i} are inserted by the backend. The backend processes the name parts and takes care of the delimiters between the elements that make up a name part, processing each part individually. In contrast to that, the delimiters between the parts of the complete name (\cmd{bibnamedelimc/d}) are added by name formatting directives at a later point in the processing chain. The spacing and punctuation of initials is also handled by the backend and may be customized by redefining the following three macros:
 
 \begin{namedelims}
 a & \cmd{bibinitperiod} & Inserted by the backend after initials.\\
@@ -4935,7 +4935,7 @@ This part of the manual documents the author interface of the \sty{biblatex} pac
 \subsection{Overview}
 \label{aut:int}
 
-Before we get to the commands and facilities provided by \sty{biblatex}, we will have a look at some of its fundamental concepts. The \sty{biblatex} package uses auxilliary files in a specia way. Most notably, the \file{bbl} file is used differently and when using \bibtex as the backend, there is only one \file{bst} file which implements a structured data interface rather than exporting printable data. With \latex's standard bibliographic facilities, a document includes any number of citation commands in the document body plus \cmd{bibliographystyle} and \cmd{bibliography}, usually towards the end of the document. The location of the former is arbitrary, the latter marks the spot where the list of references is to be printed:
+Before we get to the commands and facilities provided by \sty{biblatex}, we will have a look at some of its fundamental concepts. The \sty{biblatex} package uses auxiliary files in a special way. Most notably, the \file{bbl} file is used differently and when using \bibtex as the backend, there is only one \file{bst} file which implements a structured data interface rather than exporting printable data. With \latex's standard bibliographic facilities, a document includes any number of citation commands in the document body plus \cmd{bibliographystyle} and \cmd{bibliography}, usually towards the end of the document. The location of the former is arbitrary, the latter marks the spot where the list of references is to be printed:
 
 \begin{ltxexample}
 \documentclass{...}
@@ -5028,9 +5028,9 @@ In order to streamline the whole procedure, \sty{biblatex} essentially employs t
 
 \item Run \bin{latex}: The first step is similar to the traditional procedure described above: \cmd{bibstyle} and \cmd{bibdata} commands are written to the \file{aux} file (\bibtex backend) or \file{bcf} file (\biber backend), along with \cmd{citation} commands for all citations. We then wait for the backend to supply the required data. With \bibtex as a backend, since \sty{biblatex} uses a special \file{bst} file which implements its data interface on the \bibtex end, the \cmd{bibstyle} command is always |\bibstyle{biblatex}|.
 
-\item Run \bin{biber} or \bin{bibtex}: The backend supplies those entries from the \file{bib} file which were requested by the \cmd{citation} commands in the auxilliary file. However, it does not write a printable bibliography to the \file{bbl} file, but rather a structured representation of the bibliographic data. Just like an \file{aux} file, this \file{bbl} file does not print anything when read in. It merely puts data in memory.
+\item Run \bin{biber} or \bin{bibtex}: The backend supplies those entries from the \file{bib} file which were requested by the \cmd{citation} commands in the auxiliary file. However, it does not write a printable bibliography to the \file{bbl} file, but rather a structured representation of the bibliographic data. Just like an \file{aux} file, this \file{bbl} file does not print anything when read in. It merely puts data in memory.
 
-\item Run \bin{latex}: Starting with the second run, the \file{bbl} file is processed right at the beginning of the document body, just like an \file{aux} file. From this point on, all bibliographic data is available in memory so that all citations can be printed right away.\footnote{If the \opt{defernumbers} package option is enabled \sty{biblatex} uses an alogrithm similar to the traditional procedure to generate numeric lables. In this case, the numbers are assigned as the bibliography is printed and then cycled through the backend auzilliary file. It will take an additional \latex run for them to be picked up in citations.} The citation commands have access to the complete bibliographic data, not only to a predefined label. The bibliography is generated from memory using the same data and may be filtered or split as required.
+\item Run \bin{latex}: Starting with the second run, the \file{bbl} file is processed right at the beginning of the document body, just like an \file{aux} file. From this point on, all bibliographic data is available in memory so that all citations can be printed right away.\footnote{If the \opt{defernumbers} package option is enabled \sty{biblatex} uses an algorithm similar to the traditional procedure to generate numeric labels. In this case, the numbers are assigned as the bibliography is printed and then cycled through the backend auxiliary file. It will take an additional \latex run for them to be picked up in citations.} The citation commands have access to the complete bibliographic data, not only to a predefined label. The bibliography is generated from memory using the same data and may be filtered or split as required.
 
 \end{enumerate}
 
@@ -5217,7 +5217,7 @@ At this point, there is still one piece missing: the formatting directives used
 \DeclareFieldFormat{title}{\emph{#1}}
 \end{lstlisting}
 %
-List formats are slightly more complex. After splitting up the list into individual items, \sty{biblatex} will execute the formatting directive once for every item in the list. The item is passed to the directive as an argument. The separator to be inserted between the indivdual items in the list is also handled by the corresponding directive, hence we have to check whether we are in the middle of the list or at the end when inserting it.
+List formats are slightly more complex. After splitting up the list into individual items, \sty{biblatex} will execute the formatting directive once for every item in the list. The item is passed to the directive as an argument. The separator to be inserted between the individual items in the list is also handled by the corresponding directive, hence we have to check whether we are in the middle of the list or at the end when inserting it.
 
 \begin{lstlisting}[style=latex]{}
 \DeclareListFormat{location}{%
@@ -5241,7 +5241,7 @@ Formatting directives for names are similar to those for literal lists, but the
     {}}
 \end{lstlisting}
 %
-The above directive reverses the name of the first author («Last, First») and prints the remaining names in their regular sequence («First Last»). Note that the only component which is guaranteed to be available is the last name, hence we have to check which parts of the name are actually present. If a certain component of a name is not available, the corresponding argument will be blank. As with directives for literal lists, the separator to be inserted between the indivdual items in the list is also handled by the formatting directive, hence we have to check whether we are in the middle of the list or at the end when inserting it. This is what the second \cmd{ifthenelse} test does.
+The above directive reverses the name of the first author («Last, First») and prints the remaining names in their regular sequence («First Last»). Note that the only component which is guaranteed to be available is the last name, hence we have to check which parts of the name are actually present. If a certain component of a name is not available, the corresponding argument will be blank. As with directives for literal lists, the separator to be inserted between the individual items in the list is also handled by the formatting directive, hence we have to check whether we are in the middle of the list or at the end when inserting it. This is what the second \cmd{ifthenelse} test does.
 
 \subsubsection{Special Fields}
 \label{aut:bbx:fld}
@@ -5279,7 +5279,7 @@ This field is special in that it is only available locally in name formatting di
 
 \fielditem{namehash}{string}
 
-A hash string which uniquely identifies the \bibfield{labelname} list. This is useful for recurrence checks. For example, a citation style wich replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{fullhash}.
+A hash string which uniquely identifies the \bibfield{labelname} list. This is useful for recurrence checks. For example, a citation style which replaces recurrent authors or editors with a string like <idem> could save the \bibfield{namehash} field with \cmd{savefield} and use it in a comparison with \cmd{iffieldequals} later (see \secref{aut:aux:dat, aut:aux:tst}). The \bibfield{namehash} is derived from the truncated \bibfield{labelname} list, \ie it is responsive to \opt{maxnames} and \opt{minnames}. See also \bibfield{hash} and \bibfield{fullhash}.
 
 \fielditem{fullhash}{string}
 
@@ -5725,7 +5725,7 @@ Note that name affixes are referred to as the <junior part> of the name in the \
 \item[\#8] The name affixes, given as initials.
 \end{argumentlist}
 %
-If a certain part of a name is not available, the corresponding argument will be empty, hence you may use \cmd{ifblank} tests to check for the inidividual parts of a name. The name of the name list currently being processed is available to the \prm{code} as \cmd{currentname}. Note that the formatting directive also handles the punctuation to be inserted between separate names and between the individual parts of a name. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. See also \secref{use:cav:nam}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared.
+If a certain part of a name is not available, the corresponding argument will be empty, hence you may use \cmd{ifblank} tests to check for the individual parts of a name. The name of the name list currently being processed is available to the \prm{code} as \cmd{currentname}. Note that the formatting directive also handles the punctuation to be inserted between separate names and between the individual parts of a name. You need to check whether you are in the middle of or at the end of the list, \ie whether \cnt{listcount} is smaller than or equal to \cnt{liststop}. See also \secref{use:cav:nam}. The starred variant of this command is similar to the regular version, except that all type-specific formats are cleared.
 
 \cmditem{DeclareIndexFieldFormat}[entrytype, \dots]{format}{code}
 \cmditem*{DeclareIndexFieldFormat}*{format}{code}
@@ -6129,12 +6129,14 @@ Validation against the data model means that after mapping your data sources int
 \item Whether the fields obey various constraints on their format which you specify
 \end{itemize}
 %
-Redefining the data model can be done in several places. Style authors can create a \file{.dbx} file which contains the data model macros required and this will be loaded automatically when using the \sty{biblatex} package \opt{style} option by looking for a file named afer the style with a \file{.dbx} (just like the \file{.cbx} and \file{.bbx} files for a style). Alternatively, the name of the data model file can be different from the style name by specifying the name (without \file{.dbx} extension) to the package \opt{datamodel} option. After loading the style data model file, \sty{biblatex} then loads, if present, a users \file{biblatex-dm.cfg} which should be put somewhere \sty{biblatex} can find it, just like the main configuration file \sty{biblatex.cfg}. To summarise, the data model is determined by adding to the data model from each of these locations, in order:\\
+Redefining the data model can be done in several places. Style authors can create a \file{.dbx} file which contains the data model macros required and this will be loaded automatically when using the \sty{biblatex} package \opt{style} option by looking for a file named after the style with a \file{.dbx} extension (just like the \file{.cbx} and \file{.bbx} files for a style). If the \opt{style} option is not used but rather the \opt{citestyle} and \opt{bibstyle} options, then the package will try to load \file{.dbx} files called \file{<citestyle>.dbx} and \file{<bibstyle>.dbx}.
+Alternatively, the name of the data model file can be different from any of the style option names by specifying the name (without \file{.dbx} extension) to the package \opt{datamodel} option. After loading the style data model file, \sty{biblatex} then loads, if present, a users \file{biblatex-dm.cfg} which should be put somewhere \sty{biblatex} can find it, just like the main configuration file \sty{biblatex.cfg}. To summarise, the data model is determined by adding to the data model from each of these locations, in order:\\
 
 \noindent\file{blx-dm.def}$\rightarrow$\\
 \hspace*{1em}\file{<datamodel option>.dbx} $\rightarrow$\\
 \hspace*{2em}\file{<style option>.dbx} $\rightarrow$\\
-\hspace*{3em}\file{biblatex-dm.cfg}\\
+\hspace*{3em}\file{<citestyle option>.dbx} and \file{<bibstyle option>.dbx} $\rightarrow$\\
+\hspace*{4em}\file{biblatex-dm.cfg}\\
 
 \noindent The data model is defined using the following macros:
 
@@ -6364,7 +6366,7 @@ Forces the label part derived from the field to uppercase. By default, the case
 
 \boolitem[false]{varwidth}
 
-Use a variable width, left-side substring of characters from the \prm{field} (each lastname in name list fields). The length of the string is determined by the minimum length needed to disambiguate the substring from all other \prm{field} elements in the same position in the label. For name list fields, this means that each name substring is disambigated from all other name substrings which occur in the sme position in the name list (see examples below). This option overrides \texttt{strwidth} if both are used. The short form \opt{varwidth} is equivalent to \kvopt{varwidth}{true}. For name list fields, if \kvopt{useprefix}{true}, the first character of the name prefix is prepended to the substring.
+Use a variable width, left-side substring of characters from the \prm{field} (each lastname in name list fields). The length of the string is determined by the minimum length needed to disambiguate the substring from all other \prm{field} elements in the same position in the label. For name list fields, this means that each name substring is disambiguated from all other name substrings which occur in the same position in the name list (see examples below). This option overrides \texttt{strwidth} if both are used. The short form \opt{varwidth} is equivalent to \kvopt{varwidth}{true}. For name list fields, if \kvopt{useprefix}{true}, the first character of the name prefix is prepended to the substring.
 
 \boolitem[false]{varwidthnorm}
 
@@ -6636,7 +6638,7 @@ The \cmd{citeorder} element has a special meaning. It requests a sort based on t
 \cite{one,two}
 \end{lstlisting}
 %
-there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting scheme):
+there is a distinction between the lexical order and the semantic order. Here «one» and «two» have the same semantic order but a unique lexical order. The semantic order only matters if you specify further sorting to disambiguate entries with the same semantic order. For example, this is the definition of the \opt{none} sorting scheme:
 
 \begin{lstlisting}[style=latex]{}
 \DeclareSortingScheme{none}{
@@ -7687,7 +7689,7 @@ The \cmd{setunit} command is similar to \cmd{newunit} except that it uses \prm{p
 
 \cmditem{setpunctfont}{command}
 
-This command, which is intended for use in field formatting directives, provides an alternative way of dealing with unit punctuation after a field printed in a different font (for example, a title printed in italics). The standard \latex way of dealing with this is adding a small amount of space, the so-called italic correction. This command allows adapting the punctuation to the font of the preceeding field. The \prm{command} should be a text font command which takes one argument, such as \cmd{emph} or \cmd{textbf}. This command will only affect punctuation marks inserted by one of the commands from \secref{aut:pct:pct}. The font adaption is applied to the next punctuation mark only and will be reset automatically thereafter. If you want to reset it manually before it takes effect, issue \cmd{resetpunctfont}. If the \opt{punctfont} package option is disabled, this command does nothing. Note that the \cmd{mkbibemph} and \cmd{mkbibbold} wrappers from \secref{aut:fmt:ich} incorporate this feature by default.
+This command, which is intended for use in field formatting directives, provides an alternative way of dealing with unit punctuation after a field printed in a different font (for example, a title printed in italics). The standard \latex way of dealing with this is adding a small amount of space, the so-called italic correction. This command allows adapting the punctuation to the font of the preceding field. The \prm{command} should be a text font command which takes one argument, such as \cmd{emph} or \cmd{textbf}. This command will only affect punctuation marks inserted by one of the commands from \secref{aut:pct:pct}. The font adaption is applied to the next punctuation mark only and will be reset automatically thereafter. If you want to reset it manually before it takes effect, issue \cmd{resetpunctfont}. If the \opt{punctfont} package option is disabled, this command does nothing. Note that the \cmd{mkbibemph} and \cmd{mkbibbold} wrappers from \secref{aut:fmt:ich} incorporate this feature by default.
 
 \csitem{resetpunctfont}
 
@@ -7895,7 +7897,7 @@ Undoes the settings applied by \cmd{uspunctuation}, restoring standard punctuati
 \subsubsection{Correcting Punctuation Tracking}
 \label{aut:pct:ctr}
 
-The facilities for punctuation tracking and automatic capitalization are very reliable under normal circumstances, but there are always marginal cases which may require manual intervention. Typical cases are localization strings printed as the first word in a footnote (which is usually treated as the beginning of a paragaph as far as capitalization is concerned, but \tex is not in vertical mode at this point) or punctuation after periods which are not really end"=of"=sentence periods (for example, after an ellipsis like «[\dots\unkern]» a command such as \cmd{addperiod} would do nothing since parentheses and brackets are transparent to the punctuation tracker). In such cases, use the following commands in bibliography and citation styles to mark the beginning or middle of a sentence if and where required:
+The facilities for punctuation tracking and automatic capitalization are very reliable under normal circumstances, but there are always marginal cases which may require manual intervention. Typical cases are localization strings printed as the first word in a footnote (which is usually treated as the beginning of a paragraph as far as capitalization is concerned, but \tex is not in vertical mode at this point) or punctuation after periods which are not really end"=of"=sentence periods (for example, after an ellipsis like «[\dots\unkern]» a command such as \cmd{addperiod} would do nothing since parentheses and brackets are transparent to the punctuation tracker). In such cases, use the following commands in bibliography and citation styles to mark the beginning or middle of a sentence if and where required:
 
 \begin{ltxsyntax}
 
@@ -8018,7 +8020,7 @@ The first value is the long, written out expression, the second one is an abbrev
 }
 \end{lstlisting}
 
-The above examples are slightly simplified. Real localization files should use the punctuation and formatting commands discussed in \secref{aut:pct:pct, use:fmt} instead of literal puntuation. Here is an excerpt from a real localization file:
+The above examples are slightly simplified. Real localization files should use the punctuation and formatting commands discussed in \secref{aut:pct:pct, use:fmt} instead of literal punctuation. Here is an excerpt from a real localization file:
 
 \begin{lstlisting}[style=latex]{}
   bibliography     = {{Bibliography}{Bibliography}},
@@ -8924,7 +8926,7 @@ Alternative syntax for \cmd{mkbibbrackets}. This will also work across groups. N
 
 \cmditem{mkbibfootnote}{text}
 
-A generic command which prints its argument as a footnote. This is a wrapper around the standard \latex \cmd{footnote} command which removes spurious whitespace preceeding the footnote mark and prevents nested footnotes. By default, \cmd{mkbibfootnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibfootnotewrapper} macro introduced below.
+A generic command which prints its argument as a footnote. This is a wrapper around the standard \latex \cmd{footnote} command which removes spurious whitespace preceding the footnote mark and prevents nested footnotes. By default, \cmd{mkbibfootnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibfootnotewrapper} macro introduced below.
 
 \cmditem{mkbibfootnotetext}{text}
 
@@ -8932,7 +8934,7 @@ Similar to \cmd{mkbibfootnote} but uses the \cmd{footnotetext} command.
 
 \cmditem{mkbibendnote}{text}
 
-Similar in concept to \cmd{mkbibfootnote} execept that it prints its argument as an endnote. \cmd{mkbibendnote} removes spurious whitespace preceeding the endnote mark and prevents nested notes. It supports the \cmd{endnote} command provided by the \sty{endnotes} package as well as the \cmd{pagenote} command provided by the \sty{pagenote} package and the \sty{memoir} class. If both commands are available, \cmd{endnote} takes precedence. If no endnote support is available, \cmd{mkbibendnote} issues an error and falls back to \cmd{footnote}. By default, \cmd{mkbibendnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibendnotewrapper} macro introduced below.
+Similar in concept to \cmd{mkbibfootnote} except that it prints its argument as an endnote. \cmd{mkbibendnote} removes spurious whitespace preceding the endnote mark and prevents nested notes. It supports the \cmd{endnote} command provided by the \sty{endnotes} package as well as the \cmd{pagenote} command provided by the \sty{pagenote} package and the \sty{memoir} class. If both commands are available, \cmd{endnote} takes precedence. If no endnote support is available, \cmd{mkbibendnote} issues an error and falls back to \cmd{footnote}. By default, \cmd{mkbibendnote} requests capitalization at the beginning of the note and automatically adds a period at the end. You may change this behavior by redefining the \cmd{bibendnotewrapper} macro introduced below.
 
 \cmditem{mkbibendnotetext}{text}
 
@@ -8960,7 +8962,7 @@ Similar in concept to \cmd{bibfootnotewrapper} but related to the \cmd{mkbibendn
 
 \cmditem{mkbibsuperscript}{text}
 
-A generic command which prints its argument as superscripted text. This is a simple wrapper around the standard \latex \cmd{textsuperscript} command which removes spurious whitespace and allows hyphenation of the preceeding word.
+A generic command which prints its argument as superscripted text. This is a simple wrapper around the standard \latex \cmd{textsuperscript} command which removes spurious whitespace and allows hyphenation of the preceding word.
 
 \cmditem{mkbibmonth}{integer}
 
@@ -9565,7 +9567,7 @@ When defining \cmd{bbx@xref}, the \prm{precode}, \prm{postcode}, and \prm{sepcod
 
 \paragraph{The Basics}
 
-There is one fundamental principle style authors should keep in mind when designing a bibligraphy driver: block and unit punctuation is handled asynchronously. This is best explained by way of example. Consider the following code snippet:
+There is one fundamental principle style authors should keep in mind when designing a bibliography driver: block and unit punctuation is handled asynchronously. This is best explained by way of example. Consider the following code snippet:
 
 \begin{lstlisting}[style=latex]{}
 \printfield{title}% 
@@ -9609,7 +9611,7 @@ Block and unit punctuation will only be inserted if \emph{all} of these conditio
 \printfield{note}% 
 \end{lstlisting}
 %
-Here's what happens if the \bibfield{edition} field is undefined. The first \cmd{printfield} command prints the title and sets an internal <new~text> flag. The first \cmd{newunit} sets an interal <new~unit> flag. No punctuation has been printed at this point. The second \cmd{printfield} does nothing because the \bibfield{edition} field is undefined. The next \cmd{newunit} command sets the interal flag <new unit> again. Still no punctuation has been printed. The third \cmd{printfield} checks if the \bibfield{note} field is defined. If so, it looks at the <new~text> and <new~unit> flags. If both are set, it inserts the punctuation buffer before printing the note. It then clears the <new~unit> flag and sets the <new~text> flag again.
+Here's what happens if the \bibfield{edition} field is undefined. The first \cmd{printfield} command prints the title and sets an internal <new~text> flag. The first \cmd{newunit} sets an internal <new~unit> flag. No punctuation has been printed at this point. The second \cmd{printfield} does nothing because the \bibfield{edition} field is undefined. The next \cmd{newunit} command sets the internal flag <new unit> again. Still no punctuation has been printed. The third \cmd{printfield} checks if the \bibfield{note} field is defined. If so, it looks at the <new~text> and <new~unit> flags. If both are set, it inserts the punctuation buffer before printing the note. It then clears the <new~unit> flag and sets the <new~text> flag again.
 
 This may all sound more complicated than it is. In practice, it means that it is possible to write large parts of a bibliography driver in a sequential way. The advantage of this approach becomes obvious when trying to write the above code without using the punctuation tracker. Such an attempt will lead to a rather convoluted set of \cmd{iffieldundef} tests required to check for all possible field combinations (note that the code below handles three fields; a typical driver may need to cater for some two dozen fields):
 
@@ -9882,7 +9884,7 @@ The \opt{bibtex} driver is of course the most comprehensive and mature of the \b
 
 \subsection{\opt{endnotexml}}
 
-The \opt{endnotexml} driver for \biber uses the following mappings. This format is quite messy and not well suited to robust typsetting of bibliographic data. It is presented largely as an example of \biber's modular datasource abilities and also of how to map foreign data models into the \biblatex data model. Mappings from such messy and relatively simple data models are inevitably fragile and are of limited use.
+The \opt{endnotexml} driver for \biber uses the following mappings. This format is quite messy and not well suited to robust typesetting of bibliographic data. It is presented largely as an example of \biber's modular datasource abilities and also of how to map foreign data models into the \biblatex data model. Mappings from such messy and relatively simple data models are inevitably fragile and are of limited use.
 
 \begin{lstlisting}[style=latex]{}
 \DeclareDefaultSourcemap[datatype=endnotexml]{
@@ -10518,6 +10520,12 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.1}{2012-08-01}
+\item Misc bug fixes
+\item Added better Norwegian localization
+\item Increased data model auto-loading possibilities\see{aut:ctm:dm}\BiberOnlyMark
+\end{release}
+
 \begin{release}{2.0}{2012-07-01}
 \item Misc bug fixes
 \item Generalised \opt{singletitle} test a little\see{aut:aux:tst}\BiberOnlyMark
diff --git a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
index b979e19006e..2b1cc3178a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/bibtex/bib/biblatex-examples.bib
@@ -629,6 +629,7 @@
   hyphenation = {american},
   sortyear = {1986-2},
   sorttitle = {Computers & Typesetting C},
+  author = {Knuth, Donald E.},
   indextitle = {METAFONTbook, The},
   title = {The METAFONTbook},
   shorttitle = {METAFONTbook},
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
index 95f306a306e..dbea075c7b3 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/90-related-entries.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
index b979e19006e..2b1cc3178a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
+++ b/Master/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
@@ -629,6 +629,7 @@
   hyphenation = {american},
   sortyear = {1986-2},
   sorttitle = {Computers & Typesetting C},
+  author = {Knuth, Donald E.},
   indextitle = {METAFONTbook, The},
   title = {The METAFONTbook},
   shorttitle = {METAFONTbook},