X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2Fpazpar2_conf.xml;h=05ca85d4257bcbe782be3d73104d0bab56e72e70;hb=990a1a76db5f46c095e9d7bcca166cdc16c201cc;hp=c61a73e1d4a2cd3c55ee8a87c54200aa283b4510;hpb=14074ecf20d86518ccedc0c9617a49949ec19779;p=pazpar2-moved-to-github.git
diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index c61a73e..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:
- ;charset=charset to
+ ;charset to
iso2709. If omitted, a charset of
MARC-8 is assumed. This is correct for most MARC21/USMARC records.
@@ -1250,8 +1250,35 @@
pz:authentication
- Sets an authentication string for a given server. See the section on
- authorization and authentication for discussion.
+ Sets an authentication string for a given database. For Z39.50,
+ this is carried as part of the Initialize Request. In order to carry
+ the information in the "open" elements, separate
+ username and password with a slash (In Z39.50 it is a VisibleString).
+ In order to carry the information in the idPass elements, separate
+ username term, password term and, optionally, a group term with a
+ single blank.
+ If three terms are given, the order is
+ user, group, password.
+ If only two terms are given, the order is
+ user, password.
+
+
+ For HTTP based procotols, such as SRU and Solr, the authentication
+ string includes a username term and, optionally, a password term.
+ Each term is separated by a single blank. The
+ authentication information is passed either by HTTP basic
+ authentication or via URL parameters. The mode is operation is
+ determined by pz:authentication_mode setting.
+
+
+
+
+
+ pz:authentication_mode
+
+
+ Determines how authentication is carried in HTTP based protocols.
+ Value may be "basic" or "url".
@@ -1262,8 +1289,6 @@
Allows or denies access to the resources it is applied to. Possible
values are '0' and '1'.
The default is '1' (allow access to this resource).
- See the manual section on authorization and authentication for
- discussion about how to use this setting.