Return-Path: Delivered-To: apmail-cocoon-docs-archive@www.apache.org Received: (qmail 18567 invoked from network); 4 Oct 2004 22:20:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Oct 2004 22:20:20 -0000 Received: (qmail 82023 invoked by uid 500); 4 Oct 2004 22:20:20 -0000 Delivered-To: apmail-cocoon-docs-archive@cocoon.apache.org Received: (qmail 81926 invoked by uid 500); 4 Oct 2004 22:20:18 -0000 Mailing-List: contact docs-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: docs@cocoon.apache.org Delivered-To: mailing list docs@cocoon.apache.org Received: (qmail 81914 invoked by uid 99); 4 Oct 2004 22:20:18 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 04 Oct 2004 15:20:17 -0700 Received: (qmail 18527 invoked from network); 4 Oct 2004 22:20:15 -0000 Received: from localhost.hyperreal.org (HELO minotaur.apache.org) (127.0.0.1) by localhost.hyperreal.org with SMTP; 4 Oct 2004 22:20:15 -0000 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: docs@cocoon.apache.org To: docs@cocoon.apache.org Subject: =?iso-8859-1?q?=5BCocoon_Wiki=5D_Updated=3A__MergingBranches?= Date: Mon, 04 Oct 2004 22:20:15 -0000 Message-ID: <20041004222015.18483.96938@minotaur.apache.org> X-Spam-Rating: localhost.hyperreal.org 1.6.2 0/1000/N X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Date: 2004-10-04T15:20:14 Editor: VadimGritsenko 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.j= ava @@ -291,6 +282,7 @@ * axis * batik * bsf (Groovy support is not merged as it requires JDK 1.4) + * chaperon * cron * databases * Deli