mcconnell 2004/04/02 20:45:04
Modified: merlin/platform/xdocs/merlin/embedded navigation.xml
merlin/platform/xdocs/merlin navigation.xml
merlin/platform/xdocs/merlin/systems navigation.xml
Log:
Nav corrections.
Revision Changes Path
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 3 Apr 2004 04:34:08 -0000 1.1
+++ navigation.xml 3 Apr 2004 04:45:04 -0000 1.2
@@ -36,8 +36,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Object Model" href="/merlin/uml.html"/>
- <item name="Subsystems"/>
- <item name="Embedding">
+ <item name="Subsystems" href="/merlin/systems/index.html"/>
+ <item name="Embedding" href="/merlin/embedded/index.html">
<item name="CLI" href="/merlin/embedded/cli.html"/>
<item name="Application" href="/merlin/embedded/main.html"/>
<item name="Servlet" href="/merlin/embedded/servlet.html"/>
1.11 +2 -14 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- navigation.xml 3 Apr 2004 04:34:08 -0000 1.10
+++ navigation.xml 3 Apr 2004 04:45:04 -0000 1.11
@@ -36,20 +36,8 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Object Model" href="/merlin/uml.html"/>
- <item name="Subsystems">
- <item name="Meta" href="/merlin/systems/meta.html"/>
- <item name="Repository" href="/merlin/systems/repository.html"/>
- <item name="Composition" href="/merlin/systems/composition.html"/>
- <item name="Activation" href="/merlin/systems/activation.html"/>
- <item name="Logging" href="/merlin/systems/logging.html"/>
- <item name="Kernel" href="/merlin/systems/kernel.html"/>
- </item>
- <item name="Embedding">
- <item name="CLI" href="/merlin/embedded/cli.html"/>
- <item name="Application" href="/merlin/embedded/main.html"/>
- <item name="Servlet" href="/merlin/embedded/servlet.html"/>
- <item name="Unit" href="/merlin/embedded/unit.html"/>
- </item>
+ <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" />
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 3 Apr 2004 04:34:08 -0000 1.1
+++ navigation.xml 3 Apr 2004 04:45:04 -0000 1.2
@@ -36,7 +36,7 @@
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html">
<item name="Object Model" href="/merlin/uml.html"/>
- <item name="Subsystems">
+ <item name="Subsystems" href="/merlin/systems/index.html">
<item name="Meta" href="/merlin/systems/meta.html"/>
<item name="Repository" href="/merlin/systems/repository.html"/>
<item name="Composition" href="/merlin/systems/composition.html"/>
@@ -44,7 +44,7 @@
<item name="Logging" href="/merlin/systems/logging.html"/>
<item name="Kernel" href="/merlin/systems/kernel.html"/>
</item>
- <item name="Embedding"/>
+ <item name="Embedding" href="/merlin/embedded/index.html"/>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Extensions" href="/extensions/index.html" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
