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/06/15 17:49:15 UTC

svn commit: rev 21293 - in avalon/trunk/central/site/src: resources/images xdocs xdocs/central xdocs/central/about xdocs/central/about/resources xdocs/central/about/resources/svn xdocs/central/about/tutorials xdocs/central/about/tutorials/advanced xdocs/central/about/tutorials/advanced/lifecycle xdocs/central/about/tutorials/advanced/unit xdocs/central/about/tutorials/basic xdocs/central/about/tutorials/basic/config xdocs/central/about/tutorials/basic/context xdocs/central/about/tutorials/basic/dependencies xdocs/central/community xdocs/central/community/process xdocs/central/community/who xdocs/central/dpml xdocs/central/laboratory/studio

Author: mcconnell
Date: Tue Jun 15 08:49:15 2004
New Revision: 21293

Added:
   avalon/trunk/central/site/src/resources/images/tortoisesvn-setting.jpg   (contents, props changed)
   avalon/trunk/central/site/src/xdocs/central/about/license.xml
      - copied unchanged from rev 21170, avalon/trunk/central/site/src/xdocs/central/community/process/license.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/svn/
   avalon/trunk/central/site/src/xdocs/central/about/resources/svn/committing.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/svn/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/svn/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/svn/starting.xml
Removed:
   avalon/trunk/central/site/src/xdocs/central/about/resources/subversion.xml
   avalon/trunk/central/site/src/xdocs/central/community/process/license.xml
Modified:
   avalon/trunk/central/site/src/xdocs/central/about/download.xml
   avalon/trunk/central/site/src/xdocs/central/about/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/cvs.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/issues.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
   avalon/trunk/central/site/src/xdocs/central/about/resources/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/appliance.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/block.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/composite.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/context.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/export.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/import.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/example.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/extension.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/interfaces.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/security.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/example.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/block.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/configurable.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/defaults.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/override.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/casting.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/entries.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/standard.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/creation.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/auto.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/manual.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/execution.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/index.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/internal.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/services.xml
   avalon/trunk/central/site/src/xdocs/central/about/tutorials/index.xml
   avalon/trunk/central/site/src/xdocs/central/community/index.xml
   avalon/trunk/central/site/src/xdocs/central/community/process/index.xml
   avalon/trunk/central/site/src/xdocs/central/community/process/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/community/who/index.xml
   avalon/trunk/central/site/src/xdocs/central/dpml/index.xml
   avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml
   avalon/trunk/central/site/src/xdocs/central/navigation.xml
   avalon/trunk/central/site/src/xdocs/index.xml
Log:
updating headers, reshuffling content, added svn datails, updated jira details, added several index pages

Added: avalon/trunk/central/site/src/resources/images/tortoisesvn-setting.jpg
==============================================================================
Binary file. No diff available.

Modified: avalon/trunk/central/site/src/xdocs/central/about/download.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/download.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/download.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon: Products</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -23,7 +23,10 @@
 
  <body>
     <menu>
-      <item name="Downloads" href="download.cgi"/>
+      <item name="License" href="license.html"/>
+      <item name="Downloads" href="download.cgi"/>
+      <item name="Installation" href="installation/index.html"/>
+      <item name="Component Oriented" href="cop/index.html"/>
       <item name="Tutorials" href="tutorials/index.html"/>
       <item name="Resources" href="resources/index.html"/>
       <item name="News" href="news/index.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/cvs.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/cvs.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/cvs.xml	Tue Jun 15 08:49:15 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>CVS</title>
+    <title>Avalon Central</title>
   </properties> 
 
 

Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/index.xml	Tue Jun 15 08:49:15 2004
@@ -2,13 +2,41 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Developer's Resources</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
     <section name="Resources for Avalon Developers">
-      <p>
-      </p>
+      <subsection name="Index">
+        <table>
+          <tr><th>Topic</th><th>Description</th></tr>
+          <tr>
+            <td><a href="mailing-lists.html">Mailing List</a></td>
+            <td>
+              <p>
+      Details for subscribing to Avalon developer and user list and links
+      to list archives.
+              </p>
+            </td>
+          </tr>
+          <tr>
+            <td><a href="issues.html">JIRA Bug Tracking</a></td>
+            <td>
+              <p>
+      Convinience links to the main JIRA Projects in Avalon
+              </p>
+            </td>
+          </tr>
+          <tr>
+            <td><a href="subversion.html">Subversion</a></td>
+            <td>
+              <p>
+      Introduction to subversion - out code management solution.
+              </p>
+            </td>
+          </tr>
+        </table>
+      </subsection>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/issues.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/issues.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/issues.xml	Tue Jun 15 08:49:15 2004
@@ -2,32 +2,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon News</title>
+    <title>Avalon Central</title>
   </properties> 
  <body>
