You are viewing a plain text version of this content. The canonical link for it is here.
Posted to docs@cocoon.apache.org by do...@cocoon.apache.org on 2004/10/05 00:20:15 UTC

[Cocoon Wiki] Updated: MergingBranches

   Date: 2004-10-04T15:20:14
   Editor: VadimGritsenko <vg...@apache.org>
   Wiki: Cocoon Wiki
   Page: MergingBranches
   URL: http://wiki.apache.org/cocoon/MergingBranches

   no comment

Change Log:

------------------------------------------------------------------------------
@@ -99,15 +99,6 @@
    blocks.properties
    status.xml
 Blocks:
- * Chaperon
-   {{{
-   src/blocks/chaperon/samples/wiki/selftest.txt
-   src/blocks/chaperon/samples/grammars/wiki.grm
-   src/blocks/chaperon/samples/grammars/link.xlex
-   src/blocks/chaperon/samples/stylesheets/pattern2link.xsl
-   src/blocks/chaperon/samples/stylesheets/error2html.xsl
-   src/blocks/chaperon/samples/stylesheets/wiki2xdoc.xsl
-   }}}
  * html
    {{{
    src/blocks/html/java/org/apache/cocoon/transformation/HTMLTransformer.java
@@ -291,6 +282,7 @@
  * axis
  * batik
  * bsf (Groovy support is not merged as it requires JDK 1.4)
+ * chaperon
  * cron
  * databases
  * Deli