From f110bc50c58b63a6fe4eaaddf40a4789c27b83bf Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 6 Oct 2010 10:22:33 +0200
Subject: [PATCH] Update doc for setting "sru"; mention solr

---
 doc/common           |    2 +-
 doc/pazpar2_conf.xml |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/common b/doc/common
index 51f33ab..00de5ca 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit 51f33ab41eada587c95a46b3340c2cd03ddaa7cd
+Subproject commit 00de5ca16beac9c3ac135ff92ff719b86b0c6df9
diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 2c99a0c..17578a9 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -978,10 +978,18 @@
      <term>pz:sru</term>
      <listitem>
       <para>
-       This setting enables SRU/SRW support. It has three possible settings.
+       This setting enables
+       <ulink url="&url.sru;">SRU</ulink>/<ulink url="&url.solr;">SOLR</ulink>
+       support.
+       It has four possible settings.
        'get', enables SRU access through GET requests. 'post' enables SRU/POST
        support, less commonly supported, but useful if very large requests are
-       to be submitted. 'srw' enables the SRW variation of the protocol.
+       to be submitted. 'srw' enables the SRW (SRU over SOAP) variation of
+       the protocol.
+      </para>
+      <para>
+	A value of 'solr' anables SOLR client support. This is supported
+	for Pazpar version 1.5.0 and later.
       </para>
      </listitem>
     </varlistentry>
-- 
1.7.10.4