From c389604c2e6e0735c8398a087cd78748da3bc3da Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Fri, 1 Nov 2013 14:47:59 +0200
Subject: [PATCH] INT-2930: Mention correct SI version in Docs

JIRA: https://jira.springsource.org/browse/INT-2930
---
 src/reference/docbook/ftp.xml          | 5 +++--
 src/reference/docbook/http.xml         | 2 +-
 src/reference/docbook/transactions.xml | 2 +-
 src/reference/docbook/twitter.xml      | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/reference/docbook/ftp.xml b/src/reference/docbook/ftp.xml
index 967934adc8..1e04a9960f 100644
--- a/src/reference/docbook/ftp.xml
+++ b/src/reference/docbook/ftp.xml
@@ -108,8 +108,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp
   </para>
 
   <para>
-  <classname>DefaultFtpSessionFactory</classname> provides an abstraction over the underlying client API which, in the current release of
-  Spring Integration, is <ulink url="http://commons.apache.org/net/">Apache Commons Net</ulink>. This spares you from the low level configuration details
+  <classname>DefaultFtpSessionFactory</classname> provides an abstraction over the underlying client API which,
+  since <emphasis>Spring Integration 2.0</emphasis>, is <ulink url="http://commons.apache.org/net/">Apache Commons Net</ulink>.
+  This spares you from the low level configuration details
   of the <classname>org.apache.commons.net.ftp.FTPClient</classname>. However there are times when access to lower level <classname>FTPClient</classname> details is
   necessary to achieve more advanced configuration (e.g., setting data timeout, default timeout etc.). For that purpose, <classname>AbstractFtpSessionFactory</classname>
   (the base class for all FTP Session Factories) exposes hooks, in the form of the two post-processing methods below.
diff --git a/src/reference/docbook/http.xml b/src/reference/docbook/http.xml
index 7a22bc51da..8ef55aeb5e 100644
--- a/src/reference/docbook/http.xml
+++ b/src/reference/docbook/http.xml
@@ -66,7 +66,7 @@
   custom <interfacename>HttpMessageConverter</interfacename> to add the default converters after the custom converters.
   By default this flag is set to false, meaning that the custom converters replace the default list.
       </para>
-      <para>Starting with this release MultiPart File support was implemented. If the request has been wrapped as a
+      <para>Starting with <emphasis>Spring Integration 2.0</emphasis>, MultiPart File support is implemented. If the request has been wrapped as a
     <emphasis>MultipartHttpServletRequest</emphasis>, when using the default converters, that request will be converted
     to a Message payload that is a MultiValueMap containing values that may be byte arrays, Strings, or instances of
     Spring's <interfacename>MultipartFile</interfacename> depending on the content type of the individual parts.
diff --git a/src/reference/docbook/transactions.xml b/src/reference/docbook/transactions.xml
index 5f8e656393..04f8368cd6 100644
--- a/src/reference/docbook/transactions.xml
+++ b/src/reference/docbook/transactions.xml
@@ -205,7 +205,7 @@ public interface TransactionSynchronizationProcessor {
 }]]></programlisting>
 
         The factory is responsible for creating a
-        <ulink url="http://static.springsource.org/spring-framework/docs/3.1.2.RELEASE/javadoc-api/org/springframework/transaction/support/TransactionSynchronization.html">TransactionSynchronization</ulink>
+        <ulink url="http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/transaction/support/TransactionSynchronization.html">TransactionSynchronization</ulink>
         object. You can implement your own, or use the one provided by the framework:
         <classname>DefaultTransactionSynchronizationFactory</classname>. This implementation returns a
         <classname>TransactionSynchronization</classname> that delegates to a default implementation of
diff --git a/src/reference/docbook/twitter.xml b/src/reference/docbook/twitter.xml
index 267f665777..40c4d7bb97 100644
--- a/src/reference/docbook/twitter.xml
+++ b/src/reference/docbook/twitter.xml
@@ -124,7 +124,7 @@ twitter.oauth.accessTokenSecret=AbRxUAvyNCtqQtxFK8w5ZMtMj20KFhB6o]]></programlis
   	<link linkend="http://support.twitter.com/groups/31-twitter-basics/topics/109-tweets-messages/articles/119138-types-of-tweets-and-where-they-appear">twitter messages, or tweets</link>
   	</para>
   	<para>
-  	The current release of Spring Integration provides support for receiving tweets as <emphasis>Timeline Updates</emphasis>,
+    <emphasis>Spring Integration version 2.0 and above</emphasis> provides support for receiving tweets as <emphasis>Timeline Updates</emphasis>,
   	<emphasis>Direct Messages</emphasis>, <emphasis>Mention Messages</emphasis> as well as Search Results.
   	</para>
   	<para>
@@ -241,7 +241,7 @@ received.
   	Twitter outbound channel adapters allow you to send Twitter Messages, or tweets.
   	</para>
   	<para>
-  	The current release of Spring Integration supports sending <emphasis>Status Update Messages</emphasis> and <emphasis>Direct Messages</emphasis>.
+    <emphasis>Spring Integration version 2.0 and above</emphasis> supports sending <emphasis>Status Update Messages</emphasis> and <emphasis>Direct Messages</emphasis>.
     Twitter outbound channel adapters will take the Message payload and send it as a Twitter message. Currently the only supported payload type is
     <classname>String</classname>, so consider adding a <emphasis>transformer</emphasis> if the payload of the incoming message is not a String.
   	</para>