Updated Branches: refs/heads/master 40810dee0 -> 64be05ee9
[KARAF-2511] Update the developers guide toc Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/64be05ee Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/64be05ee Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/64be05ee Branch: refs/heads/master Commit: 64be05ee90efaeb89311bd514e7af8ab13babe3f Parents: 40810de Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Dec 23 22:01:45 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Dec 23 22:01:45 2013 +0100 ---------------------------------------------------------------------- manual/src/main/webapp/_navigation.conf | 27 ++++++++++---------- .../src/main/webapp/developers-guide/index.conf | 1 - manual/src/main/webapp/manual.conf | 20 +++++++++------ 3 files changed, 25 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/64be05ee/manual/src/main/webapp/_navigation.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/_navigation.conf b/manual/src/main/webapp/_navigation.conf index 5e0113b..7be5518 100644 --- a/manual/src/main/webapp/_navigation.conf +++ b/manual/src/main/webapp/_navigation.conf @@ -36,22 +36,21 @@ h3. [Users Guide|/users-guide/index] h3. [Developers Guide|/developers-guide/index] -- [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-commands] +- [Developer commands|/developers-guide/developer-commands] +- [Scripting|/developers-guide/scripting] +- [Programmatically connect|/developers-guide/connect] +- [Branding|/developers-guide/branding] +- [Extending|/developers-guide/extending] +- [Karaf Maven plugin|/developers-guide/karaf-maven-plugin] +- [Custom distribution|/developers-guide/custom-distribution] +- [OSGi services|/developers-guide/services] +- [Create OSGi bundle|/developers-guide/creating-bundles] +- [Blueprint|/developers-guide/blueprint] +- [CDI|/developers-guide/cdi] - [Maven Archetypes|/developers-guide/archetypes] -- [Extending the Console|/developers-guide/extending-console] -- [Branding the Console|/developers-guide/branding-console] -- [Using the Karaf Maven plugin|/developers-guide/karaf-maven-plugin] - [Security Framework|/developers-guide/security-framework] -- [Custom Distribution|/developers-guide/custom-distribution] -- [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] +- [Troubleshooting, Debugging, Profiling|/developers-guide/debugging] +- [Integration testing|/developers-guide/writing-tests] - [Github Contributions|/developers-guide/github-contributions] h3. [Commands|/commands/commands] http://git-wip-us.apache.org/repos/asf/karaf/blob/64be05ee/manual/src/main/webapp/developers-guide/index.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/developers-guide/index.conf b/manual/src/main/webapp/developers-guide/index.conf index 36c7dac..1aaaa52 100644 --- a/manual/src/main/webapp/developers-guide/index.conf +++ b/manual/src/main/webapp/developers-guide/index.conf @@ -15,5 +15,4 @@ h1. Developers Guide * [Security Framework|security-framework] * [Troubleshooting, Debugging, Profiling|debugging] * [Integration testing|writing-tests] -* [Shell syntax|shell-syntax] * [Github Contributions|github-contributions] http://git-wip-us.apache.org/repos/asf/karaf/blob/64be05ee/manual/src/main/webapp/manual.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/manual.conf b/manual/src/main/webapp/manual.conf index f86f7de..767f211 100644 --- a/manual/src/main/webapp/manual.conf +++ b/manual/src/main/webapp/manual.conf @@ -64,14 +64,11 @@ h1. Users Guide {include:users-guide/tuning} h1. Developers Guide -{include:developers-guide/connect-console.conf} -{include:developers-guide/shell-syntax.conf} -{include:developers-guide/creating-bundles.conf} -{include:developers-guide/debugging.conf} {include:developers-guide/developer-commands.conf} -{include:developers-guide/archetypes.conf} -{include:developers-guide/extending-console.conf} -{include:developers-guide/branding-console.conf} +{include:developers-guide/scripting.conf} +{include:developers-guide/connect.conf} +{include:developers-guide/branding.conf} +{include:developers-guide/extending.conf} {include:developers-guide/karaf-maven-plugin.conf} {include:developers-guide/karaf-maven-plugin-features-add-to-repository.conf} {include:developers-guide/karaf-maven-plugin-features-generate-descriptor.conf} @@ -79,7 +76,14 @@ h1. Developers Guide {include:developers-guide/karaf-maven-plugin-features-create-kar.conf} {include:developers-guide/karaf-maven-plugin-commands-generate-help.conf} {include:developers-guide/karaf-maven-plugin-instance-create-archive.conf} +{include:developers-guide/custom-distribution.conf} +{include:developers-guide/services.conf} +{include:developers-guide/creating-bundles.conf} +{include:developers-guide/blueprint.conf} +{include:developers-guide/cdi.conf} +{include:developers-guide/archetypes.conf} {include:developers-guide/security-framework.conf} +{include:developers-guide/debugging.conf} {include:developers-guide/writing-tests.conf} -{include:developers-guide/custom-distribution.conf} +{include:developers-guide/github-contributions.conf}
