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 2003/10/04 13:08:40 UTC

cvs commit: avalon/merlin/platform/xdocs/starting/advanced/lifecycle navigation.xml

mcconnell    2003/10/04 04:08:40

  Modified:    merlin/platform/xdocs/starting/advanced index.xml
                        navigation.xml
               merlin/platform/xdocs/starting/advanced/lifecycle
                        navigation.xml
  Removed:     merlin/platform/xdocs/starting/advanced includes.xml
  Log:
  Reme includes tutorial as this is duplicated by and more completely covered in the composition tutorial.
  
  Revision  Changes    Path
  1.5       +0 -6      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	4 Oct 2003 11:00:09 -0000	1.4
  +++ index.xml	4 Oct 2003 11:08:40 -0000	1.5
  @@ -76,12 +76,6 @@
               <td>Demonstration of the selection of a packaged profile by name.</td>
             </tr>
             <tr>
  -            <td><a href="includes.html">Block Includes</a></td>
  -            <td>Example of block composition via include statements with emphasis 
  -                on managing multiple external configurations.  This tutorial also
  -                includes usage of the application repository.</td>
  -          </tr>
  -          <tr>
               <td><a href="composite.html">Block Composition</a></td>
               <td>Example of the use of imported blocks that can publish services and declare 
                   dependencies.  The tutorial demonstrates the use of block level service 
  
  
  
  1.5       +0 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	4 Oct 2003 11:00:09 -0000	1.4
  +++ navigation.xml	4 Oct 2003 11:08:40 -0000	1.5
  @@ -71,7 +71,6 @@
             <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"/>
  -          <item name="Includes" href="/starting/advanced/includes.html"/>
             <item name="Composition" href="/starting/advanced/composite.html"/>
           </item>
         </item>
  
  
  
  1.2       +3 -5      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	24 Sep 2003 09:35:21 -0000	1.1
  +++ navigation.xml	4 Oct 2003 11:08:40 -0000	1.2
  @@ -73,12 +73,10 @@
               <item name="Interfaces" href="/starting/advanced/lifecycle/interfaces.html"/>
               <item name="Example" href="/starting/advanced/lifecycle/example.html"/>
             </item>
  -          <item name="Contextulization" href="/starting/advanced/context.html"/>
  +          <item name="Contextualization" href="/starting/advanced/context.html"/>
             <item name="Deployment Templates" href="/starting/advanced/profiles.html"/>
  -          <item name="Profile Selectors" href="/starting/advanced/selectors.html"/>
  -          <item name="Block Includes" href="/starting/advanced/includes.html"/>
  -          <item name="Block Composition" href="/starting/advanced/composite.html"/>
  -          <item name="Custom Containers" href="/starting/advanced/containers.html"/>
  +          <item name="Profile Selection" href="/starting/advanced/selection.html"/>
  +          <item name="Composition" href="/starting/advanced/composite.html"/>
           </item>
         </item>
         <item name="Merlin System" href="/merlin/index.html"/>
  
  
  

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