cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/concepts catalog.xml

[cr...@apache.org]

crossley    2003/06/25 23:57:26

  Modified:    src/documentation/xdocs/userdocs/concepts catalog.xml
  Log:
  Reflect the recent changes in the "catalog-demo" sample.
  
  Revision  Changes    Path
  1.4       +28 -21    cocoon-2.1/src/documentation/xdocs/userdocs/concepts/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/catalog.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- catalog.xml	18 Mar 2003 07:11:20 -0000	1.3
  +++ catalog.xml	26 Jun 2003 06:57:26 -0000	1.4
  @@ -5,7 +5,7 @@
    <header>
     <title>Entity resolution with catalogs</title>
     <subtitle>Resolve external entities to local or other resources</subtitle>
  -  <version>1.5</version> 
  +  <version>1.6</version> 
     <type>Technical document</type> 
     <authors>
      <person name="David Crossley" email="crossley@indexgeo.com.au"/>
  @@ -240,15 +240,22 @@
   PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
          "ISOnum.pen"
   
  +-- Document Type Definitions --
  +PUBLIC "-//APACHE//DTD Documentation V1.0//EN"
  +       "document-v10.dtd"
  +PUBLIC "-//APACHE//DTD FAQ V1.0//EN"
  +       "faq-v10.dtd"
  +-- (other declarations removed for brevity) --
  +
   -- these entries are used for the catalog-demo sample application --
   OVERRIDE NO
   PUBLIC "-//Arbortext//TEXT Test Override//EN"
  -       "catalog-demo/override.xml"
  +       "catalog-demo/override.txt"
   OVERRIDE YES
   PUBLIC "-//Arbortext//TEXT Test Public Identifier//EN"
  -       "catalog-demo/testpub.xml"
  +       "catalog-demo/testpub.txt"
   SYSTEM "urn:x-arbortext:test-system-identifier"
  -       "catalog-demo/testsys.xml"
  +       "catalog-demo/testsys.txt"
   PUBLIC "-//Indexgeo//DTD Catalog Demo v1.0//EN"
          "catalog-demo/catalog-demo-v10.dtd"
   -- end of entries for the catalog-demo sample application --
  @@ -297,6 +304,7 @@
   
   <source><![CDATA[
   <?xml version="1.0"?>
  +
   <!DOCTYPE catalog-demo PUBLIC "-//Indexgeo//DTD Catalog Demo v1.0//EN"
     "http://www.indexgeo.com.au/dtd/catalog-demo-v10.dtd"
   [
  @@ -304,7 +312,7 @@
      "bogus-system-identifier.xml">
    <!ENTITY testsys SYSTEM "urn:x-arbortext:test-system-identifier">
    <!ENTITY testovr PUBLIC "-//Arbortext//TEXT Test Override//EN"
  -   "testovr.xml">
  +   "testovr.txt">
    <!ENTITY % ISOnum PUBLIC
      "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
      "ISOnum.pen">
  @@ -316,9 +324,9 @@
    <section>
     <para>This sample application demonstrates the use of catalogs for
      entity resolution. &note; see the Apache Cocoon documentation
  -   <link href="/../../docs/userdocs/concepts/catalog.html">Entity
  -   resolution with catalogs</link> for the full background and
  -   explanation, and the XML source of this document (catalog-demo.xml).
  +   <link href="../../docs/userdocs/concepts/catalog.html">Entity resolution
  +   with catalogs</link> for the full background and explanation, and the XML
  +   source of this document (catalog-demo.xml).
     </para>
   
     <para>This top-level XML instance document is catalog-demo.xml - it declares
  @@ -338,9 +346,9 @@
     <para>The internal DTD subset of the top-level document instance goes on
      to declare the three external sub-document entities using various means.
      It also declares and includes the ISOnum set of character entities,
  -   so that we can use entities like &amp;frac12; (to represent &frac12;).
  +   so that we can use entities like "&amp;frac12;" (to represent &frac12;).
      Finally the internal DTD subset declares an internal general entity
  -   for &quot;note&quot;.
  +   for &quot;&amp;note&quot;.
     </para>
    </section>
   
  @@ -348,14 +356,14 @@
     <para>testpub ... this entity is declared with a PUBLIC identifier and a
      bogus system identifier (which will be overridden by the catalog)
     </para>
  -  &testpub;
  +  <para>&note; &testpub;</para>
    </section>
   
    <section>
     <para>testsys ... this entity is declared with a SYSTEM identifier
      (which will be resolved by the catalog)
     </para>
  -  &testsys;
  +  <para>&note; &testsys;</para>
    </section>
   
    <section>
  @@ -363,7 +371,7 @@
      identifier (the catalog is set to not override this one, so the
      declared system identifier is used)
     </para>
  -  &testovr;
  +  <para>&note; &testovr;</para>
    </section>
   
   </catalog-demo>
  @@ -371,17 +379,16 @@
   
     <p>
      Here is the source for one of the included sub-document external entities
  -   <code>testpub.xml</code> ...
  +   <code>testpub.txt</code> (a slab of plain text) ...
     </p>
   
   <source><![CDATA[
  -<para>&note; This paragraph is automatically included from the
  - testpub.xml external file.
  - The entity declaration deliberately used a non-existent file
  - as the system identifier. The catalog then used the declared
  - public identifer to resolve to a specific location on the local
  - filesystem.
  -</para>
  +This paragraph is automatically included from the
  +testpub.txt external file.
  +The entity declaration deliberately used a non-existent file
  +as the system identifier. The catalog then used the declared
  +public identifer to resolve to a specific location on the local
  +filesystem.
   ]]></source>
    </s1>