You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/05/25 20:02:52 UTC

svn commit: rev 20437 - in avalon/trunk/central/site: . src/xdocs/products/runtime/about src/xdocs/products/runtime/embedded src/xdocs/products/runtime/installation src/xdocs/products/runtime/platform src/xdocs/products/runtime/reference/containment/directives/categories src/xdocs/products/runtime/reference/containment/directives/classloader src/xdocs/products/runtime/reference/containment/directives/classloader/classpath src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository src/xdocs/products/runtime/reference/containment/directives/components src/xdocs/products/runtime/reference/containment/directives/components/categories src/xdocs/products/runtime/reference/containment/directives/components/context src/xdocs/products/runtime/reference/containment/directives/components/context/entry src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor src/xdocs/products/runtime/reference/containment/directives/components/dependencies src/xdocs/products/runtime/reference/containment/directives/components/parameters src/xdocs/products/runtime/reference/containment/directives/include src/xdocs/products/runtime/reference/containment/directives/services src/xdocs/products/runtime/reference/containment/overrides src/xdocs/products/runtime/reference/containment/overrides/target src/xdocs/products/runtime/reference/containment/overrides/target/categories src/xdocs/products/runtime/reference/system src/xdocs/products/runtime/reference/system/kernel src/xdocs/products/runtime/reference/system/kernel/repository src/xdocs/products/runtime/reference/system/kernel/security src/xdocs/products/runtime/reference/system/kernel/security/profile src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission src/xdocs/products/runtime/system src/xdocs/products/runtime/system/af4/cop src/xdocs/products/runtime/system/af4/principals src/xdocs/products/runtime/system/meta/info src/xdocs/products/runtime/tutorials src/xdocs/products/runtime/tutorials/advanced src/xdocs/products/runtime/tutorials/advanced/lifecycle src/xdocs/products/runtime/tutorials/advanced/unit src/xdocs/products/runtime/tutorials/basic src/xdocs/products/runtime/tutorials/basic/config src/xdocs/products/runtime/tutorials/basic/context src/xdocs/products/runtime/tutorials/basic/dependencies

Author: mcconnell
Date: Tue May 25 11:02:52 2004
New Revision: 20437

Modified:
   avalon/trunk/central/site/build.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/about/benefits.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/about/features.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/about/purpose.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/embedded/cli.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/cvs.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.0.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.2.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.3.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/platform/navigation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/category.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/exclude.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/include.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/resource.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/extensions.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/category.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/configuration.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/param.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/import.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/dependency.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/parameter.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/resource.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/source.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/service.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/category.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/config.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/security.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/cache.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/hosts.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/proxy.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/action.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/properties.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-cop-in-avalon.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-avalon.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc-security.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soc.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soii.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xmlx
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/containment.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/lifecycle.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/meta/info/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/appliance.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/block.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/composite.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/context.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/export.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/import.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/example.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/extension.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/interfaces.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/profiles.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/security.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/selection.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/example.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/block.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/configurable.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/defaults.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/override.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/casting.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/entries.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/standard.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/creation.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/auto.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/manual.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/execution.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/index.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/internal.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/services.xml
   avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/index.xml
Log:
Correct xdoc product attribute declarations.

Modified: avalon/trunk/central/site/build.xml
==============================================================================
--- avalon/trunk/central/site/build.xml	(original)
+++ avalon/trunk/central/site/build.xml	Tue May 25 11:02:52 2004
@@ -4,6 +4,7 @@
 
   <x:project index="../system/index.xml"/>
   <x:prepare/>
-  <x:xdoc/>
+  <!--<x:xdoc theme="modern"/>-->
+  <x:xdoc theme="avalon2"/>
 
 </project>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/benefits.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/about/benefits.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/about/benefits.xml	Tue May 25 11:02:52 2004
@@ -18,13 +18,11 @@
 -->
 
 <document>
-
-  <header>
-    <title>Avalon Assembly - Why?</title>
-    <authors>
-      <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
+
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/features.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/about/features.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/about/features.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Kernel</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Features and Benefits">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/purpose.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/about/purpose.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/about/purpose.xml	Tue May 25 11:02:52 2004
@@ -20,12 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Kernel</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/cli.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/cli.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/cli.xml	Tue May 25 11:02:52 2004
@@ -20,12 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Merlin CLI</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Merlin CLI (Command Line Interface)">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/installation/cvs.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/cvs.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/cvs.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-    <header>
-        <title>Installation - Merlin CVS</title>
-        <authors>
-            <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-        </authors>
-    </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
     <body>
         <section name="Building Merlin from CVS">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Installation Procedures</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Installation Procedures">
         <table>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.0.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.0.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.0.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-    <header>
-        <title>Installation</title>
-        <authors>
-            <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-        </authors>
-    </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
     <body>
         <section name="Installation">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.2.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.2.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.2.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Installation - Merlin 3.2</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Installation - Merlin 3.2">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.3.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.3.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/installation/install.3.3.xml	Tue May 25 11:02:52 2004
