From c737d220b51f24eb51fb89683f5c73c7e19cca91 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@gopivotal.com>
Date: Tue, 21 Jan 2014 10:41:56 +0100
Subject: [PATCH 1/2] Improve documentation of matrix variables.

Prior to this commit, it was not clear how to enable the support of matrix
variables in the mvc namespace. As the feature is disabled by default, added
something to highlight the part that explains how to configure it

Issue: SPR-11331
---
 src/asciidoc/index.adoc | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/asciidoc/index.adoc b/src/asciidoc/index.adoc
index 7e2a5f7ee1a3..751db5454d69 100644
--- a/src/asciidoc/index.adoc
+++ b/src/asciidoc/index.adoc
@@ -28776,10 +28776,37 @@ All matrix variables may be obtained in a Map:
 	}
 ----
 
-Note that to enable the use of matrix variables, you must set the
-`removeSemicolonContent` property of `RequestMappingHandlerMapping` to `false`. By
-default it is set to `true`.
+[TIP]
+====
+
+The MVC Java config and the MVC namespace both provide options for enabling the use of
+matrix variables.
+
+If you are using Java config, you must set the `removeSemicolonContent` property of
+`RequestMappingHandlerMapping` to `false`. By default it is set to `true`.
+
+In the MVC namespace, the `<mvc:annotation-driven>` element has an
+`enableMatrixVariables` attribute that should be set to `true`. By default it is set
+to `false`.
+
+[source,xml,indent=0]
+[subs="verbatim,quotes"]
+----
+	<?xml version="1.0" encoding="UTF-8"?>
+	<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:mvc="http://www.springframework.org/schema/mvc"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="
+			http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/mvc
+			http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+		<mvc:annotation-driven enableMatrixVariables="true"/>
 
+	</beans>
+----
+====
 
 [[mvc-ann-requestmapping-consumes]]
 ===== Consumable Media Types

From 29f875041b529c469e9e212d7db053c2022e7b46 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@gopivotal.com>
Date: Tue, 21 Jan 2014 14:37:19 +0100
Subject: [PATCH 2/2] Improve documentation of matrix variables.

Prior to this commit, it was not clear how to enable the support of matrix
variables in the mvc namespace. As the feature is disabled by default, added
something to highlight the part that explains how to configure it

Issue: SPR-11331
---
 src/asciidoc/index.adoc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/asciidoc/index.adoc b/src/asciidoc/index.adoc
index 751db5454d69..28bfa45b2ec3 100644
--- a/src/asciidoc/index.adoc
+++ b/src/asciidoc/index.adoc
@@ -28776,14 +28776,19 @@ All matrix variables may be obtained in a Map:
 	}
 ----
 
+Note that to enable the use of matrix variables, you must set the
+`removeSemicolonContent` property of `RequestMappingHandlerMapping` to `false`. By
+default it is set to `true`.
+
 [TIP]
 ====
 
 The MVC Java config and the MVC namespace both provide options for enabling the use of
 matrix variables.
 
-If you are using Java config, you must set the `removeSemicolonContent` property of
-`RequestMappingHandlerMapping` to `false`. By default it is set to `true`.
+If you are using Java config, The <<mvc-config-advanced-java, Advanced Customizations
+with MVC Java Config>> section describes how the `RequestMappingHandlerMapping` can
+be customized.
 
 In the MVC namespace, the `<mvc:annotation-driven>` element has an
 `enableMatrixVariables` attribute that should be set to `true`. By default it is set