-   <section name="Submitting Patches">
-	    <p>Generate patches using <code>cvs diff -u</code>, or <code>diff -u</code>.
-	    Please create your patches relative to the root of the cvs module the patch
-	    should be applied to. Please compile changes to multiple files
-	    in a single patch file. Make sure the patch adheres to the coding standards,
-	    and includes appropriate javadoc.</p>
-	    
-	    <p>When you've built the patch, file a new bug report in JIRA (see below) if one
-	    does not exist yet, explain the reason behind the patch, how the patch fixes
-	    the issues, and add the patch as an attachment.</p>
-	    
-	    <p>If your patch is not getting applied or there is no response, start nagging
-	    the developers (politely, please :D) on the developers mailing list.</p>    
-	    
-            <subsection name="Documentation patches">
-	      <p>Please submit documentation patches against the XML sourcefiles used
-	      for generating the documentation, and not against the documentation
-	      itself.  Site documentation issues can be opened in the Avalon Framework's
-              Documentation module.</p>
-	    </subsection>
-   </section>
 
-   <section name="Avalon Issue Tracking">
+   <section name="Issue Tracking">
     <p>
     Avalon uses the <a href="http://issues.apache.org/jira">ASF JIRA</a>
     issue tracker to manage feature requests
@@ -36,77 +15,65 @@
     submit requests to the appropriate project module (when in doubt,
     send a message to the developers mailing list).
     </p>
-    <table>
+    <table>
+
      <tr>
        <th>Project</th>
        <th>Description</th>
-       <th>Reports</th>
-     </tr>
+     </tr>
+
      <tr>
-       <td><a href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10423">Avalon</a></td>
-       <td>Core Framework, Site docs, General Issues</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10423&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10423&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10423&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10423&amp;report=popular">Popular</a>
-       </td> 
-      </tr>
-      <tr> 
-       <td><a href="http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10420">Fortress</a></td>
-       <td>All Avalon Fortress container issues</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10420&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10420&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10420&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10420&amp;report=popular">Popular</a>
-       </td> 
-      </tr>
+       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10530">Avalon Central</a></td>
+       <td>Site docs, General Issues</td>
+      </tr>
+
       <tr>  
-       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10081">Phoenix</a></td>
-       <td>All Avalon Phoenix container issues</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10081&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10081&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10081&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10081&amp;report=popular">Popular</a>
-       </td> 
-      </tr> 
-      <tr> 
-       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10428">Excalibur</a></td>
-       <td>Issues in any of the Excalibur utilities, components, or documentation</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10428&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10428&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10428&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10428&amp;report=popular">Popular</a>
-       </td> 
-      </tr> 
-      <tr> 
-       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10414">Merlin</a></td>
-       <td>Core Merlin container issues</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10414&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10414&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10414&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10414&amp;report=popular">Popular</a>
-       </td> 
-      </tr> 
-      <tr> 
-       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10426">Avalon#</a></td>
-       <td>All Avalon# issues.</td>
-       <td>
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10426&amp;report=compversions">Open Issues</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10426&amp;report=roadmap">Road Map</a> |
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10426&amp;report=changelog">Change Log</a> | 
-         <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10426&amp;report=popular">Popular</a>
-       </td> 
-      </tr> 
+       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10532">Avalon Planet</a></td>
+       <td>Components and facilities.</td>
+      </tr> 
+
+      <tr>  
+       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10533">Avalon Tools</a></td>
+       <td>Avalon's build system and general developer tools.</td>
+      </tr> 
+
+      <tr>  
+       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10425">Merlin Runtime</a></td>
+       <td>Avalon Merlin RI Container.</td>
+      </tr>
+
+      <tr>  
+       <td><a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10531">Merlin Studio</a></td>
+       <td>Exclipse support tools for Merlin component development.</td>
+      </tr>
+
     </table>
     <p>
      A full list of the projects can be found at <a href="http://issues.apache.org/jira">http://issues.apache.org/jira</a>
      in the Avalon, Avalon Merlin, and Avalon Components categories.
