From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 10 Sep 2009 08:19:03 +0000 (+0200)
Subject: Mention multiple services/servers.
X-Git-Tag: v1.2.0~3
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=8f811d796c8d84b1bfb932bbbd8580a70a0c1b4d;p=pazpar2-moved-to-github.git

Mention multiple services/servers.
---

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index 5e8ef1a..4df6094 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -59,8 +59,9 @@
   
   <refsect2 id="config-server"><title>server</title>
    <para>
-    This section governs overall behavior of the client. The data
-    elements are described below.
+    This section governs overall behavior of the server. The data
+    elements are described below. From Pazpar2 version 1.2 this is
+    a repeatable element.
    </para>
    <variablelist> <!-- level 1 -->
     <varlistentry>
@@ -189,7 +190,15 @@
        extraction of data from the internal representation, primarily
        through the 'metadata' sub-element.
       </para>
-      
+      <para>
+       Pazpar2 version 1.2 and later allows multiple service elements.
+       Multiple services must be given a unique ID by specifying
+       attribute <literal>id</literal>.
+       A single service may be unnamed (service ID omitted). The
+       service ID is referred to in the <literal>init</literal> webservice
+       command's <literal>service</literal> parameter.
+      </para>
+
       <variablelist> <!-- Level 2 -->
        <varlistentry><term>metadata</term>
 	<listitem>
diff --git a/doc/pazpar2_protocol.xml b/doc/pazpar2_protocol.xml
index 7b30ca8..a622601 100644
--- a/doc/pazpar2_protocol.xml
+++ b/doc/pazpar2_protocol.xml
@@ -73,6 +73,17 @@
 	</para>
       </listitem>
      </varlistentry>
+
+     <varlistentry>
+      <term>service</term>
+      <listitem>
+       <para>
+	Makes the session use the service with the given ID. If
+	this is setting is omitted, the session will use the
+	unnamed service in the Pazpar2 configuration.
+	</para>
+      </listitem>
+     </varlistentry>
     </variablelist>
    </para>
   </refsect2>