From f660a2730edb626b909b8c4d0c8dfeb6b2590170 Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Fri, 20 Apr 2007 14:05:23 +0000
Subject: [PATCH] Collapsing charset into native encoding. It simplifies
 implementation, and the two are closely related anyway.

---
 doc/pazpar2_conf.xml |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 5c81fb5..8e6e6a5 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -8,7 +8,7 @@
      <!ENTITY % common SYSTEM "common/common.ent">
      %common;
 ]>
-<!-- $Id: pazpar2_conf.xml,v 1.20 2007-04-11 03:34:11 quinn Exp $ -->
+<!-- $Id: pazpar2_conf.xml,v 1.21 2007-04-20 14:05:23 quinn Exp $ -->
 <refentry id="pazpar2_conf">
  <refentryinfo>
   <productname>Pazpar2</productname>
@@ -407,7 +407,7 @@
 <settings target="*">
 
   <!-- This file introduces default settings for pazpar2 -->
-  <!-- $Id: pazpar2_conf.xml,v 1.20 2007-04-11 03:34:11 quinn Exp $ -->
+  <!-- $Id: pazpar2_conf.xml,v 1.21 2007-04-20 14:05:23 quinn Exp $ -->
 
   <!-- mapping for unqualified search -->
   <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>
@@ -526,15 +526,9 @@
 	      The representation (syntax) of the retrieval records. Currently
 	      recognized values are iso2709 and xml.
 	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>pz:encoding</term>
-	  <listitem>
 	    <para>
-	      The native encoding (character set) of retrieval records. Can be anything
-	      recognized by conv, but typical values are marc8 and latin1.
-	      The default is UTF-8.
+	      For iso2709, can also specify a native character set, e.g. "iso2709;latin-1".
+	      If no character set is provided, MARC-8 is assumed.
 	    </para>
 	  </listitem>
 	</varlistentry>
-- 
1.7.10.4