svn commit: r180465 - in /forrest/trunk/main/fresh-site/src/documentation/content: test1.html xdocs/samples/linking.xml xdocs/samples/subdir/test4.html xdocs/samples/test3.html xdocs/test1.html xdocs/test2.html

[rg...@apache.org]

Author: rgardler
Date: Mon Jun  6 12:57:39 2005
New Revision: 180465

URL: http://svn.apache.org/viewcvs?rev=180465&view=rev
Log:
correctly handle unprocessed HTML

Added:
    forrest/trunk/main/fresh-site/src/documentation/content/test1.html
      - copied unchanged from r180155, forrest/trunk/main/fresh-site/src/documentation/content/xdocs/test1.html
Removed:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/subdir/test4.html
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/test3.html
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/test1.html
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/test2.html
Modified:
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml?rev=180465&r1=180464&r2=180465&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml Mon Jun  6 12:57:39 2005
@@ -64,7 +64,7 @@
         In versions prior to 0.7 raw un-processed content was stored in
         the "<code>content/</code>" directory. In 0.7 onwards, raw
         un-processed data is stored alongside the xdocs. In addition,
-        in 0.6 and earlier, HTML documents could be stored in the xdocs
+        in 0.6 and earlier HTML documents could be stored in the xdocs
         directory and served without processing. If you 
         you wish to emulate the behaviour of 0.6 and earlier see the 
         next section.
@@ -97,7 +97,7 @@
       the file <code>content/xdocs/hello.sxw</code> can be used to produce a 
       skinned version of the document at with the name <code>hello.html</code>.
       Similarly, you can use <a href="/docs/plugins/index.html">Forrest Output 
-      Plugins</a> to create different output formats such as PDF, in this 
+      Plugins</a> to #create different output formats such as PDF, in this 
       case <code>content/xdocs/hello.sxw</code> can produce 
       <code>hello.pdf</code>.</p>
       
@@ -105,7 +105,7 @@
       can still retrieve the raw un-processed version with, for example, 
       <code>hello.sxw</code>. If you want to prevent the user retrieving the 
       un-processed version you will have to create matchers that intercept
-      these requests within your project sitemap.</p>
+      these requests within your projects sitemap.</p>
       </section>
   
     </section>
@@ -149,19 +149,19 @@
       <source><![CDATA[<a href="../hello.pdf">]]><a href="../hello.pdf">../hello.pdf</a><![CDATA[</a>]]></source>
       
       <section>
-        <title>Emulating the behaviour of pre 0.7 versions of Forrest</title>
+        <title>Serving (X)HTML content without Skinning</title>
         
-        <p>Prior to 0.7 version, the raw un-processed content was stored in
+        <p>In versions prior to 0.7 raw un-processed content was stored in
         the "<code>content/</code>" directory. In 0.7 onwards, raw
         un-processed data is stored alongside the xdocs. In addition
-        with 0.6 and earlier, HTML files could be stored in the xdocs 
+        in 0.6 and earlier HTML files could be stored in the xdocs 
         directory and they would be served without further processing.
         As described above, this is not the case in 0.7 where HTML files
         are, by default, skinned by Forrest.</p>
         
         <p>If you 
         you wish to emulate the behaviour of 0.6 and earlier then you
-        must add the following to your project sitemap.</p>
+        must add the following to your projects sitemap.</p>
         
         <source>
 &lt;map:match pattern="**.html"&gt;
@@ -186,28 +186,26 @@
 &lt;/map:match&gt;
         </source>
         
-        <p>This allows us to create links to un-processed skinned files stored
-        in the <code>{project:content}</code> directory. For example:  
-        <a href="/test1.html">href="/test1.html"</a> and 
-        <a href="/test2.html">href="/test2.html"</a>.</p>
-        
-        <p>We can also create links to un-processed skinned files stored
-        in the <code>{project:content.xdocs}</code> directory. For example:  
-        <a href="test3.html">href="test3.html"</a> and 
-        <a href="subdir/test4.html">subdir/test4.html</a>.</p>
-        
+        <p>The above allows us to create links to un-processed skinned files stored
+        in the <code>{project:content}</code> or <code>{project:content.xdocs}</code> 
+        directory. For example:  
+        &lt;a href="/test1.html"&gt;HTML content&lt;/a&gt;. However, it will
+        break the 0.7 behaviour of skinning HTML content. For this reason the old
+        ".ehtml" extension can be used to embed HTML content in a Forrest skinned
+        site </p>
+                
         <p>Note that you can change the matchers above to selectively serve some
         content as raw un-processed content, whilst still serving other content
         as skinned documents. For example, the following snippet would allow
         you to serve the content of an old, deprecated site without processing
-        from Forrest, whilst still allowing all other content to be processed 
+        from Forrest whilst still allowing all other content to be processed 
         by Forrest in the normal way:</p>
         
         <source>
 &lt;map:match pattern="old_site/**.html"&gt;
  &lt;map:select type="exists"&gt;
-  &lt;map:when test="{project:content}{0}"&gt;
-    &lt;map:read src="{project:content}/{0}" mime-type="text/html"/&gt;
+  &lt;map:when test="{project:content}{1}.html"&gt;
+    &lt;map:read src="{project:content}/{1}.html" mime-type="text/html"/&gt;
     &lt;!--
       Use this instead if you want JTidy to clean up your HTML
       &lt;map:generate type="html" src="{project:content}/{0}" /&gt;
@@ -216,6 +214,8 @@
   &lt;/map:when&gt;
 &lt;/map:match&gt;
         </source>
+        
+        <p>For example, <a href="/old_site/test1.html">HTML content</a>.</p>
       </section>
     </section>