diff --git a/src/docbkx/reference/cross-store.xml b/src/docbkx/reference/cross-store.xml
index d0f00b230..f391d04f2 100644
--- a/src/docbkx/reference/cross-store.xml
+++ b/src/docbkx/reference/cross-store.xml
@@ -125,7 +125,9 @@ public class UserAccount {
             All you need to do is to specify an <code>entityManagerFactory</code> in the XML namespace
             <code>config</code> element, and Spring Data Graph will configure itself for cross-store use.
         </para>
-<programlisting language="xml" ><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
+        <example>
+            <title>Cross-store Spring configuration</title>
+            <programlisting language="xml"><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:datagraph="http://www.springframework.org/schema/data/graph"
@@ -150,6 +152,8 @@ public class UserAccount {
     </bean>
 </beans>
 ]]></programlisting>
+        </example>
+
 
     </section>
 </chapter>
diff --git a/src/docbkx/reference/neo4j.xml b/src/docbkx/reference/neo4j.xml
index 0f364d7fd..eec2043c9 100644
--- a/src/docbkx/reference/neo4j.xml
+++ b/src/docbkx/reference/neo4j.xml
@@ -81,8 +81,7 @@
         </para>
         <example>
             <title>Neo4j usage</title>
-            <programlisting language="java" ><![CDATA[
-GraphDatabaseService graphDb = new EmbeddedGraphDatabase( "helloworld" );
+            <programlisting language="java" ><![CDATA[GraphDatabaseService graphDb = new EmbeddedGraphDatabase( "helloworld" );
 Transaction tx = graphDb.beginTx();
 try {
 	Node firstNode = graphDb.createNode();
@@ -110,8 +109,7 @@ try {
         </para>
         <example>
             <title>Traversal usage</title>
-            <programlisting language="java" ><![CDATA[
-TraversalDescription traversalDescription = Traversal.description()
+            <programlisting language="java" ><![CDATA[TraversalDescription traversalDescription = Traversal.description()
         .depthFirst()
         .relationships(KNOWS)
         .relationships(LIKES, Direction.INCOMING)
@@ -139,9 +137,7 @@ for (Path position : traversalDescription.traverse(myStartNode)) {
         </note>
         <example>
             <title>Index usage</title>
-            <programlisting language="java"><![CDATA[
-
-IndexManager indexManager = graphDb.index();
+            <programlisting language="java"><![CDATA[IndexManager indexManager = graphDb.index();
 Index<Node> nodeIndex = indexManager.forNodes("a-node-index");
 Node node = ...;
 Transaction tx = graphDb.beginTx();
diff --git a/src/docbkx/reference/programming-model/beanvalidation.xml b/src/docbkx/reference/programming-model/beanvalidation.xml
index 344edef98..de0d6203d 100644
--- a/src/docbkx/reference/programming-model/beanvalidation.xml
+++ b/src/docbkx/reference/programming-model/beanvalidation.xml
@@ -11,8 +11,7 @@
     </para>
     <example>
         <title>Bean validation</title>
-        <programlisting language="java"><![CDATA[
-@NodeEntity
+        <programlisting language="java"><![CDATA[@NodeEntity
 class Person {
     @Size(min = 3, max = 20)
     String name;
diff --git a/src/docbkx/reference/programming-model/indexing.xml b/src/docbkx/reference/programming-model/indexing.xml
index a391c853e..c7d60aeb7 100644
--- a/src/docbkx/reference/programming-model/indexing.xml
+++ b/src/docbkx/reference/programming-model/indexing.xml
@@ -39,8 +39,7 @@
         </para>
         <example>
             <title>Indexing entities</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 class Person {
     @Indexed(indexName = "people") String name;
     @Indexed int age;
@@ -80,8 +79,7 @@ for (Person middleAgedDeveloper : graphRepository.findAllByRange("age", 20, 40))
         <para>
             <example>
                 <title>Fulltext indexing</title>
-                <programlisting language="java"><![CDATA[
-@NodeEntity
+                <programlisting language="java"><![CDATA[@NodeEntity
 class Person {
     @Indexed(indexName = "person-name", fulltext=true) String name;
 }
@@ -111,8 +109,7 @@ Person mark = graphRepository.findAllByQuery("people-search", "name", "ma*");
         </para>
         <example>
             <title>Manual index usage</title>
-            <programlisting language="java"><![CDATA[
-@Autowired GraphDatabaseContext gdc;
+            <programlisting language="java"><![CDATA[@Autowired GraphDatabaseContext gdc;
 
 // Default index
 Index<Node> personIndex = gdc.getIndex(Person.class);
diff --git a/src/docbkx/reference/programming-model/projection.xml b/src/docbkx/reference/programming-model/projection.xml
index 07c1d6a2b..541c27c66 100644
--- a/src/docbkx/reference/programming-model/projection.xml
+++ b/src/docbkx/reference/programming-model/projection.xml
@@ -24,9 +24,9 @@
         reporting or auditing) and only project them to a concrete, more functional target type when the business
         logic requires it.
     </para>
-    <programlisting language="java"><![CDATA[
-// not related to Person at all
-@NodeEntity
+    <example>
+        <title>Projection of entities</title>
+        <programlisting language="java"><![CDATA[@NodeEntity
 class Trainee {
     String name;
     @RelatedTo(elementClass=Training.class);
@@ -40,5 +40,7 @@ for (Person person : graphRepository.findAllByProperyValue("occupation","develop
     }
 }
 ]]></programlisting>
+    </example>
+
 
 </section>
diff --git a/src/docbkx/reference/programming-model/relationships.xml b/src/docbkx/reference/programming-model/relationships.xml
index 083fe52de..4f89d62ec 100644
--- a/src/docbkx/reference/programming-model/relationships.xml
+++ b/src/docbkx/reference/programming-model/relationships.xml
@@ -24,8 +24,7 @@
 
         <example>
             <title>Single relationship field</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 public class Movie {
     private Actor mostPaidActor;
 }
@@ -42,8 +41,7 @@ public class Movie {
         </para>
         <example>
             <title>Node entity with relationships</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 public class Actor {
     @RelatedTo(type = "mostPaidActor", direction = Direction.INCOMING,
             elementClass = Movie.class)
@@ -103,8 +101,7 @@ public class Actor {
         </para>
         <example>
             <title>Relationship entity</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 public class Actor {
     public Role playedIn(Movie movie, String title) {
         return relatedTo(movie, Role.class, "ACTS_IN");
@@ -132,8 +129,7 @@ public class Role {
         </para>
         <example>
             <title>Accessing relationship entities using @RelatedToVia</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 public class Actor {
     @RelatedToVia(type = "ACTS_IN", elementClass = Role.class)
     private Iterable<Role> roles;
diff --git a/src/docbkx/reference/programming-model/repositories.xml b/src/docbkx/reference/programming-model/repositories.xml
index 71cf38ecb..b41fdf552 100644
--- a/src/docbkx/reference/programming-model/repositories.xml
+++ b/src/docbkx/reference/programming-model/repositories.xml
@@ -132,28 +132,27 @@
         </para>
         <example>
             <title>Using GraphRepositories</title>
-            <programlisting language="java"><![CDATA[
-    GraphRepository<Person> graphRepository = graphRepositoryFactory
-            .createGraphRepository(Person.class);
+            <programlisting language="java"><![CDATA[GraphRepository<Person> graphRepository = graphRepositoryFactory
+        .createGraphRepository(Person.class);
 
-    Person michael = graphRepository.save(new Person("Michael", 36));
+Person michael = graphRepository.save(new Person("Michael", 36));
 
-    Person dave = graphRepository.findOne(123);
+Person dave = graphRepository.findOne(123);
 
-    Long numberOfPeople = graphRepository.count();
+Long numberOfPeople = graphRepository.count();
 
-    Person mark = graphRepository.findByPropertyValue("name", "mark");
+Person mark = graphRepository.findByPropertyValue("name", "mark");
 
-    Iterable<Person> devs = graphRepository.findAllByProperyValue("occupation", "developer");
+Iterable<Person> devs = graphRepository.findAllByProperyValue("occupation", "developer");
 
-    Iterable<Person> middleAgedPeople = graphRepository.findAllByRange("age", 20, 40);
+Iterable<Person> middleAgedPeople = graphRepository.findAllByRange("age", 20, 40);
 
-    Iterable<Person> aTeam = graphRepository.findAllByQuery("name", "A*");
+Iterable<Person> aTeam = graphRepository.findAllByQuery("name", "A*");
 
-    Iterable<Person> davesFriends = graphRepository.findAllByTraversal(dave,
-        Traversal.description().pruneAfterDepth(1)
-        .relationships(KNOWS).filter(returnAllButStartNode()));
-    ]]></programlisting>
+Iterable<Person> davesFriends = graphRepository.findAllByTraversal(dave,
+    Traversal.description().pruneAfterDepth(1)
+    .relationships(KNOWS).filter(returnAllButStartNode()));
+]]></programlisting>
         </example>
     </section>
 
@@ -167,8 +166,7 @@
         </para>
         <example>
             <title>Composing repositories</title>
-            <programlisting language="java"><![CDATA[
-public interface PersonRepository extends GraphRepository<Person>, PersonRepositoryExtension {}
+            <programlisting language="java"><![CDATA[public interface PersonRepository extends GraphRepository<Person>, PersonRepositoryExtension {}
 
 // alternatively select some of the required repositories individually
 public interface PersonRepository extends CRUDGraphRepository<Node,Person>,
diff --git a/src/docbkx/reference/programming-model/transactions.xml b/src/docbkx/reference/programming-model/transactions.xml
index 7a9d0da46..afb2dfe50 100644
--- a/src/docbkx/reference/programming-model/transactions.xml
+++ b/src/docbkx/reference/programming-model/transactions.xml
@@ -22,8 +22,7 @@
     </note>
     <example>
         <title>Simple transaction manager configuration</title>
-        <programlisting language="xml"><![CDATA[
-<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
+        <programlisting language="xml"><![CDATA[<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
     <property name="transactionManager">
         <bean class="org.neo4j.kernel.impl.transaction.SpringTransactionManager">
             <constructor-arg ref="graphDatabaseService"/>
@@ -47,8 +46,7 @@
     </para>
     <example>
         <title>Neo4j Spring integration</title>
-        <programlisting language="xml"><![CDATA[
-<context:annotation-config />
+        <programlisting language="xml"><![CDATA[<context:annotation-config />
 <context:spring-configured/>
 
 <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
@@ -78,8 +76,7 @@
     </para>
     <example>
         <title>ChainedTransactionManager example</title>
-        <programlisting language="xml"><![CDATA[
-<bean id="jpaTransactionManager"
+        <programlisting language="xml"><![CDATA[<bean id="jpaTransactionManager"
         class="org.springframework.orm.jpa.JpaTransactionManager">
     <property name="entityManagerFactory" ref="entityManagerFactory"/>
 </bean>
diff --git a/src/docbkx/tutorial/annotations.xml b/src/docbkx/tutorial/annotations.xml
index 46c5c43ad..bcedd0908 100644
--- a/src/docbkx/tutorial/annotations.xml
+++ b/src/docbkx/tutorial/annotations.xml
@@ -33,8 +33,7 @@
     <para>
         <example>
             <title>First test case</title>
-            <programlisting language="java" ><![CDATA[
-@Autowired GraphDatabaseContext graphDatabaseContext;
+            <programlisting language="java" ><![CDATA[@Autowired GraphDatabaseContext graphDatabaseContext;
 
 @Test public void persistedMovieShouldBeRetrievableFromGraphDb() {
     Movie forrestGump = new Movie("Forrest Gump", 1994).persist();
@@ -56,8 +55,7 @@
         Our domain model had now evolved.
         <example>
             <title>Movie class</title>
-            <programlisting language="java"><![CDATA[
-@NodeEntity
+            <programlisting language="java"><![CDATA[@NodeEntity
 class Movie {
     int id;
     String title;
diff --git a/src/docbkx/tutorial/domain.xml b/src/docbkx/tutorial/domain.xml
index 01a25fb55..6f18c4412 100644
--- a/src/docbkx/tutorial/domain.xml
+++ b/src/docbkx/tutorial/domain.xml
@@ -24,8 +24,7 @@
     <para>
         <example>
             <title>Domain model</title>
-            <programlisting lang="java" language="java" role="java" ><![CDATA[
-class Movie {
+            <programlisting lang="java" language="java" role="java" ><![CDATA[class Movie {
     int id;
     String title;
     int year;
diff --git a/src/docbkx/tutorial/import.xml b/src/docbkx/tutorial/import.xml
index 45b8c5e4b..d42452945 100644
--- a/src/docbkx/tutorial/import.xml
+++ b/src/docbkx/tutorial/import.xml
@@ -12,8 +12,7 @@
     <para>
         <example>
             <title>JSON movie response</title>
-            <programlisting language="javascript" ><![CDATA[
-   [{"popularity":3,
+            <programlisting language="javascript" ><![CDATA[[{"popularity":3,
 "translated":true, "adult":false, "language":"en",
 "original_name":"[Rec]", "name":"[Rec]", "alternative_name":"[REC]",
 "movie_type":"movie",
@@ -60,8 +59,7 @@
         </example>
         <example>
             <title>JSON actor response</title>
-            <programlisting language="javascript" ><![CDATA[
-    [{"popularity":3,
+            <programlisting language="javascript" ><![CDATA[[{"popularity":3,
 "name":"Glenn Strange", "known_as":[{"name":"George Glenn Strange"}, {"name":"Glen Strange"},
 {"name":"Glen 'Peewee' Strange"}, {"name":"Peewee Strange"}, {"name":"'Peewee' Strange"}],
 "id":30112,
@@ -96,8 +94,7 @@
     <para>
         <example>
             <title>Importing the data</title>
-            <programlisting language="java" ><![CDATA[
-@Transactional
+            <programlisting language="java" ><![CDATA[@Transactional
 public Movie importMovie(String movieId) {
     Movie movie = repository.getMovie(movieId);
     if (movie == null) { // Not found: Create fresh
diff --git a/src/docbkx/tutorial/indexing.xml b/src/docbkx/tutorial/indexing.xml
index 3c0d017d2..1176843fa 100644
--- a/src/docbkx/tutorial/indexing.xml
+++ b/src/docbkx/tutorial/indexing.xml
@@ -12,8 +12,7 @@
     <para>
         <example>
             <title>Exact Indexing for Movie id</title>
-            <programlisting language="java" ><![CDATA[
-@NodeEntity class Movie {
+            <programlisting language="java" ><![CDATA[@NodeEntity class Movie {
     @Indexed int id;
     String title;
     int year;
diff --git a/src/docbkx/tutorial/neo4j.xml b/src/docbkx/tutorial/neo4j.xml
index 17bbb5494..c71e2cae1 100644
--- a/src/docbkx/tutorial/neo4j.xml
+++ b/src/docbkx/tutorial/neo4j.xml
@@ -29,8 +29,7 @@
     <para>
         <example>
             <title>Neo4j Maven dependency</title>
-            <programlisting language="xml" ><![CDATA[
-<dependency>
+            <programlisting language="xml" ><![CDATA[<dependency>
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j</artifactId>
     <version>1.3.M05</version>
@@ -41,8 +40,7 @@
     <para>
         <example>
             <title>Neo4j core API (transaction code omitted)</title>
-            <programlisting language="java" ><![CDATA[
-enum RelationshipTypes implements RelationshipType { ACTS_IN };
+            <programlisting language="java" ><![CDATA[enum RelationshipTypes implements RelationshipType { ACTS_IN };
 
 GraphDatabaseService gds = new EmbeddedGraphDatabase("/path/to/store");
 Node forrest=gds.createNode();
diff --git a/src/docbkx/tutorial/recommendations.xml b/src/docbkx/tutorial/recommendations.xml
index c1fe18507..c02cd99ff 100644
--- a/src/docbkx/tutorial/recommendations.xml
+++ b/src/docbkx/tutorial/recommendations.xml
@@ -20,8 +20,7 @@
     <para>
         <example>
             <title>Recommendations</title>
-            <programlisting language="java"><![CDATA[
-public Map<Movie,Integer> recommendMovies(User user, final int ratingDistance) {
+            <programlisting language="java"><![CDATA[public Map<Movie,Integer> recommendMovies(User user, final int ratingDistance) {
     final DynamicRelationshipType RATED = withName(User.RATED);
     final Map<Long,int[]> ratings=new HashMap<Long, int[]>();
     TraversalDescription traversal= Traversal.description().breadthFirst()
diff --git a/src/docbkx/tutorial/relationships.xml b/src/docbkx/tutorial/relationships.xml
index 1cda800f5..428b4293e 100644
--- a/src/docbkx/tutorial/relationships.xml
+++ b/src/docbkx/tutorial/relationships.xml
@@ -19,8 +19,7 @@
         <para>
             <example>
                 <title>Role class</title>
-                <programlisting language="java"><![CDATA[
-@RelationshipEntity
+                <programlisting language="java"><![CDATA[@RelationshipEntity
 class Role {
     @StartNode Actor actor;
     @EndNode Movie movie;
@@ -40,8 +39,7 @@ class Role {
         <para>
             <example>
                 <title>Relating actors to movies</title>
-                <programlisting language="java" ><![CDATA[
-class Actor {
+                <programlisting language="java" ><![CDATA[class Actor {
 ...
     public Role playedIn(Movie movie, String roleName) {
         Role role = relateTo(movie, Role.class, "ACTS_IN");
@@ -65,8 +63,7 @@ class Actor {
         <para>
             <example>
                 <title>@RelatedTo usage</title>
-                <programlisting language="java" ><![CDATA[
-@NodeEntity
+                <programlisting language="java" ><![CDATA[@NodeEntity
 class Movie {
     @Indexed int id;
     String title;
@@ -115,8 +112,7 @@ class Actor {
         <para>
             <example>
                 <title>@RelatedToVia usage</title>
-                <programlisting language="java" ><![CDATA[
-@NodeEntity
+                <programlisting language="java" ><![CDATA[@NodeEntity
 class Movie {
     @Indexed int id;
     String title;
diff --git a/src/docbkx/tutorial/repository.xml b/src/docbkx/tutorial/repository.xml
index f4b4f5b2d..c9e6a8ce1 100644
--- a/src/docbkx/tutorial/repository.xml
+++ b/src/docbkx/tutorial/repository.xml
@@ -9,16 +9,14 @@
         work with a named interface rather than different versions of a generic one.
         <example>
             <title>Movie repository</title>
-        <programlisting language="java"><![CDATA[
-package org.neo4j.cineasts.repository;
+            <programlisting language="java"><![CDATA[package org.neo4j.cineasts.repository;
 public interface MovieRepository extends GraphRepository<Movie> {}
 ]]></programlisting>
         </example>
         Then we added it to the Spring context configuration by simply adding:
         <example>
             <title>Repository context configuration</title>
-        <programlisting language="xml"><![CDATA[
-<datagraph:repositories base-package="org.neo4j.cineasts.repository"/>
+            <programlisting language="xml"><![CDATA[<datagraph:repositories base-package="org.neo4j.cineasts.repository"/>
 ]]></programlisting>
         </example>
         We then created the domain-specific repository class, annotating it with <code>@Repository</code> and
@@ -27,8 +25,7 @@ public interface MovieRepository extends GraphRepository<Movie> {}
     <para>
         <example>
             <title>Domain-specific repository</title>
-            <programlisting language="java"><![CDATA[
-@Repository @Transactional
+            <programlisting language="java"><![CDATA[@Repository @Transactional
 public class CineastsRepostory {
   @Autowired MovieRepository movieRepository;
 
diff --git a/src/docbkx/tutorial/running.xml b/src/docbkx/tutorial/running.xml
index bb82dbaa3..83a4b3ea9 100644
--- a/src/docbkx/tutorial/running.xml
+++ b/src/docbkx/tutorial/running.xml
@@ -17,8 +17,7 @@
         <para>
             <example>
                 <title>Populating the database - Controller</title>
-                <programlisting language="java"><![CDATA[
-@Service
+                <programlisting language="java"><![CDATA[@Service
 public class DatabasePopulator {
 
     @Autowired GraphDatabaseContext ctx;
@@ -54,8 +53,7 @@ public class MovieController {
             </example>
             <example>
                 <title>Populating the database - JSP</title>
-                <programlisting language="jsp"><![CDATA[
-<%@ page session="false" %>
+                <programlisting language="jsp"><![CDATA[<%@ page session="false" %>
 <%@ taglib uri="http://www.springframework.org/tags" prefix="s" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
@@ -119,8 +117,7 @@ public class MovieController {
             <para>
                 <example>
                     <title>Starting the Neo4j Shell</title>
-                    <programlisting language="shell" ><![CDATA[
-neo4j-shell -readonly -path data/graph.db
+                    <programlisting language="shell" ><![CDATA[neo4j-shell -readonly -path data/graph.db
 ]]></programlisting>
                 </example>
             </para>
@@ -132,8 +129,7 @@ neo4j-shell -readonly -path data/graph.db
             <para>
                 <example>
                     <title>Neo4j Shell usage</title>
-                    <programlisting language="shell" ><![CDATA[
-neo4j-sh[readonly] (0)$ help
+                    <programlisting language="shell" ><![CDATA[neo4j-sh[readonly] (0)$ help
 Available commands: index dbinfo ls rm alias set eval mv gsh env rmrel mkrel
                     trav help pwd paths ... man cd
 Use man <command> for info about each command.
diff --git a/src/docbkx/tutorial/security.xml b/src/docbkx/tutorial/security.xml
index 36b3cc02a..98ab8b54f 100644
--- a/src/docbkx/tutorial/security.xml
+++ b/src/docbkx/tutorial/security.xml
@@ -15,8 +15,7 @@
     <para>
         <example>
             <title>Spring Security pom.xml</title>
-            <programlisting language="xml" ><![CDATA[
-<dependency>
+            <programlisting language="xml" ><![CDATA[<dependency>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-web</artifactId>
     <version>${spring.version}</version>
@@ -32,8 +31,7 @@
     <para>
         <example>
             <title>Spring Security web.xml</title>
-            <programlisting language="xml" ><![CDATA[
-<context-param>
+            <programlisting language="xml" ><![CDATA[<context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>
         /WEB-INF/applicationContext-security.xml
@@ -60,8 +58,7 @@
     <para>
         <example>
             <title>Spring Security applicationContext-security.xml</title>
-            <programlisting language="xml" ><![CDATA[
-<security:global-method-security secured-annotations="enabled">
+            <programlisting language="xml" ><![CDATA[<security:global-method-security secured-annotations="enabled">
 </security:global-method-security>
 
 <security:http auto-config="true" access-denied-page="/auth/denied"> <!-- use-expressions="true" -->
@@ -89,8 +86,7 @@
         </example>
         <example>
             <title>UserDetailsService and UserDetails implementation</title>
-            <programlisting language="java" ><![CDATA[
-@Service
+            <programlisting language="java" ><![CDATA[@Service
 public class CineastsUserDetailsService implements UserDetailsService, InitializingBean {
 
     @Autowired private UserRepository userRepository;
diff --git a/src/docbkx/tutorial/setup.xml b/src/docbkx/tutorial/setup.xml
index 391cbbad5..dfe679abe 100644
--- a/src/docbkx/tutorial/setup.xml
+++ b/src/docbkx/tutorial/setup.xml
@@ -32,8 +32,7 @@
         <para>
             <example>
                 <title>Project pom.xml</title>
-                <programlisting language="xml"><![CDATA[
-<properties>
+                <programlisting language="xml"><![CDATA[<properties>
     <spring.version>3.0.5.RELEASE</spring.version>
 </properties>
 
@@ -69,8 +68,7 @@
 
             <example>
                 <title>Project web.xml</title>
-                <programlisting language="xml"><![CDATA[
-<listener>
+                <programlisting language="xml"><![CDATA[<listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 </listener>
 
@@ -99,8 +97,7 @@
         <para>
             <example>
                 <title>Project applicationContext.xml</title>
-                <programlisting language="xml"><![CDATA[
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <programlisting language="xml"><![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
     xmlns:tx="http://www.springframework.org/schema/tx"
@@ -124,8 +121,7 @@
             </example>
             <example>
                 <title>Project dispatcherServlet-servlet.xml</title>
-                <programlisting language="xml"><![CDATA[
-<mvc:annotation-driven/>
+                <programlisting language="xml"><![CDATA[<mvc:annotation-driven/>
 <mvc:resources mapping="/images/**" location="/images/"/>
 <mvc:resources mapping="/resources/**" location="/resources/"/>
 <context:component-scan base-package="org.neo4j.cineasts.controller"/>
diff --git a/src/docbkx/tutorial/social.xml b/src/docbkx/tutorial/social.xml
index 6d0302c4d..1a8a4ae37 100644
--- a/src/docbkx/tutorial/social.xml
+++ b/src/docbkx/tutorial/social.xml
@@ -18,8 +18,7 @@
         <para>
             <example>
                 <title>Social entities</title>
-                <programlisting language="java" ><![CDATA[
-@NodeEntity
+                <programlisting language="java" ><![CDATA[@NodeEntity
 class User {
     @Indexed String login;
     String name;
@@ -59,8 +58,7 @@ class Rating {
         <para>
             <example>
                 <title>Populate users and ratings</title>
-                <programlisting language="java" ><![CDATA[
-@Transactional
+                <programlisting language="java" ><![CDATA[@Transactional
 public List<Movie> populateDatabase() {
     Actor tomHanks = new Actor("1", "Tom Hanks").persist();
     Movie forestGump = new Movie("1", "Forrest Gump").persist();
@@ -88,8 +86,7 @@ public List<Movie> populateDatabase() {
         <para>
             <example>
                 <title>Getting the rating of a movie</title>
-                <programlisting language="java" ><![CDATA[
-class Movie {
+                <programlisting language="java" ><![CDATA[class Movie {
     ...
 
     @RelatedToVia(elementClass=Rating.class, type="RATED", direction = Direction.INCOMING)
diff --git a/src/docbkx/tutorial/spring-data-graph.xml b/src/docbkx/tutorial/spring-data-graph.xml
index ddd1b5558..92605f6f3 100644
--- a/src/docbkx/tutorial/spring-data-graph.xml
+++ b/src/docbkx/tutorial/spring-data-graph.xml
@@ -18,9 +18,7 @@
         The first step was to configure Maven:
         <example>
             <title>Spring Data Graph Maven configuration</title>
-            <programlisting language="xml"><![CDATA[
-
-<properties>
+            <programlisting language="xml"><![CDATA[<properties>
     <aspectj.version>1.6.11.RELEASE</aspectj.version>
 </properties>
 
@@ -85,8 +83,7 @@
     <para>
         <example>
             <title>Spring Data Graph context configuration</title>
-            <programlisting language="xml"><![CDATA[
-<beans xmlns="http://www.springframework.org/schema/beans" ...
+            <programlisting language="xml"><![CDATA[<beans xmlns="http://www.springframework.org/schema/beans" ...
        xmlns:datagraph="http://www.springframework.org/schema/data/graph"
        xsi:schemaLocation="... http://www.springframework.org/schema/data/graph
        http://www.springframework.org/schema/data/graph/datagraph-1.0.xsd">
diff --git a/src/docbkx/tutorial/webapp.xml b/src/docbkx/tutorial/webapp.xml
index d4073fb83..1b5a6b328 100644
--- a/src/docbkx/tutorial/webapp.xml
+++ b/src/docbkx/tutorial/webapp.xml
@@ -12,8 +12,7 @@
     <para>
         <example>
             <title>Controller for showing movies</title>
-            <programlisting language="java"><![CDATA[
-@RequestMapping(value = "/movies/{movieId}", method = RequestMethod.GET, headers = "Accept=text/html")
+            <programlisting language="java"><![CDATA[@RequestMapping(value = "/movies/{movieId}", method = RequestMethod.GET, headers = "Accept=text/html")
 public String singleMovieView(final Model model, @PathVariable String movieId) {
     Movie movie = repository.getMovie(movieId);
     model.addAttribute("id", movieId);
@@ -51,8 +50,7 @@ public String singleMovieView(final Model model, @PathVariable String movieId) {
         <para>
             <example>
                 <title>Searching for movies</title>
-                <programlisting language="java"><![CDATA[
-public class CineastRepository {
+                <programlisting language="java"><![CDATA[public class CineastRepository {
     ....
     public void List<Movie> findMovies(String query, int count) {
         List<Movie> movies=new ArrayList<Movie>(count);
@@ -79,8 +77,7 @@ public class CineastRepository {
         <para>
             <example>
                 <title>Search controller</title>
-                <programlisting language="java"><![CDATA[
-@RequestMapping(value = "/movies", method = RequestMethod.GET, headers = "Accept=text/html")
+                <programlisting language="java"><![CDATA[@RequestMapping(value = "/movies", method = RequestMethod.GET, headers = "Accept=text/html")
 public String findMovies(Model model, @RequestParam("q") String query) {
     List<Movie> movies = repository.findMovies(query, 20);
     model.addAttribute("movies", movies);
@@ -93,8 +90,7 @@ public String findMovies(Model model, @RequestParam("q") String query) {
         <para>
             <example>
                 <title>Search Results JSP</title>
-                <programlisting language="jsp" ><![CDATA[
-<h2>Movies</h2>
+                <programlisting language="jsp" ><![CDATA[<h2>Movies</h2>
 
 <c:choose>
     <c:when test="${not empty movies}">