X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Fadministration.xml;h=6ee4e09149f9e48874c2921d5217808f388a3255;hb=3d5a55462e2b1a9404a522bfd71a0b2058b24f7a;hp=fbb02e2346c8baca186e58951e7d19d893355d77;hpb=8dbcb21f153124c2479e966b0ca0aff28f5b4760;p=idzebra-moved-to-github.git

diff --git a/doc/administration.xml b/doc/administration.xml
index fbb02e2..6ee4e09 100644
--- a/doc/administration.xml
+++ b/doc/administration.xml
@@ -1,5 +1,4 @@
 <chapter id="administration">
- <!-- $Id: administration.xml,v 1.54 2007-12-19 09:30:29 adam Exp $ -->
  <title>Administrating &zebra;</title>
  <!-- ### It's a bit daft that this chapter (which describes half of
           the configuration-file formats) is separated from
@@ -313,6 +312,19 @@
      </varlistentry>
 
      <varlistentry>
+      <term>sortmax: <replaceable>integer</replaceable></term>
+      <listitem>
+       <para>
+    Specifies the maximum number of records that will be sorted
+    in a result set.  If the result set contains more than 
+    <replaceable>integer</replaceable> records, records after the
+    limit will not be sorted.  If omitted, the default value is
+    1,000.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
       <term>staticrank: <replaceable>integer</replaceable></term>
       <listitem>
        <para>
@@ -329,10 +341,10 @@
       <term>estimatehits:: <replaceable>integer</replaceable></term>
       <listitem>
        <para>
-	Controls whether &zebra; should calculate approximite hit counts and
+	Controls whether &zebra; should calculate approximate hit counts and
 	at which hit count it is to be enabled.
-	A value of 0 disables approximiate hit counts.
-	For a positive value approximaite hit count is enabled
+	A value of 0 disables approximate hit counts.
+	For a positive value approximate hit count is enabled
 	if it is known to be larger than <replaceable>integer</replaceable>.
        </para>
        <para>
@@ -426,7 +438,7 @@
      <replaceable>permstring</replaceable></term>
      <listitem>
       <para>
-       Specifies permissions (priviledge) for a user that are allowed
+       Specifies permissions (privilege) 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
@@ -446,12 +458,23 @@
         <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
+	  dbnames</literal>, where dbnames is a list of database names, separated by
 	  '+'. No whitespace is allowed in the database list.
 	</para>
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>encoding <replaceable>charsetname</replaceable></term>
+      <listitem>
+        <para>
+	  Tells Zebra to interpret the terms in Z39.50 queries as
+	  having been encoded using the specified character
+	  encoding.  The default is <literal>ISO-8859-1</literal>; one
+	  useful alternative is <literal>UTF-8</literal>.
+	</para>
+      </listitem>
+    </varlistentry>
    </variablelist>
   </para>
   
@@ -774,9 +797,7 @@
    The value of the <literal>register</literal> setting is a sequence
    of tokens. Each token takes the form:
    
-   <screen>
-    <emphasis>dir</emphasis><literal>:</literal><emphasis>size</emphasis> 
-   </screen>
+   <emphasis>dir</emphasis><literal>:</literal><emphasis>size</emphasis> 
    
    The <emphasis>dir</emphasis> specifies a directory in which index files
    will be stored and the <emphasis>size</emphasis> specifies the maximum
@@ -1030,7 +1051,7 @@
   <title>Static Ranking</title>
   
    <para>
-    &zebra; uses internally inverted indexes to look up term occurencies
+    &zebra; uses internally inverted indexes to look up term frequencies
     in documents. Multiple queries from different indexes can be
     combined by the binary boolean operations <literal>AND</literal>, 
     <literal>OR</literal> and/or <literal>NOT</literal> (which
@@ -1121,7 +1142,7 @@
    <para>
      The default <literal>rank-1</literal> ranking module implements a 
      TF/IDF (Term Frequecy over Inverse Document Frequency) like
-     algorithm. In contrast to the usual defintion of TF/IDF
+     algorithm. In contrast to the usual definition of TF/IDF
      algorithms, which only considers searching in one full-text
      index, this one works on multiple indexes at the same time.
      More precisely, 
@@ -1834,7 +1855,7 @@ where g = rset_count(terms[i]->rset) is the count of all documents in this speci
    <sect2 id="administration-extended-services-debugging">
     <title>Extended services debugging guide</title>
     <para>
-     When debugging ES over PHP we recomment the following order of tests:
+     When debugging ES over PHP we recommend the following order of tests:
     </para>
 
     <itemizedlist>
@@ -1855,14 +1876,14 @@ where g = rset_count(terms[i]->rset) is the count of all documents in this speci
        <literal>yaz-client</literal> like described in
        <xref linkend="administration-extended-services-yaz-client"/>,
        and
-       remeber the <literal>-a</literal> option which tells you what
+       remember the <literal>-a</literal> option which tells you what
        goes over the wire! Notice also the section on permissions:
        try 
        <screen>
         perm.anonymous: rw
        </screen>
        in <literal>zebra.cfg</literal> to make sure you do not run into 
-       permission  problems (but never expose such an unsecure setup on the 
+       permission  problems (but never expose such an insecure setup on the 
        internet!!!). Then, make sure to set the general
        <literal>recordType</literal> instruction, pointing correctly
        to the GRS-1 filters,