Trying to use Solr name consistently

[yaz-moved-to-github.git] / doc / zoom.xml

diff --git a/doc/zoom.xml b/doc/zoom.xml
index c371520..78b5d72 100644 (file)
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -35,15 +35,15 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     connection's <literal>sru</literal> option, which may be SRU over
     HTTP GET (<literal>get</literal>),
     SRU over HTTP POST (<literal>post</literal>), (SRU over
-    SOAP) (<literal>soap</literal>) or <literal>SOLR</literal>
-    (<ulink url="&url.solr;">SOLR</ulink> Web Service).
+    SOAP) (<literal>soap</literal>) or <literal>solr</literal>
+    (<ulink url="&url.solr;">Solr</ulink> Web Service).
     Using the facility for embedding options in target strings, a
     connection can be forced to use SRU rather the SRW (the default) by
     prefixing the target string with <literal>sru=get,</literal>, like this:
     <literal>sru=get,http://sru.miketaylor.org.uk:80/sru.pl</literal>
   </para>
   <para>
-   <ulink url="&url.solr;">SOLR</ulink>  protocol support was added to
+   <ulink url="&url.solr;">Solr</ulink>  protocol support was added to
    YAZ in version 4.1.0, as a dialect of a SRU protocol, since both are
    HTTP based protocols.
   </para>
@@ -118,7 +118,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     You can prefix the host with a scheme followed by colon. The
     default scheme is <literal>tcp</literal> (Z39.50 protocol).
     The scheme <literal>http</literal> selects SRU/get over HTTP by default,
-    but can overridded to use SRU/post, SRW and the SOLR protocol.
+    but can overridded to use SRU/post, SRW and the Solr protocol.
    </para>
    <para>
     You can prefix the scheme-qualified host-string with one or more
@@ -279,7 +279,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
        </entry><entry>none</entry></row>
       <row>
        <entry>sru</entry><entry>
-       SRU/SOLR transport type. Must be either <literal>soap</literal>,
+       SRU/Solr transport type. Must be either <literal>soap</literal>,
        <literal>get</literal>, <literal>post</literal>, or
        <literal>solr</literal>.
         </entry><entry>soap</entry></row>
@@ -389,14 +389,14 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     </para>
     </sect2>
    <sect2 id="zoom.sru.init.behavior">
-    <title>SRU/SOLR Protocol behavior</title>
+    <title>SRU/Solr Protocol behavior</title>
     <para>
-     The HTTP based protocols (SRU, SRW, SOLR) doesn't feature an Inititialize Request, so
+     The HTTP based protocols (SRU, SRW, Solr) doesn't feature an Inititialize Request, so
      the connection phase merely establishes a TCP/IP connection
      with the SOAP service.
     </para>
     <para>Most of the ZOOM connection options do not
-     affect SRU/SOLR and they are ignored. However, future versions
+     affect SRU/Solr and they are ignored. However, future versions
      of &yaz; might honor <literal>implementationName</literal> and
      put that as part of User-Agent header for HTTP requests.
      </para>
@@ -760,10 +760,10 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      SRU SearchRetrieveRequest.
     </para>
     <para>
-     SOLR queries has to be done in SOLR query format.
+     Solr queries has to be done in Solr query format.
     </para>
     <para>
-     Unfortunately, SRU or SOLR does not define a database setting. Hence,
+     Unfortunately, SRU or Solr does not define a database setting. Hence,
      <literal>databaseName</literal> is unsupported and ignored.
      However, the path part in host parameter for functions
      <function>ZOOM_connecton_new</function> and
@@ -916,7 +916,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
      </varlistentry>
      <varlistentry><term><literal>xml</literal></term>
       <listitem><para>The record is returned in XML if possible.
-       SRU, SOLR and Z39.50 records with transfer syntax XML are
+       SRU, Solr and Z39.50 records with transfer syntax XML are
        returned verbatim. MARC records are returned in
        <ulink url="&url.marcxml;">
         MARCXML
@@ -983,9 +983,9 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
     </para>
    </sect2>
    <sect2 id="zoom.sru.record.behavior">
-    <title>SRU/SOLR Protocol behavior</title>
+    <title>SRU/Solr Protocol behavior</title>
     <para>
-     The ZOOM driver for SRU/SOLR treats records returned by a SRU/SOLR server
+     The ZOOM driver for SRU/Solr treats records returned by a SRU/Solr server
      as if they where Z39.50 records with transfer syntax XML and
      no element set name or database name.
     </para>
@@ -995,7 +995,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    <para>
     Facets operations is not part of the official ZOOM specification, but
     is an Index Data extension for YAZ-based Z39.50 targets or
-    <ulink url="&url.solr;">SOLR</ulink> targets.
+    <ulink url="&url.solr;">Solr</ulink> targets.
     In case the target can and is requested to return facets, using a
     result set the ZOOM client can request one or all facet fields.
     Using a facet field the client can request the term count and then
@@ -1075,7 +1075,7 @@ ZOOM_query_cql2rpn(ZOOM_query s, const char *str, ZOOM_connection conn)
    </para>
 
    <para>
-    The Scan interface is supported for both Z39.50, SRU (and SOLR?).
+    The Scan interface is supported for both Z39.50, SRU and Solr.
    </para>
 
    <synopsis>