svn commit: r1843258 - /felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext

[pd...@apache.org]

Author: pderop
Date: Tue Oct  9 13:27:56 2018
New Revision: 1843258

URL: http://svn.apache.org/viewvc?rev=1843258&view=rev
Log:
dm r12 updates

Modified:
    felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext?rev=1843258&r1=1843257&r2=1843258&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager.mdtext Tue Oct  9 13:27:56 2018
@@ -23,17 +23,16 @@ Below is the full table of contents.
 ### Step-by-step Tutorials
 
 * [Getting started](apache-felix-dependency-manager/tutorials/getting-started.html)
-* [Working with annotations](apache-felix-dependency-manager/tutorials/working-with-annotations.html)
 * [Leveraging the shell](apache-felix-dependency-manager/tutorials/leveraging-the-shell.html)
 
 ### Overviews and Guides
 
 * [History](apache-felix-dependency-manager/guides/history.html)
 * [Background](apache-felix-dependency-manager/guides/background.html)
-* [What's new in version 4](apache-felix-dependency-manager/guides/whatsnew.html)
+* [What's new in DM 4](apache-felix-dependency-manager/guides/whatsnew.html)
+* [What's new in release r12](apache-felix-dependency-manager/guides/whatsnew-r12.html)
 * [Bundles and dependencies](apache-felix-dependency-manager/guides/bundles-and-dependencies.html)
 * [Migrating from earlier versions](apache-felix-dependency-manager/guides/migrating-from-earlier-versions.html)
-* [Annotations](apache-felix-dependency-manager/guides/annotations.html)
 * [Performance Tuning](apache-felix-dependency-manager/guides/performance-tuning.html)
 * [Development](apache-felix-dependency-manager/guides/development.html)
 * [Design Patterns](apache-felix-dependency-manager/guides/design-patterns.html)
@@ -42,7 +41,6 @@ Below is the full table of contents.
 
 ### Reference Guide
 
-* [Dependency Manager Lambda](apache-felix-dependency-manager/guides/dm-lambda.html)
 * [Components](apache-felix-dependency-manager/reference/components.html)
     * [Singleton](apache-felix-dependency-manager/reference/component-singleton.html)
     * [Aspect](apache-felix-dependency-manager/reference/component-aspect.html)
@@ -55,6 +53,8 @@ Below is the full table of contents.
     * [Configuration](apache-felix-dependency-manager/reference/dependency-configuration.html)
     * [Bundle](apache-felix-dependency-manager/reference/dependency-bundle.html)
     * [Resource](apache-felix-dependency-manager/reference/dependency-resource.html)
+* [Dependency Manager Annotations](apache-felix-dependency-manager/reference/dm-annotations.html)
+* [Dependency Manager Lambda](apache-felix-dependency-manager/guides/dm-lambda.html)
 * [Thread Model](apache-felix-dependency-manager/reference/thread-model.html)
 * [External Links and Articles](apache-felix-dependency-manager/reference/external-links.html)