From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 14 Oct 2013 13:12:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.36~9
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=56887e2bace5aede54e6173e38bdd4e4c82e3cc6;hp=93e4eeecaf4b9b964488f5d015831190e3967df4;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index a7dc400..05ca85d 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -1165,7 +1165,7 @@
        chacater set of the MARC must be known (if not, the resulting
        XML is probably not well-formed). The character set may be
        specified by adding:
-       <literal>;charset=</literal><replaceable>charset</replaceable> to
+       <literal>;</literal><replaceable>charset</replaceable> to
        <literal>iso2709</literal>. If omitted, a charset of
        MARC-8 is assumed. This is correct for most MARC21/USMARC records.
       </para>