From 6104404b99d63343646f1d8e21bce49a82c16d3d Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Jun 2008 20:35:20 +0200
Subject: [PATCH] Added info about GNU TLS.

---
 doc/common           |    2 +-
 doc/installation.xml |   14 ++++++++++++--
 doc/introduction.xml |    1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/common b/doc/common
index 3c4ff09..0c19be9 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit 3c4ff09dc8ef24aa09fb3fad8630ec555c8e324c
+Subproject commit 0c19be9d4595cc8e596f3c884ed466dbd9b0737a
diff --git a/doc/installation.xml b/doc/installation.xml
index c6f81f2..9e5452f 100644
--- a/doc/installation.xml
+++ b/doc/installation.xml
@@ -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>
 
diff --git a/doc/introduction.xml b/doc/introduction.xml
index f2ca4ff..1010413 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -31,6 +31,7 @@
      </para></listitem>
     <listitem><para>
       Secure Socket Layer support using
+      <ulink url="&url.gnutls;">GNU TLS</ulink> or
       <ulink url="&url.openssl;">OpenSSL</ulink>.
       If enabled, &yaz; uses HTTPS transport (for SOAP) or
       "Secure BER" (for Z39.50).
-- 
1.7.10.4