diff --git a/docs/src/reference/docbook/aggregator.xml b/docs/src/reference/docbook/aggregator.xml
index 4503c52671..585d3f30d8 100644
--- a/docs/src/reference/docbook/aggregator.xml
+++ b/docs/src/reference/docbook/aggregator.xml
@@ -1,5 +1,5 @@
-
Aggregator
@@ -622,4 +622,4 @@
the @MessageEndpoint is defined on the class, detected automatically
through classpath scanning.
-
+
diff --git a/docs/src/reference/docbook/bridge.xml b/docs/src/reference/docbook/bridge.xml
index 105cfc76e6..6bfc6742cb 100644
--- a/docs/src/reference/docbook/bridge.xml
+++ b/docs/src/reference/docbook/bridge.xml
@@ -1,5 +1,5 @@
-
Messaging Bridge
@@ -56,4 +56,4 @@
-
+
diff --git a/docs/src/reference/docbook/chain.xml b/docs/src/reference/docbook/chain.xml
index c82a01577a..1ae62b1d53 100644
--- a/docs/src/reference/docbook/chain.xml
+++ b/docs/src/reference/docbook/chain.xml
@@ -1,5 +1,5 @@
-
Message Handler Chain
@@ -111,4 +111,4 @@ When light version of <gateway> element is defined in the chain SI will co
-
+
diff --git a/docs/src/reference/docbook/channel-adapter.xml b/docs/src/reference/docbook/channel-adapter.xml
index c14d6db69f..fc18b04db8 100644
--- a/docs/src/reference/docbook/channel-adapter.xml
+++ b/docs/src/reference/docbook/channel-adapter.xml
@@ -1,7 +1,7 @@
-
+
Channel Adapter
A Channel Adapter is a Message Endpoint that enables connecting a single sender or receiver to a Message Channel.
@@ -75,4 +75,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/docs/src/reference/docbook/channel.xml b/docs/src/reference/docbook/channel.xml
index c4babca116..00a5ece6c2 100644
--- a/docs/src/reference/docbook/channel.xml
+++ b/docs/src/reference/docbook/channel.xml
@@ -1,5 +1,5 @@
-
Message Channels
@@ -599,4 +599,4 @@ public Message> receive(final PollableChannel> channel) { ... }]]>
-
+
diff --git a/docs/src/reference/docbook/delayer.xml b/docs/src/reference/docbook/delayer.xml
index 3a41f4d63a..dd4c42c2e0 100644
--- a/docs/src/reference/docbook/delayer.xml
+++ b/docs/src/reference/docbook/delayer.xml
@@ -1,5 +1,5 @@
-
Delayer
@@ -58,4 +58,4 @@
-
+
diff --git a/docs/src/reference/docbook/endpoint.xml b/docs/src/reference/docbook/endpoint.xml
index de74cbc352..4d77f11768 100644
--- a/docs/src/reference/docbook/endpoint.xml
+++ b/docs/src/reference/docbook/endpoint.xml
@@ -1,5 +1,5 @@
-
Message Endpoints
@@ -346,4 +346,4 @@ any transaction configuration essentially allowing you to enhance the behavior o
to - Section 25 - Task Execution and Scheduling of Spring reference manual.
-
+
diff --git a/docs/src/reference/docbook/filter.xml b/docs/src/reference/docbook/filter.xml
index c9bd8aeb1d..b31c71189d 100644
--- a/docs/src/reference/docbook/filter.xml
+++ b/docs/src/reference/docbook/filter.xml
@@ -1,5 +1,5 @@
-
Filter
@@ -128,4 +128,4 @@
to be treated as Message Channel names by a router component.
-
+
diff --git a/docs/src/reference/docbook/gateway.xml b/docs/src/reference/docbook/gateway.xml
index 12a88b2f27..a09aebe08a 100644
--- a/docs/src/reference/docbook/gateway.xml
+++ b/docs/src/reference/docbook/gateway.xml
@@ -1,5 +1,5 @@
-
Inbound Messaging Gateways
@@ -251,4 +251,4 @@ For a more detailed example, please refer to the async-gateway
-
+
diff --git a/docs/src/reference/docbook/groovy.xml b/docs/src/reference/docbook/groovy.xml
index d23bd712ba..979985e0d2 100644
--- a/docs/src/reference/docbook/groovy.xml
+++ b/docs/src/reference/docbook/groovy.xml
@@ -1,5 +1,5 @@
-
Groovy support
@@ -69,4 +69,4 @@ You see that script could be included inline or via location attrib
-
+
diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index 12876a4bb0..f679ed3626 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -63,67 +63,19 @@
+
Core Messaging
Core Messaging TODO
-
- Messaging Channels
-
- Message Channels TODO
-
-
-
-
-
-
- Messaging Construction
-
- Message Construction TODO
-
-
-
-
-
- Messaging Routing
-
- Message Routing TODO
-
-
-
-
-
-
-
-
-
- Messaging Transformation
-
- Message Transformation TODO
-
-
-
-
- Messaging Endpoints
-
- Message Endpoints TODO
-
-
-
-
-
-
-
-
- System Management
-
- Message Endpoints TODO
-
-
-
-
+
+
+
+
+
+
Integration Adapters
diff --git a/docs/src/reference/docbook/jmx.xml b/docs/src/reference/docbook/jmx.xml
index d9802cd296..b3c27ead27 100644
--- a/docs/src/reference/docbook/jmx.xml
+++ b/docs/src/reference/docbook/jmx.xml
@@ -1,5 +1,5 @@
-
JMX Support
@@ -187,4 +187,4 @@
foundation is available, however, we will be able to extend the attributes
and operations that are being exposed.
-
+
diff --git a/docs/src/reference/docbook/message-construction.xml b/docs/src/reference/docbook/message-construction.xml
new file mode 100644
index 0000000000..321021a299
--- /dev/null
+++ b/docs/src/reference/docbook/message-construction.xml
@@ -0,0 +1,9 @@
+
+
+ Message Construction
+
+
+
+
diff --git a/docs/src/reference/docbook/message-history.xml b/docs/src/reference/docbook/message-history.xml
index 63857a403f..d6345c578d 100644
--- a/docs/src/reference/docbook/message-history.xml
+++ b/docs/src/reference/docbook/message-history.xml
@@ -1,5 +1,5 @@
-
Message History
@@ -61,4 +61,4 @@ assertEquals("sampleChain", chainHistory.get("name"));]]>
be changed once written. Every attempt will end in exception.
-
+
diff --git a/docs/src/reference/docbook/message-routing.xml b/docs/src/reference/docbook/message-routing.xml
new file mode 100644
index 0000000000..b71b571da3
--- /dev/null
+++ b/docs/src/reference/docbook/message-routing.xml
@@ -0,0 +1,14 @@
+
+
+ Message Routing
+
+
+
+
+
+
+
+
+
diff --git a/docs/src/reference/docbook/message-transformation.xml b/docs/src/reference/docbook/message-transformation.xml
new file mode 100644
index 0000000000..c8644b35f4
--- /dev/null
+++ b/docs/src/reference/docbook/message-transformation.xml
@@ -0,0 +1,9 @@
+
+
+ Message Transformation
+
+
+
+
diff --git a/docs/src/reference/docbook/message.xml b/docs/src/reference/docbook/message.xml
index def77ba699..2129313f02 100644
--- a/docs/src/reference/docbook/message.xml
+++ b/docs/src/reference/docbook/message.xml
@@ -1,5 +1,5 @@
-
Message
@@ -219,4 +219,4 @@ assertEquals(MessagePriority.HIGHEST, anotherMessage.getHeaders().getPriority())
-
+
diff --git a/docs/src/reference/docbook/messaging-channels.xml b/docs/src/reference/docbook/messaging-channels.xml
new file mode 100644
index 0000000000..089245c31f
--- /dev/null
+++ b/docs/src/reference/docbook/messaging-channels.xml
@@ -0,0 +1,11 @@
+
+
+ Messaging Channels
+
+
+
+
+
+
diff --git a/docs/src/reference/docbook/messaging-endpoints.xml b/docs/src/reference/docbook/messaging-endpoints.xml
new file mode 100644
index 0000000000..faf9233bf9
--- /dev/null
+++ b/docs/src/reference/docbook/messaging-endpoints.xml
@@ -0,0 +1,13 @@
+
+
+ Messaging Endpoints
+
+
+
+
+
+
+
+
diff --git a/docs/src/reference/docbook/resequencer.xml b/docs/src/reference/docbook/resequencer.xml
index 7c58816c8c..cd3a6572a0 100644
--- a/docs/src/reference/docbook/resequencer.xml
+++ b/docs/src/reference/docbook/resequencer.xml
@@ -1,5 +1,5 @@
-
Resequencer
@@ -123,4 +123,4 @@
Since there is no custom behavior to be implemented in Java classes for resequencers, there is no annotation support for it.
-
+
diff --git a/docs/src/reference/docbook/router.xml b/docs/src/reference/docbook/router.xml
index 1fcc281e77..4092462023 100644
--- a/docs/src/reference/docbook/router.xml
+++ b/docs/src/reference/docbook/router.xml
@@ -1,5 +1,5 @@
-
Router
@@ -402,4 +402,4 @@ public List<String> route(@Header("orderStatus") OrderStatus status)
-
+
diff --git a/docs/src/reference/docbook/service-activator.xml b/docs/src/reference/docbook/service-activator.xml
index 2325d17e54..4ccadc3f80 100644
--- a/docs/src/reference/docbook/service-activator.xml
+++ b/docs/src/reference/docbook/service-activator.xml
@@ -1,5 +1,5 @@
-
Service Activator
@@ -68,4 +68,4 @@
-
+
diff --git a/docs/src/reference/docbook/splitter.xml b/docs/src/reference/docbook/splitter.xml
index b22ffe64b8..9f60a54202 100644
--- a/docs/src/reference/docbook/splitter.xml
+++ b/docs/src/reference/docbook/splitter.xml
@@ -1,5 +1,5 @@
-
Splitter
@@ -154,4 +154,4 @@ List<LineItem> extractItems(Order order) {
}
-
+
diff --git a/docs/src/reference/docbook/system-management.xml b/docs/src/reference/docbook/system-management.xml
new file mode 100644
index 0000000000..a8f7342c0b
--- /dev/null
+++ b/docs/src/reference/docbook/system-management.xml
@@ -0,0 +1,10 @@
+
+
+ System Management
+
+
+
+
+
diff --git a/docs/src/reference/docbook/transformer.xml b/docs/src/reference/docbook/transformer.xml
index 42014c7e67..f0a6341e90 100644
--- a/docs/src/reference/docbook/transformer.xml
+++ b/docs/src/reference/docbook/transformer.xml
@@ -1,5 +1,5 @@
-
Transformer
@@ -180,4 +180,4 @@ Order generateOrder(String productId, @Header("customerName") String customer) {
-
+