355584: fix documentation errors

4 files changed, 15 insertions, 14 deletions

diff --git a/docs/src/docbkx/introduction/eclipse-migration.xml b/docs/src/docbkx/introduction/eclipse-migration.xml
index e9cc81d..e6b39ef 100644
--- a/docs/src/docbkx/introduction/eclipse-migration.xml
+++ b/docs/src/docbkx/introduction/eclipse-migration.xml
@@ -3,13 +3,13 @@
 
       <para>
       In late 2009, as a member of the Gemini project <ulink url="http://eclipse.org/proposals/gemini/">proposal</ulink>, 
-      SpringSource <ulink url="http://blog.springsource.com/2009/11/24/gemini-project-proposal-at-eclipse-org/">contributed</ulink> Spring Dynamic Modules 
+      SpringSource <ulink url="http://blog.springsource.com/2009/11/24/gemini-project-proposal-at-eclipse-org/">contributed</ulink> the Spring Dynamic Modules 
       (also known as Spring OSGi) <ulink url="http://www.springframework.org/osgi">project</ulink>
       to the Eclipse Foundation. Spring DM v2 code base has been moved to Eclipse.org along with its issue tracker and forum. The project
       became dual licensed under Apache License and EPL.
       </para>
       <para>
-      While the name has changed, the code and its functionality remained the same. Existing Spring DM applications can be easily migrated to Eclipse Gemini Blueprint
+      While the name has changed, the code and its functionality remain the same. Existing Spring DM applications can be easily migrated to Eclipse Gemini Blueprint
       as mentioned in the migration <ulink url="http://www.eclipse.org/gemini/blueprint/documentation/migration/">guide</ulink>.
       </para>
       <para>While the project name has changed (to Eclipse Gemini Blueprint) and significant efforts have been made to reflect this in the project documentation and resources,
diff --git a/docs/src/docbkx/introduction/getting-started.xml b/docs/src/docbkx/introduction/getting-started.xml
index 060c099..b67a60a 100644
--- a/docs/src/docbkx/introduction/getting-started.xml
+++ b/docs/src/docbkx/introduction/getting-started.xml
@@ -4,7 +4,7 @@
 <chapter id="get-started">
     <title>Getting Started</title>
 
-    <para>Learning a new framework is not always straight forward. In this section, we (the Spring DM/Gemini Blueprint team) 
+    <para>Learning a new framework is not always straightforward. In this section, we (the Spring DM/Gemini Blueprint team) 
     tried to provide, what we think is, an easy to follow guide for starting with Gemini Blueprint. 
     Of course, feel free to create your own learning 'path' as you see fit and, if possible, please report back
     any improvements to the documentation that can help others.</para>
@@ -21,12 +21,12 @@
 			<title>Knowing Spring</title>
 			<para>Gemini Blueprint uses heavily Spring framework's <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/spring-core.html">core</ulink> functionalty, 
 			such as the <ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/beans.html">IoC</ulink> container,
-			<ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/resources.html">resource</ulink> abstract or
+			<ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/resources.html">resource</ulink> abstraction and
 			<ulink url="http://static.springframework.org/spring/docs/2.5.x/reference/aop.html">AOP</ulink> infrastructure. While it is not important
-			to know the Spring APIs, understanding the concepts behind them is. At a minimum, the idea behind IoC should be familiar.
-			These being said, the more knowledge one has about the Spring, the faster she will pick Gemini Blueprint.
-			Besides the very comprehensive (and sometimes disarming) documentation that explains in detail the Spring Framework,
-			there are a lot of articles, blog entries and books on the matter - take a look at the Spring framework
+			to know the Spring framework APIs, understanding the concepts behind them is. At a minimum, the idea behind IoC should be familiar.
+			That being said, the more knowledge you have about Spring framework, the faster you will pick Gemini Blueprint.
+			Besides the comprehensive documentation that explains the Spring Framework in detail,
+			there are a lot of articles, blog entries and books on the topic - take a look at the Spring framework
 			<ulink url="http://www.springsource.org/documentation">home page</ulink> for more information. In general, this should be the starting point for 
 			OSGi (or Eclipse plugin) developers wanting to try Gemini Blueprint.</para>
 		</section>
@@ -85,12 +85,12 @@
     <section id="get-started:help">
 		<title>Need Help?</title>
 		
-		<para>If you encounter issues or you are just looking for an advice, feel free to use one of the links below:</para>
+		<para>If you encounter issues or you are just looking for advice, feel free to use one of the links below:</para>
 		
 		<section id="get-started:help:community">
   		    <title>Community Support</title>
 			<para>The Gemini Blueprint <ulink url="http://www.eclipse.org/forums/index.php/f/153/">forum</ulink> 
-			(and Spring DM previous <ulink url="http://forum.springframework.org/forumdisplay.php?f=43">forum</ulink>) is a message board for all Gemini Blueprint users to
+			(and the previous Spring DM <ulink url="http://forum.springframework.org/forumdisplay.php?f=43">forum</ulink>) is a message board for all Gemini Blueprint users to
 			share information and help each other. Note that registration is needed <emphasis>only</emphasis> for posting.
 			</para>
 		</section>
diff --git a/docs/src/docbkx/introduction/requirements.xml b/docs/src/docbkx/introduction/requirements.xml
index 7c23920..2415edc 100644
--- a/docs/src/docbkx/introduction/requirements.xml
+++ b/docs/src/docbkx/introduction/requirements.xml
@@ -1,9 +1,10 @@
   <chapter id="requirements">
       <title>Requirements</title>
 
-      <para>Gemini Blueprint 1.x binaries requires JDK level 5.0 and above, 
+      <para>Gemini Blueprint 2.x binaries require JDK level 6.0 or above, 
       and <ulink url="http://www2.osgi.org/Specifications/HomePage?section=2">OSGi
-      R4.2</ulink> (though R4.1 and even R4.0 might work) and above. For JDK 1.4, consider using Spring Dynamic Modules 1.x.
+      R4.2</ulink> (though R4.1 and even R4.0 might work) or above. For JDK 1.5, consider using Gemini Blueprint 1.x.
+      For JDK 1.4, consider using Spring Dynamic Modules 1.x.
       </para>
       <para>
       Bundles deployed for use with Gemini Blueprint should specify
diff --git a/docs/src/docbkx/preface.xml b/docs/src/docbkx/preface.xml
index d327bfb..53790d5 100644
--- a/docs/src/docbkx/preface.xml
+++ b/docs/src/docbkx/preface.xml
@@ -15,8 +15,8 @@
 	to change this by allowing applications to be divided into <emphasis>modules</emphasis> that can have different
 	life cycles, dependencies and still exist as a whole.</para>
     
-    <para>Eclipse Gemini Blueprint (formerly Spring Dynamic Modules) focuses on integrating Spring Framework powerful, non-invasive programming model and 
-    concepts with the dynamics and modularity of OSGi platform. It allows transparent exporting and importing of OSGi
+    <para>Eclipse Gemini Blueprint (formerly Spring Dynamic Modules) focuses on integrating Spring Framework's powerful, non-invasive programming model and 
+    concepts with the dynamics and modularity of the OSGi platform. It allows transparent exporting and importing of OSGi
     services, life cycle management and control. Moreover, the Spring DM model was standardized in OSGi r4.2, in the form
     of the <ulink url="http://www.osgi.org/Specifications/Drafts">Blueprint</ulink> Container for which Eclipse Gemini Blueprint
     serves as the reference implementation (RI).