diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 46d670034..157b43af3 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -48,5 +48,6 @@ include::{spring-data-commons-docs}/repository-namespace-reference.adoc[]
 include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[]
 include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[]
 include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[]
+include::reference/migration-guides.adoc[]
 
 :leveloffset: -1
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
index 97063b59f..33736ac49 100644
--- a/src/main/asciidoc/new-features.adoc
+++ b/src/main/asciidoc/new-features.adoc
@@ -15,9 +15,13 @@ to `org.springframework.data.cassandra`.
 * Introduced `Update` and `Query` objects.
 * Renamed CRUD _Repository_ interface: `CassandraRepository` using `MapId` is now renamed to `MapIdCassandraRepository`.
 `TypedIdCassandraRepository` is renamed to `CassandraRepository`.
-* Added lightweight transaction support via `InsertOptions` and `UpdateOptions` using the Template API.
-* Added support for Index creation on application startup via `@Indexed` and `@SASI`.
+* <<cassandra.repositories.queries,Pagination>> via `PagingState` and `CassandraPageRequest`.
+* Interface and DTO projections in Repository query methods.
+* Lightweight transaction support via `InsertOptions` and `UpdateOptions` using the Template API.
+* <<cassandra.repositories.queries.options,Query options>> for Repository query methods.
 * Introduced new annotation for `@AllowFiltering`.
+* Index creation on application startup via `@Indexed` and `@SASI`.
+* Tooling support for null-safety via Spring's `@NonNullApi` and `@Nullable` annotations.
 
 [[new-features.1-5-0]]
 == What's new in Spring Data for Apache Cassandra 1.5
diff --git a/src/main/asciidoc/reference/cassandra-repositories.adoc b/src/main/asciidoc/reference/cassandra-repositories.adoc
index d2e2a4994..53c3ce786 100644
--- a/src/main/asciidoc/reference/cassandra-repositories.adoc
+++ b/src/main/asciidoc/reference/cassandra-repositories.adoc
@@ -187,7 +187,6 @@ public interface PersonRepository extends CrudRepository<Person, String> {
     Person findByShippingAddress(Address address);                          <5>
 
     Stream<Person> findAllBy();                                             <6>
->>>>>>> 18c314d... DATACASS-56 - Cassandra paging support.
 }
 ----
 <1> The method shows a query for all people with the given `lastname`. The query will be derived from parsing
@@ -267,6 +266,7 @@ NOTE: Querying non-primary key properties requires secondary indexes.
 
 include::../{spring-data-commons-docs}/repository-projections.adoc[leveloffset=+2]
 
+[[cassandra.repositories.queries.options]]
 === Query options
 
 You can specify query options for query methods by passing a `QueryOptions` object
diff --git a/src/main/asciidoc/reference/migration-guide-1.5-to-2.0.adoc b/src/main/asciidoc/reference/migration-guide-1.5-to-2.0.adoc
index a5f25114e..71c9cfc93 100644
--- a/src/main/asciidoc/reference/migration-guide-1.5-to-2.0.adoc
+++ b/src/main/asciidoc/reference/migration-guide-1.5-to-2.0.adoc
@@ -1,5 +1,5 @@
 [[cassandra.migration.1.x-to-2.x]]
-= Migration guide from Spring Data Cassandra 1.x to 2.x
+= Migration Guide from Spring Data Cassandra 1.x to 2.x
 
 Spring Data for Apache Cassandra 2.0 introduces a set of breaking changes when upgrading from earlier versions:
 
diff --git a/src/main/asciidoc/reference/migration-guides.adoc b/src/main/asciidoc/reference/migration-guides.adoc
new file mode 100644
index 000000000..d0ff4e1f2
--- /dev/null
+++ b/src/main/asciidoc/reference/migration-guides.adoc
@@ -0,0 +1,5 @@
+= Appendix E: Migration Guides
+
+:leveloffset: +1
+include::migration-guide-1.5-to-2.0.adoc[]
+:leveloffset: -1
\ No newline at end of file