niclas      2004/01/04 04:07:08

  Modified:    merlin/platform/xdocs/merlin/kernel index.xml
  Log:
  Formatting.
  
  Revision  Changes    Path
  1.2       +14 -7     avalon/merlin/platform/xdocs/merlin/kernel/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml 24 Sep 2003 09:34:38 -0000      1.1
  +++ index.xml 4 Jan 2004 12:07:08 -0000       1.2
  @@ -62,16 +62,25 @@
       <section name="Merlin Kernel">
   
       <p>
  -Merlin separates the concepts of <strong>Kernel</strong> and 
<strong>Container</strong>. A kernel manages <em>resources</em> (Objects) whereas a 
container manages <em>services</em>. Merlin provides a default kernel that manages a 
container hierarchy: <a 
href="../../api/org/apache/avalon/merlin/kernel/impl/DefaultKernel.html">DefaultKernel</a>.
 It handles overall management, including startup, shutdown, extension management, and 
other system-wide tasks.
  +      Merlin separates the concepts of <strong>Kernel</strong> and 
  +      <strong>Container</strong>. A kernel manages <em>resources</em> (Objects)
  +      whereas a container manages <em>services</em>. Merlin provides a default 
  +      kernel that manages a container hierarchy: <a 
  +      href="../../api/org/apache/avalon/merlin/kernel/impl/DefaultKernel.html">
  +      DefaultKernel</a>. It handles overall management, including startup, 
  +      shutdown, extension management, and other system-wide tasks.
       </p>
   
       <p>
  -The kernel provides a set of bootstrap services (like a logging service) and 
context entries to the (root) container it is managing. It subsequently publishes 
established entries and services (derived from container deployment) towards kernel 
clients.
  +      The kernel provides a set of bootstrap services (like a logging service) 
  +      and context entries to the (root) container it is managing. It 
  +      subsequently publishes established entries and services (derived from 
  +      container deployment) towards kernel clients.
       </p>
   
  -    <p><em>
  -Kernel to Container conceptual relationship:
  -    </em></p>
  +    <p>
  +      <em>Kernel to Container conceptual relationship:</em>
  +    </p>
   
       <img src="./../../images/overview.gif" />
   
  @@ -80,5 +89,3 @@
   </body>
   
   </document>
  -
  -
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to