svn commit: r1220769 - in /karaf/trunk/manual/src/main/webapp: WEB-INF/scalate/layouts/default.scaml _navigation.conf

[jb...@apache.org]

Author: jbonofre
Date: Mon Dec 19 14:33:22 2011
New Revision: 1220769

URL: http://svn.apache.org/viewvc?rev=1220769&view=rev
Log:
Align documentation navigation and manual TOC

Modified:
    karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
    karaf/trunk/manual/src/main/webapp/_navigation.conf

Modified: karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1220769&r1=1220768&r2=1220769&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Mon Dec 19 14:33:22 2011
@@ -17,7 +17,7 @@
 -#
 
 -@ var body: String
--@ var title : String = "Apache Karaf ${pom.version} Guide"
+-@ var title : String = "Apache Karaf ${project.version} Guide"
 - response.setContentType("text/html")
 
 -# Only include the console if it's available and the engine is in dev mode.

Modified: karaf/trunk/manual/src/main/webapp/_navigation.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_navigation.conf?rev=1220769&r1=1220768&r2=1220769&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_navigation.conf (original)
+++ karaf/trunk/manual/src/main/webapp/_navigation.conf Mon Dec 19 14:33:22 2011
@@ -8,30 +8,38 @@ h3. [Users Guide|/users-guide/index]
 - [Installing Karaf|/users-guide/installation]
 - [Directory Structure|/users-guide/directory-structure]
 - [Starting and stopping Karaf|/users-guide/start-stop]
+- [OS integration|/users-guide/wrapper]
+- [Configuration|/users-guide/configuration]
 - [Using the console|/users-guide/using-console]
 - [Web console|/users-guide/web-console]
+- [Colorized console|/users-guide/colorized-console]
 - [Remote console|/users-guide/remote-console]
+- [Web console|/users-guide/web-console]
+- [Deployer|/users-guide/deployer]
 - [Child instances|/users-guide/child-instances]
 - [Security|/users-guide/security]
 - [Failover Deployments|/users-guide/failover]
 - [Logging system|/users-guide/logging-system]
-- [Deployer|/users-guide/deployer]
 - [Provisioning|/users-guide/provisioning]
-- [Configuration|/users-guide/configuration]
+- [KAR archive|/users-guide/kar]
+- [JRE tuning|/users-guide/jre-tuning]
 - [Web applications|/users-guide/web-applications]
-- [OS integration|/users-guide/wrapper]
+- [HTTP service|/users-guide/http]
+- [JMX for monitoring and administration|/users-guide/jmx]
 
 h3. [Developers Guide|/developers-guide/index]
 
-- [Branding the Console|/developers-guide/branding-console]
+- [Programmatically connect to the Console|/developers-guide/connect-console]
+- [Shell syntax|/developers-guide/shell-syntax]
+- [Creating bundles|/developers-guide/creating-bundles]
+- [Troubleshooting, Debugging and Profiling|/developers-guide/debugging]
+- [Developer Commands|/developers-guide/developer-command]
+- [Maven Archetypes|/developers-guide/archetypes]
 - [Extending the Console|/developers-guide/extending-console]
-- [Custom Distribution|/developers-guide/custom-distribution]
+- [Branding the Console|/developers-guide/branding-console]
+- [Using the Karaf Maven plugin|/developers-guide/karaf-maven-plugin]
 - [Security Framework|/developers-guide/security-framework]
-- [Using the karaf-maven-plugin|/developers-guide/karaf-maven-plugin]
-- [Troubleshooting, Debugging and Profiling|/developers-guide/debugging]
-- [Programmatically connect to the console|/developers-guide/connect-console]
-- [Writing integration tests|/developers-guide/writing-tests]
-- [Creating bundles|/developers-guide/creating-bundles]
-- [Shell syntax|/developers-guide/shell-syntax]
+- [Writing Integration Test|/developers-guide/writing-tests]
+- {Custom Distribution|/developers-guide/custom-distribution]
 
 h3. [Commands|/commands/commands]