-    </p>
+    </p>
+
+     <subsection name="Submitting Patches">
+	    <p>Generate patches using <code>cvs diff -u</code>, or <code>diff -u</code>.
+	    Please create your patches relative to the root of the cvs module the patch
+	    should be applied to. Please compile changes to multiple files
+	    in a single patch file. Make sure the patch adheres to the coding standards,
+	    and includes appropriate javadoc.</p>
+	    
+	    <p>When you've built the patch, file a new bug report in JIRA if one
+	    does not exist yet, explain the reason behind the patch, how the patch fixes
+	    the issues, and add the patch as an attachment.</p>
+	    
+	    <p>If your patch is not getting applied or there is no response, start nagging
+	    the developers (politely, please :D) on the developers mailing list.</p>    
+	    
+	    <p>Please submit documentation patches against the XML sourcefiles used
+	    for generating the documentation, and not against the documentation
+	    itself.  Site documentation issues can be opened in the Avalon Framework's
+          Documentation module.</p>
+
+     </subsection>
+
    </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/mailing-lists.xml	Tue Jun 15 08:49:15 2004
@@ -2,21 +2,21 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon E-Mail Lists</title>
+    <title>Avalon Central</title>
   </properties> 
 
 <body>
 
-<section name="Guidelines">
-  <p>A mailing list is an electronic discussion forum that anyone can subscribe to.
-  When someone sends an email message to the mailing list, a copy of that message is
-  broadcast to everyone who is subscribed to that mailing list. Mailing lists provide
-  a simple and effective communication mechanism. With potentially thousands of
-  subscribers, there is a
-  <a href="http://jakarta.apache.org/site/mail.html">common set of etiquette
-  guidelines</a> that you should observe.</p>
-</section>
-  <section name="The lists">
+<section name="Mailing Lists">
+
+    <p>A mailing list is an electronic discussion forum that anyone can subscribe to.
+    When someone sends an email message to the mailing list, a copy of that message is
+    broadcast to everyone who is subscribed to that mailing list. Mailing lists provide
+    a simple and effective communication mechanism. With potentially thousands of
+    subscribers, there is a
+    <a href="http://jakarta.apache.org/site/mail.html">common set of etiquette
+    guidelines</a> that you should observe.</p>
+
     <subsection name="The Avalon Users List">
       <p>
 	<em>Light Traffic</em>
@@ -56,7 +56,7 @@
         Changes to the Avalon CVSes are echoed to this list.
       </p>
     </subsection>
-</section>
+  </section>
 
 </body>
 

Modified: avalon/trunk/central/site/src/xdocs/central/about/resources/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/resources/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -25,8 +25,7 @@
     <menu>
       <item name="Mailing Lists" href="mailing-lists.html"/>
       <item name="Issue Tracking" href="issues.html"/>
-      <item name="Subversion" href="subversion.html"/>
-      <item name="CVS" href="cvs.html"/>
+      <item name="Subversion" href="svn/index.html"/>
     </menu>
   </body>
 

Added: avalon/trunk/central/site/src/xdocs/central/about/resources/svn/committing.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/svn/committing.xml	Tue Jun 15 08:49:15 2004
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Avalon Central</title>
+  </properties> 
+
+  <body>
+
+      <section name="Commit Access under Subversion">
+
+        <p>
+          Before you can commit to the subversion repository, you will
+          need to create an SVN password.  To do this, log on to 
+          minotaur.apache.org and run the following command:
+        </p>
+
+        <source>
+          svnpasswd 
+        </source>
+
+        <p>
+          The will ask you for a subversion password.  This is the user 
+          and password you will use when checking in code.  
+        </p>
+
+        <p>
+          When you commit code to subversion, it will try to use the
+          username you are logged in as on the current system. If this 
+          is different than your subversion username, you will need to
+          specifiy this on the commit statement.  Subversion will prompt 
+          for your password when you run the command.  Note the is the 
+          SVN password, which is not the same as your minotaur password
+          This password can be entered as a command line argument to 
+          avoid interaction.  The follow command line will commit with a 
+          specified username and password:
+        </p>
+        <source>
+          svn commit --username <i>username</i> --password <i>password</i>
+        </source>
+
+        <p>
+          To commit with TortoiseSVN, simply right click on the directory
+          you want to run the commit from and select commit.  A list of
+          files changed will be displayed with a text box for a log message.
+          At this point you can select which files should be committed and
+          enter you log text.  Select OK to start the commit, a dialog box
+          will appear prompting for username and password.  You will also
+          be able to select a check box to remember the credentials.  If you
+          select this check box, you will not be prompted for information in
+          the future
+        </p>
+
+    </section>
+  </body>
+</document>
+

