X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=doc%2Fintroduction.xml;h=fc9a628b20ccdbea415cc4d025cc9a985fc3cf47;hp=bb6149b966bc26da6a54f45feed7d0380233727a;hb=cc639afc463cc2a31d2e29c80c82a19c1a028228;hpb=4641562b204d07a8fca9e1fa94c86593766fa165

diff --git a/doc/introduction.xml b/doc/introduction.xml
index bb6149b..fc9a628 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -1,9 +1,8 @@
-<!-- $Id: introduction.xml,v 1.20 2006-04-24 09:21:35 adam Exp $ -->
  <chapter id="introduction"><title>Introduction</title>
 
   <para>
    &yaz; is a C/C++ library for information retrieval applications
-   using the Z39.50/SRW/SRU protocols for information retrieval.
+   using the Z39.50/SRU/SOLR protocols for information retrieval.
   </para>
   
   <para>
@@ -16,8 +15,8 @@
      </para></listitem>
     <listitem><para>
       Supports 
-      <ulink url="&url.sru;">SRW/SRU</ulink>
-      version 1.1 (over HTTP and HTTPS).
+      <ulink url="&url.sru;">SRU GET/POST/SOAP</ulink>
+      version 1.2 (over HTTP and HTTPS).
      </para></listitem>
     <listitem><para>
       Includes BER encoders/decoders for the 
@@ -25,6 +24,10 @@
       protocol.
      </para></listitem>
     <listitem><para>
+      Supports 
+      <ulink url="&url.solr;">SOLR</ulink> Web Service version 1.4.x (client side only)
+     </para></listitem>
+    <listitem><para>
       Supports the following transports: BER over TCP/IP
       (<ulink url="&url.ber.over.tcpip;">RFC1729</ulink>),
       BER over unix local socket, and 
@@ -32,14 +35,15 @@
      </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).
      </para></listitem>
     <listitem><para>
       Offers 
-      <ulink url="&url.zoom;">ZOOM</ulink> C API implementing both
-      Z39.50 and SRW.
+      <ulink url="&url.zoom;">ZOOM</ulink> C API implementing
+      Z39.50, SRU and SOLR Web Service.
      </para></listitem>
     <listitem><para>
       The &yaz; library offers a set of useful utilities
@@ -82,22 +86,22 @@
     <listitem>
      <para>
       <xref linkend="zoom"/> describes the ZOOM API of &yaz;.
-      This is definitely worth a read if you wish to develop a Z39.50/SRW
-     client.
-    </para>
+      This is definitely worth a read if you wish to develop a Z39.50/SRU
+      client.
+     </para>
     </listitem>
     
     <listitem>
      <para>
       <xref linkend="server"/> describes the generic frontend server
-      and explains how to develop server Z39.50/SRW applications for &yaz;.
-     Obviously worth reading if you're to develop a server.
+      and explains how to develop server Z39.50/SRU applications for &yaz;.
+      Obviously worth reading if you're to develop a server.
     </para>
     </listitem>
 
     <listitem>
      <para>
-      <xref linkend="client"/> describes how to use the &yaz; Z39.50
+      <xref linkend="yaz-client"/> describes how to use the &yaz; Z39.50
       client. If you're developer and wish to test your server
       or a server from another party, you might find this chapter
       useful.
@@ -114,8 +118,8 @@
 
     <listitem>
      <para>
-      <xref linkend="soap"/> describes how SRW and SOAP is used 
-      in &yaz;. Only if you're developing SOAP/SRW applications
+      <xref linkend="soap"/> describes how SRU and SOAP is used 
+      in &yaz;. Only if you're developing SRU applications
       this section is a must.
      </para>
     </listitem>
@@ -124,8 +128,8 @@
      <para>
       <xref linkend="tools"/> contains sections for the various
       tools offered by &yaz;. Scan through the material quickly
-      and see what's relevant to you! SRW/SRU implementors
-      might find the <link linkend="tools.cql">CQL</link> section
+      and see what's relevant to you! SRU implementors
+      might find the <link linkend="cql">CQL</link> section
       particularly useful.
      </para>
     </listitem>
@@ -158,9 +162,9 @@
    <para>
     The <ulink url="&url.yaz;">&yaz;</ulink>
     toolkit offers several different levels of access to the
-    <ulink url="&url.z39.50">ISO23950/Z39.50</ulink>,
+    <ulink url="&url.z39.50;">ISO23950/Z39.50</ulink>,
     <ulink url="&url.ill;">ILL</ulink> and
-    <ulink url="&url.sru/">SRU</ulink>/<ulink url="&url.srw/">SRW</ulink>
+    <ulink url="&url.sru;">SRU</ulink>
     protocols.
     The level that you need to use depends on your requirements, and
     the role (server or client) that you want to implement.
@@ -204,7 +208,7 @@
       <para>
        The second layer provides a C represenation of the 
        protocol units (packages) for Z39.50 ASN.1, ILL ASN.1,
-       SRW SOAP.
+       SRU.
       </para>
      </listitem>
      <listitem>