diff --git a/src/docbkx/configuration.xml b/src/docbkx/configuration.xml
index 6d5c33c3cc..995f948b8e 100644
--- a/src/docbkx/configuration.xml
+++ b/src/docbkx/configuration.xml
@@ -30,9 +30,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis>xmlns:integration="http://www.springframework.org/schema/integration"</emphasis><![CDATA[
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            ]]><emphasis>http://www.springframework.org/schema/integration
-           http://www.springframework.org/schema/integration/spring-integration-1.0.xsd"</emphasis>&gt;</programlisting>
+           http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"</emphasis>&gt;</programlisting>
     </para>
     <para>
 	  You can choose any name after "xmlns:"; <emphasis>integration</emphasis> is used here for clarity, but you might
@@ -43,9 +43,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis>xmlns:beans="http://www.springframework.org/schema/beans"</emphasis><![CDATA[
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/integration
-           http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">]]></programlisting>
+           http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">]]></programlisting>
     </para>
     <para>
       When using this alternative, no prefix is necessary for the Spring Integration elements. On the other hand, if
@@ -71,19 +71,19 @@
     xmlns:rmi="http://www.springframework.org/schema/integration/rmi"
     xmlns:ws="http://www.springframework.org/schema/integration/ws"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
             http://www.springframework.org/schema/integration
-            http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+            http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
             http://www.springframework.org/schema/integration/file
-            http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd
+            http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
             http://www.springframework.org/schema/integration/jms
-            http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd
+            http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
             http://www.springframework.org/schema/integration/mail
-            http://www.springframework.org/schema/integration/mail/spring-integration-mail-1.0.xsd
+            http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd
             http://www.springframework.org/schema/integration/rmi
-            http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd
+            http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd
             http://www.springframework.org/schema/integration/ws
-            http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
+            http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd">
  ...
 </beans>]]></programlisting>
       The reference manual provides specific examples of the various elements in their corresponding chapters. Here, the
diff --git a/src/docbkx/file.xml b/src/docbkx/file.xml
index e4b6aa6662..fd1e0d48d1 100644
--- a/src/docbkx/file.xml
+++ b/src/docbkx/file.xml
@@ -74,11 +74,11 @@
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:file="http://www.springframework.org/schema/integration/file"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 			http://www.springframework.org/schema/integration/file
-			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+			http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd">
 </beans>]]></programlisting>
 			Within this namespace you can reduce the FileReadingMessageSource and wrap
 			it in an inbound Channel Adapter like this:
diff --git a/src/docbkx/httpinvoker.xml b/src/docbkx/httpinvoker.xml
index fae646e28b..1686072eed 100644
--- a/src/docbkx/httpinvoker.xml
+++ b/src/docbkx/httpinvoker.xml
@@ -74,7 +74,7 @@
 		Spring Integration provides an "httpinvoker" namespace and schema definition. To include it in your
 		configuration, simply provide the following URI within a namespace declaration:
 		'http://www.springframework.org/schema/integration/httpinvoker'. The schema location should then map to
-		'http://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-1.0.xsd'.
+		'http://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-2.0.xsd'.
 	</para>
     <para>
 		To configure the inbound gateway you can choose to use the namespace support for it. The following code snippet shows the different configuration options that are supported.
diff --git a/src/docbkx/jms.xml b/src/docbkx/jms.xml
index 6e8be44650..87af25608a 100644
--- a/src/docbkx/jms.xml
+++ b/src/docbkx/jms.xml
@@ -74,7 +74,7 @@
         an instance of DefaultMessageListenerContainer will be created and configured based on these properties.
         For example, you can specify the "transaction-manager" reference, the "concurrent-consumers" value, and
         several other property references and values. Refer to the JavaDoc and Spring Integration's JMS Schema
-        (spring-integration-jms-1.0.xsd) for more detail.
+        (spring-integration-jms-2.0.xsd) for more detail.
       </note>
     </para>
     <para>
diff --git a/src/docbkx/samples.xml b/src/docbkx/samples.xml
index 0e2a83a6fe..504164956d 100644
--- a/src/docbkx/samples.xml
+++ b/src/docbkx/samples.xml
@@ -51,11 +51,11 @@
     xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:stream="http://www.springframework.org/schema/integration/stream"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
             http://www.springframework.org/schema/integration
-            http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+            http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
             http://www.springframework.org/schema/integration/stream
-            http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
+            http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd">
 
     <gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
diff --git a/src/docbkx/security.xml b/src/docbkx/security.xml
index 476a36b883..a614ebbc7c 100644
--- a/src/docbkx/security.xml
+++ b/src/docbkx/security.xml
@@ -36,9 +36,9 @@
 			http://www.springframework.org/schema/security
 			http://www.springframework.org/schema/security/spring-security-2.0.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+			http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
 			http://www.springframework.org/schema/integration/security
-			http://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd">
+			http://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd">
 
 <si-security:secured-channels>
     <si-security:access-policy pattern="admin.*" send-access="ROLE_ADMIN"/>
diff --git a/src/docbkx/stream.xml b/src/docbkx/stream.xml
index 789fa7be64..7d263f059e 100644
--- a/src/docbkx/stream.xml
+++ b/src/docbkx/stream.xml
@@ -66,9 +66,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
 			http://www.springframework.org/schema/integration/stream
-			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">]]></programlisting>
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd">]]></programlisting>
 	</para>
     <para>
 		To configure the inbound channel adapter the following code snippet shows the different configuration options that are supported.
diff --git a/src/docbkx/xml.xml b/src/docbkx/xml.xml
index cf75252e3d..8a70c44701 100644
--- a/src/docbkx/xml.xml
+++ b/src/docbkx/xml.xml
@@ -122,18 +122,18 @@
        xmlns:integration="http://www.springframework.org/schema/integration"
        xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/integration
-           http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+           http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
            http://www.springframework.org/schema/integration/xml
-           http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
+           http://www.springframework.org/schema/integration/xml/spring-integration-xml-2.0.xsd">
 </beans>]]></programlisting>
 		The namespace support for <classname>UnmarshallingTransformer</classname> is shown below.
 		Since the namespace is now creating an endpoint instance rather than a transformer,
 		a poller can also be nested within the element to control the polling of the input channel.  
 		<programlisting language="xml"><![CDATA[<si-xml:unmarshalling-transformer id="defaultUnmarshaller"
     input-channel="input"
-    output-channel="output"
+    output-channel="output"	
     unmarshaller="unmarshaller"/>
 
 <si-xml:unmarshalling-transformer id="unmarshallerWithPoller"