X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2Ftutorial.xml;h=0cd0bd7c4a79b7c45ffee56b387967b93a346b6b;hb=cc72249ff74400f6106897b513c10b932a67feec;hp=2b7a25053be44a59ef7465c8b2d875a676ea14f2;hpb=972bceaa6386f904bc3e4845f1c5598656c5c6f2;p=idzebra-moved-to-github.git

diff --git a/doc/tutorial.xml b/doc/tutorial.xml
index 2b7a250..0cd0bd7 100644
--- a/doc/tutorial.xml
+++ b/doc/tutorial.xml
@@ -15,7 +15,7 @@
     Go to the <literal>examples/oai-pmh</literal> subdirectory of the
     distribution archive, or make a deep copy of the Debian installation
     directory
-    <literal>/usr/share/idzebra-2.0.-examples/oai-pmh</literal>.
+    <literal>/usr/share/idzebra-2.0-examples/oai-pmh</literal>.
     An XML file containing multiple &acro.oai;
     records is located in the  sub
     directory <literal>examples/oai-pmh/data</literal>.
@@ -213,7 +213,7 @@
      any:w
      title:w
      author:w
-     subject:w
+     subject-heading:w
      description:w
      contributor:w
      publisher:w
@@ -225,10 +225,8 @@
     correct &acro.pqf; query. For example, to search in titles only,
     we use
     <ulink
-     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@attr
-     1=title the&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
-     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@attr
-     1=title the&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
+     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@attr 1=title the&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
+     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@attr 1=title the&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
     </ulink>
    </para>
 
@@ -240,13 +238,8 @@
     <literal>description</literal> using the query
     <literal>@and @attr 1=title the @attr 1=description fish</literal>.
     <ulink
-     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@and
-     @attr 1=title the
-     @attr 1=description
-     fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
-     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@and
-     @attr 1=title the
-     @attr 1=description fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
+     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@and @attr 1=title the @attr 1=description fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
+     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;x-pquery=@and @attr 1=title the @attr 1=description fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
     </ulink>
    </para>
 
@@ -309,7 +302,7 @@
 
    <para>
     The &acro.sru; specification mandates that the &acro.cql; query
-    language is supported and properly configure. Also, the server
+    language is supported and properly configured. Also, the server
     needs to be able to emit a proper  &acro.explain; &acro.xml;
     record, which is used to determine the capabilities of the
     specific server instance.
@@ -326,7 +319,7 @@
    </para>
 
    <para>
-    We are all set to start the &acro.sru;/acro.z3950; server including
+    We are all set to start the &acro.sru;/&acro.z3950; server including
     &acro.pqf; and &acro.cql; query configuration. It uses the &yaz; frontend
     server configuration - just type
     <screen>
@@ -341,6 +334,7 @@
     <ulink
      url="http://localhost:9999">http://localhost:9999
     </ulink>
+    or
     <ulink
      url="http://localhost:9999/?version=1.1&amp;operation=explain">
      http://localhost:9999/?version=1.1&amp;operation=explain
@@ -353,11 +347,8 @@
     <literal>dc.title=the
      and dc.description=fish</literal> results in the following page
     <ulink
-     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the
-     and dc.description=fish
-     &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
-     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the
-     and dc.description=fish &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
+     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the and dc.description=fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc">
+     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the and dc.description=fish &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=dc
     </ulink>
    </para>
 
@@ -382,11 +373,8 @@
     schema's of the form
     <literal>zebra::</literal> just work right out of the box
     <ulink
-     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the
-     and dc.description=fish
-     &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=zebra::snippet">
-     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the
-     and dc.description=fish &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=zebra::snippet
+     url="http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the and dc.description=fish&amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=zebra::snippet">
+     http://localhost:9999/?version=1.1&amp;operation=searchRetrieve&amp;query=dc.title=the and dc.description=fish &amp;startRecord=1&amp;maximumRecords=1&amp;recordSchema=zebra::snippet
     </ulink>
    </para>