X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Finstallation.xml;h=3e23ca4c459b8a0fe524bd3f10cecbb6a3c95023;hp=116c19326984d62aa1a16a035331e10011a5788a;hb=23a11d4150aeef79e2583c964214db8ad428487a;hpb=6a8bbb0642cc2256976e0f2e0203c4b61bd7f3ad

diff --git a/doc/installation.xml b/doc/installation.xml
index 116c193..3e23ca4 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -146,19 +146,19 @@
      <ulink url="&url.libtool;">Libtool</ulink>
      are used to generate Makefiles and configure &yaz; for the system.
      You do <emphasis>not</emphasis> these tools unless you're using the
-     CVS version of &yaz;.
+     git version of &yaz;.
     </para>
 
     <para>
      The CQL parser for &yaz; is built using
      GNU <ulink url="&url.bison;">Bison</ulink>.
-     This tool is only needed if you're using the CVS version of &yaz;.
+     This tool is only needed if you're using the git version of &yaz;.
     </para>
 
     <para>
      &yaz; includes a tiny ASN.1 compiler. This compiler is
      written in <ulink url="&url.tcl;">Tcl</ulink>.
-     But as for Bison you do not need it unless you're using CVS
+     But as for Bison you do not need it unless you're using git
      version of &yaz; or you're using the compiler to built own codecs
      for private ASN.1.
     </para>
@@ -299,21 +299,22 @@
       </varlistentry>
 
       <varlistentry><term>
-        <literal>--with-openssl</literal>[=<replaceable>prefix</replaceable>]
+        <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
        </term>
-       <listitem><para>&yaz; will be linked with the OpenSSL libraries and
-         an SSL COMSTACK will be provided. If OpenSSL is enabled, GNU TLS
-         is automatically disabled.
+       <listitem><para>&yaz; will be linked the
+	<ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
+	If prefix is not given, the libraries exposed by the script
+	<application>icu-config</application> will be used if found.
         </para></listitem>
       </varlistentry>
 
       <varlistentry><term>
-        <literal>--with-icu</literal>[=<replaceable>prefix</replaceable>]
+        <literal>--with-libgcrypt</literal>[=<replaceable>prefix</replaceable>]
        </term>
-       <listitem><para>&yaz; will be linked the
-	<ulink url="&url.icu;">ICU</ulink> library in the prefix if given.
+       <listitem><para>&yaz; will be linked with
+	<ulink url="&url.libgcrypt;">Libgcrypt</ulink> in the prefix if given.
 	If prefix is not given, the libraries exposed by the script
-	<application>icu-config</application> will be used if found.
+	<application>libgcrypt-config</application> will be used if found.
         </para></listitem>
       </varlistentry>
 
@@ -530,7 +531,7 @@
     an installer from
     <ulink url="&url.yaz.download.win32;">here</ulink>.
     The installer comes with source too - in case you wish to
-    compile YAZ with different Compiler options etc.
+    compile YAZ with different compiler options, etc.
    </para>
 
    <sect2 id="installation.win32.source">
@@ -538,9 +539,8 @@
     <para>
      &yaz; is shipped with "makefiles" for the NMAKE tool that comes
      with <ulink url="&url.vstudio;">
-      Microsoft Visual Studio</ulink>.
-     Version 6 and .NET has been tested. We expect that &yaz; compiles
-     with version 5 as well.
+     Microsoft Visual Studio</ulink>. It has been tested with
+     Microsoft Visual Studio 2003/2005/2008.
     </para>
     <para>
      Start a command prompt and switch the sub directory
@@ -566,7 +566,8 @@
          If <literal>HAVE_TCL</literal> is set to 1, nmake will
          use the ASN.1 compiler (<ulink url="&url.tcl;">Tcl</ulink> based).
          You must set <literal>TCL</literal> to the full path of the Tcl
-         interpreter.
+         interpreter. A Windows version of Tcl is part of
+         <ulink url="&url.gitwindows;">Git for Windows</ulink>.
         </para>
         <para>
          If you do not have Tcl installed, set
@@ -578,15 +579,15 @@
        <term><literal>HAVE_BISON</literal>,
         <literal>BISON</literal></term>
        <listitem><para>
-         If GNU Bison is present, you might set <literal>HAVE_ICONV</literal>
+         If GNU Bison is present, you might set <literal>HAVE_BISON</literal>
          to 1 and specify the Bison executable in <literal>BISON</literal>.
-         Bison is only required if you use the CVS version of
+         Bison is only required if you use the git version of
          YAZ or if you modify the grammar for CQL
          (<filename>cql.y</filename>).
         </para>
         <para>
          A Windows version of GNU Bison is part of
