Author: crossley
Date: Wed Feb 27 23:14:02 2008
New Revision: 631876
URL: http://svn.apache.org/viewvc?rev=631876&view=rev
Log:
Clean up the FAQs about non-skinned html sources. It was too confusing.
Added:
forrest/trunk/main/fresh-site/src/documentation/content/old_site/
forrest/trunk/main/fresh-site/src/documentation/content/old_site/test1.html
- copied unchanged from r631861,
forrest/trunk/main/fresh-site/src/documentation/content/test1.html
Removed:
forrest/trunk/main/fresh-site/src/documentation/content/test1.html
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/linking.xml
forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
Modified:
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/linking.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/linking.xml?rev=631876&r1=631875&r2=631876&view=diff
==============================================================================
---
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/linking.xml
(original)
+++
forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/linking.xml
Wed Feb 27 23:14:02 2008
@@ -218,18 +218,21 @@
processed by Forrest in the normal way:
</p>
<source>
-<map:match pattern="old_site/**.html">
- <map:select type="exists">
- <map:when test="{properties:content}{1}.html">
- <map:read src="{properties:content}/{1}.html" mime-type="text/html"/>
- <!--
- Use this instead if you want JTidy to clean up your HTML
- <map:generate type="html" src="{properties:content}/{0}" />
- <map:serialize type="html"/>
- -->
- </map:when>
-</map:match>
- </source>
+<![CDATA[
+ <map:match pattern="old_site/**.html">
+ <map:select type="exists">
+ <map:when test="{properties:content}{0}">
+ <map:read src="{properties:content}{0}" mime-type="text/html"/>
+<!--
+ If you want JTidy to clean up your HTML source, then use a
+ generator/serializer instead of the reader.
+ <map:generate type="html" src="{properties:content}{0}" />
+ <map:serialize type="html"/>
+ -->
+ </map:when>
+ </map:select>
+ </map:match>
+ ]]></source>
<p>
For example: <a href="../old_site/test1.html">HTML content</a>.
</p>
Modified: forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap?rev=631876&r1=631875&r2=631876&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap (original)
+++ forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap Wed Feb 27
23:14:02 2008
@@ -44,15 +44,16 @@
</map:resources>
<map:pipelines>
<map:pipeline>
- <map:match pattern="old_site/*.html">
+ <map:match pattern="old_site/**.html">
<map:select type="exists">
- <map:when test="{properties:content}{1}.html">
- <map:read src="{properties:content}{1}.html"
mime-type="text/html"/>
+ <map:when test="{properties:content}{0}">
+ <map:read src="{properties:content}{0}" mime-type="text/html"/>
<!--
- Use this instead if you want JTidy to clean up your HTML
- <map:generate type="html" src="{properties:content}/{0}" />
- <map:serialize type="html"/>
- -->
+ If you want JTidy to clean up your HTML source, then use a
+ generator/serializer instead of the reader.
+ <map:generate type="html" src="{properties:content}{0}" />
+ <map:serialize type="html"/>
+ -->
</map:when>
</map:select>
</map:match>
Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml?rev=631876&r1=631875&r2=631876&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml Wed Feb 27
23:14:02 2008
@@ -728,23 +728,25 @@
<answer>
<p>
To serve, for example a legacy HTML site, add something like the
- following to your project's sitemap and place the source content at
- the <code>src/documentation/content/xdocs/old_site/</code> directory.
+ following to your project's sitemap and place the source content in a
+ <code>src/documentation/content/old_site/</code> directory.
</p>
<source>
-<map:match pattern="old_site/**.html">
- <map:select type="exists">
- <map:when test="{properties:content}{0}">
- <map:read src="{properties:content}/{0}" mime-type="text/html"/>
- <!--
- Use this instead if you want JTidy to clean up your HTML
- <map:generate type="html" src="{properties:content}/{0}" />
- <map:serialize type="html"/>
- -->
- </map:when>
- </map:select>
-</map:match>
- </source>
+<![CDATA[
+ <map:match pattern="old_site/**.html">
+ <map:select type="exists">
+ <map:when test="{properties:content}{0}">
+ <map:read src="{properties:content}{0}" mime-type="text/html"/>
+<!--
+ If you want JTidy to clean up your HTML source, then use a
+ generator/serializer instead of the reader.
+ <map:generate type="html" src="{properties:content}{0}" />
+ <map:serialize type="html"/>
+ -->
+ </map:when>
+ </map:select>
+ </map:match>
+ ]]></source>
<p>
Exactly what the match should be is dependant on your content
structure. It is outside the scope of this FAQ to provide full
@@ -759,8 +761,8 @@
<li>mkdir seed</li>
<li>cd seed</li>
<li>forrest seed-sample</li>
- <li>forrest</li>
-
<li><code>http://localhost:8888/samples/linking.html#no-decoration</code></li>
+ <li>forrest run</li>
+
<li><code>http://localhost:8888/samples-b/linking.html#no-decoration</code></li>
</ol>
</answer>
</faq>