@@ -17,13 +17,13 @@
  limitations under the License.
 -->
 
-<document>
-  <header>
-    <title>Installation - Merlin 3.3.0</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+<document>
+
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Installation - Merlin 3.3">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/platform/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/platform/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/platform/navigation.xml	Tue May 25 11:02:52 2004
@@ -23,7 +23,6 @@
 
   <body>
     <menu>
-      <item name="Introduction" href="index.html" />
       <item name="NT Service" href="nt.html"/>
     </menu>
  </body>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Merlin NT</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Merlin NT Service">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/category.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/category.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/category.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Category Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Category Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/categories/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Categories Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Categories Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/exclude.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/exclude.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/exclude.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Exclude Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-      <person name="Timothy Bennett" email="tbennett@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/include.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/include.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/include.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Include Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-      <person name="Timothy Bennett" email="tbennett@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/fileset/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Fileset Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-      <person name="Timothy Bennett" email="tbennett@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,12 @@
 -->
 
 <document>
-  <header>
-    <title>Classpath Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
    <section name="Classpath Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Repository Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/resource.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/resource.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/classpath/repository/resource.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Include Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Resource Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/extensions.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/extensions.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/extensions.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Library Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/classloader/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Classloader</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/category.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/category.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/category.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Category Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Category Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/categories/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Categories Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Categories Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/configuration.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/configuration.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/configuration.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Configuration Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Configuration Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Entry Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Constructor Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/param.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/param.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/constructor/param.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Parameter Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Param Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/import.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/import.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/import.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Import Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Import Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/entry/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Entry Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Entry Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/context/index.xml	Tue May 25 11:02:52 2004
@@ -20,13 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Context Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Context Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/dependency.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/dependency.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/dependency.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Dependency Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
     <section name="Dependency Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/dependencies/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Dependencies Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Dependencies Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Container Managed Component Declaration</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Parameters Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Parameters Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/parameter.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/parameter.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/components/parameters/parameter.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Parameters Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Parameters Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Include Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Include Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/resource.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/resource.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/resource.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Include Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Resource Include Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/source.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/source.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/include/source.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Source Include Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
     <section name="Source Include Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Block Service Export</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
     <section name="Block Service Export">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/service.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/service.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/directives/services/service.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Block Service Export</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Targets Override Directives</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Targets Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/category.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/category.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/category.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Category Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Category Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/categories/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Categories Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Categories Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/config.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/config.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/config.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Configuration Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Configuration Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/index.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Target Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Target Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/security.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/security.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/overrides/target/security.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Security Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Security Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Kernel Reference</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Kernel">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/cache.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/cache.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/cache.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Repository Proxy</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Cache">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/hosts.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/hosts.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/hosts.xml	Tue May 25 11:02:52 2004
@@ -20,13 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Repository Hosts</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Hosts">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Kernel Logging Categories</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Repository">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/proxy.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/proxy.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/repository/proxy.xml	Tue May 25 11:02:52 2004
@@ -20,13 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Repository Proxy</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Proxy">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Security Element</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Security Element">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Security Element</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Security Profile Element">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Security Profile Permissions Element</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Security Profile Permissions Element">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/action.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/action.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/action.xml	Tue May 25 11:02:52 2004
@@ -19,14 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Action Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-      <person name="Niclas Hedhman" email="niclas@hedhman.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Action Directive">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/kernel/security/profile/permissions/permission/index.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Permission Directive</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-      <person name="Niclas Hedhman" email="niclas@hedhman.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Permission Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/properties.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/properties.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/system/properties.xml	Tue May 25 11:02:52 2004
@@ -20,13 +20,11 @@
 
 <document>
 
