forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r178287 - /forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html /forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml /forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
Date Tue, 24 May 2005 21:24:49 GMT
Author: rgardler
Date: Tue May 24 14:24:49 2005
New Revision: 178287

URL: http://svn.apache.org/viewcvs?rev=178287&view=rev
Log:
Updated information about embedded HTML (was ihtml)

Added:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
      - copied, changed from r170732, forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml
Removed:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml
Modified:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml

Copied: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
(from r170732, forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml)
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html?p2=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html&p1=forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml&r1=170732&r2=178287&rev=178287&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ihtml-sample.ihtml
(original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
Tue May 24 14:24:49 2005
@@ -18,40 +18,28 @@
 -->
 <html>
 <head>
-  <title>Interpreted HTML (ihtml) demonstration page</title>
+  <title>Embedded HTML demonstration page</title>
 </head>
 <body>
 
-<h1><a name="intro" />Interpreted HTML (ihtml) demonstration page</h1>
+<h1><a name="intro" />Embedded HTML demonstration page</h1>
 		
-<p>This HTML document is used as the source for this page, and translated
+<p>An HTML document is used as the source for this page, and translated
 to the intermediate Apache Forrest xdocs document structure. The sitemap then
 does the normal aggregation with the navigation content and application of
 the skin.
 </p>
 
 <p>
-Note that this source file has the .ihtml filename extension. All requests to
-the sitemap for *.html are served by looking for matching *.ihtml source,
-or by the
-<a href="http://forrest.apache.org/faq.html#link_raw">"raw content"</a>
-method, or by the normal processing of structured xml xdocs format, or by
-other specialised xml processing.
-</p>
-
-<p>
-The ihtml is being interpreted by Forrest and transformed to the
+The html is being interpreted by Forrest and transformed to the
 intermediate Apache xdocs document structure. That stylesheet cannot deal
 with every possibility in unstructured html, so it tries to guess how to
 build &lt;section&gt; elements and such.
-It needs &lt;h1&gt; (&lt;h2&gt; etc.) headings in the source ihtml
+It needs &lt;h1&gt; (&lt;h2&gt; etc.) headings in the source html
 in order to identify sections. Patches are welcome to enhance
 that transformer.
 </p>
 
-<p>All linked-to pages are also available, for example
-<a href="../test2.html">this one</a>.</p>
-
 <p>
 You can still take advantage of Forrest's
 <a href="http://forrest.apache.org/docs/linking.html">"<b>site:<b>"
@@ -60,15 +48,15 @@
 </p>
 
 <hr>
-<p><b>Note:</b> XHTML can also be used, but it is just treated as interpreted
+<note>XHTML can also be used, but it is just treated as interpreted
 html. Future versions of Forrest will take much more advantage of XHTML.
-</p>
+</note>
 <hr>
 
-<h1><a name="examples" />Some example uses of ihtml</h1>
+<h1><a name="examples" />Some example uses of HTML</h1>
 <p>
 There are situations when the Apache Forrest xdocs DTD is not sufficient.
-This interpreted html enables such extra capabilities.
+The use of embedded HTML enables you to use HTML code in these situations.
 </p>
 
 <h2><a name="js" />Embedded applets and Javascript</h2>
@@ -89,7 +77,7 @@
 <a href="http://www.google.com/">
 <img src="http://www.google.com/logos/Logo_40wht.gif" 
 border="0" alt="Google Search" align="middle" width="150" height="55"></a>
-<input type="text" name="as_q" size="25" maxlength="255" value="ihtml">
+<input type="text" name="as_q" size="25" maxlength="255" value="HTML">
 &nbsp;
 <input type="submit" name="btnG" value="Google Search">
 </form>
@@ -97,7 +85,7 @@
 </p>
 
 <p>
-See a demonstration of "ihtml" and "html forms" with our 
+See a demonstration of "html" and "html forms" with our 
 <a href="http://forrest.apache.org/mirrors.cgi">Forrest download mirror</a>
 facility and the
 <a href="http://forrest.apache.org/howto/howto-asf-mirror.html">explanation</a>
howto document.
@@ -105,11 +93,19 @@
 
 <h2><a name="invalid" />Invalid HTML</h2>
 <p>
-This paragraph has a missing closing tag for the &lt;p&gt; element.
+This paragraph has a missing closing tag for the &lt;p&gt; element. If you look
+at the <a href="embedded_html.xml">XML created by Forrest</a> you'll notice that

+Forrest has fixed this.
+
+<h2>Potentially Invalid XDocs</h2>
+
+<warning>However, it should also be noted that the resultant XML is not a valid document
+since it contains the additional HTML elements. If you are intending to use
+the intermediate XDocs for any purpose be aware of this fact.</warning>
 
 <h2><a name="blink" />Other non-standard html-type abilities</h2>
 <p>
-Use other HTML <blink>delights and tricks</blink>.
+Use other HTML <blink>delights (???) and tricks</blink>.
 </p>
 </body>
 </html>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml?rev=178287&r1=178286&r2=178287&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml Tue May 24 14:24:49
2005
@@ -56,8 +56,8 @@
       description="Static raw un-processed content" />
     <linking label="Linking" href="linking.html" 
       description="Linking explained and demonstrated" />
-    <sample-ihtml label="ihtml page" href="ihtml-sample.html" 
-      description="Test iHTML page" />
+    <sample-html label="Embedded HTML" href="embedded_html.html" 
+      description="Test of Embedded HTML" />
     <sample-ascii-art label="ascii-art page" href="ascii-art.html" 
       description="Sample Ascii Art page" />
     <sample-usemap label="usemap" href="usemap.html" 



Mime
View raw message