-         <ulink url="&url.unxutils;">unxutils</ulink>.
+         <ulink url="&url.gitwindows;">Git for Windows</ulink>.
         </para></listitem>
       </varlistentry>
 
@@ -691,44 +692,44 @@
      The following files are generated upon successful compilation:
 
      <variablelist>
-      <varlistentry><term><filename>bin/yaz4.dll</filename> /
-	  <filename>bin/yaz4d.dll</filename></term>
+      <varlistentry><term><filename>bin/yaz5.dll</filename> /
+	  <filename>bin/yaz5d.dll</filename></term>
        <listitem><para>
          &yaz; Release/Debug DLL.
         </para></listitem></varlistentry>
 
-      <varlistentry><term><filename>lib/yaz4.lib</filename> /
-	  <filename>lib/yaz4d.lib</filename></term>
+      <varlistentry><term><filename>lib/yaz5.lib</filename> /
+	  <filename>lib/yaz5d.lib</filename></term>
        <listitem><para>
-         Import library for <filename>yaz4.dll</filename> /
-	 <filename>yaz4d.dll</filename>.
+         Import library for <filename>yaz5.dll</filename> /
+	 <filename>yaz5d.dll</filename>.
         </para></listitem></varlistentry>
 
-      <varlistentry><term><filename>bin/yaz_cond4.dll</filename> /
-	  <filename>bin/yaz_cond4d.dll</filename></term>
+      <varlistentry><term><filename>bin/yaz_cond5.dll</filename> /
+	  <filename>bin/yaz_cond5d.dll</filename></term>
        <listitem><para>
 	 Release/Debug DLL for condition variable utilities (condvar.c).
         </para></listitem></varlistentry>
 
-      <varlistentry><term><filename>lib/yaz_cond4.lib</filename> /
-	  <filename>lib/yaz_cond4d.lib</filename></term>
+      <varlistentry><term><filename>lib/yaz_cond5.lib</filename> /
+	  <filename>lib/yaz_cond5d.lib</filename></term>
        <listitem><para>
-         Import library for <filename>yaz_cond4.dll</filename> /
-	 <filename>yaz_cond4d.dll</filename>.
+         Import library for <filename>yaz_cond5.dll</filename> /
+	 <filename>yaz_cond5d.dll</filename>.
         </para></listitem></varlistentry>
 
-      <varlistentry><term><filename>bin/yaz_icu4.dll</filename> /
-          <filename>bin/yaz_icu4d.dll</filename></term>
+      <varlistentry><term><filename>bin/yaz_icu5.dll</filename> /
+          <filename>bin/yaz_icu5d.dll</filename></term>
        <listitem><para>
          Release/Debug DLL for the ICU wrapper utility.
 	 Only build if HAVE_ICU is 1.
         </para></listitem></varlistentry>
 
-      <varlistentry><term><filename>lib/yaz_icu4.lib</filename> /
-	  <filename>lib/yaz_icu4d.lib</filename></term>
+      <varlistentry><term><filename>lib/yaz_icu5.lib</filename> /
+	  <filename>lib/yaz_icu5d.lib</filename></term>
        <listitem><para>
-         Import library for <filename>yaz_icu4.dll</filename> /
-	 <filename>yaz_icu4d.dll</filename>.
+         Import library for <filename>yaz_icu5.dll</filename> /
+	 <filename>yaz_icu5d.dll</filename>.
         </para></listitem></varlistentry>
 
       <varlistentry><term><filename>bin/yaz-ztest.exe</filename></term>
@@ -788,14 +789,14 @@
       <varlistentry><term>include path</term><listitem><para>
          Set it to the <filename>include</filename> directory of &yaz;.
         </para></listitem></varlistentry>
-      <varlistentry><term>import library <filename>yaz4.lib</filename>
+      <varlistentry><term>import library <filename>yaz5.lib</filename>
        </term><listitem><para>
          You must link with this library. It's located in the
          sub directory <filename>lib</filename> of &yaz;.
 	 If you want to link with the debug version of &yaz;, you must
-	 link against <filename>yaz4d.lib</filename> instead.
+	 link against <filename>yaz5d.lib</filename> instead.
         </para></listitem></varlistentry>
-      <varlistentry><term>dynamic link library <filename>yaz4.dll</filename>
+      <varlistentry><term>dynamic link library <filename>yaz5.dll</filename>
        </term><listitem><para>
          This DLL must be in your execution path when you invoke
          your application. Specifically, you should distribute this