Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra

diff --git a/IDMETA b/IDMETA
index eaadd0c..7308ea3 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="jessie wheezy squeeze"
 UBUNTU_DIST="utopic trusty saucy precise"
 CENTOS_DIST="centos5 centos6"
-VERSION=2.0.59
+VERSION=2.0.60

diff --git a/NEWS b/NEWS
index 507b18d..f156ec8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+--- 2.0.60 2015/02/06
+
+Fix ICU phrase searches for terms split by ICU ZEB-664
+
+Update Visual Studio nmake file for VS 2013.
+
 --- 2.0.59 2014/04/17
 
 Fix 0 ptr reference (crash) during search that occurred due to slightly

diff --git a/doc/tutorial.xml b/doc/tutorial.xml
index 2b7a250..52498be 100644 (file)
--- a/doc/tutorial.xml
+++ b/doc/tutorial.xml
@@ -15,7 +15,7 @@
     Go to the <literal>examples/oai-pmh</literal> subdirectory of the
     distribution archive, or make a deep copy of the Debian installation
     directory
-    <literal>/usr/share/idzebra-2.0.-examples/oai-pmh</literal>.
+    <literal>/usr/share/idzebra-2.0-examples/oai-pmh</literal>.
     An XML file containing multiple &acro.oai;
     records is located in the  sub
     directory <literal>examples/oai-pmh/data</literal>.