Added: avalon/trunk/central/site/src/xdocs/central/about/resources/svn/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/svn/index.xml	Tue Jun 15 08:49:15 2004
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Avalon Central</title>
+  </properties> 
+
+  <body>
+
+    <section name="About Subversion">
+      <p> Subversion is an open source version control system, released under 
+        an Apache/BSD-style license. This application was designed, and is on 
+        track to replace CVS. Users familiar with CVS will be able to jump into 
+        Subversion easily as most of the interface is the same. Details about 
+        the benefits and technical information can be viewed on the Subversion 
+        <a href="http://subversion.tigris.org/">home page</a>, here are just a 
+        few of the highlights: 
+        <ul> 
+          <li> Atomic Commits </li> 
+          <li> Versioned meta-data </li> 
+          <li> Revision numbers are per-commit, not per-file</li> 
+          <li> Uses Apache web server and WebDAV/DeltaV for network communication </li> 
+          <li> Enables binary diffs </li> 
+        </ul> 
+      </p>
+    </section> 
+  </body>
+</document>
+

Added: avalon/trunk/central/site/src/xdocs/central/about/resources/svn/navigation.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/svn/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+ Copyright 2004 Apache Software Foundation
+ Licensed  under the  Apache License,  Version 2.0  (the "License");
+ you may not use  this file  except in  compliance with the License.
+ You may obtain a copy of the License at 
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed  under the  License is distributed on an "AS IS" BASIS,
+ WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ implied.
+ 
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project>
+
+  <title>Apache Avalon Central</title>
+
+  <body>
+    <menu>
+      <item name="Getting Started" href="starting.html"/>
+      <item name="Committing Changes" href="committing.html"/>
+    </menu>
+  </body>
+
+</project>

Added: avalon/trunk/central/site/src/xdocs/central/about/resources/svn/starting.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/central/about/resources/svn/starting.xml	Tue Jun 15 08:49:15 2004
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+  <properties>
+    <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+    <title>Avalon Central</title>
+  </properties> 
+
+  <body>
+
+    <section name="Getting Started"> 
+
+      <p> The subversion book is an excellent resource for users and 
+        administrators, it can obtained <a href= 
+        "http://svnbook.red-bean.com/html-chunk/">here</a>.
+      </p>
+    
+      <p>
+        You can also browse the repository using ViewSVN <a href=
+       "http://svn.apache.org/viewcvs.cgi/avalon/?root=Apache-SVN">
+        here</a>.
+      </p>
+    
+      <p>
+        There are several options available to you for retrival of 
+        sources via Subversion.  Subversion can be run from
+        the command line (Linux or Windows) and there are also an 
+        increasing number of GUI's and plugin's.      
+      </p>
+  
+      <p>
+        The SVN utilities are available as native Windows, Linux, and solaris 
+        binaries. The source is also avaiable for other operating systems.  
+        The binaries and source can be obatined from the Subversion <a href="http://subversion.tigris.org/project_packages.html"> download 
+        page.</a>. 
+      </p>
+        
+      <p>To get the current development project, run the following command</p>
+      <source>
+        svn co https://svn.apache.org/repos/asf/avalon/trunk
+      </source>
+        
+      <subsection name="Using TortoiseSVN">
+        <p>
+          <a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a> is an excellent 
+          extension for the Windows Explorer which integrates SVN.
+        </p>
+  
+        <p>
+          After you've created a folder where you want to check out the sources 
+          to, right-click and select SVN Checkout.  Then, fill out the settings 
+          like in the screenshot below, and then click ok.</p>
+        <p>
+          <img src="/images/tortoisesvn-setting.jpg" border="1"/>
+        </p>
+      </subsection>
+
+    </section>
+  </body>
+</document>
+

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/appliance.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/appliance.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/appliance.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/block.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/block.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/block.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/composite.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/composite.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/composite.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/context.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/context.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/context.xml	Tue Jun 15 08:49:15 2004
@@ -21,7 +21,7 @@
 
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
 

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/export.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/export.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/export.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/import.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/import.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/import.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/example.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/example.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/example.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/extension.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/extension.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/extension.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/interfaces.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/interfaces.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/lifecycle/interfaces.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -18,7 +18,7 @@
 -->
 
 <project>
