X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fadministration.xml;h=eca056efe286e048ce8575561eb78a2d6a6aa4c4;hb=985e74909c7e486edbb5220522796ec66c735504;hp=299b1d06ccd402c0e07a0378740a5a57fd42cde7;hpb=e809d64f640790b2695a659bd2eb0ebd4e3cf963;p=idzebra-moved-to-github.git

diff --git a/doc/administration.xml b/doc/administration.xml
index 299b1d0..eca056e 100644
--- a/doc/administration.xml
+++ b/doc/administration.xml
@@ -1,5 +1,5 @@
 <chapter id="administration">
- <!-- $Id: administration.xml,v 1.16 2002-12-30 12:56:07 adam Exp $ -->
+ <!-- $Id: administration.xml,v 1.21 2006-01-19 09:26:59 marc Exp $ -->
  <title>Administrating Zebra</title>
  <!-- ### It's a bit daft that this chapter (which describes half of
           the configuration-file formats) is separated from
@@ -305,6 +305,19 @@
        Specifies <replaceable>size</replaceable> of internal memory
        to use for the zebraidx program.
        The amount is given in megabytes - default is 4 (4 MB).
+       The more memory, the faster large updates happen, up to about
+       half the free memory available on the computer.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>tempfiles: <replaceable>Yes/Auto/No</replaceable></term>
+     <listitem>
+      <para>
+       Tells zebra if it should use temporary files when indexing. The
+       default is Auto, in which case zebra uses temporary files only
+       if it would need more that <replaceable>memMax</replaceable> 
+       megabytes of memory. This should be good for most uses.
       </para>
      </listitem>
     </varlistentry>
@@ -322,27 +335,62 @@
      </listitem>
     </varlistentry>
 
-     <!--
-     no longer supported.
     <varlistentry>
-     <term>tagsysno: 0|1</term>
+     <term>passwd: <replaceable>file</replaceable></term>
      <listitem>
       <para>
-       Species whether Zebra should include system-number data in XML
-       and GRS-1 records returned to clients, represented by the
-       <literal>&lt;localControlNumber&gt;</literal> element in XML
-       and the <literal>(1,14)</literal> tag in GRS-1.
-       The content of these elements is an internally-generated
-       integer uniquely identifying the record within its database.
-       It is included by default but may be turned off, with
-       <literal>tagsysno: 0</literal> for databases in which a local
-       control number is explicitly specified in the input records
-       themselves.
+       Specifies a file with description of user accounts for Zebra.
+       The format is similar to that known to Apache's htpasswd files
+       and UNIX' passwd files. Non-empty lines not beginning with
+       # are considered account lines. There is one account per-line.
+       A line consists of fields separate by a single colon character.
+       First field is username, second is password.
       </para>
      </listitem>
     </varlistentry>
-     -->
-     
+
+    <varlistentry>
+     <term>passwd.c: <replaceable>file</replaceable></term>
+     <listitem>
+      <para>
+       Specifies a file with description of user accounts for Zebra.
+       File format is similar to that used by the passwd directive except
+       that the password are encrypted. Use Apache's htpasswd or similar
+       for maintenanace.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term>perm.<replaceable>user</replaceable>:
+     <replaceable>permstring</replaceable></term>
+     <listitem>
+      <para>
+       Specifies permissions (priviledge) for a user that are allowed
+       to access Zebra via the passwd system. There are two kinds
+       of permissions currently: read (r) and write(w). By default
+       users not listed in a permission directive are given the read
+       priviledge. To specify permissions for a user with no
+       username, or Z39.50 anonymous style use
+	<literal>anonymous</literal>. The permstring consists of
+       a sequence of characters. Include character <literal>w</literal>
+       for write/update access, <literal>r</literal> for read access.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>dbaccess <replaceable>accessfile</replaceable></term>
+      <listitem>
+        <para>
+	  Names a file which lists database subscriptions for individual users.
+	  The access file should consists of lines of the form <literal>username:
+	  dbnames</literal>, where dbnames is a list of database names, seprated by
+	  '+'. No whitespace is allowed in the database list.
+	</para>
+      </listitem>
+    </varlistentry>
+
    </variablelist>
   </para>
   
@@ -621,7 +669,7 @@
   </para>
   
   <para>
-   (see <xref linkend="data-model"/>
+   (see <xref linkend="grs-record-model"/>
     for details of how the mapping between elements of your records and
     searchable attributes is established).
   </para>