diff --git a/src/docbkx/reference/neo4j-server.xml b/src/docbkx/reference/neo4j-server.xml
index 39c1a166b..e2a1047e1 100644
--- a/src/docbkx/reference/neo4j-server.xml
+++ b/src/docbkx/reference/neo4j-server.xml
@@ -106,7 +106,7 @@ public void foo( @Context WorldRepository repo ) {
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-neo4j-rest</artifactId>
-  <version>2.0.0.RELEASE</version>
+  <version>2.1.0.RC1</version>
 </dependency>
 ]]></programlisting>
             </example>
diff --git a/src/docbkx/reference/programming-model/beanvalidation.xml b/src/docbkx/reference/programming-model/beanvalidation.xml
index a4dcf4148..4c3543a56 100644
--- a/src/docbkx/reference/programming-model/beanvalidation.xml
+++ b/src/docbkx/reference/programming-model/beanvalidation.xml
@@ -27,11 +27,16 @@ class Person {
 	The validation supports needs the bean validation API and a reference implementation configured, right now this is the Hibernate Validator by default (which not integrated with Hibernate ORM). Tthe maven dependency is:
 </para>
 <example>
-    <title>Hibernate Validator Dependency</title>
+    <title>Validation setup</title>
     <programlisting language="java"><![CDATA[<dependency>
   <groupId>org.hibernate</groupId>
   <artifactId>hibernate-validator</artifactId>
   <version>4.2.0.Final</version>
-</dependency>]]></programlisting>
+</dependency>
+
+// the application-context should contain a LocalValidatorFactoryBean
+
+<bean id="validator"
+  class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>]]></programlisting>
 </example>
 </section>
diff --git a/src/docbkx/reference/programming-model/indexing.xml b/src/docbkx/reference/programming-model/indexing.xml
index 535476f59..a42daa29d 100644
--- a/src/docbkx/reference/programming-model/indexing.xml
+++ b/src/docbkx/reference/programming-model/indexing.xml
@@ -26,7 +26,8 @@
         </para>
         <para>
             Numerical fields are indexed numerically so that they are available for range queries. All
-            other fields are indexed with their string representation.
+            other fields are indexed with their string representation. If a numeric field should not be
+            indexed numerically, it is possible to switch it off with <code>@Indexed(numeric=false)</code>.
         </para>
         <para>
             The <code>@Indexed</code> annotation also provides the option of using a custom index name. The default index
diff --git a/src/docbkx/reference/setup.xml b/src/docbkx/reference/setup.xml
index 39a40a105..f37c3d0d7 100644
--- a/src/docbkx/reference/setup.xml
+++ b/src/docbkx/reference/setup.xml
@@ -17,15 +17,15 @@
     <section>
            <title>Dependencies for Spring Data Neo4j Simple Mapping</title>
            <para>
-               For the simple POJO mapping it is enough to add the <code>org.springframework.data:spring-data-neo4j:2.0.0.RELEASE</code> dependency
-               to your project. If you want to use the Cypher query language please add <code>org.neo4j:neo4j-cypher:1.6</code>
+               For the simple POJO mapping it is enough to add the <code>org.springframework.data:spring-data-neo4j:2.1.0.RC1</code> dependency
+               to your project. If you want to use the Cypher query language please add <code>org.neo4j:neo4j-cypher:1.7</code>
            </para>
         <example>
             <title>Maven dependencies for Spring Data Neo4j</title>
             <programlisting language="xml"><![CDATA[<dependency>
 <groupId>org.springframework.data</groupId>
 <artifactId>spring-data-neo4j</artifactId>
-<version>2.0.0.RELEASE</version>
+<version>2.1.0.RC1</version>
 </dependency>
 ]]></programlisting>
         </example>
@@ -44,7 +44,7 @@
 targetCompatibility = 1.6
 
 springVersion = "3.0.7.RELEASE"
-springDataNeo4jVersion = "2.0.0.RELEASE"
+springDataNeo4jVersion = "2.1.0.RC1"
 aspectjVersion = "1.6.12"
 
 apply from:'https://github.com/SpringSource/spring-data-neo4j/raw/master/build/
@@ -128,7 +128,7 @@ repositories {
                 <programlisting language="xml"><![CDATA[<dependency>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-neo4j-aspects</artifactId>
-    <version>2.0.0.RELEASE</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 
 <dependency>
@@ -139,7 +139,7 @@ repositories {
 [<dependency>
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j-cypher</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
 </dependency>]
 ]]></programlisting>
             </example>
diff --git a/src/docbkx/tutorial/neo4j-server.xml b/src/docbkx/tutorial/neo4j-server.xml
index 396d78fb9..6ba578648 100644
--- a/src/docbkx/tutorial/neo4j-server.xml
+++ b/src/docbkx/tutorial/neo4j-server.xml
@@ -48,7 +48,7 @@
 <dependency>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-neo4j-rest</artifactId>
-    <version>2.0.0.RELEASE</version>
+    <version>2.1.0.RC1</version>
 </dependency>
 ]]></programlisting>
             </example>
diff --git a/src/docbkx/tutorial/neo4j.xml b/src/docbkx/tutorial/neo4j.xml
index c30ec57b6..2ca12800a 100644
--- a/src/docbkx/tutorial/neo4j.xml
+++ b/src/docbkx/tutorial/neo4j.xml
@@ -40,7 +40,7 @@
             <programlisting language="xml" ><![CDATA[<dependency>
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
 </dependency>
 ]]></programlisting>
         </example>
diff --git a/src/docbkx/tutorial/spring-data-neo4j-aj.xml b/src/docbkx/tutorial/spring-data-neo4j-aj.xml
index d8c5e13b5..383faebdc 100644
--- a/src/docbkx/tutorial/spring-data-neo4j-aj.xml
+++ b/src/docbkx/tutorial/spring-data-neo4j-aj.xml
@@ -26,7 +26,7 @@
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-neo4j-aspects</artifactId>
-  <version>2.0.0.RELEASE</version>
+  <version>2.1.0.RC1</version>
 </dependency>
 
 <dependency>
diff --git a/src/docbkx/tutorial/spring-data-neo4j.xml b/src/docbkx/tutorial/spring-data-neo4j.xml
index c47398037..4a2bbce8f 100644
--- a/src/docbkx/tutorial/spring-data-neo4j.xml
+++ b/src/docbkx/tutorial/spring-data-neo4j.xml
@@ -21,7 +21,7 @@
             <programlisting language="xml"><![CDATA[<dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-neo4j</artifactId>
-  <version>2.0.0.RELEASE</version>
+  <version>2.1.0.RC1</version>
 </dependency>]]></programlisting>
       </example>
     </para>