-  <header>
-    <title>Merlin Properties</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Merlin Properties">
       <subsection name="Overview">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-cop-in-avalon.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-cop-in-avalon.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-cop-in-avalon.xml	Tue May 25 11:02:52 2004
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - COP in Avalon</title>
-    <authors>
-      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
-      <person name="Leo Simons" email="leosimons@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Components in Avalon">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-avalon.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-avalon.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-avalon.xml	Tue May 25 11:02:52 2004
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Patterns in Avalon</title>
-    <authors>
-      <person name="Avalon Documentation Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Getting Started with Patterns">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc-security.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc-security.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc-security.xml	Tue May 25 11:02:52 2004
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - Security Concerns</title>
-    <authors>
-      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-ioc.xml	Tue May 25 11:02:52 2004
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - Inversion of Control</title>
-    <authors>
-      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
-      <person name="Leo Simons" email="leosimons@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soc.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soc.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soc.xml	Tue May 25 11:02:52 2004
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - Multi Dimensional Separation of Concerns</title>
-    <authors>
-      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soii.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soii.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/guide-patterns-soii.xml	Tue May 25 11:02:52 2004
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - Separation of Interface and Implementation</title>
-    <authors>
-      <person name="Paul Hammant" email="Paul_Hammant@yahoo.com"/>
-      <person name="Peter Donald" email="peter at apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xml	Tue May 25 11:02:52 2004
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - What is COP?</title>
-    <version>1.0</version>
-    <authors>
-      <person name="Leo Simons" email="leosimons@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction"> 
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xmlx
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xmlx	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/cop/index.xmlx	Tue May 25 11:02:52 2004
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Guide - OOP best Practices</title>
-    <authors>
-      <person name="Leo Simons" email="leosimons@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/containment.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/containment.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/containment.xml	Tue May 25 11:02:52 2004
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Containment</title>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Containment">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/index.xml	Tue May 25 11:02:52 2004
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - Designing a Component</title>
-    <version>1.0</version>
-    <authors>
-      <person name="Berin Loritsch" email="bloritsch@apache.org"/>
-      <person name="Leo Simons" email="leosimons@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
       <section name="Designing a Component">
         <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/lifecycle.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/lifecycle.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/af4/principals/lifecycle.xml	Tue May 25 11:02:52 2004
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <document>
-  <header>
-    <title>Avalon Framework - The Component Lifecycle</title>
-    <authors>
-      <person id="BL" name="Berin Loritsch" email="bloritsch@apache.org"/>
-      <person id="PD" name="Peter Donald" email="peter at apache.org"/>
-      <person id="LS" name="Leo Simons" email="mail@leosimons.com"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Introduction">
       <p>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/meta/info/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/meta/info/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/meta/info/index.xml	Tue May 25 11:02:52 2004
@@ -2,13 +2,11 @@
 
 <document>
 
-  <header>
-    <title>Descriptors</title>
-    <authors>
-      <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
     <section name="Descriptors">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml	Tue May 25 11:02:52 2004
@@ -19,13 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Merlin Overview</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
-
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Object Model">
       <subsection name="UML">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/appliance.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/appliance.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/appliance.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Creating a Custom Appliance">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/block.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/block.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/block.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Creating a Custom Block">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/composite.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/composite.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/composite.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Composite Blocks">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/context.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/context.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/context.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Advanced Features">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/export.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/export.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/export.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Exporting Services">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/import.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/import.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/import.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Importing Blocks">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
         <table>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/example.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/example.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/example.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Lifecycle Tools</title>
-    <authors>
-      <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
   <section name="Lifecycle Tools Example">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/extension.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/extension.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/extension.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Lifecycle Tools</title>
-    <authors>
-      <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
   <section name="About lifecycle extensions">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Context</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Lifecycle Tools">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/interfaces.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/interfaces.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/lifecycle/interfaces.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Lifecycle Tools Interfaces</title>
-    <authors>
-      <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
 
   <section name="Lifecycle Tools">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/profiles.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/profiles.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/profiles.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Packaged Deployment Profiles">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/security.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/security.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/security.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 <document>
 
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Niclas Hedhman" email="niclas@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
 
   <body>
     <section name="Advanced Features">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/selection.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/selection.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/selection.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
 

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/example.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/example.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/example.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Unit Test Example">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/advanced/unit/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Advanced Features">
       <subsection name="Unit Tests">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/block.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/block.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/block.xml	Tue May 25 11:02:52 2004
@@ -19,12 +19,11 @@
 
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Declaring a Configuration in the Component Directive">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/configurable.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/configurable.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/configurable.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Adding Configuration Support to the Component">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/defaults.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/defaults.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/defaults.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Creating a Default Configuration">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Context</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Configuration Management">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/override.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/override.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/config/override.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Using Configuration Overrides">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/casting.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/casting.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/casting.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Contextualization</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Casting Context to a Custom Interface">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/entries.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/entries.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/entries.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Contextualization</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Custom Context Management">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Context</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Context Management">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/standard.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/standard.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/context/standard.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Contextualization</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Managing Context">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/creation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/creation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/creation.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Tutorial Overview">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/auto.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/auto.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/auto.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Service</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Managing Dependencies">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Dependencies</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Dependency Management">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/manual.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/manual.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/dependencies/manual.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Service</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Managing Dependencies - Manual Association">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/execution.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/execution.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/execution.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Runtime</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Building the Block">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
         <table>

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/internal.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/internal.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/internal.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Behind the Scenes -info">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/services.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/services.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/basic/services.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Using Merlin : Service</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Using Merlin">
       <subsection name="Publishing Services">

Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/tutorials/index.xml	Tue May 25 11:02:52 2004
@@ -18,12 +18,11 @@
 -->
 
 <document>
-  <header>
-    <title>Getting Started</title>
-    <authors>
-      <person name="Stephen McConnell" email="mcconnell@apache.org"/>
-    </authors>
-  </header>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Merlin Runtime</title>
+  </properties> 
+
   <body>
     <section name="Getting Started">
         <table>

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org