You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2006/08/25 07:04:10 UTC

svn commit: r436661 - in /forrest/trunk: main/java/org/apache/forrest/sourceexists/ main/webapp/ main/webapp/skins/coat/xslt/html/ main/webapp/skins/common/xslt/html/ main/webapp/skins/leather-dev/xslt/html/ main/webapp/skins/leather-dev/xslt/xml/ main...

Author: crossley
Date: Thu Aug 24 22:04:08 2006
New Revision: 436661

URL: http://svn.apache.org/viewvc?rev=436661&view=rev
Log:
Update filenames in text for the new *-to-*.xsl naming convention.
Issue: FOR-922

Modified:
    forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java
    forrest/trunk/main/webapp/faq.xmap
    forrest/trunk/main/webapp/search.xmap
    forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/common/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/common/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/common/xslt/html/tabutils.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt
    forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
    forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/src/documentation/content/xdocs/index.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/project_sitemap.xmap.html
    forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/samples/xhtml2_subset.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/java/org/apache/forrest/acting/RecursiveDirectoryTraversalAction.java

Modified: forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java Thu Aug 24 22:04:08 2006
@@ -53,7 +53,7 @@
  *       </map:when>
  *       <map:otherwise>
  *         <map:generate src="content/xdocs/{1}.xml" />
- *         <map:transform src="stylesheets/document2fo.xsl" />
+ *         <map:transform src="stylesheets/document-to-fo.xsl" />
  *       </map:otherwise>
  *    </map:select>
  *    <map:serialize type="fo2pdf" />

Modified: forrest/trunk/main/webapp/faq.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/faq.xmap?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/faq.xmap (original)
+++ forrest/trunk/main/webapp/faq.xmap Thu Aug 24 22:04:08 2006
@@ -139,7 +139,7 @@
       <!-- ============================================================ -->
 
       <!-- Special matcher for FAQ PDFs, so we can pass an extra
-      'numbersections' param into document2fo.xsl -->
+      'numbersections' param into document-to-fo.xsl -->
       <map:match pattern="**.fo">
         <map:aggregate element="site">
           <map:part src="cocoon://skinconf.xml"/>

