karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [2/3] karaf git commit: Use article format for documentation
Date Mon, 04 Jan 2016 16:53:45 GMT
http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/installation.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/installation.adoc b/manual/src/main/asciidoc/user-guide/installation.adoc
index de89d5f..843e21d 100644
--- a/manual/src/main/asciidoc/user-guide/installation.adoc
+++ b/manual/src/main/asciidoc/user-guide/installation.adoc
@@ -12,11 +12,11 @@
 // limitations under the License.
 //
 
-== Installation
+=== Installation
 
 Apache Karaf is a lightweight container, very easy to install and administrate, on both Unix and Windows platforms.
 
-=== Requirements
+==== Requirements
 
 *Hardware:*
 
@@ -32,7 +32,7 @@ Apache Karaf is a lightweight container, very easy to install and administrate,
 * Java SE 1.7.x or greater (http://www.oracle.com/technetwork/java/javase/).
 * The JAVA_HOME environment variable must be set to the directory where the Java runtime is installed,
 
-=== Using Apache Karaf binary distributions
+==== Using Apache Karaf binary distributions
 
 Apache Karaf is available in two distributions, both as a tar.gz and zip archives.
 
@@ -44,15 +44,21 @@ It means that Apache Karaf minimal distribution requires an Internet connection
 The features provided by the "minimal" distribution are exactly the same as in the "default" distribution, the difference
 is that the minimal distribution will download the features from Internet.
 
-==== Installation on Windows platform
+===== Installation on Windows platform
 
-NB: the JAVA_HOME environment variable has to be correctly defined. To accomplish that, press Windows key and Break key together, switch to "Advanced" tab and click on "Environment Variables".
+[NOTE]
+====
+The JAVA_HOME environment variable has to be correctly defined. To accomplish that, press Windows key and Break key together, switch to "Advanced" tab and click on "Environment Variables".
+====
 
 . From a browser, navigate to http://karaf.apache.org/index/community/download.html.
 . Download Apache Karaf binary distribution in the zip format: `apache-karaf-4.0.0.zip`.
 . Extract the files from the zip file into a directory of your choice (it's the `KARAF_HOME`.
 
-NB: remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
+[NOTE]
+====
+Remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
+====
 
 [NOTE]
 ====
@@ -65,9 +71,11 @@ subst S: "C:\your very % problematic path!\KARAF"
 so your Karaf root directory is S: --- which works for sure and is short to type.
 ====
 
-==== Installation on Unix platforms
+===== Installation on Unix platforms
 
-NB: the JAVA_HOME environment variable has to be correctly defined. Check the current value using
+[NOTE]
+====
+The JAVA_HOME environment variable has to be correctly defined. Check the current value using
 
 ----
 echo $JAVA_HOME
@@ -78,6 +86,7 @@ If it's not correct, fix it using:
 ----
 export JAVA_HOME=....
 ----
+====
 
 . From a browser, navigate to http://karaf.apache.org/index/community/download.html.
 . Download Apache Karaf binary distribution in the tar.gz format: `apache-karaf-4.0.0.tar.gz`.
@@ -88,9 +97,12 @@ gunzip apache-karaf-4.0.0.tar.gz
 tar xvf apache-karaf-4.0.0.tar
 ----
 
-NB: remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
+[NOTE]
+====
+Remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
+====
 
-=== Post-Installation steps
+==== Post-Installation steps
 
 Thought it is not always required, it is strongly advised to set up the `JAVA_HOME` environment property to point to the JDK you want Apache Karaf to use before starting it.
 This property is used to locate the `java` executable and should be configured to point to the home directory of the Java SE 7 installation.
@@ -103,7 +115,7 @@ You can define your own directory layout, by using some Karaf environment variab
 * `KARAF_ETC` is the location of the etc folder, where Karaf stores configuration files.
 * `KARAF_BASE` is the Karaf base folder. By default `KARAF_BASE` is the same as `KARAF_HOME`.
 
-=== Building from Sources
+==== Building from Sources
 
 If you intend to build Apache Karaf from the sources, the requirements are a bit different:
 
@@ -116,7 +128,7 @@ If you intend to build Apache Karaf from the sources, the requirements are a bit
 * Java SE Development Kit 1.7.x or greater (http://www.oracle.com/technetwork/java/javase/).
 * Apache Maven 3.0.4 or greater (http://maven.apache.org/download.html).
 
-==== Building on Windows platform
+===== Building on Windows platform
 
 You can get the Apache Karaf sources from:
 
@@ -133,15 +145,18 @@ Use Apache Maven to build Apache Karaf:
 mvn clean install
 ----
 
-NB: you can speed up the build by bypassing the unit tests:
+[NOTE]
+====
+You can speed up the build by bypassing the unit tests:
 
 ----
 mvn clean install -DskipTests
 ----
+====
 
 Now, you can find the built binary distribution in `assemblies\apache-karaf\target\apache-karaf-4.0.0.zip`.
 
-==== Building on Unix platforms
+===== Building on Unix platforms
 
 You can get the Apache Karaf sources from:
 
@@ -158,10 +173,13 @@ Use Apache Maven to build Apache Karaf:
 mvn clean install
 ----
 
-NB: you can speed up the build by bypassing the unit tests:
+[NOTE]
+====
+You can speed up the build by bypassing the unit tests:
 
 ----
 mvn clean install -DskipTests
 ----
+====
 
 Now, you can find the built binary distribution in `assemblies/apache-karaf/target/apache-karaf-4.0.0.tar.gz`.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/instances.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/instances.adoc b/manual/src/main/asciidoc/user-guide/instances.adoc
index bdcec2b..84ef494 100644
--- a/manual/src/main/asciidoc/user-guide/instances.adoc
+++ b/manual/src/main/asciidoc/user-guide/instances.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Instances
+=== Instances
 
 A instance is a complete new Apache Karaf runtime, isolated from the other ones.
 
@@ -22,11 +22,11 @@ A instance is a new instance that you can launch separately from the root one, a
 
 A instance does not contain a full copy of the Apache Karaf distribution, but only a set of the configuration files and data folder which contains all the runtime information, logs and temporary files.
 
-=== Using the instance commands
+==== Using the instance commands
 
 The *instance* commands allow you to create and manage instances.
 
-==== Creating instances
+===== Creating instances
 
 You create a new runtime instance by typing [`instance:create`|/commands/instance-create] in the Karaf console.
 
@@ -72,7 +72,7 @@ Creating file: /opt/karaf/instances/test/bin/stop
 You can manually configure the different ports, the location of the instance, the Apache Karaf features URLs using different options of the `instance:create` command.
 You can have details about these options using the `--help` option.
 
-==== Cloning an instance
+===== Cloning an instance
 
 Instead of creating a fresh instance, you can clone an existing instance using `instance:clone`.
 
@@ -84,7 +84,7 @@ karaf@root()> instance:clone root test
 
 You can have details about the cloning options using the `--help` option.
 
-==== Changing the instance location
+===== Changing the instance location
 
 By default, the new instances storage is in the `KARAF_HOME/instance` directory.
 You find a directory with the name of the instance storing the different instance files.
@@ -127,7 +127,7 @@ Careful, it's not possible to change the location of an instance once it has bee
 `instance:destroy` will remove the instance location for you. You don't have to remove the instance location "by hand".
 ====
 
-==== Changing instance ports
+===== Changing instance ports
 
 You can change the SSH port number assigned to an instance using the `instance:ssh-port-change` command:
 
@@ -158,7 +158,7 @@ where test is the instance name and 44447 is the new RMI Server port number to u
 The instance has to be stopped to be able to change the port numbers.
 ====
 
-==== Starting instances
+===== Starting instances
 
 New instances are created in a stopped state.
 
@@ -170,7 +170,7 @@ karaf@root()> instance:start test
 
 where test is the instance name.
 
-==== Listing instances
+===== Listing instances
 
 To list the instances and their current status, you can use the `instance:list` command:
 
@@ -188,7 +188,7 @@ An instance can be in the following status:
 - Starting: the instance is starting.
 - Started: the instance is up and running. You can connect and use it.
 
-==== Status of an instance
+===== Status of an instance
 
 You can get directly the status of a given instance using the `instance:status` command:
 
@@ -199,7 +199,7 @@ Started
 
 where test is the instance name.
 
-==== Connecting to an instance
+===== Connecting to an instance
 
 You can connect to a running instance directly from the root one using the `instance:connect` command:
 
@@ -245,7 +245,7 @@ region                        | 4.0.0           | x         | standard-4.0.0
 ...
 ----
 
-==== Stop an instance
+===== Stop an instance
 
 To stop an instance, you can connect to the instance (using `instance:connect`) and execute the `system:shutdown`
 command.
@@ -260,7 +260,7 @@ where test is the instance name.
 
 The instance will go to the "Stopped" state.
 
-==== Destroy an instance
+===== Destroy an instance
 
 You can completely delete a stopped instance using the `instance:destroy` command:
 
@@ -275,7 +275,7 @@ where test is the instance name.
 The `instance:destroy` deletes the instance store (the location where the instance files are stored).
 ====
 
-==== Rename an instance
+===== Rename an instance
 
 You can change the name of a stopped instance using the `instance:rename` command:
 
@@ -285,7 +285,7 @@ karaf@root()> instance:rename test newTest
 
 where test is the current instance name, and newTest the new instance name.
 
-=== Instance script
+==== Instance script
 
 The `instance:*` commands require the root instance running.
 
@@ -350,13 +350,13 @@ OPTIONS
 
 ----
 
-=== JMX InstanceMBean
+==== JMX InstanceMBean
 
 On the JMX layer, you have a MBean dedicated to the management of the instances: the InstanceMBean.
 
 The ObjectName to use is `org.apache.karaf:type=instance,name=*`.
 
-==== Attributes
+===== Attributes
 
 The `Instances` attribute is a tabular data attribute providing details about the instances:
 
@@ -370,7 +370,7 @@ The `Instances` attribute is a tabular data attribute providing details about th
 * `SSH Port` (int): it's the port number of the instance SSH Server.
 * `State` (string): it's the current status of the instance (Stopped, Starting, Started).
 
-==== Operations
+===== Operations
 
 The InstanceMBean provides the following operations, corresponding to the previous `instance:*` commands:
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/jdbc.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/jdbc.adoc b/manual/src/main/asciidoc/user-guide/jdbc.adoc
index 177a6da..083c852 100644
--- a/manual/src/main/asciidoc/user-guide/jdbc.adoc
+++ b/manual/src/main/asciidoc/user-guide/jdbc.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== DataSources (JDBC)
+==== DataSources (JDBC)
 
 The Apache Karaf DataSources (JDBC) is an optional enterprise feature.
 
@@ -41,9 +41,9 @@ This feature provides an OSGi service to create/delete JDBC datasources in the c
 
 This JDBC OSGi service can be manipulated programmatically (see the developer guide for details), using the `jdbc:*` commands, or using the JDBC MBean.
 
-==== Commands
+===== Commands
 
-===== `jdbc:ds-create`
+====== `jdbc:ds-create`
 
 The `jdbc:ds-create` command automatically creates a datasource definition file by leveraging pax-jdbc.
 
@@ -97,7 +97,7 @@ karaf@root()> jdbc:ds-create -dn derby -dbName test -url jdbc:derby:test test
 
 We can see that this command created a configuration PID containing the datasource properties.
 
-==== `jdbc:ds-delete`
+===== `jdbc:ds-delete`
 
 The `jdbc:ds-delete` command deletes a datasource.
 
@@ -105,7 +105,7 @@ The `jdbc:ds-delete` command deletes a datasource.
 karaf@root()> jdbc:ds-delete test
 ----
 
-==== `jdbc:ds-list`
+===== `jdbc:ds-list`
 
 The `jdbc:ds-list` command lists the JDBC datasources:
 
@@ -116,7 +116,7 @@ Name | Product | Version | URL | Status
 
 ----
 
-==== `jdbc:ds-info`
+===== `jdbc:ds-info`
 
 The `jdbc:ds-info` command provides details about a JDBC datasource:
 
@@ -132,7 +132,7 @@ driver.name    | Apache Derby Embedded JDBC Driver
 url            | jdbc:derby:test
 ----
 
-==== `jdbc:execute`
+===== `jdbc:execute`
 
 The `jdbc:execute` command executes a SQL query that doesn't return any result on a given JDBC datasource.
 
@@ -151,7 +151,7 @@ karaf@root()> jdbc:execute test "insert into person(name, nick) values('foo','ba
 karaf@root()> jdbc:execute test "insert into person(name, nick) values('test','test')"
 ----
 
-==== `jdbc:query`
+===== `jdbc:query`
 
 The `jdbc:query` command is similar to the `jdbc:execute` one but it displays the query result.
 
@@ -165,7 +165,7 @@ bar        | foo
 test       | test
 ----
 
-==== `jdbc:tables`
+===== `jdbc:tables`
 
 The `jdbc:tables` command displays all tables available on a given JDBC datasource:
 
@@ -198,13 +198,13 @@ REF_GENERATION | TYPE_NAME | TABLE_NAME       | TYPE_CAT | REMARKS | TYPE_SCHEM
                |           | PERSON           |          |         |            | TABLE        | APP         |           |
 ----
 
-==== JMX JDBC MBean
+===== JMX JDBC MBean
 
 The JMX JDBC MBean provides the JDBC datasources, and the operations to manipulate datasources and database.
 
 The object name to use is `org.apache.karaf:type=jdbc,name=*`.
 
-===== Attributes
+====== Attributes
 
 The `Datasources` attribute provides a tabular data of all JDBC datasource, containing:
 
@@ -213,7 +213,7 @@ The `Datasources` attribute provides a tabular data of all JDBC datasource, cont
 * `url` is the JDBC URL used by the datasource
 * `version` is the database version backend.
 
-===== Operations
+====== Operations
 
 * `create(name, type, jdbcDriverClassName, version, url, user, password, installBundles)` creates a JDBC datasource (the arguments correspond to the options of the `jdbc:create` command).
 * `delete(name)` deletes a JDBC datasource.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/jms.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/jms.adoc b/manual/src/main/asciidoc/user-guide/jms.adoc
index 8d2585d..174fa63 100644
--- a/manual/src/main/asciidoc/user-guide/jms.adoc
+++ b/manual/src/main/asciidoc/user-guide/jms.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== JMS
+==== JMS
 
 The Apache Karaf MOM (Messaging Oriented Middleware/JMS) is an optional enterprise feature.
 
@@ -52,9 +52,9 @@ and perform JMS operations (send or consume messages, get information about a JM
 
 This JMS OSGi service can be manipulated programmatically (see the developer guide for details), using the `jms:*` commands, or using the JMS MBean.
 
-==== Commands
+===== Commands
 
-===== `jms:create`
+====== `jms:create`
 
 The `jms:create` command creates a JMS connection factory in the Apache Karaf container. It automatically creates a
 blueprint XML file in the `deploy` folder containing the JMS connection factory definition corresponding
@@ -128,7 +128,7 @@ By default, the `jms:create` command constructs a JNDI name for the connection f
 
 It means that the connection factory name to use for the other `jms:*` commands is `/jms/[name]`.
 
-===== `jms:delete`
+====== `jms:delete`
 
 The `jms:delete` command deletes a JMS connection factory. The `name` argument is the name that you used at creation time:
 
@@ -136,7 +136,7 @@ The `jms:delete` command deletes a JMS connection factory. The `name` argument i
 karaf@root()> jms:delete test
 ----
 
-===== `jms:connectionfactories`
+====== `jms:connectionfactories`
 
 The `jms:connectionfactories` command lists the JMS connection factories:
 
@@ -147,7 +147,7 @@ JMS Connection Factory
 /jms/test     
 ----
 
-===== `jms:info`
+====== `jms:info`
 
 The `jms:info` command provides details about the JMS connection factory:
 
@@ -163,7 +163,7 @@ You can see the JMS broker product and version.
 
 If the JMS broker requires an authentication, you can use the `-u` (`--username`) and `-p` (`--password`) options.
 
-===== `jms:queues`
+====== `jms:queues`
 
 The `jms:queues` command lists the JMS queues available on a JMS broker. For instance:
 
@@ -184,7 +184,7 @@ Depending of the JMS connection factory type, this command may not work.
 For now, the command works only with Apache ActiveMQ.
 ====
 
-===== `jms:topics`
+====== `jms:topics`
 
 The `jms:topics` command lists the JMS topics available on a JMS broker. For instance:
 
@@ -205,7 +205,7 @@ Depending of the JMS connection factory type, this command may not work.
 For now, the command works only with Apache ActiveMQ.
 ====
 
-===== `jms:send`
+====== `jms:send`
 
 The `jms:send` command sends a message to a given JMS queue.
 
@@ -217,7 +217,7 @@ karaf@root()> jms:send /jms/test MyQueue "Hello World"
 
 If the JMS broker requires an authentication, you can use the `-u` (`--username`) and `-p` (`--password`) options.
 
-===== `jms:consume`
+====== `jms:consume`
 
 The `jms:consume` command consumes messages from a JMS queue.
 
@@ -238,7 +238,7 @@ The `jms:consume` command just consumes (so removes) messages from a JMS queue.
 If you want to see the details of messages, you can use the `jms:browse` command.
 ====
 
-===== `jms:count`
+====== `jms:count`
 
 The `jms:count` command counts the number of pending messages into a JMS queue.
 
@@ -253,7 +253,7 @@ Messages Count
 
 If the JMS broker requires an authentication, you can use the `-u` (`--username`) and `-p` (`--password`) options.
 
-===== `jms:browse`
+====== `jms:browse`
 
 The `jms:browse` command browses a JMS queue and display details about messages.
 
@@ -283,7 +283,7 @@ If you want to browse only some messages, you can define a selector using the `-
 
 If the JMS broker requires an authentication, you can use the `-u` (`--username`) and `-p` (`--password`) options.
 
-===== `jms:move`
+====== `jms:move`
 
 The `jms:move` command consumes all messages from a JMS queue and send it to another one.
 
@@ -294,17 +294,17 @@ karaf@root()> jms:move /jms/test MyQueue AnotherQueue
 3 message(s) moved
 ----
 
-==== JMX JMS MBean
+===== JMX JMS MBean
 
 The JMX JMS MBean provides the attributes and operations to manipulate the JMS connection factories and JMS messages.
 
 The object name to use is `org.apache.karaf:type=jms,name=*`.
 
-===== Attributes
+====== Attributes
 
 The `Connectionfactories` attribute provides the list of all JMS connection factories names.
 
-===== Operations
+====== Operations
 
 * `create(name, type, url)` creates a JMS connection factory.
 * `delete(name)` deletes a JMS connection factory.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/jndi.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/jndi.adoc b/manual/src/main/asciidoc/user-guide/jndi.adoc
index 12e44a6..d11d86b 100644
--- a/manual/src/main/asciidoc/user-guide/jndi.adoc
+++ b/manual/src/main/asciidoc/user-guide/jndi.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== Naming (JNDI)
+==== Naming (JNDI)
 
 The Apache Karaf Naming (JNDI) is an optional enterprise feature.
 
@@ -29,7 +29,7 @@ You have two parts in the Apache Karaf JNDI support:
 * a fully compliant implementation of the OSGi Alliance JNDI Service specification.
 * a more "regular" JNDI context, containing different names that you can administrate.
 
-==== OSGi Services Registry and JNDI
+===== OSGi Services Registry and JNDI
 
 The OSGi Service Registry provides a centralized register/query capabilities for OSGi services.
 
@@ -51,7 +51,7 @@ Context ctx = new InitialContext();
 Runnable r = (Runnable) ctx.lookup("osgi:service/java.lang.Runnable");
 ----
 
-==== JNDI service
+===== JNDI service
 
 Apache Karaf also supports regular JNDI, including a directoy system where you can register name bindings, sub-context, etc.
 
@@ -65,11 +65,11 @@ Runnable r = (Runnable) ctx.lookup("this/is/the/name");
 It also allows you to bind some OSGi services as "pure" JNDI name. In that case, you don't have to use the specific
 `osgi:service` scheme.
 
-==== Commands
+===== Commands
 
 Apache Karaf provides specific commands to manipulate the JNDI service.
 
-===== `jndi:names`
+====== `jndi:names`
 
 The `jndi:names` command lists all JNDI names. It groups both the JNDI names from the `osgi:service` scheme and the
 regular JNDI names:
@@ -102,7 +102,7 @@ The `jndi:names` lists only names (the full qualified name). It means that the e
 To display all JNDI sub-contexts (empty or not), you can use the `jndi:contexts` command.
 ====
 
-===== `jndi:contexts`
+====== `jndi:contexts`
 
 The `jndi:contexts` command lists all JNDI sub-contexts:
 
@@ -114,7 +114,7 @@ other/context
 foo/bar
 ----
 
-===== `jndi:create`
+====== `jndi:create`
 
 The `jndi:create` command creates a new JNDI sub-context:
 
@@ -122,7 +122,7 @@ The `jndi:create` command creates a new JNDI sub-context:
 karaf@root()> jndi:create my/company
 ----
 
-===== `jndi:delete`
+====== `jndi:delete`
 
 The `jndi:delete` command deletes a JNDI sub-context:
 
@@ -130,7 +130,7 @@ The `jndi:delete` command deletes a JNDI sub-context:
 karaf@root()> jndi:delete my/company
 ----
 
-===== `jndi:alias`
+====== `jndi:alias`
 
 The `jndi:alias` command creates a new JNDI name (alias) with an existing one.
 
@@ -162,7 +162,7 @@ alias/jndi/service | org.apache.karaf.jndi.internal.JndiServiceImpl
 The `jndi:alias` automatically creates all required JNDI sub-contexts.
 ====
 
-===== `jndi:bind`
+====== `jndi:bind`
 
 The `jndi:bind` command binds an OSGi service with a JNDI name.
 
@@ -179,7 +179,7 @@ osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
 services/kar      | org.apache.karaf.kar.internal.KarServiceImpl
 ----
 
-===== `jndi:unbind`
+====== `jndi:unbind`
 
 The `jndi:unbind` command unbind a given JNDI name:
 
@@ -201,20 +201,20 @@ osgi:service/jndi | org.apache.karaf.jndi.internal.JndiServiceImpl
 It's not possible to unbind a name from the `osgi:service` schema, as it's linked to a OSGi service.
 ====
 
-==== JMX JndiMBean
+===== JMX JndiMBean
 
 The JMX JndiMBean provides the JNDI names, and the operations to manipulate the JNDI service.
 
 The object name to use is `org.apache.karaf:type=jndi,name=*`.
 
-===== Attributes
+====== Attributes
 
 The `Names` attribute provides a map containing all JNDI names and class names from both `osgi:service` scheme
 and the regular JNDI service.
 
 The `Contexts` attribute provides a list containing all JNDI sub-contexts.
 
-===== Operations
+====== Operations
 
 * `getNames(context)` provides a map containing JNDI names and class names in a given JNDI sub-context.
 * `create(context)` creates a new JNDI sub-context.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/jpa.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/jpa.adoc b/manual/src/main/asciidoc/user-guide/jpa.adoc
index aa94112..6c32eee 100644
--- a/manual/src/main/asciidoc/user-guide/jpa.adoc
+++ b/manual/src/main/asciidoc/user-guide/jpa.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== Persistence (JPA)
+==== Persistence (JPA)
 
 Apache Karaf provides JPA persistence providers (such as Apache OpenJPA) to be easy to use (in a OSGi way) and provide
 container managed persistence for applications (using Blueprint).
@@ -21,7 +21,7 @@ Apache Karaf embeds Aries JPA, providing a very easy way to develop applications
 
 See the developer guide for details about developing applications that use JPA.
 
-==== Persistence engine features
+===== Persistence engine features
 
 Apache Karaf provides a set of ready to use persistence engine features:
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/jta.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/jta.adoc b/manual/src/main/asciidoc/user-guide/jta.adoc
index e3439e5..eafd7df 100644
--- a/manual/src/main/asciidoc/user-guide/jta.adoc
+++ b/manual/src/main/asciidoc/user-guide/jta.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== Transaction (JTA)
+==== Transaction (JTA)
 
 Apache Karaf provides container managed transactions, available as OSGi services.
 
@@ -25,7 +25,7 @@ karaf@root()> feature:install transaction
 However, the `transaction` feature is installed (as a transitive dependency) when installing enterprise features
 (like `jdbc` or `jms` features for instance).
 
-==== Apache Aries Transaction and ObjectWeb HOWL
+===== Apache Aries Transaction and ObjectWeb HOWL
 
 The `transaction` feature uses Apache Aries and ObjectWeb HOWL. Aapache Aries Transaction "exposes" the transaction
 manager as OSGi service. The actual implementation of the transaction manager is ObjectWeb HOWL.
@@ -41,7 +41,7 @@ It is not a replacement for traditional log kits such as LOG4J and Java SE Loggi
 In Apache Karaf, ObjectWeb HOWL (High-speed ObjectWeb Logger) is used to implement TransactionLog (in Aries Transaction),
 providing a very performant transaction manager in an OSGi way.
 
-==== Configuration
+===== Configuration
 
 The installation of the `transaction` feature installs a new configuration: `org.apache.aries.transaction`.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/kar.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/kar.adoc b/manual/src/main/asciidoc/user-guide/kar.adoc
index 50c343d..6e1a367 100644
--- a/manual/src/main/asciidoc/user-guide/kar.adoc
+++ b/manual/src/main/asciidoc/user-guide/kar.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== KAR
+=== KAR
 
 As described in the link:provisioning[Provisioning section], Apache Karaf features describe applications.
 
@@ -97,7 +97,7 @@ updating: repository/ (stored 0%)
 
 You can create KAR files using Apache Maven, or directly in the Apache Karaf console.
 
-=== Maven
+==== Maven
 
 Apache Karaf provides a Maven plugin: `karaf-maven-plugin`.
 
@@ -145,11 +145,11 @@ To create the KAR file, simply type:
 
 Uou will have your kar in the `target` directory.
 
-=== Commands
+==== Commands
 
 Apache Karaf provides `kar:*` commands to manage KAR archives.
 
-==== `kar:list`
+===== `kar:list`
 
 The `kar:list` command lists the installed KAR archives.
 
@@ -162,7 +162,7 @@ my-kar-1.0-SNAPSHOT
 
 A KAR is identified by its name.
 
-==== `kar:create`
+===== `kar:create`
 
 Instead of using the `karaf-maven-plugin` or create the KAR archive by hand, you can use the `kar:create` command.
 
@@ -211,7 +211,7 @@ Adding feature pax-tomcat
 Kar file created : /opt/apache-karaf-4.1.4/data/kar/org.ops4j.pax.web-4.1.4.kar
 ----
 
-==== `kar:install`
+===== `kar:install`
 
 You can deploy a KAR file using `kar:install` command.
 
@@ -227,7 +227,7 @@ The KAR file is uncompressed and populated the `KARAF_BASE/system` folder.
 The Apache Karaf KAR service is looking for features XML files in the KAR file, registers the features XML and automatically
 installs all features described in the features repositories present in the KAR file.
 
-==== `kar:uninstall`
+===== `kar:uninstall`
 
 The `kar:uninstall` command uninstall a KAR file (identified by a name).
 
@@ -242,7 +242,7 @@ For instance, to uninstall the previously installed `my-kar-1.0-SNAPSHOT.kar` KA
 karaf@root()> kar:uninstall my-kar-1.0-SNAPSHOT
 ----
 
-=== Deployer
+==== Deployer
 
 Apache Karaf also provides a KAR deployer. It means that you can drop a KAR file directly in the `deploy` folder.
 
@@ -280,17 +280,17 @@ noAutoRefreshBundles=false
 By default, when the KAR deployer install features, by default, it refresh the bundles already installed.
 You can disable the automatic bundles refresh by setting the `noAutoRefreshBundles` property to `false`.
 
-=== JMX KarMBean
+==== JMX KarMBean
 
 On the JMX layer, you have a MBean dedicated to the management of the KAR files.
 
 The ObjectName to use is `org.apache.karaf:type=kar,name=*`.
 
-==== Attributes
+===== Attributes
 
 The `Kars` attributes provides the list of KAR files (name) installed.
 
-==== Operations
+===== Operations
 
 * `install(url)` installs the KAR file at the given `url`.
 * `create(repository, features)` creates a KAR file using the given features `repository` name, and optionally the

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/log.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc b/manual/src/main/asciidoc/user-guide/log.adoc
index faaf16e..1ab1b72 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Log
+=== Log
 
 Apache Karaf provides a very dynamic and powerful logging system.
 
@@ -28,7 +28,7 @@ It supports:
 It means that the applications can use any logging framework, Apache Karaf will use the central log system to manage the
 loggers, appenders, etc.
 
-=== Configuration files
+==== Configuration files
 
 The initial log configuration is loaded from `etc/org.ops4j.pax.logging.cfg`.
 
@@ -118,7 +118,7 @@ You can edit this file at runtime: any change will be reloaded and be effective
 Another configuration file is used by Apache Karaf: `etc/org.apache.karaf.log.cfg`. This files configures the Log Service
 used by the log commands (see later).
 
-=== Log4j v2 support
+==== Log4j v2 support
 
 Karaf supports log4j v2 backend.
 
@@ -160,16 +160,16 @@ A default configuration in `etc/log4j2.xml` could be:
 </Configuration>
 ----
 
-=== Commands
+==== Commands
 
 Instead of changing the `etc/org.ops4j.pax.logging.cfg` file, Apache Karaf provides a set of commands allowing to
 dynamically change the log configuration and see the log content:
 
-==== `log:clear`
+===== `log:clear`
 
 The `log:clear` command clears the log entries.
 
-==== `log:display`
+===== `log:display`
 
 The `log:display` command displays the log entries.
 
@@ -238,14 +238,14 @@ karaf@root()> log:display -p "%d - %c - %m%n"
 The pattern is a regular Log4j pattern where you can use keywords like %d for the date, %c for the class, %m for the log
 message, etc.
 
-==== `log:exception-display`
+===== `log:exception-display`
 
 The `log:exception-display` command displays the last occurred exception.
 
 As for `log:display` command, the `log:exception-display` command uses the `rootLogger` by default, but you can
 specify a logger with the `logger` argument.
 
-==== `log:get`
+===== `log:get`
 
 The `log:get` command show the current log level of a logger.
 
@@ -287,7 +287,7 @@ my.logger | DEBUG
 
 The `log:list` command is an alias to `log:get ALL`.
 
-==== `log:log`
+===== `log:log`
 
 The `log:log` command allows you to manually add a message in the log. It's interesting when you create Apache Karaf
 scripts:
@@ -306,7 +306,7 @@ karaf@root()> log:display
 2015-07-01 07:21:38,902 | ERROR | Local user karaf | command                          | 59 - org.apache.karaf.log.command - 4.0.0 | Hello World
 ----
 
-==== `log:set`
+===== `log:set`
 
 The `log:set` command sets the log level of a logger.
 
@@ -394,7 +394,7 @@ So, both `my.logger.custom` and `my.logger` use the log level of the parent `roo
 
 It's not possible to use DEFAULT keyword with the `rootLogger` and it doesn't have parent.
 
-==== `log:tail`
+===== `log:tail`
 
 The `log:tail` is exactly the same as `log:display` but it continuously displays the log entries.
 
@@ -412,24 +412,24 @@ karaf@root()> log:tail
 
 To exit from the `log:tail` command, just type CTRL-C.
 
-=== JMX LogMBean
+==== JMX LogMBean
 
 All actions that you can perform with the `log:*` command can be performed using the LogMBean.
 
 The LogMBean object name is `org.apache.karaf:type=log,name=*`.
 
-==== Attributes
+===== Attributes
 
 * `Level` attribute is the level of the ROOT logger.
 
-==== Operations
+===== Operations
 
 * `getLevel(logger)` to get the log level of a specific logger. As this operation supports the ALL keyword, it returns a Map with the level of each logger.
 * `setLevel(level, logger)` to set the log level of a specific logger. This operation supports the DEFAULT keyword as for the `log:set` command.
 
-=== Advanced configuration
+==== Advanced configuration
 
-==== Filters
+===== Filters
 
 You can use filters on appender. Filters allow log events to be evaluated to determine if or how they should be published.
 
@@ -470,7 +470,7 @@ log4j.appender.out.filter.f1.LevelMin=DEBUG
 Thanks to this filter, the log files generated by the `out` appender will contain only log messages with a level
 between DEBUG and FATAL (the log events with TRACE as level are rejected).
 
-==== Nested appenders
+===== Nested appenders
 
 A nested appender is a special kind of appender that you use "inside" another appender.
 It allows you to create some kind of "routing" between a chain of appenders.
@@ -498,7 +498,7 @@ log4j.appender.jms=org.apache.log4j.net.JMSAppender
 ...
 ----
 
-==== Error handlers
+===== Error handlers
 
 Sometime, appenders can fail. For instance, a RollingFileAppender tries to write on the filesystem but the filesystem is full, or a JMS appender tries to send a message but the JMS broker is not there.
 
@@ -524,7 +524,7 @@ log4j.appender.[appender-name].errorhandler.logger-ref=[logger-ref]
 log4j.appender.[appender-name].errorhandler.appender-ref=[appender-ref]
 ----
 
-==== OSGi specific MDC attributes
+===== OSGi specific MDC attributes
 
 The `sift` appender is a OSGi oriented appender allowing you to split the log events based on MDC (Mapped Diagnostic Context) attributes.
 
@@ -549,7 +549,7 @@ log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
 log4j.appender.sift.appender.append=true
 ----
 
-==== Enhanced OSGi stack trace renderer
+===== Enhanced OSGi stack trace renderer
 
 By default, Apache Karaf provides a special stack trace renderer, adding some OSGi specific specific information.
 
@@ -575,7 +575,7 @@ java.lang.IllegalArgumentException: Command not found:  *:foo
 	at java.lang.Thread.run(Thread.java:637)[:1.7.0_21]
 ----
 
-==== Custom appenders
+===== Custom appenders
 
 You can use your own appenders in Apache Karaf.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/monitoring.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/monitoring.adoc b/manual/src/main/asciidoc/user-guide/monitoring.adoc
index 5f8f809..9b7a820 100644
--- a/manual/src/main/asciidoc/user-guide/monitoring.adoc
+++ b/manual/src/main/asciidoc/user-guide/monitoring.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Monitoring and Management using JMX
+=== Monitoring and Management using JMX
 
 Apache Karaf provides a complete JMX layer.
 
@@ -20,7 +20,7 @@ You can remotely connect to a running Apache Karaf instance using any JMX client
 
 The Apache Karaf features provide a set of MBeans, dedicating for the monitoring and management.
 
-=== Connecting
+==== Connecting
 
 Apache Karaf exposes a complete MBean server that you can use remotely.
 
@@ -45,7 +45,7 @@ The JMX layer user the security framework, and so, by default, it uses the users
 
 You can change the port numbers of the JMX layer in the `etc/org.apache.karaf.management.cfg` configuration file.
 
-=== Configuration
+==== Configuration
 
 The Apache Karaf JMX management layer is configured in the `etc/org.apache.karaf.management.cfg` configuration file:
 
@@ -119,7 +119,7 @@ objectName = connector:name=rmi
 * `rmiServerPort` property contains the port number of the JMX RMI server. Default is `44444`.
 * `jmxRealm` is the security realm to use as authentication backend. By default it uses the `karaf` realm.
 
-=== MBeans
+==== MBeans
 
 Apache Karaf provides a bunch of MBeans.
 
@@ -151,7 +151,7 @@ The following MBeans list is non exhaustive:
 * `org.apache.karaf:type=web,name=*`: management of WebApplications (provided by the `war` feature).
 * `org.apache.karaf:type=wrapper,name=*`: management of the service wrapper (provided by the `wrapper` feature).
 
-=== RBAC
+==== RBAC
 
 Apache Karaf provides a complete Role-Based Access Control to the JMX MBeans and operations.
 
@@ -231,7 +231,7 @@ By default, all "read-only" operations (`list*`, `get*`, `is*`) can be performed
 The `org.apache.karaf:type=security,area=jmx` MBean can be used to check whether the current user can access a certain MBean or invoke a specific operation on it.
 This MBean can be used by management clients (monitoring tools, etc) to decide whether to show certain MBeans or operations to the end user.
 
-=== JMX-HTTP bridge with Jolokia
+==== JMX-HTTP bridge with Jolokia
 
 It's not always easy to use a JMX client with the RMI protocol.
 
@@ -282,6 +282,6 @@ Enter host password for user 'karaf':
 
 You can find details on the http://www.jolokia.org[Jolokia website] and in the http://www.jolokia.org/reference/html/[documentation].
 
-=== Decanter
+==== Apache Karaf Decanter
 
 Apache Karaf Decanter provides a complete monitoring solution including data history, turnkey dashboards, SLA and alerting support.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/obr.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/obr.adoc b/manual/src/main/asciidoc/user-guide/obr.adoc
index c725a24..94f18fa 100644
--- a/manual/src/main/asciidoc/user-guide/obr.adoc
+++ b/manual/src/main/asciidoc/user-guide/obr.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== OBR
+=== OBR
 
 The goal of OBR (OSGi Bundle Repository) is:
 
@@ -47,7 +47,7 @@ Thanks to that, when you install ("deploy" in OBR wording) a bundle using the OB
 providing the capabilities matching the bundle requirements.
 It will automatically install the bundles needed for the bundle.
 
-=== Features OBR resolver
+==== Features OBR resolver
 
 If the feature specifies `obr` in the `resolver` attribute, Apache Karaf can use the OBR service to construct the list
 of bundles to install with the features.
@@ -56,9 +56,9 @@ The feature default resolver just consider the bundles described in the feature
 
 Using the OBR resolver, Apache Karaf can extend the bundle list at the feature installation time using the OBR service.
 
-=== Commands
+==== Commands
 
-==== `obr:url-add`
+===== `obr:url-add`
 
 The `obr:url-add` command registers the OBR repository at a given URL in the OBR service.
 
@@ -73,7 +73,7 @@ For instance:
 karaf@root()> obr:url-add file:///user/.m2/repository/repository.xml
 ----
 
-==== `obr:url-list`
+===== `obr:url-list`
 
 The `obr:url-list` command lists the OBR repository (with URL) registered in the OBR service:
 
@@ -84,7 +84,7 @@ Index | OBR URL
 0     | file:/user/.m2/repository/repository.xml
 ----
 
-==== `obr:url-refresh`
+===== `obr:url-refresh`
 
 The `obr:url-refresh` command refresh an OBR repository (reloading the URL).
 
@@ -110,7 +110,7 @@ To do so, you have to use the `-i` option:
 karaf@root()> obr:url-refresh -i 0
 ----
 
-==== `obr:url-remove`
+===== `obr:url-remove`
 
 The `obr:url-remove` command removes an OBR repository from the OBR service.
 
@@ -127,7 +127,7 @@ To do so, you have to use the `-i` option:
 karaf@root()> obr:url-remove -i 0
 ----
 
-==== `obr:list`
+===== `obr:list`
 
 The `obr:list` command lists all bundles available on the registered OBR repositories:
 
@@ -143,7 +143,7 @@ Apache Aries Application API                                                 | o
 ...
 ----
 
-==== `obr:info`
+===== `obr:info`
 
 The `obr:info` command displays the details about bundles available on the OBR service. Especially, it provides details about
 capabilities and requirements of bundles.
@@ -197,7 +197,7 @@ karaf@root()> obr:info org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wrap
 ...
 ----
 
-==== `obr:source`
+===== `obr:source`
 
 In addition of the bundles executable, the OBR service can also store the bundles sources.
 
@@ -221,7 +221,7 @@ karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core,4.0.0 org.apache.kar
 ...
 ----
 
-==== `obr:resolve`
+===== `obr:resolve`
 
 The `obr:resolve` command displays the resolution output for a given set of requirements. Actually, it show the bundles providing
 the capabilities to match the requirements. It's what the OBR service does when executing `obr:deploy`.
@@ -237,7 +237,7 @@ Required resource(s):
    Apache Karaf :: Wrapper :: Core (4.0.0)
 ----
 
-==== `obr:find`
+===== `obr:find`
 
 The `obr:find` command is similar to the `obr:resolve` one. It displays the bundles resolving the provided requirements, with details.
 
@@ -275,7 +275,7 @@ Capabilities:
    package:{package=org.apache.karaf.wrapper.management, uses:=javax.management, version=4.0.0}
 ----
 
-==== `obr:deploy`
+===== `obr:deploy`
 
 The `obr:deploy` command installs a bundle from the OBR repository, including all bundles required to satisfy the bundle requirements.
 
@@ -309,7 +309,7 @@ karaf@root()> obr:deploy org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wr
 ...
 ----
 
-=== `obr:start`
+==== `obr:start`
 
 The `obr:start` command does the same as `obr:deploy -s` command. It installs the bundle (and all required bundles to
 satisfy the requirements) and starts all installed bundles.
@@ -342,19 +342,19 @@ karaf@root()> obr:start org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wra
 ...
 ----
 
-=== JMX ObrMBean
+==== JMX ObrMBean
 
 On the JMX layer, Apache Karaf provides a MBean dedicated to the management of the OBR service: the ObrMBean.
 
 The ObjectName to use is `org.apache.karaf:type=obr,name=*`.
 
-==== Attributes
+===== Attributes
 
 The `Urls` attribute provides the list of registered OBR repositories URLs.
 
 The `Bundles` attribute provides a tabular data containing all bundles available on the registered OBR repositories.
 
-==== Operations
+===== Operations
 
 * `addUrl(url)` registers the OBR repository using the `url` to the `repository.xml`.
 * `removeUrl(url)` removes the OBR repository at the given `url`.
@@ -366,7 +366,7 @@ The `Bundles` attribute provides a tabular data containing all bundles available
 
 The name to identify a bundle uses the following syntax: `symbolic_name,version` where version is optional.
 
-=== Apache Karaf Cave
+==== Apache Karaf Cave
 
 In addition of being an OBR client, Apache Karaf can act as an OBR repositories server, thanks to Apache Karaf Cave.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/provisioning.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/provisioning.adoc b/manual/src/main/asciidoc/user-guide/provisioning.adoc
index aef345b..07eb99c 100644
--- a/manual/src/main/asciidoc/user-guide/provisioning.adoc
+++ b/manual/src/main/asciidoc/user-guide/provisioning.adoc
@@ -12,15 +12,15 @@
 // limitations under the License.
 //
 
-== Provisioning
+=== Provisioning
 
 Apache Karaf supports the provisioning of applications and modules using the concept of Karaf Features.
 
-=== Application
+==== Application
 
 By provisioning application, it means install all modules, configuration, and transitive applications.
 
-=== OSGi
+==== OSGi
 
 It natively supports the deployment of OSGi applications.
 
@@ -38,7 +38,7 @@ configuration.
 
 As we can see, the provisioning of an application can be very long and fastidious.
 
-=== Feature and resolver
+==== Feature and resolver
 
 Apache Karaf provides a simple and flexible way to provision applications.
 
@@ -77,7 +77,7 @@ providing the capabilities to satisfy the requirements.
 
 A feature has a complete lifecycle: install, start, stop, update, uninstall.
 
-=== Features repositories
+==== Features repositories
 
 The features are described in a features XML descriptor. This XML file contains the description of a set of features.
 
@@ -121,7 +121,7 @@ repositories registered and features installed will be lost: you will have to re
 features by hand again.
 To prevent this behaviour, you can specify features as boot features.
 
-=== Boot features
+==== Boot features
 
 You can describe some features as boot features. A boot feature will be automatically install by Apache Karaf, even if it has
 not been previously installed using `feature:install` or FeatureMBean.
@@ -133,7 +133,7 @@ This configuration file contains the two properties to use to define boot featur
 * `featuresRepositories` contains a list (coma separated) of features repositories (features XML) URLs.
 * `featuresBoot` contains a list (come separated) of features to install at boot.
 
-=== Features upgrade
+==== Features upgrade
 
 You can update a release by installing the same feature (with the same SNAPSHOT version or a different version).
 
@@ -141,9 +141,9 @@ Thanks to the features lifecycle, you can control the status of the feature (sta
 
 You can also use a simulation to see what the update will do.
 
-=== Feature bundles
+==== Feature bundles
 
-==== Start Level
+===== Start Level
 
 By default, the bundles deployed by a feature will have a start-level equals to the value defined in the `etc/config.properties`
 configuration file, in the `karaf.startlevel.bundle` property.
@@ -162,7 +162,7 @@ The start-level attribute insure that the `myproject-dao` bundle is started befo
 Instead of using start-level, a better solution is to simply let the OSGi framework know what your dependencies are by
 defining the packages or services you need. It is more robust than setting start levels.
 
-==== Simulate, Start and stop
+===== Simulate, Start and stop
 
 You can simulate the installation of a feature using the `-t` option to `feature:install` command.
 
@@ -178,13 +178,13 @@ To do so, a feature can specify the `start` attribute to false in the `<bundle/>
   </feature>
 ----
 
-==== Dependency
+===== Dependency
 
 A bundle can be flagged as being a dependency, using the `dependency` attribute set to true on the `<bundle/>` element.
 
 This information can be used by resolvers to compute the full list of bundles to be installed.
 
-=== Dependent features
+==== Dependent features
 
 A feature can depend to a set of other features:
 
@@ -213,7 +213,7 @@ If a single version is specified, this version will be chosen.
 
 If nothing is specified, the highest available will be installed.
 
-=== Feature configurations
+==== Feature configurations
 
 The `<config/>` element in a feature XML allows a feature to create and/or populate a configuration (identified by a configuration PID).
 
@@ -229,7 +229,7 @@ The installation of the feature will have the same effect as dropping a file nam
 
 The content of the `<config/>` element is a set of properties, following the key=value standard.
 
-=== Feature configuration files
+==== Feature configuration files
 
 Instead of using the `<config/>` element, a feature can specify `<configfile/>` elements.
 
@@ -255,7 +255,7 @@ as a already existing file might contain customization. This behaviour can be ov
 
 The file URL is any URL supported by Apache Karaf (see the [Artifacts repositories and URLs|urls] of the user guide for details).
 
-==== Requirements
+===== Requirements
 
 A feature can also specify expected requirements. The feature resolver will try to satisfy the requirements. For that, it checks
 the features and bundles capabilities and will automatically install the bundles to satisfy the requirements.
@@ -270,9 +270,9 @@ The requirement specifies that the feature will work by only if the JDK version
 
 The features resolver is also able to refresh the bundles when an optional dependency is satisfy, rewiring the optional import.
 
-=== Commands
+==== Commands
 
-==== `feature:repo-list`
+===== `feature:repo-list`
 
 The `feature:repo-list` command lists all registered features repository:
 
@@ -306,7 +306,7 @@ enterprise-4.0.0         | mvn:org.apache.karaf.features/enterprise/4.0.0/xml/fe
 spring-4.0.0             | mvn:org.apache.karaf.features/spring/4.0.0/xml/features
 ----
 
-==== `feature:repo-add`
+===== `feature:repo-add`
 
 To register a features repository (and so having new features available in Apache Karaf), you have to use the
 `feature:repo-add` command.
@@ -397,7 +397,7 @@ features described in this features repository:
 karaf@root()> feature:repo-add -i cellar
 ----
 
-==== `feature:repo-refresh`
+===== `feature:repo-refresh`
 
 Apache Karaf parses the features repository XML when you register it (using `feature:repo-add` command or the FeatureMBean).
 If the features repository XML changes, you have to indicate to Apache Karaf to refresh the features repository to load the changes.
@@ -428,7 +428,7 @@ karaf@root()> feature:repo-refresh cellar
 Refreshing feature url mvn:org.apache.karaf.cellar/apache-karaf-cellar/LATEST/xml/features
 ----
 
-==== `feature:repo-remove`
+===== `feature:repo-remove`
 
 The `feature:repo-remove` command removes a features repository from the registered ones.
 
@@ -454,7 +454,7 @@ If you use `-u` option, the `feature:repo-remove` command uninstalls all feature
 karaf@root()> feature:repo-remove -u karaf-cellar-4.0.0.RC1
 ----
 
-==== `feature:list`
+===== `feature:list`
 
 The `feature:list` command lists all available features (provided by the different registered features repositories):
 
@@ -521,7 +521,7 @@ management      | 4.0.0   | x        | Started | standard-4.0.0 | Provide a JMX
 wrap            | 0.0.0   | x        | Started | standard-4.0.0 | Wrap URL handler
 ----
 
-==== `feature:install`
+===== `feature:install`
 
 The `feature:install` command installs a feature.
 
@@ -575,7 +575,7 @@ You can decide to not start the bundles installed by a feature using the `-s` or
 karaf@root()> feature:install -s eventadmin
 ----
 
-==== `feature:start`
+===== `feature:start`
 
 By default, when you install a feature, it's automatically installed. However, you can specify the `-s` option to the `feature:install` command.
 
@@ -584,12 +584,12 @@ the wiring in other bundles.
 
 When starting a feature, all bundles are started, and so, the feature also exposes the services.
 
-==== `feature:stop`
+===== `feature:stop`
 
 You can also stop a feature: it means that all services provided by the feature will be stop and removed from the service registry. However, the packages
 are still available for the wiring (the bundles are in resolved state).
 
-==== `feature:uninstall`
+===== `feature:uninstall`
 
 The `feature:uninstall` command uninstalls a feature. As the `feature:install` command, the `feature:uninstall` command
 requires the `feature` argument. The `feature` argument is the name of the feature, or the name/version of the feature.
@@ -602,7 +602,7 @@ karaf@root()> feature:uninstall eventadmin
 The features resolver is involved during feature uninstallation: transitive features installed by the uninstalled feature can be uninstalled
 themselves if not used by other feature.
 
-=== Deployer
+==== Deployer
 
 You can "hot deploy" a features XML by dropping the file directly in the `deploy` folder.
 
@@ -635,13 +635,13 @@ feature3 won't be installed:
 </features>
 ----
 
-=== JMX FeatureMBean
+==== JMX FeatureMBean
 
 On the JMX layer, you have a MBean dedicated to the management of the features and features repositories: the FeatureMBean.
 
 The FeatureMBean object name is: `org.apache.karaf:type=feature,name=*`.
 
-==== Attributes
+===== Attributes
 
 The FeatureMBean provides two attributes:
 
@@ -665,7 +665,7 @@ The `Features` attribute provides the following information:
 * `Configuration Files` is a tabular data set of all configuration files described in the feature.
 * `Dependencies` is a tabular data set of all dependent features described in the feature.
 
-==== Operations
+===== Operations
 
 * `addRepository(url)` adds the features repository with the `url`. The `url` can be a `name` as in the `feature:repo-add` command.
 * `addRepository(url, install)` adds the features repository with the `url` and automatically installs all bundles if `install` is true. The `url` can be a `name` like in the `feature:repo-add` command.
@@ -677,7 +677,7 @@ The `Features` attribute provides the following information:
 * `uninstallFeature(name)` uninstalls the feature with the `name`.
 * `uninstallFeature(name, version)` uninstalls the feature with the `name` and `version`.
 
-==== Notifications
+===== Notifications
 
 The FeatureMBean sends two kind of notifications (on which you can subscribe and react):
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/remote.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/remote.adoc b/manual/src/main/asciidoc/user-guide/remote.adoc
index 35d551e..7c33f9d 100644
--- a/manual/src/main/asciidoc/user-guide/remote.adoc
+++ b/manual/src/main/asciidoc/user-guide/remote.adoc
@@ -12,14 +12,14 @@
 // limitations under the License.
 //
 
-== Remote
+=== Remote
 
 Apache Karaf supports a complete remote mechanism allowing you to remotely connect to a running Apache Karaf instance.
 More over, you can also browse, download, and upload files remotely to a running Apache Karaf instance.
 
 Apache Karaf embeds a complete SSHd server.
 
-=== SSHd server
+==== SSHd server
 
 When you start Apache Karaf, it enables a remote console that can be accessed over SSH.
 
@@ -30,7 +30,7 @@ container and services running inside of it. As the "local" console, the remote
 In addition of the remote console, Apache Karaf also provides a remote filesystem. This remote filesystem can be accessed
 using a SCP/SFTP client.
 
-==== Configuration
+===== Configuration
 
 The configuration of the SSHd server is stored in the `etc/org.apache.karaf.shell.cfg` file:
 
@@ -141,9 +141,9 @@ karaf@root()> bundle:restart -f org.apache.karaf.shell.ssh
 
 The Apache Karaf SSHd server supports key/agent authentication and password authentication.
 
-==== Console clients
+===== Console clients
 
-===== System native clients
+====== System native clients
 
 The Apache Karaf SSHd server is a pure SSHd server, similar to OpenSSH daemon.
 
@@ -178,7 +178,7 @@ On Windows, you can use Putty, Kitty, etc.
 
 If you don't have SSH client installed on your machine, you can use Apache Karaf client.
 
-===== `ssh:ssh` command
+====== `ssh:ssh` command
 
 Apache Karaf itself provides a SSH client. When you are on the Apache Karaf console, you have the `ssh:ssh` command:
 
@@ -262,7 +262,7 @@ Last login: Sun Sep  8 19:21:12 2013
 user@server:~$
 ----
 
-===== Apache Karaf client
+====== Apache Karaf client
 
 The `ssh:ssh` command requires to be run into a running Apache Karaf console.
 
@@ -333,7 +333,7 @@ Welcome to Ubuntu 13.10 (GNU/Linux 3.11.0-13-generic x86_64)
 Last login: Tue Dec  3 18:18:31 2013 from localhost
 ----
 
-===== Logout
+====== Logout
 
 When you are connected to a remote Apache Karaf console, you can logout using:
 
@@ -341,14 +341,14 @@ When you are connected to a remote Apache Karaf console, you can logout using:
  the Apache Karaf instance (as CTRL-D does when used on a local console).
 * using `shell:logout` command (or simply `logout`)
 
-==== Filsystem clients
+===== Filsystem clients
 
 Apache Karaf SSHd server also provides complete fileystem access via SSH. For security reason, the available filesystem
 is limited to `KARAF_BASE` directory.
 
 You can use this remote filesystem with any SCP/SFTP compliant clients.
 
-===== Native SCP/SFTP clients
+====== Native SCP/SFTP clients
 
 On Unix, you can directly use `scp` command to download/upload files to the Apache Karaf filesystem. For instance,
 to retrieve the `karaf.log` file remotely:
@@ -397,7 +397,7 @@ You can also use graphic client like `filezilla`, `gftp`, `nautilus`, etc.
 
 On Windows, you can use `filezilla`, `WinSCP`, etc.
 
-===== Apache Maven
+====== Apache Maven
 
 Apache Karaf `system` folder is the Karaf repository, that use a Maven directory structure. It's where Apache Karaf
 looks for the artifacts (bundles, features, kars, etc).
@@ -415,7 +415,7 @@ mvn deploy:deploy-file -Dfile=org.apache.servicemix.bundles.facebook4j-2.0.2_1.j
 If you want to turn Apache Karaf as a simple Maven repository, you can use link:http://karaf.apache.org/index/subprojects/cave.html[Apache Karaf Cave].
 ====
 
-=== JMX MBeanServer
+==== JMX MBeanServer
 
 Apache Karaf provides a JMX MBeanServer.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/security.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/security.adoc b/manual/src/main/asciidoc/user-guide/security.adoc
index a4bae68..afeba11 100644
--- a/manual/src/main/asciidoc/user-guide/security.adoc
+++ b/manual/src/main/asciidoc/user-guide/security.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Security
+=== Security
 
 Apache Karaf provides an advanced and flexible security system, powered by JAAS (Java Authentication and Authorization
 Service) in an OSGi compliant way.
@@ -28,7 +28,7 @@ The Apache Karaf security framework is used internally to control the access to:
 
 Your applications can also use the security framework (see the developer guide for details).
 
-=== Realms
+==== Realms
 
 Apache Karaf is able to manage multiple realms. A realm contains the definition of the login modules to use for the
 authentication and/or authorization on this realm. The login modules define the authentication and authorization for
@@ -62,7 +62,7 @@ Apache Karaf provides additional login modules (see the developer guide for deta
 
 You can manage an existing realm, login module, or create your own realm using the `jaas:realm-manage` command.
 
-=== Users, groups, roles, and passwords
+==== Users, groups, roles, and passwords
 
 As we saw, by default, Apache Karaf uses a PropertiesLoginModule.
 
@@ -118,11 +118,11 @@ roles.
 
 It means that the `karaf` user will have the roles defined by the `admingroup`.
 
-==== Commands
+===== Commands
 
 The `jaas:*` commands manage the realms, users, groups, roles in the console.
 
-===== `jaas:realm-list`
+====== `jaas:realm-list`
 
 We already used the `jaas:realm-list` previously in this section.
 
@@ -140,7 +140,7 @@ We have here one realm (`karaf`) containing two login modules (`PropertiesLoginM
 
 The `index` is used by the `jaas:realm-manage` command to easily identify the realm/login module that we want to manage.
 
-===== `jaas:realm-manage`
+====== `jaas:realm-manage`
 
 The `jaas:realm-manage` command switch in realm/login module edit mode, where you can manage the users, groups, and roles in the login module.
 
@@ -158,7 +158,7 @@ option expects the login module class name:
 karaf@root()> jaas:realm-manage --realm karaf --module org.apache.karaf.jaas.modules.properties.PropertiesLoginModule
 ----
 
-===== `jaas:user-list`
+====== `jaas:user-list`
 
 When you are in edit mode, you can list the users in the login module using the `jaas:user-list`:
 
@@ -173,7 +173,7 @@ karaf     | admingroup | viewer
 
 You can see the user name and the group by role.
 
-===== `jaas:user-add`
+====== `jaas:user-add`
 
 The `jaas:user-add` command adds a new user (and the password) in the currently edited login module:
 
@@ -197,7 +197,7 @@ foo       |            |
 
 On the other hand, if you want to rollback the user addition, you can use the `jaas:cancel` command.
 
-===== `jaas:user-delete`
+====== `jaas:user-delete`
 
 The `jaas:user-delete` command deletes an user from the currently edited login module:
 
@@ -218,7 +218,7 @@ karaf     | admingroup | manager
 karaf     | admingroup | viewer
 ----
 
-===== `jaas:group-add`
+====== `jaas:group-add`
 
 The `jaas:group-add` command assigns a group (and eventually creates the group) to an user in the currently edited login module:
 
@@ -226,7 +226,7 @@ The `jaas:group-add` command assigns a group (and eventually creates the group)
 karaf@root()> jaas:group-add karaf mygroup
 ----
 
-===== `jaas:group-delete`
+====== `jaas:group-delete`
 
 The `jaas:group-delete` command removes an user from a group in the currently edited login module:
 
@@ -234,7 +234,7 @@ The `jaas:group-delete` command removes an user from a group in the currently ed
 karaf@root()> jaas:group-delete karaf mygroup
 ----
 
-===== `jaas:group-role-add`
+====== `jaas:group-role-add`
 
 The `jaas:group-role-add` command adds a role in a group in the currently edited login module:
 
@@ -242,7 +242,7 @@ The `jaas:group-role-add` command adds a role in a group in the currently edited
 karaf@root()> jaas:group-role-add mygroup myrole
 ----
 
-===== `jaas:group-role-delete`
+====== `jaas:group-role-delete`
 
 The `jaas:group-role-delete` command removes a role from a group in the currently edited login module:
 
@@ -250,16 +250,16 @@ The `jaas:group-role-delete` command removes a role from a group in the currentl
 karaf@root()> jaas:group-role-delete mygroup myrole
 ----
 
-===== `jaas:update`
+====== `jaas:update`
 
 The `jaas:update` command commits your changes in the login module backend. For instance, in the case of the PropertiesLoginModule,
 the `etc/users.properties` will be updated only after the execution of the `jaas:update` command.
 
-===== `jaas:cancel`
+====== `jaas:cancel`
 
 The `jaas:cancel` command rollback your changes and doesn't update the login module backend.
 
-=== Passwords encryption
+==== Passwords encryption
 
 By default, the passwords are stored in clear form in the `etc/users.properties` file.
 
@@ -345,7 +345,7 @@ The `etc/org.apache.karaf.jaas.cfg` configuration file allows you to define adva
 * the `encryption.encoding` property defines the encoding of the encrypted password. The possible values are `hexadecimal`
  or `base64`. The default value is `hexadecimal`.
 
-=== Managing authentication by key
+==== Managing authentication by key
 
 For the SSH layer, Karaf supports the authentication by key, allowing to login without providing the password.
 
@@ -402,7 +402,7 @@ or to ssh
 ssh -p 8101 -i ~/karaf.id_dsa karaf@localhost
 ----
 
-=== RBAC
+==== RBAC
 
 Apache Karaf uses the roles to control the access to the resources: it's a RBAC (Role Based Access Control) system.
 
@@ -413,11 +413,11 @@ The roles are used to control:
 * access to JMX (MBeans and/or operations)
 * access to the WebConsole
 
-==== OSGi services
+===== OSGi services
 
 The details about OSGi services RBAC support is explained in the developer guide.
 
-==== Console
+===== Console
 
 Console RBAC supports is a specialization of the OSGi service RBAC. Actually, in Apache Karaf, all console commands are
 defined as OSGi services.
@@ -483,7 +483,7 @@ You can fine tuned the command RBAC support by editing the `karaf.secured.servic
 karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
 ----
 
-==== JMX
+===== JMX
 
 Like for the console commands, you can define ACL (AccessLists) to the JMX layer.
 
@@ -518,7 +518,7 @@ By default, Apache Karaf defines the following JMX ACLs:
  The `list*()`, `get*()`, `is*()` operations can be performed by users with the `viewer` role.
  The `set*()` and all other `*()` operations can be performed by users with the `admin` role.
 
-==== WebConsole
+===== WebConsole
 
 The Apache Karaf WebConsole is not available by default. To enable it, you have to install the `webconsole` feature:
 
@@ -530,14 +530,14 @@ The WebConsole doesn't support fine grained RBAC like console or JMX for now.
 
 All users with the `admin` role can logon the WebConsole and perform any operations.
 
-=== SecurityMBean
+==== SecurityMBean
 
 Apache Karaf provides a JMX MBean to check if the current user can invoke a given MBean and/or operation.
 
 The `canInvoke()` operation gets the roles of the current user, and check if one the roles can invoke the MBean and/or the
 operation, eventually with a given argument value.
 
-==== Operations
+===== Operations
 
 * `canInvoke(objectName)` returns `true` if the current user can invoke the MBean with the `objectName`, `false` else.
 * `canInvoke(objectName, methodName)` returns `true` if the current user can invoke the operation `methodName` on the MBean
@@ -547,7 +547,7 @@ with the array of arguments types `argumentTypes` on the MBean with `objectName`
 * `canInvoke(bulkQuery)` returns a tabular data containing for each operation in the `bulkQuery` tabular data if `canInvoke`
 is `true` or `false`.
 
-=== Security providers
+==== Security providers
 
 Some applications require specific security providers to be available, such as [BouncyCastle|http://www.bouncycastle.org].
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/start-stop.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/start-stop.adoc b/manual/src/main/asciidoc/user-guide/start-stop.adoc
index d89a005..b463b9b 100644
--- a/manual/src/main/asciidoc/user-guide/start-stop.adoc
+++ b/manual/src/main/asciidoc/user-guide/start-stop.adoc
@@ -12,9 +12,9 @@
 // limitations under the License.
 //
 
-== Start, stop, restart, connect
+=== Start, stop, restart, connect
 
-=== Start
+==== Start
 
 Apache Karaf supports different start mode:
 
@@ -24,7 +24,7 @@ Apache Karaf supports different start mode:
 
 You can also manage Apache Karaf as a system service (see link:wrapper[System Service] section).
 
-==== Regular mode
+===== Regular mode
 
 The regular mode uses the `bin/karaf` Unix script (`bin\karaf.bat` on Windows). It's the default start process.
 
@@ -73,7 +73,7 @@ karaf@root()>
 Closing the console or shell window will cause Apache Karaf to terminate.
 ====
 
-==== Server mode
+===== Server mode
 
 The server mode starts Apache Karaf as a foreground process, but it doesn't start the shell console.
 
@@ -100,7 +100,7 @@ Closing the console or shell window will cause Apache Karaf to terminate.
 
 You can connect to the shell console using SSH or client (see the Connect section in this page).
 
-==== Background mode
+===== Background mode
 
 The background mode starts Apache Karaf as a background process.
 
@@ -120,7 +120,7 @@ bin\start.bat
 
 You can connect to the shell console using SSH or client (see the Connect section in this page).
 
-==== Clean start
+===== Clean start
 
 Apache Karaf stores all previously applications installed and changes that you did in the data folder.
 
@@ -148,7 +148,7 @@ bin\karaf.bat clean
 bin\start.bat clean
 ----
 
-==== Customize variables
+===== Customize variables
 
 Apache Karaf accepts environment variables:
 
@@ -183,7 +183,7 @@ set JAVA_MIN_MEM=256M
 set JAVA_MAX_MEM=1024M
 ----
 
-==== Connect
+===== Connect
 
 Even if you start Apache Karaf without the console (using server or background modes), you can connect to the console.
 This connection can be local or remote. It means that you can access to Karaf console remotely.
@@ -301,7 +301,7 @@ Hit '<ctrl-d>' or type 'logout' to disconnect shell from current session.
 karaf@root()>
 ----
 
-=== Stop
+==== Stop
 
 When you start Apache Karaf in regular mode, the `logout` command or CTRL-D key binding logout from the console and shutdown Apache Karaf.
 
@@ -375,7 +375,7 @@ OPTIONS
                 Reboot the Karaf container.
 ----
 
-=== Status
+==== Status
 
 When you start Apache Karaf in background mode, you may want to check the current status.
 
@@ -410,7 +410,7 @@ bin\status.bat
 Running ...
 ----
 
-=== Restart
+==== Restart
 
 The `shutdown` command accepts the `-r` (`--restart`) option to restart Apache Karaf:
 
@@ -423,7 +423,7 @@ karaf@root()> system:shutdown -r
 This command does not start a new JVM. It simply restarts the OSGi framework.
 ====
 
-=== SystemMBean
+==== SystemMBean
 
 Apache Karaf provides the JMX SystemMBean dedicated to control of the container itself.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/tuning.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/tuning.adoc b/manual/src/main/asciidoc/user-guide/tuning.adoc
index 07e7e74..9081144 100644
--- a/manual/src/main/asciidoc/user-guide/tuning.adoc
+++ b/manual/src/main/asciidoc/user-guide/tuning.adoc
@@ -12,9 +12,9 @@
 // limitations under the License.
 //
 
-== Tuning
+=== Tuning
 
-=== Garbage Collection
+==== Garbage Collection
 
 Like any Java applications, Apache Karaf uses a JVM. An important feature of the JVM is the Garbage Collector.
 
@@ -46,7 +46,7 @@ memory leaks, and see the possible optimisation of the spaces and GC.
 
 You can find introduction about GC here: [http://www.oracle.com/webfolder/technetwork/tutorials/obe/java/gc01/index.html].
 
-==== Java 6
+===== Java 6
 
 If you have enough resources available on the machine, a good configuration may be:
 
@@ -61,7 +61,7 @@ It will give more resources to Apache Karaf, and avoid some perm space saturatio
 
 See http://www.oracle.com/technetwork/java/javase/gc-tuning-6-140523.html for details about Java 6 tuning.
 
-==== Java 7
+===== Java 7
 
 Java 7 introduces a new GC algorithm: the GC1.
 
@@ -74,11 +74,11 @@ See http://docs.oracle.com/javase/7/docs/technotes/guides/vm/G1.html for details
 
 You can find a good article about Java 7 tuning here: http://java-is-the-new-c.blogspot.de/2013/07/tuning-and-benchmarking-java-7s-garbage.html
 
-=== Threads
+==== Threads
 
 In high loaded system, the number of threads can be very large.
 
-==== WebContainer
+===== WebContainer
 
 If you use the Apache Karaf WebContainer, the Jetty connectors create threads to handle the incoming HTTP requests.
 
@@ -114,7 +114,7 @@ defines the following properties:
  this value, the status is "low on resources". In that case, a new connection timeout is applied: the `lowResourceMaxIdleTime`.
 * `Acceptors` defines the number of threads for incoming connections.
 
-==== Apache Camel
+===== Apache Camel
 
 For instance, if you use Apache Camel inside Apache Karaf, Camel components can create a lot of threads.
 
@@ -130,7 +130,7 @@ For instance, the following Camel configuration defines a pool creation strategy
 
 See the http://camel.apache.org for details.
 
-==== Apache CXF
+===== Apache CXF
 
 Apache CXF uses workqueues to handle server request/response.
 
@@ -145,7 +145,7 @@ On a workqueue, you can define the following properties about the threads:
 
 See the http://cxf.apache.org for details.
 
-=== System packages
+==== System packages
 
 The `etc/jre.properties` defines the packages directly provided by the JVM.
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/urls.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/urls.adoc b/manual/src/main/asciidoc/user-guide/urls.adoc
index 47f7abe..15f6911 100644
--- a/manual/src/main/asciidoc/user-guide/urls.adoc
+++ b/manual/src/main/asciidoc/user-guide/urls.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Artifacts repositories and URLs
+=== Artifacts repositories and URLs
 
 The main information provided by a feature is the set of OSGi bundles that defines the application.  Such bundles are URLs pointing to the actual bundle jars.  For example, one would write the following definition:
 
@@ -35,7 +35,7 @@ located in a directory which is not available using Maven
 
 Note: The path is relative to the Apache Karaf installation directory
 
-=== Maven URL Handler
+==== Maven URL Handler
 
 The equivalent of the above bundle would be:
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/webconsole.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/webconsole.adoc b/manual/src/main/asciidoc/user-guide/webconsole.adoc
index 62c6eb1..dd61a5f 100644
--- a/manual/src/main/asciidoc/user-guide/webconsole.adoc
+++ b/manual/src/main/asciidoc/user-guide/webconsole.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== WebConsole
+=== WebConsole
 
 Apache Karaf provides an optional WebConsole.
 
@@ -29,7 +29,7 @@ You can use the WebConsole to:
 The WebConsole is extensible via a plugins system. Some applications can add new pages to the WebConsole.
 For instance, Apache Karaf Cellar provides additional pages to administrate cluster groups, nodes, etc.
 
-=== Installation
+==== Installation
 
 To enable the Apache Karaf WebConsole, you just have to install the `webconsole` feature:
 
@@ -39,7 +39,7 @@ karaf@root()> feature:install webconsole
 
 The `webconsole` feature automatically installs the `http` feature (see the [WebContainer section|webcontainer] for details).
 
-=== Access
+==== Access
 
 The Apache Karaf WebConsole uses the WebContainer port number (see the [WebContainer section|webcontainer] for details)
 with the `/system/console` context.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/webcontainer.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/webcontainer.adoc b/manual/src/main/asciidoc/user-guide/webcontainer.adoc
index cccd9af..85be760 100644
--- a/manual/src/main/asciidoc/user-guide/webcontainer.adoc
+++ b/manual/src/main/asciidoc/user-guide/webcontainer.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-=== WebContainer (JSP/Servlet)
+==== WebContainer (JSP/Servlet)
 
 Apache Karaf can act a complete WebContainer, fully supporting JSP/Servlet specification.
 
@@ -38,7 +38,7 @@ The `war` feature provides:
 * a set of console commands
 * a new war deployer
 
-==== Configuration
+===== Configuration
 
 The default port used by the WebContainer is 8181.
 
@@ -153,14 +153,14 @@ The following resources give you details about advanced `etc/jetty.xml` configur
 * http://wiki.eclipse.org/Jetty/Howto/Configure_SSL
 * http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax
 
-==== Deploy
+===== Deploy
 
 Apache Karaf WebContainer is able to deploy:
 
 * pure OSGi WebApplication Bundle (WAB)
 * "classical" standard WebApplication aRchive (WAR)
 
-===== WAB (WebApplication Bundle)
+====== WAB (WebApplication Bundle)
 
 A WAB is a standard WAR or JAR archive containing at least the following properties in the MANIFEST:
 
@@ -178,7 +178,7 @@ For instance, the Apache Karaf manual (documentation) is available as a WAB that
 karaf@root()> bundle:install -s mvn:org.apache.karaf/manual/4.0.0/war
 ----
 
-===== WAR (WebApplication aRchive)
+====== WAR (WebApplication aRchive)
 
 Apache Karaf allows you to deploy directly WAR files without repackaging as WAB.
 
@@ -192,9 +192,9 @@ karaf@root()> bundle:install -s "webbundle:http://tomcat.apache.org/tomcat-7.0-d
 
 You can note the `webbundle` prefix, and the `Bundle-SymbolicName` and `Web-ContextPath` headers on the URL.
 
-==== Commands
+===== Commands
 
-===== `http:list`
+====== `http:list`
 
 The `http:list` lists the available Servlets deployed in the WebContainer.
 
@@ -215,7 +215,7 @@ The `State` is the current state of the Servlet (`Deployed` or `Undeployed`).
 
 The `Url` is the URL where the Servlet is available.
 
-===== `web:list`
+====== `web:list`
 
 The `web:list` command lists the WebApplication Bundles ("native" WAB or "wrapped WAR") deployed in the WebContainer.
 
@@ -228,7 +228,7 @@ ID  | State       | Web-State   | Level | Web-ContextPath | Name
 111 | Active      | Deployed    | 80    | /karaf-doc      | Apache Karaf :: Manual (4.0.0)
 ----
 
-===== `web:stop`
+====== `web:stop`
 
 The `web:stop` command stops a web application in the WebContainer. The `web:stop` command expects a `id` argument
 corresponding to the bundle ID (as displayed by the `web:list` command).
@@ -239,7 +239,7 @@ For instance, to stop the Apache Karaf manual web application:
 karaf@root()> web:stop 111
 ----
 
-===== `web:start`
+====== `web:start`
 
 The `web:start` command starts a web application in the WebContainer. The `web:start` command expects a `id` argument
 corresponding to the bundle ID (as displayed by the `web:list` command).
@@ -250,13 +250,13 @@ For instance, to start the Apache Karaf manual web application:
 karaf@root()> web:start 111
 ----
 
-==== JMX HttpMBean
+===== JMX HttpMBean
 
 On the JMX layer, you have a MBean dedicated to the manipulation of the Servlets: the HttpMBean.
 
 The ObjectName to use is `org.apache.karaf:type=http,name=*`.
 
-===== Attributes
+====== Attributes
 
 The `Servlets` attribute provides a tabular data providing the list of deployed Servlets including:
 
@@ -266,13 +266,13 @@ The `Servlets` attribute provides a tabular data providing the list of deployed
 * `State` is the current Servlet state (`Deployed` or `Undeployed`).
 * `URL` is the URL of the Servlet (the Servlet context path).
 
-==== JMX WebMBean
+===== JMX WebMBean
 
 On the JMX layer, you have a MBean dedicated to the manipulation of the Web Applications: the WebMBean.
 
 The ObjectName to use is `org.apache.karaf:type=web,name=*`.
 
-===== Attributes
+====== Attributes
 
 The `WebBundles` attribute provides a tabular data providing the list of deployed Web Applications including:
 
@@ -283,7 +283,7 @@ The `WebBundles` attribute provides a tabular data providing the list of deploye
 * `Web-ContextPath` is the context path of the Web Application.
 * `Web-State` is the current status of the Web Application (`Deployed` or `Undeployed`).
 
-===== Operations
+====== Operations
 
 * `start(id)` starts the web context of the bundle with `id`.
 * `start(list)` starts the web context of the bundles with ID in the provided `list`.

http://git-wip-us.apache.org/repos/asf/karaf/blob/c806a6ad/manual/src/main/asciidoc/user-guide/wrapper.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/wrapper.adoc b/manual/src/main/asciidoc/user-guide/wrapper.adoc
index 9f52fb7..5ab8cf9 100644
--- a/manual/src/main/asciidoc/user-guide/wrapper.adoc
+++ b/manual/src/main/asciidoc/user-guide/wrapper.adoc
@@ -12,7 +12,7 @@
 // limitations under the License.
 //
 
-== Integration in the operating system: the Service Wrapper
+=== Integration in the operating system: the Service Wrapper
 
 In the previous chapter, we saw the different scripts and commands to start, stop, restart Apache Karaf.
 
@@ -29,7 +29,7 @@ It also includes advanced fault detection software which monitors an application
 The "Service Wrapper" is able to detect crashes, freezes, out of memory and other exception events, then automatically react by restarting Apache Karaf with a minimum of delay.
 It guarantees the maximum possible uptime of Apache Karaf.
 
-=== Supported platforms
+==== Supported platforms
 
 * Windows 8, 7, 2008 R2, 2003, Vista (32 and 64 bits architecture)
 * Linux RedHat Enterprise Linux, Debian, CentOS, Fedora, Ubuntu (32 and 64 bits architecture)
@@ -40,7 +40,7 @@ It guarantees the maximum possible uptime of Apache Karaf.
 * SGI Irix
 * MacOS X
 
-=== Installation
+==== Installation
 
 Apache Karaf Service Wrapper is an optional feature. You have to install the "Service Wrapper" installer first.
 
@@ -79,7 +79,7 @@ OPTIONS
                 (defaults to )
 ----
 
-=== Installation
+==== Installation
 
 Karaf Wrapper is an optional feature. To install it, simply type:
 
@@ -177,7 +177,7 @@ systemctl enable /opt/apache-karaf-4.0.2/bin/karaf.service
 
 This will enable Karaf at system boot.
 
-=== Uninstall
+==== Uninstall
 
 The `wrapper:install` provides the system commands to perform to uninstall the service/daemon).
 
@@ -199,7 +199,7 @@ You can remove the "Wrapper Service" installer after that:
 karaf@root()> feature:uninstall service-wrapper
 ----
 
-=== Note for MacOS users
+==== Note for MacOS users
 
 On MacOS you can install the service for an user or for the system.
 
@@ -238,7 +238,7 @@ If you want to remove the service call:
 launchctl remove org.apache.karaf.KARAF
 ----
 
-=== Configuration
+==== Configuration
 
 When using scripts in the Apache Karaf `bin` folder, you can using `bin/setenv` Unix script (`bin\setenv.bat` on Windows) as described in the [Start, stop, restart, connect|start-stop] section of the documentation.
 


Mime
View raw message