diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 3a7432d52..1181085c8 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,28 +1,34 @@
 = Spring Data Solr
 Christoph Strobl, Oliver Gierke, Mark Pollack, Thomas Risberg
+:revnumber: {version}
+:revdate: {localdate}
 :toc:
+:toc-placement!:
 :spring-data-commons-docs: https://raw.githubusercontent.com/spring-projects/spring-data-commons/master/src/main/asciidoc
 
-{version}
+(C) 2012-2014 The original author(s).
 
-(C) 2012-2014 The original author(s)
+NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 
-NOTE: _Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically._
+toc::[]
 
 include::preface.adoc[]
 
 [[reference]]
 = Reference Documentation
 
-:leveloffset: 1
+:leveloffset: +1
 include::{spring-data-commons-docs}/repositories.adoc[]
 include::reference/data-solr.adoc[]
 include::reference/misc.adoc[]
+:leveloffset: -1
 
-:leveloffset: 0
-:numbered!:
 [[appendix]]
 = Appendix
 
+:numbered!:
+:leveloffset: +1
 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[]
+:leveloffset: -1
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
index 7f3aef71d..06ccf3b13 100644
--- a/src/main/asciidoc/preface.adoc
+++ b/src/main/asciidoc/preface.adoc
@@ -1,21 +1,24 @@
-[preface]
 = Preface
 
 The Spring Data Solr project applies core Spring concepts to the development of solutions using the Apache Solr Search Engine. We provide a "template" as a high-level abstraction for storing and querying documents. You will notice similarities to the mongodb support in the Spring Framework.
 
 [[project]]
+[preface]
 == Project Metadata
 
-* Version Control - `git://github.com/spring-projects/spring-data-solr.git`
+* Version Control - https://github.com/spring-projects/spring-data-solr
 * Bugtacker - https://jira.spring.io/browse/DATASOLR
-* Release repository - http://repo.springsource.org/libs-release
-* Milestone repository - http://repo.springsource.org/libs-milestone
-* Snapshot repository - http://repo.springsource.org/libs-snapshot
+* Release repository - https://repo.springsource.org/libs-release
+* Milestone repository - https://repo.springsource.org/libs-milestone
+* Snapshot repository - https://repo.springsource.org/libs-snapshot
 
 [[requirements]]
+[preface]
 == Requirements
 
-Requires http://lucene.apache.org/solr/[Apache Solr] 3.6 and above or optional dependency [source,xml]
+Requires http://lucene.apache.org/solr/[Apache Solr] 3.6 and above or optional dependency
+
+[source,xml]
 ----
 <dependency>
   <groupId>org.apache.solr</groupId>