X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=CHANGELOG;h=c815752f790ce5959694d640be0716ca7c01804c;hb=2f19e1d09666a88da5680a7dbbdc705db9a38215;hp=ee72b28fc3c9a81469055b432045fc00858e0009;hpb=e1f85310e64f96f4f4878b36e313786b8c63a512;p=idzebra-moved-to-github.git

diff --git a/CHANGELOG b/CHANGELOG
index ee72b28..c815752 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,27 @@
-<<<<<<< CHANGELOG
---- 1.0a7 1997/5/16
+New settings, memMax and keyTmpDir.
+
+Changed name of setting lockDir (previously called lockPath) and
+setTmpDir (previously called tempSetPath).
+
+Generalized and changed record type specifications. In short, there are:
+       text                plain SUTRS
+       grs.sgml            structured, "SGML-like" syntax
+       grs.regx.<filter>   structured, Regular expression filter
+
+Bug fix: Result sets weren't sorted in operations involving boolean
+operations with "ranked" operands.
+
+--- 1.0a8 1996/6/6
+
+Added national character-handling subsystem.
+
+Various fixes.
+
+Small modifications to input filters and profiles.
+
+Added support for SOIF syntax (with private OID).
+
+--- 1.0a7 1996/5/16
 
 Fixed buffer-size problem in indexing.
 
@@ -9,11 +31,8 @@ Added phrase registers.
 
 Added dynamic mapping of search attribute to multiple termlists (ANY).
 
-||||||| 1.18
-=======
 Scan support in multiple databases/registers.
 
->>>>>>> /tmp/T4a11432
 Configuration settings are case-insensitive and single dash (-)
 characters are ignored in comparisons.