-  <title>Merlin</title>
+  <title>Tutorials</title>
 
   <body>
     <menu>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/profiles.xml	Tue Jun 15 08:49:15 2004
@@ -21,7 +21,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/security.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/security.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/security.xml	Tue Jun 15 08:49:15 2004
@@ -21,7 +21,7 @@
 
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
 

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/selection.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/example.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/example.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/example.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/advanced/unit/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/block.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/block.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/block.xml	Tue Jun 15 08:49:15 2004
@@ -21,7 +21,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/configurable.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/configurable.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/configurable.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/defaults.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/defaults.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/defaults.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,12 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
-      <subsection name="Configuration Management">
+    <section name="Configuration Management">
         <table>
           <tr><th>Topic</th><th>Summary</th></tr>
           <tr>
@@ -64,7 +63,6 @@
         Resource supporting this tutorial are contained in the 
         turorials/configuration package.
         </p>
-      </subsection>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/override.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/override.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/config/override.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/casting.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/casting.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/casting.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/entries.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/entries.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/entries.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,12 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
-      <subsection name="Context Management">
+    <section name="Context Management">
         <table>
           <tr><th>Topic</th><th>Summary</th></tr>
           <tr>
@@ -54,7 +53,6 @@
             </td>
           </tr>
         </table>
-      </subsection>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/standard.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/standard.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/context/standard.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/creation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/creation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/creation.xml	Tue Jun 15 08:49:15 2004
@@ -20,11 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
+    <section name="Hello Block">
       <subsection name="Tutorial Overview">
         <p>
         This tutorial takes you though the creation of a very simple

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/auto.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/auto.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/auto.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,12 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
-      <subsection name="Dependency Management">
+    <section name="Dependency Management">
         <table>
           <tr><th>Topic</th><th>Summary</th></tr>
           <tr>
@@ -44,7 +43,6 @@
             </td>
           </tr>
         </table>
-      </subsection>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/manual.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/manual.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/dependencies/manual.xml	Tue Jun 15 08:49:15 2004
@@ -20,7 +20,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/execution.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/execution.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/execution.xml	Tue Jun 15 08:49:15 2004
@@ -20,11 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
+    <section name="Running Hello">
       <subsection name="Building the Block">
         <p>
         Using the sources included in the tutorials/hello directory 

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,11 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
+    <section name="Basic Concepts">
         <table>
           <tr><th>Topic</th><th>Summary</th></tr>
           <tr>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/internal.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/internal.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/internal.xml	Tue Jun 15 08:49:15 2004
@@ -20,12 +20,11 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
-      <subsection name="Behind the Scenes -info">
+    <section name="Behind the Scenes -info">
         <p>
         To get a better understanding of what is happening we can ask Merlin
         to present a summary of the source information and resources used
@@ -75,7 +74,6 @@
 [INFO   ] (tutorial.hello): Hello World!
 ]]></source>
         
-      </subsection>
       <subsection name="Targetted debugging using -config">
 
         <p>

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/services.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/services.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/basic/services.xml	Tue Jun 15 08:49:15 2004
@@ -20,12 +20,12 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Using Merlin">
-      <subsection name="Publishing Services">
+    <section name="Service Publication">
+
         <p>
         One of the most important aspects of a component management 
         platform is the ability to provide component assembly.  Assembly
@@ -41,7 +41,7 @@
         Resources supporting this tutorial are contained in the 
         tutorials/dependencies/ package.
         </p>
-      </subsection>
+
       <subsection name="Service Interface">
         <p>
         Services are normally exposed under a service interface. The following

