X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Finstallation.xml;h=49a60aedb9ef4bfabc9462bda78c8b519d00fd59;hb=c54a5790984e8bd597a8ccd4d1d2d0cae6da8af3;hp=c6f81f22f1d88299b3ce3cdced0af3c42f824876;hpb=d940392c53c32ccf76fb287cc5b997b9e921a431;p=yaz-moved-to-github.git

diff --git a/doc/installation.xml b/doc/installation.xml
index c6f81f2..49a60ae 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -20,7 +20,7 @@
     <ulink url="&url.ubuntu;">Ubuntu Linux</ulink>,
     <ulink url="&url.freebsd;">FreeBSD (i386)</ulink>,
     <ulink url="&url.macosx;">MAC OSX</ulink>,
-    <ulink url="&url.solaris;">SunOS 5.8 (sparc)</ulink>,
+    <ulink url="&url.solaris;">SunOS 5.10 (sparc)</ulink>,
     <ulink url="&url.windows2000;">Windows 2000</ulink>,
     <ulink url="&url.windows2003server;">Windows 2003 server</ulink>.
    </para>
@@ -87,7 +87,7 @@
 
     <para>
      YAZ 3.0.16 and later includes a wrapper for the 
-     <ulink url="%url.icu;">ICU</ulink> 
+     <ulink url="&url.icu;">ICU</ulink> 
      (International Components for Unicode).
      In order to use this, the developer version of the ICU library
      must be available.
@@ -252,11 +252,21 @@
       </varlistentry>
 
       <varlistentry><term>
+        <literal>--with-gnutls</literal>[=<replaceable>prefix</replaceable>]
+       </term>
+       <listitem><para>&yaz; will be linked with the GNU TLS libraries and
+         an SSL COMSTACK will be provided. By default configure enables
+         SSL support for YAZ if the GNU TLS development libraries are found
+         on the system.
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>
         <literal>--with-openssl</literal>[=<replaceable>prefix</replaceable>]
        </term>
        <listitem><para>&yaz; will be linked with the OpenSSL libraries and
-         an SSL COMSTACK will be provided. Note that SSL support is still
-         experimental.
+         an SSL COMSTACK will be provided. If OpenSSL is enabled, GNU TLS
+         is automatically disabled.
         </para></listitem>
       </varlistentry>
 
@@ -295,8 +305,14 @@
       <varlistentry><term><filename>src/libyaz_server.la</filename></term>
        <listitem><para>
          Generic Frontend server. This is an add-on for libyaz.la.
-         Code in this library uses POSIX threads functions - if they
-         available on the platform.
+         Code in this library uses POSIX threads functions - if POSIX
+         threads are available on the platform.
+        </para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term><filename>src/libyaz_icu.la</filename></term>
+       <listitem><para>
+         Functions that wrap the ICU library.
         </para></listitem>
       </varlistentry>