avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/platform/xdocs/tools/maven index.xml navigation.xml
Date Sat, 03 Apr 2004 08:52:19 GMT
mcconnell    2004/04/03 00:52:19

  Modified:    merlin/platform/xdocs/about navigation.xml
               merlin/platform/xdocs/dpml navigation.xml
               merlin/platform/xdocs/extensions/facilities navigation.xml
               merlin/platform/xdocs/extensions index.xml navigation.xml
               merlin/platform/xdocs/extensions/platform index.xml
                        navigation.xml
               merlin/platform/xdocs/merlin/embedded navigation.xml
               merlin/platform/xdocs/merlin navigation.xml
               merlin/platform/xdocs/merlin/systems navigation.xml
               merlin/platform/xdocs navigation.xml
               merlin/platform/xdocs/reference/component/artifacts
                        navigation.xml
               merlin/platform/xdocs/reference/component/descriptors
                        navigation.xml
               merlin/platform/xdocs/reference/component/lifecycle
                        navigation.xml
               merlin/platform/xdocs/reference/component/lifestyle
                        navigation.xml
               merlin/platform/xdocs/reference/component navigation.xml
               merlin/platform/xdocs/reference/containment/directives/categories
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/classloader/classpath
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/classloader
                        extensions.xml index.xml navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/categories
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/context/entry
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/context
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/dependencies
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/components/parameters
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/include
                        index.xml navigation.xml
               merlin/platform/xdocs/reference/containment/directives
                        navigation.xml
               merlin/platform/xdocs/reference/containment/directives/services
                        navigation.xml
               merlin/platform/xdocs/reference/containment navigation.xml
               merlin/platform/xdocs/reference/containment/overrides
                        navigation.xml
               merlin/platform/xdocs/reference/containment/overrides/target/categories
                        navigation.xml
               merlin/platform/xdocs/reference/containment/overrides/target
                        navigation.xml
               merlin/platform/xdocs/reference/deployment navigation.xml
               merlin/platform/xdocs/reference navigation.xml
               merlin/platform/xdocs/reference/system/kernel navigation.xml
               merlin/platform/xdocs/reference/system/kernel/repository
                        navigation.xml
               merlin/platform/xdocs/reference/system/kernel/security
                        navigation.xml
               merlin/platform/xdocs/reference/system/kernel/security/profile
                        navigation.xml
               merlin/platform/xdocs/reference/system/kernel/security/profile/permissions
                        navigation.xml
               merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission
                        navigation.xml
               merlin/platform/xdocs/reference/system navigation.xml
               merlin/platform/xdocs/resources navigation.xml
               merlin/platform/xdocs/resources/roadmap navigation.xml
               merlin/platform/xdocs/starting/advanced index.xml
                        navigation.xml
               merlin/platform/xdocs/starting/advanced/lifecycle
                        example.xml extension.xml index.xml interfaces.xml
                        navigation.xml
               merlin/platform/xdocs/starting/advanced/unit navigation.xml
               merlin/platform/xdocs/starting/examples/afs navigation.xml
               merlin/platform/xdocs/starting/examples/afs/simple
                        navigation.xml
               merlin/platform/xdocs/starting/examples/james navigation.xml
               merlin/platform/xdocs/starting/examples navigation.xml
               merlin/platform/xdocs/starting/installation navigation.xml
               merlin/platform/xdocs/starting navigation.xml
               merlin/platform/xdocs/starting/tutorial/config
                        navigation.xml
               merlin/platform/xdocs/starting/tutorial/context
                        navigation.xml
               merlin/platform/xdocs/starting/tutorial/dependencies
                        navigation.xml
               merlin/platform/xdocs/starting/tutorial navigation.xml
               merlin/platform/xdocs/tools index.xml navigation.xml
               merlin/platform/xdocs/tools/maven index.xml navigation.xml
  Log:
  Fixing broken links and a little reorganization netween tools and extensions.
  
  Revision  Changes    Path
  1.10      +2 -2      avalon/merlin/platform/xdocs/about/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/about/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	1 Apr 2004 23:49:08 -0000	1.9
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.10
  @@ -39,8 +39,8 @@
         </item>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.9       +1 -1      avalon/merlin/platform/xdocs/dpml/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/dpml/navigation.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- navigation.xml	1 Apr 2004 23:49:08 -0000	1.8
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.9
  @@ -35,7 +35,7 @@
         <item name="Overview" href="/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  +      <item name="Extensions" href="/extensions/index.html"/>
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +1 -1      avalon/merlin/platform/xdocs/extensions/facilities/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/facilities/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	3 Apr 2004 07:52:51 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.3
  @@ -35,7 +35,6 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
         <item name="Extensions" href="/extensions/index.html">
           <item name="Platform" href="/extensions/platform/index.html"/>
           <item name="Facilities" href="/extensions/facilities/index.html">
  @@ -43,6 +42,7 @@
             <item name="Avalon HTTP" href="/extensions/facilities/http.html"/>
           </item>
         </item>
  +      <item name="Tools" href="/tools/index.html"/>
       </menu>
   
       <menu name="Resources">
  
  
  
  1.4       +3 -3      avalon/merlin/platform/xdocs/extensions/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	3 Apr 2004 05:34:14 -0000	1.3
  +++ index.xml	3 Apr 2004 08:52:17 -0000	1.4
  @@ -25,12 +25,12 @@
     </properties>
   
     <body>
  -    <section name="Extensions">
  +    <section name="Tools">
         <subsection name="Index">
           <table>
             <tr><th>Topic</th><th>Summary</th></tr>
             <tr>
  -            <td><a href="platform/index.html">Platform Extensions</a></td>
  +            <td><a href="platform/index.html">Platform Tools</a></td>
               <td>
                 Platform specific extensions.
               </td>
  
  
  
  1.7       +1 -1      avalon/merlin/platform/xdocs/extensions/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	3 Apr 2004 05:34:14 -0000	1.6
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.7
  @@ -35,11 +35,11 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
         <item name="Extensions" href="/extensions/index.html">
           <item name="Platform" href="/extensions/platform/index.html"/>
           <item name="Facilities" href="/extensions/facilities/index.html"/>
         </item>
  +      <item name="Tools" href="/tools/index.html"/>
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/extensions/platform/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/platform/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	3 Apr 2004 05:34:14 -0000	1.1
  +++ index.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -25,7 +25,7 @@
     </properties>
   
     <body>
  -    <section name="Platform Extensions">
  +    <section name="Platform Tools">
         <subsection name="Index">
           <table>
             <tr><th>Topic</th><th>Summary</th></tr>
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/extensions/platform/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/platform/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	3 Apr 2004 05:34:14 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -35,13 +35,13 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
         <item name="Extensions" href="/extensions/index.html">
           <item name="Platform" href="/extensions/platform/index.html">
             <item name="NT Service" href="/extensions/platform/nt.html"/>
           </item>
           <item name="Facilities" href="/extensions/facilities/index.html"/>
         </item>
  +      <item name="Tools" href="/tools/index.html"/>
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/merlin/embedded/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/embedded/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	3 Apr 2004 04:45:04 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.3
  @@ -44,8 +44,8 @@
             <item name="Unit" href="/merlin/embedded/unit.html"/>
           </item>
         </item>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.12      +2 -2      avalon/merlin/platform/xdocs/merlin/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml	3 Apr 2004 04:45:04 -0000	1.11
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.12
  @@ -39,8 +39,8 @@
           <item name="Subsystems" href="/merlin/systems/index.html"/>
           <item name="Embedding" href="/merlin/embedded/index.html"/>
         </item>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/merlin/systems/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/systems/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	3 Apr 2004 04:45:04 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.3
  @@ -46,8 +46,8 @@
           </item>
           <item name="Embedding" href="/merlin/embedded/index.html"/>
         </item>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.10      +2 -2      avalon/merlin/platform/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	1 Apr 2004 23:49:08 -0000	1.9
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.10
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.7       +2 -2      avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.6
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.7
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.8       +2 -2      avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.7
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.8
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.8       +2 -2      avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.7
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.8
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.7       +2 -2      avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.6
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.7
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.7       +2 -2      avalon/merlin/platform/xdocs/reference/component/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/component/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.6
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.7
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -34,8 +34,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -34,8 +34,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +1 -1      avalon/merlin/platform/xdocs/reference/containment/directives/classloader/extensions.xml
  
  Index: extensions.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/extensions.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- extensions.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ extensions.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -31,7 +31,7 @@
       <section name="Library Directive">
   
         <subsection name="Description">
  -<p>An engine may contain a muliple extensions path declarations that specify the directories in which extension jar files may be located.  Extensions directories may be declared within any classloader.</p>
  +<p>An engine may contain a muliple extensions path declarations that specify the directories in which extension jar files may be located.  Tools directories may be declared within any classloader.</p>
   
   <p>The extensions element may contain multiple directory-set declarations, each containing possible multiple relative directory paths.  Merlin will attempt to resolve any jar files declaring extension dependencies based on the jar files included in the declared extension directories and the extension directories declared in parent engine.</p>
         </subsection>
  
  
  
  1.2       +0 -16     avalon/merlin/platform/xdocs/reference/containment/directives/classloader/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ index.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -53,12 +53,6 @@
                Jar file option extensions repository.
               </td>
             </tr>
  -          <tr>
  -            <td><a href="grant/index.html">grant</a></td><td>0..1</td>
  -            <td>
  -             Granting permissions to code level security.
  -            </td>
  -          </tr>
           </table>
         </subsection>
   
  @@ -70,16 +64,6 @@
         <resource id="tutorial:composition-api" version="1.0"/>
       </repository>
     </classpath>
  -  <grant>
  -    <permission class="java.lang.RuntimePermission" name="getClassLoader" />
  -    <permission class="java.util.PropertyPermission" name="java.*" >
  -      <action>read</action>
  -    </permission>
  -    <permission class="java.util.PropertyPermission" name="com.mycompany.*" >
  -      <action>read</action>
  -      <action>write</action>
  -    </permission>
  -  </grant>
   </classloader>
   ]]></source>
         </subsection>
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -34,8 +34,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:17 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -34,8 +34,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/include/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ index.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -41,8 +41,8 @@
               <td>
                A set of target directives scoped relative to the container established 
                by the include. Targets declarations correspond to the specification of 
  -             <a href="../../config/index.html">target elements</a> presented under 
  -             the config.xml spec.
  +             <a href="../../overrides/index.html">override target elements</a> 
  +             presented under the config.xml spec.
               </td>
             </tr>
           </table>
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:09:59 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:10:00 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.2       +2 -2      avalon/merlin/platform/xdocs/reference/containment/overrides/target/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	2 Apr 2004 08:10:00 -0000	1.1
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.2
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.7       +2 -2      avalon/merlin/platform/xdocs/reference/deployment/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/deployment/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	3 Apr 2004 05:34:14 -0000	1.6
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.7
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.6       +2 -2      avalon/merlin/platform/xdocs/reference/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	2 Apr 2004 08:09:58 -0000	1.5
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.6
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.2
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.3
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.4       +2 -2      avalon/merlin/platform/xdocs/reference/system/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/reference/system/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	3 Apr 2004 04:52:07 -0000	1.3
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.4
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
       
       <menu name="Resources">
  
  
  
  1.10      +2 -2      avalon/merlin/platform/xdocs/resources/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/resources/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.9
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.10
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.10      +2 -2      avalon/merlin/platform/xdocs/resources/roadmap/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/resources/roadmap/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.9
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.10
  @@ -35,8 +35,8 @@
         <item name="Overview" href="/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.10      +1 -1      avalon/merlin/platform/xdocs/starting/advanced/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/index.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- index.xml	25 Jan 2004 13:28:49 -0000	1.9
  +++ index.xml	3 Apr 2004 08:52:18 -0000	1.10
  @@ -29,7 +29,7 @@
           <table>
             <tr><th>Topic</th><th>Summary</th></tr>
             <tr>
  -            <td><a href="lifecycle/index.html">Lifecycle Extensions</a></td>
  +            <td><a href="lifecycle/index.html">Lifecycle Tools</a></td>
               <td>Definition and implementation of custom lifecycle stage handlers.</td>
             </tr>
             <tr>
  
  
  
  1.16      +3 -3      avalon/merlin/platform/xdocs/starting/advanced/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/navigation.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.15
  +++ navigation.xml	3 Apr 2004 08:52:18 -0000	1.16
  @@ -36,7 +36,7 @@
           <item name="Installation" href="/starting/installation/index.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html">
  -          <item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html"/>
  +          <item name="Lifecycle Tools" href="/starting/advanced/lifecycle/index.html"/>
             <item name="Contextualization" href="/starting/advanced/context.html"/>
             <item name="Deployment Templates" href="/starting/advanced/profiles.html"/>
             <item name="Profile Selection" href="/starting/advanced/selection.html"/>
  @@ -45,8 +45,8 @@
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.4       +2 -2      avalon/merlin/platform/xdocs/starting/advanced/lifecycle/example.xml
  
  Index: example.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/example.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- example.xml	25 Jan 2004 13:28:49 -0000	1.3
  +++ example.xml	3 Apr 2004 08:52:19 -0000	1.4
  @@ -19,14 +19,14 @@
   
   <document>
     <header>
  -    <title>Lifecycle Extensions</title>
  +    <title>Lifecycle Tools</title>
       <authors>
         <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
       </authors>
     </header>
     <body>
   
  -  <section name="Lifecycle Extensions Example">
  +  <section name="Lifecycle Tools Example">
   
       <subsection name="Creating your lifestyle stage interface">
   
  
  
  
  1.4       +1 -1      avalon/merlin/platform/xdocs/starting/advanced/lifecycle/extension.xml
  
  Index: extension.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/extension.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- extension.xml	25 Jan 2004 13:28:49 -0000	1.3
  +++ extension.xml	3 Apr 2004 08:52:19 -0000	1.4
  @@ -19,7 +19,7 @@
   
   <document>
     <header>
  -    <title>Lifecycle Extensions</title>
  +    <title>Lifecycle Tools</title>
       <authors>
         <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
       </authors>
  
  
  
  1.3       +1 -1      avalon/merlin/platform/xdocs/starting/advanced/lifecycle/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	25 Jan 2004 13:28:49 -0000	1.2
  +++ index.xml	3 Apr 2004 08:52:19 -0000	1.3
  @@ -26,7 +26,7 @@
     </header>
     <body>
       <section name="Using Merlin">
  -      <subsection name="Lifecycle Extensions">
  +      <subsection name="Lifecycle Tools">
           <table>
             <tr><th>Topic</th><th>Summary</th></tr>
             <tr>
  
  
  
  1.3       +2 -2      avalon/merlin/platform/xdocs/starting/advanced/lifecycle/interfaces.xml
  
  Index: interfaces.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/interfaces.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- interfaces.xml	25 Jan 2004 13:28:49 -0000	1.2
  +++ interfaces.xml	3 Apr 2004 08:52:19 -0000	1.3
  @@ -19,14 +19,14 @@
   
   <document>
     <header>
  -    <title>Lifecycle Extensions Interfaces</title>
  +    <title>Lifecycle Tools Interfaces</title>
       <authors>
         <person name="Avalon Development Team" email="dev@avalon.apache.org"/>
       </authors>
     </header>
     <body>
   
  -  <section name="Lifecycle Extensions">
  +  <section name="Lifecycle Tools">
   
         <subsection name="Interface Summary">
   
  
  
  
  1.12      +3 -3      avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/lifecycle/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.11
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.12
  @@ -37,7 +37,7 @@
           <item name="Installation" href="/starting/installation/index.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html">
  -          <item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html">
  +          <item name="Lifecycle Tools" href="/starting/advanced/lifecycle/index.html">
               <item name="Overview" href="/starting/advanced/lifecycle/extension.html"/>
               <item name="Interfaces" href="/starting/advanced/lifecycle/interfaces.html"/>
               <item name="Example" href="/starting/advanced/lifecycle/example.html"/>
  @@ -49,8 +49,8 @@
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +3 -3      avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/advanced/unit/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -36,7 +36,7 @@
           <item name="Installation" href="/starting/installation/index.html"/>
           <item name="Using Merlin" href="/starting/tutorial/index.html"/>
           <item name="Advanced Features" href="/starting/advanced/index.html">
  -          <item name="Lifecycle Extensions" href="/starting/advanced/lifecycle/index.html"/>
  +          <item name="Lifecycle Tools" href="/starting/advanced/lifecycle/index.html"/>
             <item name="Contextualization" href="/starting/advanced/context.html"/>
             <item name="Deployment Templates" href="/starting/advanced/profiles.html"/>
             <item name="Profile Selection" href="/starting/advanced/selection.html"/>
  @@ -47,8 +47,8 @@
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -47,8 +47,8 @@
           -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/afs/simple/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -38,8 +38,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/james/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -38,8 +38,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/examples/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/examples/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -45,8 +45,8 @@
           -->
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.10      +2 -2      avalon/merlin/platform/xdocs/starting/installation/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/installation/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.9
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.10
  @@ -44,8 +44,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -39,8 +39,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.13      +2 -2      avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/config/navigation.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.12
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.13
  @@ -51,8 +51,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/context/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -50,8 +50,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/dependencies/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:09 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -49,8 +49,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.11      +2 -2      avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/starting/tutorial/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:10 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -46,8 +46,8 @@
           <item name="Advanced Features" href="/starting/advanced/index.html"/>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  -      <item name="Tools" href="/tools/index.html"/>
  -      <item name="Extensions" href="/extensions/index.html" />
  +      <item name="Extensions" href="/extensions/index.html"/>
  +      <item name="Tools" href="/tools/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.5       +1 -1      avalon/merlin/platform/xdocs/tools/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/index.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	2 Apr 2004 08:10:01 -0000	1.4
  +++ index.xml	3 Apr 2004 08:52:19 -0000	1.5
  @@ -21,7 +21,7 @@
   
     <properties>
       <author email="mcconnell@apache.org">Stephen McConnell</author>
  -    <title>Merlin Tools</title>
  +    <title>Merlin Extensions</title>
     </properties>
   
     <body>
  
  
  
  1.12      +1 -1      avalon/merlin/platform/xdocs/tools/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml	2 Apr 2004 08:10:01 -0000	1.11
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.12
  @@ -35,10 +35,10 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  +      <item name="Extensions" href="/extensions/index.html"/>
         <item name="Tools" href="/tools/index.html">
           <item name="Merlin Plugin for Maven" href="/tools/maven/index.html"/>
         </item>
  -      <item name="Extensions" href="/extensions/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  
  1.3       +1 -1      avalon/merlin/platform/xdocs/tools/maven/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/maven/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	25 Jan 2004 13:28:51 -0000	1.2
  +++ index.xml	3 Apr 2004 08:52:19 -0000	1.3
  @@ -21,7 +21,7 @@
   
     <properties>
       <author email="mcconnell@apache.org">Stephen McConnell</author>
  -    <title>Merlin Tools</title>
  +    <title>Merlin Extensions</title>
     </properties>
   
     <body>
  
  
  
  1.11      +1 -3      avalon/merlin/platform/xdocs/tools/maven/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/tools/maven/navigation.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- navigation.xml	1 Apr 2004 23:49:10 -0000	1.10
  +++ navigation.xml	3 Apr 2004 08:52:19 -0000	1.11
  @@ -35,15 +35,13 @@
         <item name="Overview" href="/about/index.html"/>
         <item name="Getting Started" href="/starting/index.html"/>
         <item name="Merlin System" href="/merlin/index.html"/>
  +      <item name="Extensions" href="/extensions/index.html"/>
         <item name="Tools" href="/tools/index.html">
           <item name="Merlin Plugin for Maven" href="/tools/maven/index.html">
             <item name="Goals" href="/tools/maven/deploy.html"/>
             <item name="Properties" href="/tools/maven/properties.html"/>
           </item>
  -        <item name="Meta Plugin for Maven" 
  -          href="http://avalon.apache.org/meta/tools/index.html"/>
         </item>
  -      <item name="Extensions" href="/extensions/index.html" />
       </menu>
   
       <menu name="Resources">
  
  
  

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


Mime
View raw message