Modified: avalon/trunk/central/site/src/xdocs/central/about/tutorials/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/about/tutorials/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/about/tutorials/index.xml	Tue Jun 15 08:49:15 2004
@@ -20,17 +20,17 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Merlin Runtime</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>
-    <section name="Getting Started">
+    <section name="Avalon Tutorial">
         <table>
           <tr><th>Topic</th><th>Summary</th></tr>
           <tr>
-            <td><a href="basic/index.html">Using Merlin</a></td>
+            <td><a href="basic/index.html">Basic Concepts</a></td>
             <td>
-A short introduction to using Merlin based on a Hello Block example that takes your though the definition of a block, subsequent deployment, and general aspects concerning configuration, contextualization, service publication, and service dependency management.
+A short introduction to using Avalon Merlin together with "Hello Block" that takes your though the definition of a block, subsequent deployment, and general aspects concerning configuration, contextualization, service publication, and service dependency management.
             </td>
           </tr>
           <tr>

Modified: avalon/trunk/central/site/src/xdocs/central/community/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/community/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/community/index.xml	Tue Jun 15 08:49:15 2004
@@ -6,12 +6,12 @@
   </properties>
 
   <body>
-    <section name="The Avalon Community">
+    <section name="Community">
       <subsection name="Index">
         <table>
           <tr><th>Topic</th><th>Description</th></tr>
           <tr>
-            <td><a href="who/index.html">Who We Are</a></td>
+            <td><a href="who/index.html">People</a></td>
             <td>
               <p>
       These pages list many of the contributors to avalon. They
@@ -37,7 +37,7 @@
             </td>
           </tr>
           <tr>
-            <td><a href="history/index.html">Historical</a></td>
+            <td><a href="history/index.html">History</a></td>
             <td><p>Background content - how Avalon came to be.<br/></p></td>
           </tr>
         </table>

Modified: avalon/trunk/central/site/src/xdocs/central/community/process/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/community/process/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/community/process/index.xml	Tue Jun 15 08:49:15 2004
@@ -8,9 +8,6 @@
   <body>
     <section name="The Avalon Community">
      <p>
-      Welcome to the Avalon community!
-     </p>
-     <p>
       Avalon, like all other projects at Apache, is a
       <em>meritocracy</em> and follows the <em>Apache Way</em> of
       community and project management.  The following documents
@@ -35,39 +32,6 @@
          Contributor license Agreement</a> [PDF]</li>
        <li><a href="http://james.apache.org/contribute.html">Getting Involved</a></li>
      </ul>
-    </section>
-    <section name="Opening up Avalon's Repositories">
-      <p>
-        Avalon continually looks at ways to cooperate better with
-        other projects, especially here at Apache. Recently, the
-        Avalon team decided to open up the "avalon-excalibur"
-        repository to the Apache Cocoon community. The response has
-        been favorable as the libraries there now have a wider group
-        of supporting developers. As a result, the Avalon team decided
-        to take this process one step further and open up the
-        "avalon-components" repository to both the Apache Cocoon and
-        Apache JAMES projects.
-      </p>
-      <p>
-       If you are from another Apache project, and would like all the
-       committers from your project to have access to the Avalon
-       Repositories, all you need to do is ask the Avalon PMC
-       (pmc@avalon.apache.org). The repositories that are available
-       for wider access are:
-       </p>
-       <ul>
-        <li>avalon-components</li>
-        <li>avalon-excalibur</li>
-        <li>avalon-sandbox</li>
-       </ul>
-       <p>
-         The PMC will let you know if your request is accepted or
-         not. If you are interested in commit privileges, but are not
-         part of one of the Apache projects, then you have to do it
-         the old fashioned way and participate on the mailing lists
-         and post patches, etc. We are taking advantage of the Apache
-         infrastructure to make this happen.
-       </p>
     </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/community/process/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/community/process/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/community/process/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -27,7 +27,6 @@
       <item name="Charter" href="mission.html"/>
       <item name="Coding Standards" href="code-standards.html"/>
       <item name="Release Management" href="release.html"/>
-      <item name="Apache License" href="license.html"/>
     </menu>
  </body>
 

Modified: avalon/trunk/central/site/src/xdocs/central/community/who/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/community/who/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/community/who/index.xml	Tue Jun 15 08:49:15 2004
@@ -50,56 +50,5 @@
 <tr><td>ymikulski</td> 	<td>Yauheny Mikulski</td></tr>
      </table>
     </section>