Modified: forrest/trunk/main/webapp/search.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/search.xmap?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/search.xmap (original)
+++ forrest/trunk/main/webapp/search.xmap Thu Aug 24 22:04:08 2006
@@ -34,7 +34,7 @@
                http://localhost/**.html (use the search box after setting
                <search provider="lucene"/> in skinconf.xml)
 Uses        :  content/xdocs/**.xml, context/xdocs/**.ehtml,
-               resources/stylesheets/*2lucene*.xsl
+               resources/stylesheets/*-to-*lucene*.xsl
 
 $Revision$
 ==================================================== -->
@@ -85,7 +85,7 @@
       <map:match pattern="lucene-search.xml">
         <map:generate type="search">
           <!-- Important: This value must match that of the
-          "directory" parameter passed to book2include-lucene.xsl (see
+          "directory" parameter passed to book-to-cinclude-lucene.xsl (see
           below) -->
           <map:parameter name="index" value="lucene-index"/>
           <map:parameter name="query-string" value="queryString"/>

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu.  See the imported book2menu.xsl for
+book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 details.
 -->
 

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -17,7 +17,7 @@
 -->
 <!--
 This stylesheet contains templates for converting documentv11 to HTML.  See the
-imported document2html.xsl for details.
+imported document-to-html.xsl for details.
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -35,7 +35,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu. It outputs XML/HTML of the form:
+book-to-menu.xsl generates the HTML menu. It outputs XML/HTML of the form:
   <div class="menu">
      ...
   </div>
-which is then merged with other HTML by site2xhtml.xsl
+which is then merged with other HTML by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -23,8 +23,8 @@
    ...
   </div>
 
-..which site2xhtml.xsl then combines with HTML from the index (book2menu.xsl)
-and tabs (tab2menu.xsl) to generate the final HTML.
+..which site-to-xhtml.xsl then combines with HTML from the index (book-to-menu.xsl)
+and tabs (tab-to-menu.xsl) to generate the final HTML.
 
 Section handling
   - <a name/> anchors are added if the id attribute is specified

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -34,7 +34,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/tabutils.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/html/tabutils.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/tabutils.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/tabutils.xsl Thu Aug 24 22:04:08 2006
@@ -18,7 +18,7 @@
 
 <!--
 Some callable templates useful when dealing with tab paths.  Mostly used in
-tab2menu.xsl
+tab-to-menu.xsl
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu.  See the imported book2menu.xsl for
+book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 details.
 -->
 

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -17,7 +17,7 @@
 -->
 <!--
 This stylesheet contains templates for converting documentv11 to HTML.  See the
-imported document2html.xsl for details.
+imported document-to-html.xsl for details.
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -35,7 +35,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/contract.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xml.xsl is the final stage in XML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xml.xsl is the final stage in XML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <elements>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
 -->
 the pipeline to include the fct-bits into the outcome should be like this:
 
-skinconf.xml + site2xml.xsl = container.xsl
+skinconf.xml + site-to-xml.xsl = container.xsl
 ft.xml + container.xsl = XHTML output
 
-the site2xml has to include the fct-bits into the container.
+the site-to-xml has to include the fct-bits into the container.

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xml.xsl is the final stage in XML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xml.xsl is the final stage in XML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <elements>

Modified: forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl (original)
+++ forrest/trunk/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xml.xsl is the final stage in XML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xml.xsl is the final stage in XML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <elements>

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu.  See the imported book2menu.xsl for
+book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 details.
 -->
 

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -17,7 +17,7 @@
 -->
 <!--
 This stylesheet contains templates for converting documentv11 to HTML.  See the
-imported document2html.xsl for details.
+imported document-to-html.xsl for details.
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -35,7 +35,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <!--
-See the imported book2menu.xsl for details.
+See the imported book-to-menu.xsl for details.
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:import href="../../../common/xslt/html/book-to-menu.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

Modified: forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -23,8 +23,8 @@
    ...
   </div>
 
-..which site2xhtml.xsl then combines with HTML from the index (book2menu.xsl)
-and tabs (tab2menu.xsl) to generate the final HTML.
+..which site-to-xhtml.xsl then combines with HTML from the index (book-to-menu.xsl)
+and tabs (tab-to-menu.xsl) to generate the final HTML.
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu.  See the imported book2menu.xsl for
+book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 details.
 -->
 

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -17,7 +17,7 @@
 -->
 <!--
 This stylesheet contains templates for converting documentv11 to HTML.  See the
-imported document2html.xsl for details.
+imported document-to-html.xsl for details.
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -35,7 +35,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 <!--
-book2menu.xsl generates the HTML menu.  See the imported book2menu.xsl for
+book-to-menu.xsl generates the HTML menu.  See the imported book-to-menu.xsl for
 details.
 
 -->

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/document-to-html.xsl Thu Aug 24 22:04:08 2006
@@ -23,8 +23,8 @@
    ...
   </div>
 
-..which site2xhtml.xsl then combines with HTML from the index (book2menu.xsl)
-and tabs (tab2menu.xsl) to generate the final HTML.
+..which site-to-xhtml.xsl then combines with HTML from the index (book-to-menu.xsl)
+and tabs (tab-to-menu.xsl) to generate the final HTML.
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -43,7 +43,7 @@
         <td class="tasknav" >
           <div align="left">
            <!--
-                site2html.xsl will search for this as
+                site-to-html.xsl will search for this as
 
                    td[@class='tasknav']/div[@align='left']
 

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl Thu Aug 24 22:04:08 2006
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!--
-site2xhtml.xsl is the final stage in HTML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
+site-to-xhtml.xsl is the final stage in HTML page production.  It merges HTML from
+document-to-html.xsl, tab-to-menu.xsl and book-to-menu.xsl, and adds the site header,
 footer, searchbar, css etc.  As input, it takes XML of the form:
 
 <site>

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl (original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl Thu Aug 24 22:04:08 2006
@@ -34,7 +34,7 @@
       ...
     </div>
 
-which is then merged by site2xhtml.xsl
+which is then merged by site-to-xhtml.xsl
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/src/documentation/content/xdocs/index.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.excel/src/documentation/content/xdocs/index.xml Thu Aug 24 22:04:08 2006
@@ -50,7 +50,7 @@
       </p>
       <p>
         For implemenation details see
-        <code>resources/stylesheets/table2document.xsl</code>.
+        <code>resources/stylesheets/table-to-document.xsl</code>
       </p>
     </section>
     <section>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/faq.xml Thu Aug 24 22:04:08 2006
@@ -322,7 +322,7 @@
         author-element)?</question>
       <answer>
         <p>You would override <code>
-            $FORREST_HOME/main/webapp/skins/common/xslt/html/document2html.xsl</code> and edit the
+            $FORREST_HOME/main/webapp/skins/common/xslt/html/document-to-html.xsl</code> and edit the
           "headers/authors" template. </p>
       </answer>
     </faq>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml Thu Aug 24 22:04:08 2006
@@ -24,7 +24,7 @@
 
   <body>
 <p>
-I see that the revision2document.xsl adds a footer to suggest that the
+I see that the revision-to-document.xsl adds a footer to suggest that the
 author should be contacted to make revisions. This is not the opensource way.
 This would create a bottleneck at the author. Community feedback should be
 encouraged to go to the relevant listserver, and patches submitted via Bugzilla.

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/project_sitemap.xmap.html
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/project_sitemap.xmap.html?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/project_sitemap.xmap.html (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/project_sitemap.xmap.html Thu Aug 24 22:04:08 2006
@@ -31,7 +31,7 @@
   <map:pipeline>
    <map:match pattern="**custom.xml">
     <map:generate src="{project:content.xdocs}{1}custom.xml" />
-    <map:transform src="{project:resources.stylesheets}/hello2document.xsl" />
+    <map:transform src="{project:resources.stylesheets}/hello-to-document.xsl" />
     <map:serialize type="xml"/>
    </map:match>
   </map:pipeline>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/locationmap.xml Thu Aug 24 22:04:08 2006
@@ -84,7 +84,7 @@
       <p>For example, here is a locationmap entry based purely on filename:</p>
       
       <source><![CDATA[
-<map:transform src="{lm:xhtml2html.xsl}"/>
+<map:transform src="{lm:xhtml-to-html.xsl}"/>
       ]]></source>
 
       <p>and here is that same entry using a "name" style.  One implies 

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/sitemap-ref.xml Thu Aug 24 22:04:08 2006
@@ -231,7 +231,7 @@
           to document-v13:</p>
         <source><![CDATA[
           <map:when test="howto-v13">
-            <map:transform src="{forrest:forrest.stylesheets}/howto2document.xsl" />
+            <map:transform src="{forrest:forrest.stylesheets}/howto-to-document.xsl" />
           </map:when>
           ]]></source>
           <!--
@@ -327,7 +327,7 @@
 2     <map:generate src="cocoon:/{1}{2}.xml"/>
 3     <map:transform type="xinclude"/>
 4     <map:transform type="]]>&linkrewriter;<![CDATA[" src="cocoon://{1}linkmap-{2}.pdf"/>
-5     <map:transform src="skins/{forrest:forrest.skin}/xslt/fo/document2fo.xsl">
+5     <map:transform src="skins/{forrest:forrest.skin}/xslt/fo/document-to-fo.xsl">
 6       <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
 7       <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
 8     </map:transform>
@@ -342,7 +342,7 @@
               pipeline</link>, with the URL <code>cocoon:/{1}{2}.xml</code></li>
           <li>We then expand any XInclude statements..</li>
           <li>and <link href="#linkrewriting_impl">rewrite links</link>..</li>
-          <li>and finally apply the document2fo.xsl stylesheet, to generate
+          <li>and finally apply the document-to-fo.xsl stylesheet, to generate
             XSL:FO XML.</li>
         </ol>
         <p>Lastly, we generate a PDF using the fo2pdf serializer.</p>
@@ -371,7 +371,7 @@
           aggregating <link href="body-index.html">body-index.html</link> and
           <link href="menu-index.html">menu-index.html</link> and 
           <link href="tab-index.html">tab-index.html</link> and then applying the
-          <code>site2xhtml.xsl</code> stylesheet to the result.
+          <code>site-to-xhtml.xsl</code> stylesheet to the result.
         </p>
         <p>
           There is a nearly identical matcher for HTML files in subdirectories:
@@ -435,7 +435,7 @@
               &lt;title&gt;How to boil eggs&lt;/title&gt;
               ...
             </source>
-            <p>Later, the <code>document2html.xsl</code> stylesheet will create
+            <p>Later, the <code>document-to-html.xsl</code> stylesheet will create
               an &lt;a name> element for every section, allowing this section to
               be referred to as <code>index.html#How+to+boil+eggs</code>.</p>
           </li>
@@ -461,7 +461,7 @@
       ]]></source>
         <p>We get XML from a "book" pipeline, 
         <link href="#linkrewriting_impl">rewrite links</link>, and apply the
-          <code>book2menu.xsl</code> stylesheet to generate HTML.</p>
+          <code>book-to-menu.xsl</code> stylesheet to generate HTML.</p>
         <p>How the menu XML is actually generated (the *book-*.html pipeline) is
           sufficiently complex to require a 
           <link href="#menu_generation_impl">section of its own</link>.</p>
@@ -480,10 +480,10 @@
        </map:call>
      </map:match>
            ]]></source>
-        <p>All the smarts are in the <code>tab2menu.xsl</code> stylesheet, which
+        <p>All the smarts are in the <code>tab-to-menu.xsl</code> stylesheet, which
           needs to choose the correct tab based on the current path.  Currently,
           a "longest matching path" algorithm is implemented.  See the
-          <code>tab2menu.xsl</code> stylesheet for details.</p>
+          <code>tab-to-menu.xsl</code> stylesheet for details.</p>
       </section>
     </section>
 
@@ -529,8 +529,8 @@
                 reveal this complexity:
               </p>
               <source><![CDATA[
-<map:transform src="resources/stylesheets/site2site-normalizetabs.xsl" />
-<map:transform src="resources/stylesheets/site2site-selectnode.xsl">
+<map:transform src="resources/stylesheets/site-to-site-normalizetabs.xsl" />
+<map:transform src="resources/stylesheets/site-to-site-selectnode.xsl">
   <map:parameter name="path" value="{1}{2}"/>
 </map:transform>
                 ]]></source>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/your-project.xml Thu Aug 24 22:04:08 2006
@@ -768,7 +768,7 @@
         <p>
           To handle these special tags, one would write a stylesheet to convert
           them to the intermediate Forrest xdocs structure. Here is such a stylesheet,
-          called "<code>download2document.xsl</code>" ...
+          called "<code>download-to-document.xsl</code>" ...
         </p>
         <source><![CDATA[<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet
@@ -829,7 +829,7 @@
   <strong><![CDATA[
    <map:match pattern="**download.xml">
     <map:generate src="{properties:content.xdocs}{1}download.xml" />
-    <map:transform src="{properties:resources.stylesheets}/download2document.xsl" />
+    <map:transform src="{properties:resources.stylesheets}/download-to-document.xsl" />
     <map:serialize type="xml"/>
    </map:match>
 ]]></strong><![CDATA[
@@ -924,11 +924,11 @@
       <map:parameter name="parameter-selector-test" value="{sourcetype}" />
       <map:when test="download-v1.0">
        <map:transform
-          src="{properties:resources.stylesheets}/download2document.xsl" />
+          src="{properties:resources.stylesheets}/download-to-document.xsl" />
       </map:when>
       <map:when test="download-v1.1">
        <map:transform
-          src="{properties:resources.stylesheets}/download-v11-2document.xsl" />
+          src="{properties:resources.stylesheets}/downloadv11-to-document.xsl" />
       </map:when>
      </map:select>
     </map:act>
@@ -966,7 +966,7 @@
   <strong><![CDATA[
    <map:match pattern="**weblog.xml">
     <map:generate src="http://blogs.cocoondev.org/stevenn/index.rss"/>
-    <map:transform src="{forrest:forrest.stylesheets}/rss2document.xsl"/>
+    <map:transform src="{forrest:forrest.stylesheets}/rss-to-document.xsl"/>
     <map:serialize type="xml"/>
    </map:match>
 ]]></strong><![CDATA[
@@ -978,9 +978,9 @@
 </map:sitemap>
 ]]></source>
             <p>You will probably want to copy the core Forrest 
-              <code>rss2document.xsl</code> to your project,
+              <code>rss-to-document.xsl</code> to your project,
               customise it to your needs, and refer to it with
-              <code>src="{properties:resources.stylesheets}/rss2document.xsl"</code>.
+              <code>src="{properties:resources.stylesheets}/rss-to-document.xsl"</code>.
               Then of course you would add an entry to site.xml to link
               to weblog.html
             </p>
@@ -1041,12 +1041,12 @@
             The two most interesting XSLT stylesheets involved are:
           </p>
           <dl>
-            <dt><code>xslt/html/document2html.xsl</code></dt>
+            <dt><code>xslt/html/document-to-html.xsl</code></dt>
             <dd>
               This stylesheet is applied to individual Forrest xdocs XML files, and
               converts them to HTML suitable for embedding in a larger HTML page.
             </dd>
-            <dt><code>xslt/html/site2xhtml.xsl</code></dt>
+            <dt><code>xslt/html/site-to-xhtml.xsl</code></dt>
             <dd>
               This stylesheet generates the final HTML file from an intermediate
               'site' structure produced by the other stylesheets. It defines the general
@@ -1061,7 +1061,7 @@
           <source><![CDATA[
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <xsl:import href="../../../common/xslt/html/document2html.xsl"/>
+  <xsl:import href="../../../common/xslt/html/document-to-html.xsl"/>
 
   ]]><strong>... overrides of default templates ...</strong><![CDATA[ 
 </xsl:stylesheet>]]></source>
@@ -1077,7 +1077,7 @@
           as this section recomends you will also need to copy the common skin
           since all existing skins import the common skin.</note>
           
-          <p>This is particularly relevant for menu rendering (book2menu.xsl),
+          <p>This is particularly relevant for menu rendering (book-to-menu.xsl),
             where the common stylesheet does the 'logic' of which item is
             selected, and over-riding stylesheets define the presentation.</p>
         </section>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/samples/xhtml2_subset.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/samples/xhtml2_subset.xml?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/samples/xhtml2_subset.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/documentation/content/xdocs/samples/xhtml2_subset.xml Thu Aug 24 22:04:08 2006
@@ -58,7 +58,7 @@
 <p>By working on the i18n integration for "pelt" we again encountered the reasons 
 for using views. ;-) The maintenance problem was to change the captions of the 
 skin features (contracts) to enable support for i18n. The case is that the 
-site2xhtml.xsl has a lot of repeating code.</p>
+site-to-xhtml.xsl has a lot of repeating code.</p>
 </blockquote>
 </section>
 <separator />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/java/org/apache/forrest/acting/RecursiveDirectoryTraversalAction.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/java/org/apache/forrest/acting/RecursiveDirectoryTraversalAction.java?rev=436661&r1=436660&r2=436661&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/java/org/apache/forrest/acting/RecursiveDirectoryTraversalAction.java (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.xhtml2/src/java/org/apache/forrest/acting/RecursiveDirectoryTraversalAction.java Thu Aug 24 22:04:08 2006
@@ -55,7 +55,7 @@
  *        &lt;/map:when&gt;
  *        &lt;map:otherwise&gt;
  *          &lt;map:generate src=&quot;content/xdocs/{1}.xml&quot; /&gt;
- *          &lt;map:transform src=&quot;stylesheets/document2fo.xsl&quot; /&gt;
+ *          &lt;map:transform src=&quot;stylesheets/document-to-fo.xsl&quot; /&gt;
  *        &lt;/map:otherwise&gt;
  *     &lt;/map:select&gt;
  *     &lt;map:serialize type=&quot;fo2pdf&quot; /&gt;