Date: 2004-08-16T01:28:50
Editor: CarstenZiegeler <[EMAIL PROTECTED]>
Wiki: Cocoon Wiki
Page: MergingBranches
URL: http://wiki.apache.org/cocoon/MergingBranches
no comment
Change Log:
------------------------------------------------------------------------------
@@ -214,49 +214,6 @@
{{{
src/confpatch/enable-instrumentation.xweb
}}}
- * src/documentation
- {{{
- src/documentation/xdocs/userdocs/offline/configuration.xml
- src/documentation/xdocs/userdocs/transformers/sourcewriting-transformer.xml
- src/documentation/xdocs/userdocs/forms/validation.xml
- src/documentation/xdocs/userdocs/forms/book.xml
- src/documentation/xdocs/userdocs/generators/linkstatus-generator.xml
- src/documentation/xdocs/userdocs/generators/directory-generator.xml
- src/documentation/xdocs/userdocs/generators/book.xml
- src/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml
- src/documentation/xdocs/userdocs/generators/calendar-generator.xml
- src/documentation/xdocs/userdocs/generators/xpathdirectory-generator.xml
- src/documentation/xdocs/userdocs/generators/file-generator.xml
- src/documentation/xdocs/userdocs/generators/jx-generator.xml
- src/documentation/xdocs/userdocs/generators/status-generator.xml
- src/documentation/xdocs/userdocs/generators/mp3directory-generator.xml
- src/documentation/xdocs/userdocs/generators/generators.xml
- src/documentation/xdocs/userdocs/generators/request-generator.xml
- src/documentation/xdocs/userdocs/generators/stream-generator.xml
- src/documentation/xdocs/userdocs/xsp/sendmail.xml
- src/documentation/xdocs/userdocs/concepts/modules-ref.xml
- src/documentation/xdocs/userdocs/concepts/xmlsearching.xml
- src/documentation/xdocs/book.xml
- src/documentation/xdocs/plan/release.xml
- src/documentation/xdocs/plan/roadmap.xml
- src/documentation/xdocs/plan/doc.xml
- src/documentation/xdocs/plan/todo-doc.xml
- src/documentation/xdocs/plan/book.xml
- src/documentation/xdocs/plan/updating.xml
- src/documentation/xdocs/plan/issues-doc.xml
- src/documentation/xdocs/howto/index.xml
- src/documentation/xdocs/howto/howto-bugzilla.xml
- src/documentation/xdocs/performancetips.xml
- src/documentation/xdocs/installing/requirements.xml
- src/documentation/xdocs/installing/updating.xml
- src/documentation/xdocs/index.xml
- src/documentation/xdocs/faq/faq-configure-environment.xml
- src/documentation/xdocs/faq/faq-xslt.xml
- src/documentation/xdocs/features.xml
- src/documentation/stylesheets/changes2document.xsl
- src/documentation/stylesheets/statuschanges2document.xsl
- src/documentation/stylesheets/site2xhtml.xsl
- }}}
* src/samples
{{{
src/samples/org/apache/cocoon/samples/parentcm/Generator.java