-    <section name="Associated Committers">
-    <p>
-     Associated committers have access to the following repositories:     
-    </p>
-     <ul>
-      <li><code>avalon-excalibur</code></li>
-      <li><code>avalon-components</code></li>
-      <li><code>avalon-sandbox</code></li>
-     </ul>
-     <p>
-      ASF projects with associated committer access:
-     </p>
-      <ul>
-        <li><a href="http://cocoon.apache.org">Cocoon</a></li>
-	<li><a href="http://james.apache.org">James</a></li>
-      </ul>
-     <p>
-     If your project would also like access, please notify the
-     <a href="mailto:pmc@avalon.apache.org">Avalon PMC</a>.
-    </p>
-    <p>
-     Full lists of ASF committers are available at:
-     <ul>
-      <li>
-       <a href="http://www.apache.org/~jim/committers.html">http://www.apache.org/~jim/committers.html</a>
-      </li>
-      <li>
-       <a href="http://www.apache.org/~jim/projects.html">http://www.apache.org/~jim/projects.html</a>
-     ( warning: it's a <em>large</em> page ~980 KB)
-      </li>
-     </ul>
-    </p>
-    </section>
-    <section name="Emeritus Committers">
-      <p>
-       The current emeritus committers (an emeritus committer is
-      someone who is not active within the avalon project anymore)
-      are: jon, fede
-      </p>
-    </section>
-    <section name="Contributors">
-      <p>
-      We've been rather sloppy in maintaining lists of these
-      peeps. Many, many people help out with avalon in one way or
-      another, be it by providing infrastructure or project resources,
-      guidance and advice, patches, or user feedback. You can find
-      many names in the avalon mailing list archives and in the
-      sources. People, even if we don't keep a list of y'all, thanks
-      for all your good work!
-      </p>
-    </section>
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/dpml/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/dpml/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/dpml/index.xml	Tue Jun 15 08:49:15 2004
@@ -26,7 +26,7 @@
 
   <body>
 
-    <section name="The Digital Product Meta Library">
+    <section name="Digital Product Meta Library (DPML)">
 
       <subsection name="The Challenge">
 

Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml	Tue Jun 15 08:49:15 2004
@@ -14,7 +14,11 @@
         that allows you to streamline the development of Merlin-based
         components and applications.
       </p>
-    </section>
+      <p>
+        DOCUMENTATION IS CURRENTLY UNDER DEVELOPMENT.
+      </p>
+    </section>
+    <!--
     <section name="Documentation Set">
       <table>
         <tr>
@@ -51,7 +55,8 @@
             extend the functionality in Merlin Developer.
           </td>
         </tr>
-      </table>
+      </table>
     </section>
+    -->
   </body>
 </document>

Modified: avalon/trunk/central/site/src/xdocs/central/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/navigation.xml	Tue Jun 15 08:49:15 2004
@@ -19,15 +19,18 @@
 
 <project>
 
- <title>Apache Avalon Central</title>
+ <title>Apache Avalon Central</title>
+
+ <!-- dropped lab for the moment until there is real content -->
+ <!-- dropped legacy (too much noise) -->
 
  <body>
     <menu>
       <item name="Welcome" href="about/index.html"/>
       <item name="Community" href="community/index.html"/>
-      <item name="Laboratory" href="laboratory/index.html"/>
+      <!-- <item name="Laboratory" href="laboratory/index.html"/> -->
       <item name="Tools" href="tools/index.html"/>
-      <item name="Legacy" href="legacy/index.html"/>
+      <!-- <item name="Legacy" href="legacy/index.html"/> -->
       <item name="DPML" href="dpml/index.html"/>
     </menu>
  </body>

Modified: avalon/trunk/central/site/src/xdocs/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/index.xml	Tue Jun 15 08:49:15 2004
@@ -8,13 +8,6 @@
 
   <body>
     <section name="Welcome to Apache Avalon">
-      <br/>
-      <p class="caption">
-        <em><strong>"any sufficiently advanced technology is 
-        indistinguishable from magic"</strong></em><br/>
-        Sir Arthur C Clarke
-      </p>
-      <br/>
     </section>
   </body>
 </document>

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