forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: rev 36476 - in forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs: . samples
Date Mon, 16 Aug 2004 16:03:23 GMT
Author: crossley
Date: Mon Aug 16 09:03:22 2004
New Revision: 36476

Added:
   forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/document-v13.xml
      - copied unchanged from rev 36467, forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml
Modified:
   forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml
   forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml
Log:
Upgrade the sample document to be document-v20
Copy the old one to be document-v13.xml


Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml	(original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/samples/sample.xml	Mon
Aug 16 09:03:22 2004
@@ -14,26 +14,26 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/v20/document-v20.dtd">
 <document> 
   <header> 
-    <title>The Apache Forrest xdocs document-v1.3 DTD</title> 
+    <title>The Apache Forrest xdocs document-v2.0 DTD</title> 
     <notice>The content of this document doesn't make any sense at all.</notice>
     <abstract>This is a demonstration document using all possible elements in
-      the current Apache Forrest xdocs <code>document-v13.dtd</code>
+      the current Apache Forrest xdocs <code>document-v20.dtd</code>
     </abstract> 
   </header> 
   <body> 
     <note>
       This is a demonstration document using all possible elements in the
-      current Apache Forrest xdocs <code>document-v13.dtd</code>
-      (See the <link href="#changes">DTD changes</link> section at the bottom.)
+      current Apache Forrest xdocs <code>document-v20.dtd</code>
+      (See the <a href="#changes">DTD changes</a> section at the bottom.)
     </note>
     <section id="sample">
       <title>Sample Content</title>
       <p><strong>Hint:</strong> See the xml source to see how the various
       elements are used and see the
-      <link href="ext:dtd-docs">DTD reference documentation</link>.</p>
+      <a href="ext:dtd-docs">DTD reference documentation</a>.</p>
       <p>This is a simple paragraph. Most documents contain a fair amount of
         paragraphs. Paragraphs are called <code>&lt;p&gt;</code>.</p>

       <p xml:space="preserve"
@@ -75,46 +75,24 @@
           which offers the ability to refer to an image map.</li> 
         <li>We have elements for hyperlinking: 
           <dl> 
-            <dt><code>&lt;link href="faq.html"&gt;</code></dt>

+            <dt><code>&lt;a href="faq.html"&gt;</code></dt>

             <dd>Use this to
-              <link href="faq.html" title="Example of a document via link">link</link>
+              <a href="faq.html" title="Example of a document via link">link</a>
               to another document. As per normal, this will open the new document
               in the same browser window.</dd> 
 
-            <dt><code>&lt;link href="#section"&gt;</code></dt>

+            <dt><code>&lt;a href="#section"&gt;</code></dt>

             <dd>Use this to
-              <link href="#section" title="Example of a document via local anchor">link</link>
+              <a href="#section" title="Example of a document via local anchor">link</a>
               to the named anchor in the current document.
             </dd> 
 
-            <dt><code>&lt;link href="faq.html#forrest"&gt;</code></dt>

+            <dt><code>&lt;a href="faq.html#forrest"&gt;</code></dt>

             <dd>Use this to
-              <link href="faq.html#forrest" title="Example of a document via link and
anchor">link</link>
+              <a href="faq.html#forrest" title="Example of a document via link and anchor">link</a>
               to another document and go to the named anchor. This will open
               the new document in the same browser window.
             </dd> 
-
-            <dt><code>&lt;jump href="faq.html"&gt;</code></dt>

-            <dd>Use this to
-              <jump href="faq.html" title="Example of a document via jump">jump</jump>
-              to another document and optionally go to a named
-              <jump href="faq.html#forrest" title="Example of a document via jump to anchor">anchor</jump>
-              within that document. This will open the new document in the same
-              browser window. So what is the difference between link and jump?
-              The jump behaves differently, in that it will replace any frames
-              in the current window.
-              This is the equivalent of
-              <code>&lt;a ... target="_top"&gt;</code>
-            </dd>
-
-            <dt><code>&lt;fork href="faq.html"&gt;</code></dt>

-            <dd>Use this to
-              <fork href="faq.html" title="Example of a document via fork">fork</fork>
-              your webbrowser to another document. This will open the document
-              in a new, unnamed browser window.
-              This is the equivalent of
-              <code>&lt;a ... target="_blank"&gt;</code>
-            </dd> 
         </dl></li> 
 
         <li>Oh, by the way, a definition list <code>&lt;dl&gt;</code>
was used inside
@@ -240,10 +218,22 @@
     <section id="changes">
       <title>DTD changes</title>
       <p>See the generated
-        <link href="ext:dtd-docs">DTD reference documentation</link>.
+        <a href="ext:dtd-docs">DTD reference documentation</a>.
       </p>
+      <section id="changes-20">
+        <title>Changes between document-v13 and document-v20</title>
+        <ul>
+          <li>Renamed <strong>&lt;link&gt;</strong>
+             to <strong>&lt;a&gt;</strong>
+          </li>
+          <li>Removed <strong>&lt;fork&gt;</strong>
+             and <strong>&lt;jump&gt;</strong> in favour of
+             <strong>&lt;a&gt;</strong>
+          </li>
+        </ul>
+      </section>
       <section id="changes-13">
-        <title>Changes since document-v12</title>
+        <title>Changes between document-v12 and document-v13</title>
         <p>
           All v1.2 docs will work fine as v1.3 DTD. The main change is the
           addition of a @class attribute to every element, which enables the
@@ -251,7 +241,7 @@
         </p>
       </section>
       <section id="changes-12">
-        <title>Changes since document-v11</title>
+        <title>Changes between document-v11 and document-v12</title>
         <p>
           doc-v12 enhances doc-v11 by relaxing various restrictions that were
           found to be unnecessary.

Modified: forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml
==============================================================================
--- forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml	(original)
+++ forrest/trunk/src/core/fresh-site/src/documentation/content/xdocs/site.xml	Mon Aug 16
09:03:22 2004
@@ -38,13 +38,18 @@
   </about>
 
   <samples label="Samples" href="samples/" tab="samples">
-    <sample label="Apache document" href="sample.html" 
-      description="A nonsense document using all possible elements in the current document">
+    <sample label="Apache doc v2.0" href="sample.html" 
+      description="A nonsense document using all possible elements in the current document
v2.0">
       <top href="#top"/>
       <section href="#section"/>
     </sample>
+    <document-v13 label="Apache doc v1.3" href="document-v13.html" 
+      description="A nonsense document using all possible elements in the document v1.3">
+      <top href="#top"/>
+      <section href="#section"/>
+    </document-v13>
     <static label="Static content" href="static.html" 
-      description="More Samples" />
+      description="Static raw un-processed content" />
     <linking label="Linking" href="linking.html" 
       description="Linking explained and demonstrated" />
     <sample-wiki label="Wiki page" href="wiki-sample.html" 

Mime
View raw message