You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/07/28 11:31:46 UTC

[1/4] wicket-site git commit: Prepare for Wicket 7.0.0, add button bars, fix some pages

Repository: wicket-site
Updated Branches:
  refs/heads/asf-site 8ae24c521 -> 8ec6434bb


http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/awc.md
----------------------------------------------------------------------
diff --git a/learn/books/awc.md b/learn/books/awc.md
index 37e3c5b..ac0e681 100644
--- a/learn/books/awc.md
+++ b/learn/books/awc.md
@@ -1,17 +1,25 @@
 ---
 layout: default
 title: Books — Apache Wicket Cookbook
+active_link: documentation
 ---
 
 ## Description ##
 
-Apache Wicket is one of the most famous Java web application frameworks. Wicket simplifies web development and makes it fun. Are you bored of going through countless pages of theory to find out how to get your web development done? With this book in hand, you don't need to go through hundreds of pages to figure out how you will actually build a web application. You will get practical solutions to your common everyday development tasks to pace up your development activities.
+Apache Wicket is one of the most famous Java web application frameworks.
+Wicket simplifies web development and makes it fun.
+Are you bored of going through countless pages of theory to find out how to get your web development done?
+With this book in hand, you don't need to go through hundreds of pages to figure out how you will actually build a web application.
+You will get practical solutions to your common everyday development tasks to pace up your development activities.
 
-Apache Wicket Cookbook provides you with information that gets your problems solved quickly without beating around the bush. This book is perfect for you if you are ready to take the next step from tutorials and step into the practical world. It will take you beyond the basics of using Apache Wicket and show you how to leverage Wicket's advanced features to create simpler and more maintainable solutions to what at first may seem complex problems.
+Apache Wicket Cookbook provides you with information that gets your problems solved quickly without beating around the bush.
+This book is perfect for you if you are ready to take the next step from tutorials and step into the practical world.
+It will take you beyond the basics of using Apache Wicket and show you how to leverage Wicket's advanced features to create simpler and more maintainable solutions to what at first may seem complex problems.
 
-You will learn how to integrate with client-side technologies such as JavaScript libraries or Flash components, which will help you to build your application faster. You will discover how to use Wicket paradigms to factor out commonly used code into custom Components, which will reduce the maintenance cost of your application, and how to leverage the existing Wicket Components to make your own code simpler.
+You will learn how to integrate with client-side technologies such as JavaScript libraries or Flash components, which will help you to build your application faster.
+You will discover how to use Wicket paradigms to factor out commonly used code into custom Components, which will reduce the maintenance cost of your application, and how to leverage the existing Wicket Components to make your own code simpler.
 
-A straightforward Cookbook with highly focused practical recipes to make your web application development easier with the Wicket web framework
+A straightforward Cookbook with highly focused practical recipes to make your web application development easier with the Wicket web framework.
 
 ## What you will learn from this book ##
 
@@ -28,16 +36,26 @@ A straightforward Cookbook with highly focused practical recipes to make your we
 
 ## Approach ##
 
-This is a hands-on practical guide to a large variety of topics and use cases. This book tries to use real-world examples when possible, but is not afraid to come up with a contrived pretext if it makes explaining the problem simpler. Unlike a lot of other books, this one does not try to maintain a continuous theme from chapter to chapter, such as demonstrating solutions on the same fictional application; doing so would be almost impossible given the wide variety of recipes presented here. Instead, this book concentrates on focused problems users are likely to encounter and shows clear solutions in a step-by-step manner. This book tries to teach by example and is not afraid to show a lot of code because, after all, it is for coders.
+This is a hands-on practical guide to a large variety of topics and use cases.
+This book tries to use real-world examples when possible, but is not afraid to come up with a contrived pretext if it makes explaining the problem simpler.
+Unlike a lot of other books, this one does not try to maintain a continuous theme from chapter to chapter, such as demonstrating solutions on the same fictional application; doing so would be almost impossible given the wide variety of recipes presented here.
+Instead, this book concentrates on focused problems users are likely to encounter and shows clear solutions in a step-by-step manner.
+This book tries to teach by example and is not afraid to show a lot of code because, after all, it is for coders.
 
 ## Who this book is written for ##
 
-This book is for current users of the Apache Wicket framework; it is not an introduction to Wicket that will bore you with tons of theory. You are expected to have built or maintained a simple Wicket application in the past and to be looking to learn new and better ways of using Wicket. If you are ready to take your Wicket skills to the next level this book is for you.
+This book is for current users of the Apache Wicket framework; it is not an introduction to Wicket that will bore you with tons of theory.
+You are expected to have built or maintained a simple Wicket application in the past and to be looking to learn new and better ways of using Wicket. 
+If you are ready to take your Wicket skills to the next level this book is for you.
 
 ## About the author ##
 
-Igor Vaynberg is a software architect with more than ten years of experience in the software field. His liking for computers was sparked when his parents got him a Sinclair Z80 when he was but ten years old. Since then he has worked with companies both large and small building modular and scalable web applications. Igor's main interest is finding ways to simplify the development of complex user interfaces required by modern web applications. Igor is a committer for the Apache Wicket framework, the aim of which is to simplify the programming model as well as reintroduce OOP to the web UI tier. In his AFK time he enjoys snowboarding with his beautiful wife and playing with his amazing children.
-
+Igor Vaynberg is a software architect with more than ten years of experience in the software field.
+His liking for computers was sparked when his parents got him a Sinclair Z80 when he was but ten years old.
+Since then he has worked with companies both large and small building modular and scalable web applications.
+Igor's main interest is finding ways to simplify the development of complex user interfaces required by modern web applications.
+Igor is a committer for the Apache Wicket framework, the aim of which is to simplify the programming model as well as reintroduce OOP to the web UI tier.
+In his AFK time he enjoys snowboarding with his beautiful wife and playing with his amazing children.
 
 ## Book details ##
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/ewdww.md
----------------------------------------------------------------------
diff --git a/learn/books/ewdww.md b/learn/books/ewdww.md
index e83a8fd..1ed12ed 100644
--- a/learn/books/ewdww.md
+++ b/learn/books/ewdww.md
@@ -1,6 +1,7 @@
 ---
 layout: default
-title: Books — Enjoying Web Development with Wicket
+title: Books — Enjoying Web Development with Wicket
+active_link: documentation
 ---
 
 Enjoying Web Development with Wicket is written by Kent Tong and is self

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/iaw6.md
----------------------------------------------------------------------
diff --git a/learn/books/iaw6.md b/learn/books/iaw6.md
index 7b58e7c..61efd5c 100644
--- a/learn/books/iaw6.md
+++ b/learn/books/iaw6.md
@@ -1,15 +1,23 @@
 ---
 layout: default
 title: Books — Instant Apache Wicket 6
+active_link: documentation
 ---
 
 ## Description ##
 
-Wicket is a component-based Java web framework. In Wicket, the server side state is automatically managed as it is associated with components. With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, Apache Wicket makes developing web-apps simple and enjoyable. There are no configuration files to learn in Wicket as it has powerful and reusable components written with plain Java and HTML. Instant Apache Wicket 6 will take you through the entire process of building web application using the Wicket frame work.
+Wicket is a component-based Java web framework.
+In Wicket, the server side state is automatically managed as it is associated with components.
+With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, Apache Wicket makes developing web-apps simple and enjoyable.
+There are no configuration files to learn in Wicket as it has powerful and reusable components written with plain Java and HTML.
+Instant Apache Wicket 6 will take you through the entire process of building web application using the Wicket frame work.
 
-Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an amazing Java framework. After you finish this book, you will be capable of developing Wicket applications, using the knowledge acquired in the book to explore more of the technology, and even contribute to Wicket’s community.
+Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an amazing Java framework.
+After you finish this book, you will be capable of developing Wicket applications, using the knowledge acquired in the book to explore more of the technology, and even contribute to Wicket’s community.
 
-Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advantages, and then goes on to show how to set up the Wicket environment and how to build a “hello world” and a sign-in/sign-out application. After you learn the Wicket core concepts and apply them to the sign-in/sign-out app, you will use Maven in Eclipse to build Wicket applications. You will learn important concepts like lifecycle (objects and requests), models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, wicket:extend, and wicket:child), and behaviors.
+Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advantages, and then goes on to show how to set up the Wicket environment and how to build a “hello world” and a sign-in/sign-out application.
+After you learn the Wicket core concepts and apply them to the sign-in/sign-out app, you will use Maven in Eclipse to build Wicket applications.
+You will learn important concepts like lifecycle (objects and requests), models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, wicket:extend, and wicket:child), and behaviors.
 
 
 ## What you will learn from this book ##
@@ -21,24 +29,28 @@ Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advan
 
 ## Approach ##
 
-Get to grips with a new technology, understand what it is and what it can do for you, and then get to work with the most important features and tasks. This Starter style guide takes the reader through the basic workflow of Apache Wicket in a practical and friendly style.
+Get to grips with a new technology, understand what it is and what it can do for you, and then get to work with the most important features and tasks.
+This Starter style guide takes the reader through the basic workflow of Apache Wicket in a practical and friendly style.
 
 ## Who this book is written for ##
 
-Instant Apache Wicket 6 is for people who want to learn the basics of Apache Wicket 6 and who already have some experience with Java and object-oriented programming. Basic knowledge of web concepts like HTTP and Ajax will be an added advantage.
+Instant Apache Wicket 6 is for people who want to learn the basics of Apache Wicket 6 and who already have some experience with Java and object-oriented programming.
+Basic knowledge of web concepts like HTTP and Ajax will be an added advantage.
 
 ## About the authors ##
 
 About the Authors
 
-João Sávio Ceregatti Longo
+### João Sávio Ceregatti Longo
 
-João Sávio Ceregatti Longo has a Bachelor's and Master's degree in Computer Science. He also has a strong background in the Java programming language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast. He is currently working at Daitan Group - http://www.daitangroup.com.
+João Sávio Ceregatti Longo has a Bachelor's and Master's degree in Computer Science.
+He also has a strong background in the Java programming language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast.
+He is currently working at Daitan Group - http://www.daitangroup.com.
 
+### Felipe Fedel Pinto
 
-Felipe Fedel Pinto
-
-Felipe Fedel Pinto holds a Bachelor's degree in Computer Science and has been developing and managing projects using Wicket since 2010. He also collaborates on open source Wicket projects. He is partner and Software Architect at Ampliato - http://www.ampliato.com.br.
+Felipe Fedel Pinto holds a Bachelor's degree in Computer Science and has been developing and managing projects using Wicket since 2010.
+He also collaborates on open source Wicket projects. He is partner and Software Architect at Ampliato - http://www.ampliato.com.br.
 
 ## Book details ##
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/index.md
----------------------------------------------------------------------
diff --git a/learn/books/index.md b/learn/books/index.md
index ace3036..591d4f0 100644
--- a/learn/books/index.md
+++ b/learn/books/index.md
@@ -1,18 +1,24 @@
 ---
 layout: default
 title: Books about Wicket
+active_link: documentation
 ---
 
 Several books have been written about Apache Wicket, 5 in English, 3 in German
 and 1 in Japanese. Click on a cover to learn more about each book.
 
-<a href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
-<a href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
-<a href="wia.html"><img src="wia.png" alt="Wicket in Action cover" title="Wicket in Action" /></a>
-<a href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
-<a href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
-<a href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" title="Pro Wicket" /></a>
-<a href="praxisbuchwicket.html"><img src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
-<a href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
-<a href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" title="Wicket Japanese" /></a>
-
+<div class="media-bar">
+<a class="l-one-quarter" href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
+<a class="l-one-quarter" href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
+<a class="l-one-quarter" href="wia.html"><img src="wia.png" alt="Wicket in Action cover" title="Wicket in Action" /></a>
+<a class="l-one-quarter" href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
+<a class="l-one-quarter" href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" title="Pro Wicket" /></a>
+<a class="l-one-quarter" href="praxisbuchwicket.html"><img src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
+<a class="l-one-quarter" href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" title="Wicket Japanese" /></a>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/koda.md
----------------------------------------------------------------------
diff --git a/learn/books/koda.md b/learn/books/koda.md
index f4a855e..567aebb 100644
--- a/learn/books/koda.md
+++ b/learn/books/koda.md
@@ -1,43 +1,31 @@
 ---
 layout: default
-title: Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework
+title: Books — Komponentenbasiert und objektorientiert - das alternative Java-Webframework
 lang: de
 ---
 
 ## Description ##
 
-Apache Wicket ist ein komponentbasiertes Webframework, das sich in den
-letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung
-gemausert hat. Man könnte diese Beliebtheit mit der einfachen
-Integration von Ajax oder der rigorosen Trennung von Markup und Logik
-erklären. Aber was Wicket wirklich über die Masse konkurrierender
-Frameworks erhebt, sind der Verzicht auf eine eigene Markup-Sprache
-und das objektorientierte Programmiermodell. Dadurch rücken Java und
-seine Sprachmittel stark in den Vordergrund. Das ermöglicht es
-erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket
-einzusteigen und auch komplexeste Anwendungen umzusetzen.
-
-Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu
-vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte
-einzugehen. Hierzu wird eine Beispielanwendung entwickelt und Schritt
-für Schritt erweitert. Anhand detaillierte Codebeispiele werden
-Sachverhalte wie der Wicket Request Cycle, Models, Validierung und
-JUnit Testing erklärt. Des Weiteren werden Themen wie
-Deplyoment-Szenarien (JEE6, Spring, ...) , jQuery-Integration und
-Performance-Tuning in separaten Kapiteln behandelt. Durch Studium
-dieses Buchs soll ein Entwickler befähigt werden, skalierbare,
-wartbare Webanwendungen in Wicket zu bauen, und er soll lernen,
-eigene, wiederverwendbare Komponenten zu entwickeln und fremde
-Komponenten zu erweitern.
-Zielgruppe
-Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der
-wichtigen Webtechnologien wie HTML und CSS
+Apache Wicket ist ein komponentbasiertes Webframework, das sich in den letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung gemausert hat.
+Man könnte diese Beliebtheit mit der einfachen Integration von Ajax oder der rigorosen Trennung von Markup und Logik erklären.
+Aber was Wicket wirklich über die Masse konkurrierender Frameworks erhebt, sind der Verzicht auf eine eigene Markup-Sprache und das objektorientierte Programmiermodell.
+Dadurch rücken Java und seine Sprachmittel stark in den Vordergrund.
+Das ermöglicht es erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket einzusteigen und auch komplexeste Anwendungen umzusetzen.
+
+Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte einzugehen.
+Hierzu wird eine Beispielanwendung entwickelt und Schritt für Schritt erweitert.
+Anhand detaillierte Codebeispiele werden Sachverhalte wie der Wicket Request Cycle, Models, Validierung und JUnit Testing erklärt.
+Des Weiteren werden Themen wie Deplyoment-Szenarien (JEE6, Spring, ...), jQuery-Integration und Performance-Tuning in separaten Kapiteln behandelt.
+Durch Studium dieses Buchs soll ein Entwickler befähigt werden, skalierbare, wartbare Webanwendungen in Wicket zu bauen, und er soll lernen, eigene, wiederverwendbare Komponenten zu entwickeln und fremde Komponenten zu erweitern.
+
+### Zielgruppe
+
+Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der wichtigen Webtechnologien wie HTML und CSS.
 
 ## About the author ##
 
-Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und
-Entwicklung. Derzeit ist er bei der Senacor Technologies AG für
-verschiedene Wicket-Projekte als Technical Lead verantwortlich.
+Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und Entwicklung.
+Derzeit ist er bei der Senacor Technologies AG für verschiedene Wicket-Projekte als Technical Lead verantwortlich.
 
 ## Book details ##
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/kwij.md
----------------------------------------------------------------------
diff --git a/learn/books/kwij.md b/learn/books/kwij.md
index 918c91f..dbb73a6 100644
--- a/learn/books/kwij.md
+++ b/learn/books/kwij.md
@@ -1,32 +1,23 @@
 ---
 layout: default
 title: Books — Wicket - Komponentenbasierte Webanwendungen in Java
+active_link: documentation
 lang: de
 ---
 
-The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart. It
-was published by dpunkt.verlag in December 2009.
+The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart.
+It was published by dpunkt.verlag in December 2009.
 
 ## Description ##
 
-Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache
-rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer,
-XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
-Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und
-kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare
-Komponenten radikal vereinfacht. Dieses Buch bietet Java-Entwicklern eine
-praxisorientierte Einführung in Wicket und zeigt, wie die Entwicklung von
-Webanwendungen in Java beschleunigt werden kann und wieder Spaß macht. Dazu
-werden die zugrunde liegenden Konzepte umfassend erklärt und anhand einer
-konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel Schritt
-für Schritt entwickelt wird. Nach der Lektüre des Buches sind Sie in der Lage,
-professionelle Webanwendungen mit Wicket zu schreiben, Komponenten für die
-eigenen Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
-Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket
-architektonisch sauber aufgebaut werden können. Umsteiger von anderen
-Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket
-kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen
-schrittweise nach Wicket zu migrieren.
+Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer, XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
+Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare Komponenten radikal vereinfacht.
+
+Dieses Buch bietet Java-Entwicklern eine praxisorientierte Einführung in Wicket und zeigt, wie die Entwicklung von Webanwendungen in Java beschleunigt werden kann und wieder Spaß macht.
+Dazu werden die zugrunde liegenden Konzepte umfassend erklärt und anhand einer konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel Schritt für Schritt entwickelt wird.
+Nach der Lektüre des Buches sind Sie in der Lage, professionelle Webanwendungen mit Wicket zu schreiben, Komponenten für die eigenen Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
+Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket architektonisch sauber aufgebaut werden können.
+Umsteiger von anderen Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen schrittweise nach Wicket zu migrieren.
 
 Aus dem Inhalt:
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/praxisbuchwicket.md
----------------------------------------------------------------------
diff --git a/learn/books/praxisbuchwicket.md b/learn/books/praxisbuchwicket.md
index 0f31975..3b32f5b 100644
--- a/learn/books/praxisbuchwicket.md
+++ b/learn/books/praxisbuchwicket.md
@@ -1,6 +1,7 @@
 ---
 layout: default
-title: Books — Praxisbuch Wicket
+title: Books — Praxisbuch Wicket
+active_link: documentation
 lang: de
 ---
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/prowicket.md
----------------------------------------------------------------------
diff --git a/learn/books/prowicket.md b/learn/books/prowicket.md
index 26854a9..e824706 100644
--- a/learn/books/prowicket.md
+++ b/learn/books/prowicket.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Books — Pro Wicket
+active_link: documentation
 ---
 
 Pro Wicket, written by by Karthik Gurumurthy, is the first book about Wicket,

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/wia.md
----------------------------------------------------------------------
diff --git a/learn/books/wia.md b/learn/books/wia.md
index d140e70..ad6d6f3 100644
--- a/learn/books/wia.md
+++ b/learn/books/wia.md
@@ -1,12 +1,11 @@
 ---
 layout: default
 title: Wicket in Action
+active_link: documentation
 ---
 
 Wicket in Action is written by Martijn Dashorst and Eelco Hillenius and is
-published by Manning. The book is currently in the final stages of production
-and will soon be available as a hard copy. Early access to the manuscript is
-available from the publishers site.
+published by Manning.
 
 ### Description ###
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/books/wicket-jp.md
----------------------------------------------------------------------
diff --git a/learn/books/wicket-jp.md b/learn/books/wicket-jp.md
index d80cdc4..aa45843 100644
--- a/learn/books/wicket-jp.md
+++ b/learn/books/wicket-jp.md
@@ -1,26 +1,27 @@
 ---
 layout: default
 title: Thorough use of open source Web application development Wicket
+active_link: documentation
 ---
 
-** NB. This page has been automatically translated as the Wicket developers
+** NB. ** This page has been automatically translated as the Wicket developers
 are unable to speak or read Japanese. Better translations are welcome!
 
-This is the only book in Japanese covering Apache Wicket. It discusses Wicket
-1.4.
+This is the only book in Japanese covering Apache Wicket. 
+It discusses Wicket 1.4.
 
 ## Description ##
 
-After all just Java and HTML. To complex applications using Ajax, XML created
-without light. Recover the object-oriented server-side. Apache Wicket 1.4-RC2
-support.
+After all just Java and HTML.
+To complex applications using Ajax, XML created without light.
+Recover the object-oriented server-side. 
+Apache Wicket 1.4-RC2 support.
 
 ## About the author ##
 
-Yano Tsutomu Born in Osaka in 1973. He joined the system development company,
-is currently working as a freelance programmer and retired. In 2008 Wicket
-User Group "Wicket-ja" up and, to the present (this data is published at the
-time was that this book was published.)
+Yano Tsutomu Born in Osaka in 1973.
+He joined the system development company, is currently working as a freelance programmer and retired. 
+In 2008 Wicket User Group "Wicket-ja" up and, to the present (this data is published at the time was that this book was published.)
 
 ## Book details ##
 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/index.md
----------------------------------------------------------------------
diff --git a/learn/index.md b/learn/index.md
index 83e8e7d..f995aee 100644
--- a/learn/index.md
+++ b/learn/index.md
@@ -5,13 +5,25 @@ subtitle: All the things you want to know about Wicket but are afraid to ask
 preamble: No matter how you want to learn about Wicket, there's something available for you. If you want a quick reference, use the User Guide. If you rather prefer a book, there's a couple waiting for you. And if you rather watch a video or presentation, we have that covered too.
 ---
 
-## News Archive
+<div class="button-bar">
+	<a class="button" href="#news"><i class="fa fa-newspaper-o"></i><br>News</a>
+	<a class="button" href="#guide"><i class="fa fa-file-text-o"></i><br>Guide</a>
+	<a class="button" href="#javadoc"><i class="fa fa-code"></i><br>API docs</a>
+	<a class="button" href="https://cwiki.apache.org/WICKET"><i class="fa fa-users"></i><br>Wiki</a>
+	<a class="button" href="books/index.html"><i class="fa fa-book"></i><br>Books</a>
+</div>
+<div class="button-bar">
+	<a class="button" href="blogs.html"><i class="fa fa-rss"></i><br>Blogs</a>
+	<a class="button" href="#migrations"><i class="fa fa-history"></i><br>Migrations</a>
+		<a class="button" href="#examples"><i class="fa fa-life-ring"></i><br>Support</a>
+	<a class="button" href="#ides"><i class="fa fa-terminal"></i><br>IDEs</a>
+	<a class="button" href="#examples"><i class="fa fa-laptop"></i><br>Examples</a>
+</div>
+
+## News Archive {#news}
 
-Every release is announced through our mailing lists and the official
-Apache announcements list. We also publish a news item on our website
-with the announcement, and it is also published in our <a
-type="application/atom+xml" title="Atom 1.0 feed"
-href="{{site.baseurl}}/atom.xml">RSS feed</a> (handy for RSS readers).
+Every release is announced through our mailing lists and the official Apache announcements list.
+We also publish a news item on our website with the announcement, and it is also published in our <a type="application/atom+xml" title="Atom 1.0 feed" href="{{site.baseurl}}/atom.xml">RSS feed</a> (handy for RSS readers).
 
 Here are the most recent headlines:
 
@@ -19,12 +31,11 @@ Here are the most recent headlines:
 - [{{post.title}}]({{ site.baseurl }}{{post.url}}) <small>{{post.date | date_to_string}}</small>
 {% endfor %}
 
-The complete articles and all other news items are available in the
-[archives]({{ site.baseurl }}/news).
+The complete articles and all other news items are available in the [archives]({{ site.baseurl }}/news).
 
 ---
 
-## Wicket User Guide
+## Wicket User Guide {#guide}
 
 Learn building web applications with Wicket from scratch reading its
 200+ page user guide. The guide gradually introduces you to the various
@@ -34,48 +45,23 @@ projects.
 
 The guide is available as PDF or html file for the following versions:
 
-1.  Wicket 6.x 
-* [HTML](http://ci.apache.org/projects/wicket/guide/6.x/)
-* [HTML (single page)](http://ci.apache.org/projects/wicket/guide/6.x/guide/single.html)
-* [PDF](http://ci.apache.org/projects/wicket/guide/6.x/guide/single.pdf)
-
-2.  Wicket 7.x (under development) 
+1.  Wicket 7.x
 * [HTML](http://ci.apache.org/projects/wicket/guide/7.x/)
 * [HTML (single page)](http://ci.apache.org/projects/wicket/guide/7.x/guide/single.html)
 * [PDF](http://ci.apache.org/projects/wicket/guide/7.x/guide/single.pdf)
 
+2.  Wicket 6.x 
+* [HTML](http://ci.apache.org/projects/wicket/guide/6.x/)
+* [HTML (single page)](http://ci.apache.org/projects/wicket/guide/6.x/guide/single.html)
+* [PDF](http://ci.apache.org/projects/wicket/guide/6.x/guide/single.pdf)
+
 You can use the guide for older releases even though there will be
 differences. We urge you however to upgrade your project to the latest
 stable release rather than sticking on an older version.
 
 ---
 
-## Books for Wicket
-
-Learn Wicket in the good old way!
-
-- [Books]({{ site.baseurl }}/learn/books/index.html)
-
-<!--
-**TODO:** integrate 'media objects' with short descriptions of each book, and links to full pages.
--->
-
----
-
-## Presentations & Videos
-
-Over the course of Wicket's existence the project was featured on many
-conferences. Some presentations were recorded on video, others have
-published their slides online. Here's a list of available videos and
-presentations:
-
-<!--
-**TODO:** integrate 'media objects' with links to presentations and videos.
--->
-
----
-
-## API Documentation
+## API Documentation {#javadoc}
 
 Each release of Wicket comes with sources, including JavaDocs. When you
 use Maven for dependency management, your IDE will automatically
@@ -85,49 +71,15 @@ method, show you the corresponding documentation.
 For reference we also publish the API documentation online so you can
 link to it from emails or websites:
 
+- [JavaDoc 7.x](http://ci.apache.org/projects/wicket/apidocs/7.x/index.html)
 - [JavaDoc 6.x](http://ci.apache.org/projects/wicket/apidocs/6.x/index.html)
 - [JavaDoc 1.5.x](http://ci.apache.org/projects/wicket/apidocs/1.5.x/index.html)
 - [JavaDoc 1.4.x](http://ci.apache.org/projects/wicket/apidocs/1.4.x/index.html)
 - [JavaDoc 1.3.x](http://ci.apache.org/projects/wicket/apidocs/1.3.x/index.html)
 
-We also publish the JavaDocs for our next version which is still under
-development:
-
-- [JavaDoc 7.x](http://ci.apache.org/projects/wicket/apidocs/7.x/index.html) (still under development)
-
----
-
-## User contributed documentation
-
-- <a href="http://cwiki.apache.org/WICKET">Wiki</a>
-
 ---
 
-## Blogs About Wicket
-
-With a history of over 10 years many developers have dedicated blog
-posts to Wicket. Here's a list of blogs that have helped thousands of
-new Wicket developers get started:
-
-* [Wicket in Action](http://wicketinaction.com/) - Martin Grigorov, Igor Vaynberg, Martijn Dashorst
-* [A Wicket Diary](http://martijndashorst.com/) - Martijn Dashorst
-* [Chillenious!](http://chillenious.wordpress.com/) - Eelco Hillenius
-* [Jonathan](http://codeact.wordpress.com/) - Jonathan Locke
-* [Here be beasties](http://herebebeasties.com/) - Al Maw
-* [Jeremy Thomerson](http://www.jeremythomerson.com/blog) - Jeremy Thomerson
-* [Codierspiel](http://technically.us/code) - Nathan Hamblen (runs on Wicket)
-* [System Mobile](http://www.systemmobile.com/?cat=4) - Nick Heudecker
-* [Wicket Praxis](http://www.wicket-praxis.de/blog/) - Michael Mosmann
-* [Mystic Coders](http://mysticcoders.com/blog) - Andrew Lombardi
-
-If you think your blog is missing, then please send a message to one of the
-core contributors or the mailinglist. In the mean time you can add your blog
-to our wiki's [special blog
-page](https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs).
-
----
-
-## Migration Guides
+## Migration Guides {#migrations}
 
 When you upgrade your application from an older Wicket version to a
 newer version you can run into all of the changes that were applied to
@@ -149,37 +101,35 @@ Here's a list of the migration guides:
         Wicket 1.5<br>
 		migration guide
     </a>
-    <a class="button" href="http://s.apache.org/wicket7migrate">
+    <a class="button" href="http://s.apache.org/wicket4migrate">
 		Wicket 1.4<br>
 		migration guide
     </a>
-    <a class="button" href="http://s.apache.org/wicket6migrate">
+    <a class="button" href="http://s.apache.org/wicket3migrate">
         Wicket 1.3<br>
 		migration guide
     </a>
 </div>
 
-
 If you encounter a change that was not in the migration guide, don't
 hesitate to notify us.
 
 ---
 
-## Getting help
+## Getting help {#support}
 
 Stuck with a problem? See how you can find [support]({{ site.baseurl }}/help/index.html)!
 
 ---
 
-## IDE Support
+## IDE Support {#ides}
 
-Wicket is well supported by the three main Java IDEs (NetBeans,
-IntelliJ and Eclipse). Find [here]({{ site.baseurl }}/contribute/ides.html) how to work with Wicket projects with
-your favourite IDE.
+Wicket is well supported by the three main Java IDEs (NetBeans, IntelliJ and Eclipse).
+Find [here]({{ site.baseurl }}/contribute/ides.html) how to work with Wicket projects with your favourite IDE.
 
 ---
 	
-## Examples
+## Examples {#examples}
 
 - <a href="{{ site.baseurl }}/learn/examples/index.html">Examples</a> - Browse a vast collection of examples in live action without having to install anything!
 - <a href="http://www.wicket-library.com/wicket-examples-6.0.x/compref/">Components reference</a> - A special subset of live examples to show you how to use Wicket components.

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/download.md
----------------------------------------------------------------------
diff --git a/start/download.md b/start/download.md
index 881c1de..d465544 100644
--- a/start/download.md
+++ b/start/download.md
@@ -4,183 +4,99 @@ title: Download Apache Wicket
 subtitle: Get the most recent version of Wicket in one source package
 preamble: Wicket is released as a source archive, convenience binaries and through the Maven Central Repository. The most convenient way of getting Wicket is through the Maven dependency management system.
 ---
-## Get the Production Release
-change
-The current stable, production ready release of Wicket is version
-**{{site.wicket.version}}**. To see what changed in this release (and
-prior releases) you can read the [change
-log](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/CHANGELOG-6.x)
 
-All projects intended for production use should use this version. These
-releases follow semantic versioning so upgrades between minor releases
-will not break compatibility.
+<div class="button-bar">
+	<a class="button" href="wicket-7.x.html">
+		<i class="fa fa-cloud-download"></i><br>
+		Apache Wicket 7.x
+	</a>
+	<a class="button" href="wicket-6.x.html">
+		<i class="fa fa-cloud-download"></i><br>
+		Apache Wicket 6.x
+	</a>
+	<a class="button" href="wicket-1.5.x.html">
+		<i class="fa fa-cloud-download"></i><br>
+		Apache Wicket 1.5.x
+	</a>
+</div>
+
+## Supported Versions
+
+The following releases are supported by the Wicket team.
+
+<table style="width:100%">
+	<tr>
+		<th>&nbsp;</th>
+		<th>Latest release</th>
+		<th>Status</th>
+		<th>More info</th>
+	</tr>
+	<tr>
+		<td>Wicket 7.x</td>
+		<td>{{site.wicket.version_70}}</td>
+		<td>current, supported</td>
+		<td><a href="wicket-7.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 6.x</td>
+		<td>{{site.wicket.version_60}}</td>
+		<td>supported</td>
+		<td><a href="wicket-6.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.5.x</td>
+		<td>{{site.wicket.version_15}}</td>
+		<td>security fixes only, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.5.x.html">overview</a></td>
+	</tr>
+</table>
+
+However, if your application is not on the current branch, you should
+consider upgrading at your earliest convenience.
 
-You can get the release using Maven or download it manually.
-
-### Get the Production Release Using Maven
-
-Use the following Maven dependency to use Wicket in your project:
-
-{% highlight xml %}
-<dependency>
-    <groupId>org.apache.wicket</groupId>
-    <artifactId>wicket-core</artifactId>
-    <version>{{site.wicket.version}}</version>
-</dependency>
-{% endhighlight xml %}
-
-Add the snippet above to your project's POM in the dependency
-(management) section.
-
-If you are not a Maven user, you can obtain the Wicket release manually.
-
-### Download the Production Release 
-
-Use the following links to download Wicket manually to build Wicket
-from source:
-
-- Download source [apache-wicket-{{site.wicket.version}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.tar.gz)
-([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.tar.gz.asc),
-[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.tar.gz.md5),
-[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.tar.gz.sha)
-)
-- Download source [apache-wicket-{{site.wicket.version}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.zip)
-([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.zip.asc),
-[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.zip.md5),
-[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/apache-wicket-{{site.wicket.version}}.zip.sha)
-)
-
-Or use the following links to get the pre-packaged binaries instead:
-
-- Download binaries [apache-wicket-{{site.wicket.version}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz)
-([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.asc),
-[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.md5),
-[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.sha)
-)
-- Download binaries [apache-wicket-{{site.wicket.version}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.zip)
-([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.zip.asc),
-[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.zip.md5),
-[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version}}/binaries/apache-wicket-{{site.wicket.version}}-bin.zip.sha)
-)
-
-### Don't mix Wicket versions
-
-You cannot mix different Wicket versions in your project. You should
-always use the artifacts from a particular release. For example it is
-**not** possible to use Wicket Extensions 1.5 in a Wicket 6 project.
-The same goes for 3rd party libraries: make sure you always use a
-compatible version of your 3rd party library.
-
-Apache Wicket {{site.wicket.version}} is the current stable release.
-Most users get Apache Wicket using [Apache Maven's dependency
-management](#maven), which incidentally is the most convenient way of
-obtaining the latest and greatest Wicket.
-
-### Developer releases
-
-If you like to live on the cutting edge and help development of Wicket
-further along, you can try out the development milestone releases:
-
- * Latest **development milestone** release for 7.x: 
-   [{{site.wicket.version_70}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}})
-
-This release is not fit for production use yet: it is only intended for
-developers of Wicket, or for people trying out our development
-versions. API changes will occur between releases.
-
-### Requirements
-
-#### Java version
-
- * Apache Wicket 7.x requires JDK 7.0 or newer
- * Apache Wicket 6.x requires JDK 6.0 or newer
- * Apache Wicket 1.5.x requires JDK 1.5 or newer
- * Apache Wicket 1.4.x requires JDK 1.5 or newer
-
-#### Logging
-
-You cannot use Wicket without adding an SLF4J logging implementation to
-your classpath. Most people use
-[log4j](http://logging.apache.org/log4j).
-
-If you do, just include **slf4j-log4j12.jar** on your classpath to get
-Wicket to use log4j too. If you want to use commons-logging or JDK14
-logging or something else, please see the [SLF4J
-site](http://www.slf4j.org/faq.html) for more information.
-
-
-## Migrating from earlier versions
-
-If you are migrating an existing application from earlier versions of
-Wicket you may find our migration guides invaluable:
-
- * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
- * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
- * Migrating from [Wicket 1.4 to Wicket 1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
- * Migrating from [Wicket 1.5 to Wicket 6.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
- * Migrating from [Wicket 6.x to Wicket 7.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0)
-
-## Maven
-
-Add the following snippet to your Maven project descriptor (`pom.xml`):
-
-{% highlight xml %}
-<dependency>
-    <groupId>org.apache.wicket</groupId>
-    <artifactId>wicket-core</artifactId>
-    <version>{{site.wicket.version}}</version>
-</dependency>
-{% endhighlight %}
-
-For the SLF4J log4j binding:
-
-{% highlight xml %}
-<dependency>
-    <groupId>org.slf4j</groupId>
-    <artifactId>slf4j-log4j12</artifactId>
-    <version>1.6.4</version>
-</dependency>
-{% endhighlight %}
-
-## SNAPSHOTs and latest bleeding-edge code ##
-
-If you wish to build the latest code from scratch, master and branches
-live in the Git repository: https://git-wip-us.apache.org/repos/asf/wicket.git
-
-Branches:
-
-* **7.x**: master
-* **6.x**: wicket-6.x
-* **1.5.x**: wicket-1.5.x
-* **1.4.x**: wicket-1.4.x
-* **1.3.x**: wicket-1.3.x
-* **1.2.x**: wicket-1.2.x
-
-There's also a Maven 2 repository providing SNAPSHOTs available here:
-
-{% highlight xml %}
-<repositories>
-    <repository>
-        <releases>
-            <enabled>false</enabled>
-        </releases>
-        <snapshots>
-            <enabled>true</enabled>
-        </snapshots>
-        <id>apache.snapshots</id>
-        <name>Apache Snapshot Repository</name>
-        <url>https://repository.apache.org/content/groups/snapshots</url>
-        <layout>default</layout>
-    </repository>
-</repositories>
-{% endhighlight %}
-
-## Looking for older releases?
-
-If you are looking for older releases of Wicket (1.5 or 1.4), please
-see the [download archive](<http://archive.apache.org/dist/wicket>) for
-more informations on our older releases.
+---
 
-- **Latest 6.x release**: [{{site.wicket.version_60}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_60}})
-- **Latest 1.5.x release**: [{{site.wicket.version_15}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_15}})
-- **Latest 1.4.x release** (security updates only): [{{site.wicket.version_14}}](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_14}})
+## Unsupported Releases
+
+The following releases are no longer supported by the Wicket team. You
+should upgrade your project if it still depends on any of these
+versions.
+
+<table style="width:100%">
+	<tr>
+		<th>&nbsp;</th>
+		<th>Latest release</th>
+		<th>Status</th>
+		<th>More info</th>
+	</tr>
+	<tr>
+		<td>Wicket 1.4.x</td>
+		<td>{{site.wicket.version_14}}</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.4.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.3.x</td>
+		<td>{{site.wicket.version_13}}</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.3.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.2.x</td>
+		<td>1.2.5</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>Wicket 1.1.x</td>
+		<td>1.1.0</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>Wicket 1.0.x</td>
+		<td>1.0.0</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+</table>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/wicket-1.3.x.md
----------------------------------------------------------------------
diff --git a/start/wicket-1.3.x.md b/start/wicket-1.3.x.md
new file mode 100644
index 0000000..dea814c
--- /dev/null
+++ b/start/wicket-1.3.x.md
@@ -0,0 +1,130 @@
+---
+layout: default
+title: Apache Wicket 1.3.x
+active_link: download
+preamble: Here you can learn about the status of Wicket 1.3.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.
+---
+
+<div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br>Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br>Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br>Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br>Migrate</a>
+</div>
+
+## Status
+
+The status for Wicket 1.3.x is: **discontinued**.
+
+This branch is **no longer maintained and will no longer recieve any updates**.
+
+<i class="fa fa-exclamation-circle"></i>
+**You should upgrade to Wicket 7.x at your earliest convenience.**
+
+### Semantic Versioning
+
+This release branch **does not** follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.
+
+## Download
+
+The most recent release in this branch is: **{{site.wicket.version_13}}**. 
+
+You can get the release using Maven or download it manually.
+
+### Using Apache Maven
+
+Use the following Maven dependency to use Wicket in your project:
+
+{% highlight xml %}
+<dependency>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket</artifactId>
+    <version>{{site.wicket.version_13}}</version>
+</dependency>
+{% endhighlight xml %}
+
+Add the snippet above to your project's POM in the dependency
+(management) section.
+
+You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the `artifactId`
+accordingly).
+
+If you are not a Maven user, you can download the Wicket release manually.
+
+### Download Manually
+
+Use the following links to download Wicket manually to build Wicket
+from source:
+
+- Download source [apache-wicket-{{site.wicket.version_13}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.tar.gz.sha)
+)
+- Download source [apache-wicket-{{site.wicket.version_13}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/apache-wicket-{{site.wicket.version_13}}.zip.sha)
+)
+
+Or use the following links to get the pre-packaged binaries instead:
+
+- Download binaries [apache-wicket-{{site.wicket.version_13}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version_13}}-bin.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.sha)
+)
+- Download binaries [apache-wicket-{{site.wicket.version_13}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version_13}}-bin.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version_13}}-bin.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version_13}}-bin.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_13}}/binaries/apache-wicket-{{site.wicket.version_13}}-bin.zip.sha)
+)
+
+Note that the binary packages and the source packages don't contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.
+
+## Requirements
+
+Apache Wicket has few requirements in order to work properly. In this
+section you'll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module's POM for
+more details on the necessary libraries.
+
+### Java version
+
+This Wicket version requires at least the following Java version: **JDK 1.4.0 or newer**.
+
+Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.
+
+### Servlet API
+
+This Wicket version requires at least the following Servlet API
+version: **Servlet API 2.3 or newer**. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.
+
+In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.
+
+### Don't mix Wicket versions
+
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+**not** possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.
+
+## Migrating from earlier versions
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/wicket-1.4.x.md
----------------------------------------------------------------------
diff --git a/start/wicket-1.4.x.md b/start/wicket-1.4.x.md
new file mode 100644
index 0000000..578ceeb
--- /dev/null
+++ b/start/wicket-1.4.x.md
@@ -0,0 +1,146 @@
+---
+layout: default
+title: Apache Wicket 1.4.x
+active_link: download
+preamble: Here you can learn about the status of Wicket 1.4.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.
+---
+
+<div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br>Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br>Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br>Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br>Migrate</a>
+</div>
+
+## Status
+
+The status for Wicket 1.4.x is: **discontinued**.
+
+This branch is **no longer maintained and will no longer recieve any updates**.
+
+<i class="fa fa-exclamation-circle"></i>
+**You should upgrade to Wicket 7.x at your earliest convenience.**
+
+### Semantic Versioning
+
+This release branch **does not** follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.
+
+### Change log
+
+To see what changed in this release (and prior releases) you can read
+the [change log](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/CHANGELOG-1.4).
+
+## Download
+
+The most recent release in this branch is: **{{site.wicket.version_14}}**. 
+
+You can get the release using Maven or download it manually.
+
+### Using Apache Maven
+
+Use the following Maven dependency to use Wicket in your project:
+
+{% highlight xml %}
+<dependency>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket</artifactId>
+    <version>{{site.wicket.version_14}}</version>
+</dependency>
+{% endhighlight xml %}
+
+Add the snippet above to your project's POM in the dependency
+(management) section.
+
+You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the `artifactId`
+accordingly).
+
+If you are not a Maven user, you can download the Wicket release manually.
+
+### Download Manually
+
+Use the following links to download Wicket manually to build Wicket
+from source:
+
+- Download source [apache-wicket-{{site.wicket.version_14}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.tar.gz.sha)
+)
+- Download source [apache-wicket-{{site.wicket.version_14}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/apache-wicket-{{site.wicket.version_14}}.zip.sha)
+)
+
+Or use the following links to get the pre-packaged binaries instead:
+
+- Download binaries [apache-wicket-{{site.wicket.version_14}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version_14}}-bin.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version}}-bin.tar.gz.sha)
+)
+- Download binaries [apache-wicket-{{site.wicket.version_14}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version_14}}-bin.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version_14}}-bin.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version_14}}-bin.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_14}}/binaries/apache-wicket-{{site.wicket.version_14}}-bin.zip.sha)
+)
+
+Note that the binary packages and the source packages don't contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.
+
+## Requirements
+
+Apache Wicket has few requirements in order to work properly. In this
+section you'll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module's POM for
+more details on the necessary libraries.
+
+### Java version
+
+This Wicket version requires at least the following Java version: **JDK 5.0 or newer**.
+
+Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.
+
+### Servlet API
+
+This Wicket version requires at least the following Servlet API
+version: **Servlet API 2.3 or newer**. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.
+
+In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.
+
+### Logging
+
+You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+[log4j](http://logging.apache.org/log4j).
+
+If you do, just include **slf4j-log4j12.jar** on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
+for more information.
+
+### Don't mix Wicket versions
+
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+**not** possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.
+
+## Migrating from earlier versions
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+ * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/wicket-1.5.x.md
----------------------------------------------------------------------
diff --git a/start/wicket-1.5.x.md b/start/wicket-1.5.x.md
new file mode 100644
index 0000000..4808787
--- /dev/null
+++ b/start/wicket-1.5.x.md
@@ -0,0 +1,149 @@
+---
+layout: default
+title: Apache Wicket 1.5.x
+active_link: download
+preamble: Here you can learn about the status of Wicket 1.5.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.
+---
+
+<div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br>Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br>Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br>Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br>Migrate</a>
+</div>
+
+## Status
+
+The status for Wicket 1.5.x is: **security fixes only**.
+
+This branch is **no longer actively maintained** and will only recieve
+backported security fixes when relevant and as long as we are able to
+actually build this branch.
+
+<i class="fa fa-exclamation-circle"></i>
+**You should upgrade to Wicket 7.x at your earliest convenience.**
+
+### Semantic Versioning
+
+This release branch **does not** follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.
+
+### Change log
+
+To see what changed in this release (and prior releases) you can read
+the [change log](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/CHANGELOG-1.5).
+
+## Download
+
+The most recent release in this branch is: **{{site.wicket.version_15}}**. 
+
+You can get the release using Maven or download it manually.
+
+### Using Apache Maven
+
+Use the following Maven dependency to use Wicket in your project:
+
+{% highlight xml %}
+<dependency>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket-core</artifactId>
+    <version>{{site.wicket.version_15}}</version>
+</dependency>
+{% endhighlight xml %}
+
+Add the snippet above to your project's POM in the dependency
+(management) section.
+
+You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the `artifactId`
+accordingly).
+
+If you are not a Maven user, you can download the Wicket release manually.
+
+### Download Manually
+
+Use the following links to download Wicket manually to build Wicket
+from source:
+
+- Download source [apache-wicket-{{site.wicket.version_15}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.tar.gz.sha)
+)
+- Download source [apache-wicket-{{site.wicket.version_15}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/apache-wicket-{{site.wicket.version_15}}.zip.sha)
+)
+
+Or use the following links to get the pre-packaged binaries instead:
+
+- Download binaries [apache-wicket-{{site.wicket.version_15}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.tar.gz.sha)
+)
+- Download binaries [apache-wicket-{{site.wicket.version_15}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_15}}/binaries/apache-wicket-{{site.wicket.version_15}}-bin.zip.sha)
+)
+
+Note that the binary packages and the source packages don't contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.
+
+## Requirements
+
+Apache Wicket has few requirements in order to work properly. In this
+section you'll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module's POM for
+more details on the necessary libraries.
+
+### Java version
+
+This Wicket version requires at least the following Java version: **JDK 5.0 or newer**.
+
+Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.
+
+### Servlet API
+
+This Wicket version requires at least the following Servlet API
+version: **Servlet API 2.5 or newer**. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.
+
+In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.
+
+### Logging
+
+You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+[log4j](http://logging.apache.org/log4j).
+
+If you do, just include **slf4j-log4j12.jar** on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
+for more information.
+
+### Don't mix Wicket versions
+
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+**not** possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.
+
+## Migrating from earlier versions
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+ * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
+ * Migrating from [Wicket 1.4 to Wicket 1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/wicket-6.x.md
----------------------------------------------------------------------
diff --git a/start/wicket-6.x.md b/start/wicket-6.x.md
new file mode 100644
index 0000000..55c68ed
--- /dev/null
+++ b/start/wicket-6.x.md
@@ -0,0 +1,153 @@
+---
+layout: default
+title: Apache Wicket 6.x
+active_link: download
+preamble: Here you can learn about the status of Wicket 6.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.
+---
+
+<div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br>Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br>Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br>Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br>Migrate</a>
+</div>
+
+## Status
+
+The status for Wicket 6.x is: **supported**.
+
+This is the previous stable, production ready release of Wicket. This
+branch will continue to recieve new features, improvements, bug- and
+security fixes.
+
+<i class="fa fa-info-circle"></i>
+However, this release will cease to receive updates in the future. You
+really should consider upgrading to Wicket 7.x at your earliest
+convenience.
+
+### Semantic Versioning
+
+These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.
+
+### Change log
+
+To see what changed in this release (and prior releases) you can read
+the [change log](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/CHANGELOG-6.x).
+
+## Download
+
+The most recent release in this branch is: **{{site.wicket.version_60}}**. 
+
+You can get the release using Maven or download it manually.
+
+### Using Apache Maven
+
+Use the following Maven dependency to use Wicket in your project:
+
+{% highlight xml %}
+<dependency>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket-core</artifactId>
+    <version>{{site.wicket.version_60}}</version>
+</dependency>
+{% endhighlight xml %}
+
+Add the snippet above to your project's POM in the dependency
+(management) section.
+
+You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the `artifactId`
+accordingly).
+
+If you are not a Maven user, you can download the Wicket release manually.
+
+### Download Manually
+
+Use the following links to download Wicket manually to build Wicket
+from source:
+
+- Download source [apache-wicket-{{site.wicket.version_60}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.tar.gz.sha)
+)
+- Download source [apache-wicket-{{site.wicket.version_60}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/apache-wicket-{{site.wicket.version_60}}.zip.sha)
+)
+
+Or use the following links to get the pre-packaged binaries instead:
+
+- Download binaries [apache-wicket-{{site.wicket.version_60}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.tar.gz.sha)
+)
+- Download binaries [apache-wicket-{{site.wicket.version_60}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_60}}/binaries/apache-wicket-{{site.wicket.version_60}}-bin.zip.sha)
+)
+
+Note that the binary packages and the source packages don't contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.
+
+## Requirements
+
+Apache Wicket has few requirements in order to work properly. In this
+section you'll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module's POM for
+more details on the necessary libraries.
+
+### Java version
+
+This Wicket version requires at least the following Java version: **JDK 6.0 or newer**.
+
+Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.
+
+### Servlet API
+
+This Wicket version requires at least the following Servlet API
+version: **Servlet API 2.5 or newer**. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.
+
+In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.
+
+### Logging
+
+You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+[log4j](http://logging.apache.org/log4j).
+
+If you do, just include **slf4j-log4j12.jar** on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
+for more information.
+
+### Don't mix Wicket versions
+
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+**not** possible to use Wicket Extensions 1.5 in a Wicket 6 project, or
+Wicket CDI 6.19 in a Wicket 7 project. The same goes for 3rd party
+libraries: make sure you always use a compatible version of your 3rd
+party library.
+
+## Migrating from earlier versions
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+ * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
+ * Migrating from [Wicket 1.4 to Wicket 1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
+ * Migrating from [Wicket 1.5 to Wicket 6.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
+

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/start/wicket-7.x.md
----------------------------------------------------------------------
diff --git a/start/wicket-7.x.md b/start/wicket-7.x.md
new file mode 100644
index 0000000..a4e47b8
--- /dev/null
+++ b/start/wicket-7.x.md
@@ -0,0 +1,146 @@
+---
+layout: default
+title: Apache Wicket 7.x
+active_link: download
+preamble: Here you can learn about the status of Wicket 7.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.
+---
+
+<div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br>Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br>Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br>Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br>Migrate</a>
+</div>
+
+## Status
+
+The status for Wicket 7.x is: **supported**.
+
+This is the current stable, **production ready** release of Wicket. All
+projects intended for production use should use this version.
+
+### Semantic versioning
+
+These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.
+
+### Change log
+
+To see what changed in these releases you can read the
+[change log](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/CHANGELOG-7.x).
+
+## Download
+
+The most recent release in this branch is: **{{site.wicket.version_70}}**. 
+You can get the release using [Maven](#maven) or [download it manually](#manually).
+
+### Using Apache Maven {#maven}
+
+Use the following Maven dependency to use Wicket in your project:
+
+{% highlight xml %}
+<dependency>
+    <groupId>org.apache.wicket</groupId>
+    <artifactId>wicket-core</artifactId>
+    <version>{{site.wicket.version_70}}</version>
+</dependency>
+{% endhighlight xml %}
+
+Add the snippet above to your project's POM in the dependency
+(management) section.
+
+You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the `artifactId`
+accordingly).
+
+If you are not a Maven user, you can download the Wicket release manually.
+
+### Download Manually {#manually}
+
+Use the following links to download Wicket manually to build Wicket
+from source:
+
+- Download source [apache-wicket-{{site.wicket.version_70}}.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.tar.gz.sha)
+)
+- Download source [apache-wicket-{{site.wicket.version_70}}.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/apache-wicket-{{site.wicket.version_70}}.zip.sha)
+)
+
+Or use the following links to get the pre-packaged binaries instead:
+
+- Download binaries [apache-wicket-{{site.wicket.version_70}}-bin.tar.gz](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.tar.gz)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.tar.gz.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.tar.gz.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.tar.gz.sha)
+)
+- Download binaries [apache-wicket-{{site.wicket.version_70}}-bin.zip](http://www.apache.org/dyn/closer.cgi/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.zip)
+([PGP](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.zip.asc),
+[MD5](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.zip.md5),
+[SHA](http://archive.apache.org/dist/wicket/{{site.wicket.version_70}}/binaries/apache-wicket-{{site.wicket.version_70}}-bin.zip.sha)
+)
+
+Note that the binary packages and the source packages don't contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.
+
+## Requirements
+
+Apache Wicket has few requirements in order to work properly. In this
+section you'll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module's POM for
+more details on the necessary libraries.
+
+### Java version
+
+This Wicket version requires at least the following Java version: **JDK 7.0 or newer**.
+
+Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.
+
+### Servlet API
+
+This Wicket version requires at least the following Servlet API
+version: **Servlet API 3.0 or newer**. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.
+
+In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.
+
+### Logging
+
+You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+[log4j](http://logging.apache.org/log4j).
+
+If you do, just include **slf4j-log4j12.jar** on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the [SLF4J site](http://www.slf4j.org/faq.html)
+for more information.
+
+### Don't mix Wicket versions
+
+You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+**not** possible to use Wicket Extensions 1.5 in a Wicket 6 project, or
+Wicket CDI 6.19 in a Wicket 7 project. The same goes for 3rd party
+libraries: make sure you always use a compatible version of your 3rd
+party library.
+
+## Migrating from earlier versions {#migrate}
+
+If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:
+
+ * Migrating from [Wicket 1.2 to Wicket 1.3](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3)
+ * Migrating from [Wicket 1.3 to Wicket 1.4](https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4)
+ * Migrating from [Wicket 1.4 to Wicket 1.5](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5)
+ * Migrating from [Wicket 1.5 to Wicket 6.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0)
+ * Migrating from [Wicket 6.x to Wicket 7.x](https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0)


[3/4] wicket-site git commit: Prepare for Wicket 7.0.0, add button bars, fix some pages

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/wicket-jp.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wicket-jp.html b/content/learn/books/wicket-jp.html
index 07964a0..f29b392 100644
--- a/content/learn/books/wicket-jp.html
+++ b/content/learn/books/wicket-jp.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/wicket-jp.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/wicket-jp.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/wicket-jp.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/wicket-jp.html -->
@@ -49,19 +49,19 @@
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <p>** NB. This page has been automatically translated as the Wicket developers
+            <p>** NB. ** This page has been automatically translated as the Wicket developers
 are unable to speak or read Japanese. Better translations are welcome!</p>
-<p>This is the only book in Japanese covering Apache Wicket. It discusses Wicket
-1.4.</p>
+<p>This is the only book in Japanese covering Apache Wicket. 
+It discusses Wicket 1.4.</p>
 <h2 id="description">Description</h2>
-<p>After all just Java and HTML. To complex applications using Ajax, XML created
-without light. Recover the object-oriented server-side. Apache Wicket 1.4-RC2
-support.</p>
+<p>After all just Java and HTML.
+To complex applications using Ajax, XML created without light.
+Recover the object-oriented server-side. 
+Apache Wicket 1.4-RC2 support.</p>
 <h2 id="about-the-author">About the author</h2>
-<p>Yano Tsutomu Born in Osaka in 1973. He joined the system development company,
-is currently working as a freelance programmer and retired. In 2008 Wicket
-User Group “Wicket-ja” up and, to the present (this data is published at the
-time was that this book was published.)</p>
+<p>Yano Tsutomu Born in Osaka in 1973.
+He joined the system development company, is currently working as a freelance programmer and retired. 
+In 2008 Wicket User Group “Wicket-ja” up and, to the present (this data is published at the time was that this book was published.)</p>
 <h2 id="book-details">Book details</h2>
 <p>Paperback: 431 pages
 Publisher: Hidekazu system (2009/03)

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/examples/dropdownchoice.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/dropdownchoice.html b/content/learn/examples/dropdownchoice.html
index 15de2a6..0d392c3 100644
--- a/content/learn/examples/dropdownchoice.html
+++ b/content/learn/examples/dropdownchoice.html
@@ -107,7 +107,7 @@ is how the page would look like in HTML:</p>
 <p>This page has three components:</p>
 <ul>
   <li>a form (needed to process the input),</li>
-  <li>a label (to show the name of the employee) and </li>
+  <li>a label (to show the name of the employee) and</li>
   <li>a select box for picking the manager.</li>
 </ul>
 <p>We will focus on the select box, because that will be our <code>DropDownChoice</code>.

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/index.html
----------------------------------------------------------------------
diff --git a/content/learn/index.html b/content/learn/index.html
index 6b9b332..d2501be 100644
--- a/content/learn/index.html
+++ b/content/learn/index.html
@@ -48,13 +48,26 @@
             <p>No matter how you want to learn about Wicket, there's something available for you. If you want a quick reference, use the User Guide. If you rather prefer a book, there's a couple waiting for you. And if you rather watch a video or presentation, we have that covered too.</p>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#news-archive"><span class="toc-number">1</span> <span class="toc-text">News Archive</span></a></li><li class="toc--level-1 toc--section-2"><a href="#wicket-user-guide"><span class="toc-number">2</span> <span class="toc-text">Wicket User Guide</span></a></li><li class="toc--level-1 toc--section-3"><a href="#books-for-wicket"><span class="toc-number">3</span> <span class="toc-text">Books for Wicket</span></a></li><li class="toc--level-1 toc--section-4"><a href="#presentations--videos"><span class="toc-number">4</span> <span class="toc-text">Presentations & Videos</span></a></li><li class="toc--level-1 toc--section-5"><a href="#api-documentation"><span class="toc-number">5</span> <span class="toc-text">API Documentation</span></a></li><li class="toc--level-1 toc--section-6"><a href="#user-contributed-documentation"><span class="toc-number">6</s
 pan> <span class="toc-text">User contributed documentation</span></a></li><li class="toc--level-1 toc--section-7"><a href="#blogs-about-wicket"><span class="toc-number">7</span> <span class="toc-text">Blogs About Wicket</span></a></li><li class="toc--level-1 toc--section-8"><a href="#migration-guides"><span class="toc-number">8</span> <span class="toc-text">Migration Guides</span></a></li><li class="toc--level-1 toc--section-9"><a href="#getting-help"><span class="toc-number">9</span> <span class="toc-text">Getting help</span></a></li><li class="toc--level-1 toc--section-10"><a href="#ide-support"><span class="toc-number">10</span> <span class="toc-text">IDE Support</span></a></li><li class="toc--level-1 toc--section-11"><a href="#examples"><span class="toc-number">11</span> <span class="toc-text">Examples</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#news"><span class="toc-number">1</span> <span class="toc-text">News Archive</span></a></li><li class="toc--level-1 toc--section-2"><a href="#guide"><span class="toc-number">2</span> <span class="toc-text">Wicket User Guide</span></a></li><li class="toc--level-1 toc--section-3"><a href="#javadoc"><span class="toc-number">3</span> <span class="toc-text">API Documentation</span></a></li><li class="toc--level-1 toc--section-4"><a href="#migrations"><span class="toc-number">4</span> <span class="toc-text">Migration Guides</span></a></li><li class="toc--level-1 toc--section-5"><a href="#support"><span class="toc-number">5</span> <span class="toc-text">Getting help</span></a></li><li class="toc--level-1 toc--section-6"><a href="#ides"><span class="toc-number">6</span> <span class="toc-text">IDE Support</span></a></li><li class="toc--level-1 toc--se
 ction-7"><a href="#examples"><span class="toc-number">7</span> <span class="toc-text">Examples</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <h2 id="news-archive">News Archive</h2>
-<p>Every release is announced through our mailing lists and the official
-Apache announcements list. We also publish a news item on our website
-with the announcement, and it is also published in our <a type="application/atom+xml" title="Atom 1.0 feed" href="/atom.xml">RSS feed</a> (handy for RSS readers).</p>
+            <div class="button-bar">
+	<a class="button" href="#news"><i class="fa fa-newspaper-o"></i><br />News</a>
+	<a class="button" href="#guide"><i class="fa fa-file-text-o"></i><br />Guide</a>
+	<a class="button" href="#javadoc"><i class="fa fa-code"></i><br />API docs</a>
+	<a class="button" href="https://cwiki.apache.org/WICKET"><i class="fa fa-users"></i><br />Wiki</a>
+	<a class="button" href="books/index.html"><i class="fa fa-book"></i><br />Books</a>
+</div>
+<div class="button-bar">
+	<a class="button" href="blogs.html"><i class="fa fa-rss"></i><br />Blogs</a>
+	<a class="button" href="#migrations"><i class="fa fa-history"></i><br />Migrations</a>
+		<a class="button" href="#examples"><i class="fa fa-life-ring"></i><br />Support</a>
+	<a class="button" href="#ides"><i class="fa fa-terminal"></i><br />IDEs</a>
+	<a class="button" href="#examples"><i class="fa fa-laptop"></i><br />Examples</a>
+</div>
+<h2 id="news">News Archive</h2>
+<p>Every release is announced through our mailing lists and the official Apache announcements list.
+We also publish a news item on our website with the announcement, and it is also published in our <a type="application/atom+xml" title="Atom 1.0 feed" href="/atom.xml">RSS feed</a> (handy for RSS readers).</p>
 <p>Here are the most recent headlines:</p>
 <ul>
   <li>
@@ -67,10 +80,9 @@ with the announcement, and it is also published in our <a type="application/atom
     <p><a href="/news/2015/02/13/wicket-1.5.13-released.html">Wicket 1.5.13 released</a> <small>13 Feb 2015</small></p>
   </li>
 </ul>
-<p>The complete articles and all other news items are available in the
-<a href="/news">archives</a>.</p>
+<p>The complete articles and all other news items are available in the <a href="/news">archives</a>.</p>
 <hr />
-<h2 id="wicket-user-guide">Wicket User Guide</h2>
+<h2 id="guide">Wicket User Guide</h2>
 <p>Learn building web applications with Wicket from scratch reading its
 200+ page user guide. The guide gradually introduces you to the various
 features of the framework with many real-world examples. It covers
@@ -78,44 +90,26 @@ subjects such as models, behaviours, testing and integration with other
 projects.</p>
 <p>The guide is available as PDF or html file for the following versions:</p>
 <ol>
-  <li>Wicket 6.x 
-    <ul>
-      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/">HTML</a></li>
-      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/guide/single.html">HTML (single page)</a></li>
-      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/guide/single.pdf">PDF</a></li>
-    </ul>
-  </li>
-  <li>Wicket 7.x (under development) 
+  <li>Wicket 7.x
     <ul>
       <li><a href="http://ci.apache.org/projects/wicket/guide/7.x/">HTML</a></li>
       <li><a href="http://ci.apache.org/projects/wicket/guide/7.x/guide/single.html">HTML (single page)</a></li>
       <li><a href="http://ci.apache.org/projects/wicket/guide/7.x/guide/single.pdf">PDF</a></li>
     </ul>
   </li>
+  <li>Wicket 6.x
+    <ul>
+      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/">HTML</a></li>
+      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/guide/single.html">HTML (single page)</a></li>
+      <li><a href="http://ci.apache.org/projects/wicket/guide/6.x/guide/single.pdf">PDF</a></li>
+    </ul>
+  </li>
 </ol>
 <p>You can use the guide for older releases even though there will be
 differences. We urge you however to upgrade your project to the latest
 stable release rather than sticking on an older version.</p>
 <hr />
-<h2 id="books-for-wicket">Books for Wicket</h2>
-<p>Learn Wicket in the good old way!</p>
-<ul>
-  <li><a href="/learn/books/index.html">Books</a></li>
-</ul>
-<!--
-**TODO:** integrate 'media objects' with short descriptions of each book, and links to full pages.
--->
-<hr />
-<h2 id="presentations--videos">Presentations &amp; Videos</h2>
-<p>Over the course of Wicket’s existence the project was featured on many
-conferences. Some presentations were recorded on video, others have
-published their slides online. Here’s a list of available videos and
-presentations:</p>
-<!--
-**TODO:** integrate 'media objects' with links to presentations and videos.
--->
-<hr />
-<h2 id="api-documentation">API Documentation</h2>
+<h2 id="javadoc">API Documentation</h2>
 <p>Each release of Wicket comes with sources, including JavaDocs. When you
 use Maven for dependency management, your IDE will automatically
 download the source JARs and when you hover on a Wicket class or
@@ -123,44 +117,14 @@ method, show you the corresponding documentation.</p>
 <p>For reference we also publish the API documentation online so you can
 link to it from emails or websites:</p>
 <ul>
+  <li><a href="http://ci.apache.org/projects/wicket/apidocs/7.x/index.html">JavaDoc 7.x</a></li>
   <li><a href="http://ci.apache.org/projects/wicket/apidocs/6.x/index.html">JavaDoc 6.x</a></li>
   <li><a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/index.html">JavaDoc 1.5.x</a></li>
   <li><a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x/index.html">JavaDoc 1.4.x</a></li>
   <li><a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x/index.html">JavaDoc 1.3.x</a></li>
 </ul>
-<p>We also publish the JavaDocs for our next version which is still under
-development:</p>
-<ul>
-  <li><a href="http://ci.apache.org/projects/wicket/apidocs/7.x/index.html">JavaDoc 7.x</a> (still under development)</li>
-</ul>
-<hr />
-<h2 id="user-contributed-documentation">User contributed documentation</h2>
-<ul>
-  <li><a href="http://cwiki.apache.org/WICKET">Wiki</a></li>
-</ul>
 <hr />
-<h2 id="blogs-about-wicket">Blogs About Wicket</h2>
-<p>With a history of over 10 years many developers have dedicated blog
-posts to Wicket. Here’s a list of blogs that have helped thousands of
-new Wicket developers get started:</p>
-<ul>
-  <li><a href="http://wicketinaction.com/">Wicket in Action</a> - Martin Grigorov, Igor Vaynberg, Martijn Dashorst</li>
-  <li><a href="http://martijndashorst.com/">A Wicket Diary</a> - Martijn Dashorst</li>
-  <li><a href="http://chillenious.wordpress.com/">Chillenious!</a> - Eelco Hillenius</li>
-  <li><a href="http://codeact.wordpress.com/">Jonathan</a> - Jonathan Locke</li>
-  <li><a href="http://herebebeasties.com/">Here be beasties</a> - Al Maw</li>
-  <li><a href="http://www.jeremythomerson.com/blog">Jeremy Thomerson</a> - Jeremy Thomerson</li>
-  <li><a href="http://technically.us/code">Codierspiel</a> - Nathan Hamblen (runs on Wicket)</li>
-  <li><a href="http://www.systemmobile.com/?cat=4">System Mobile</a> - Nick Heudecker</li>
-  <li><a href="http://www.wicket-praxis.de/blog/">Wicket Praxis</a> - Michael Mosmann</li>
-  <li><a href="http://mysticcoders.com/blog">Mystic Coders</a> - Andrew Lombardi</li>
-</ul>
-<p>If you think your blog is missing, then please send a message to one of the
-core contributors or the mailinglist. In the mean time you can add your blog
-to our wiki’s <a href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs">special blog
-page</a>.</p>
-<hr />
-<h2 id="migration-guides">Migration Guides</h2>
+<h2 id="migrations">Migration Guides</h2>
 <p>When you upgrade your application from an older Wicket version to a
 newer version you can run into all of the changes that were applied to
 Wicket’s API. We have done our best to document all the changes and
@@ -179,11 +143,11 @@ provide migration paths between the different Wicket versions.</p>
         Wicket 1.5<br />
 		migration guide
     </a>
-    <a class="button" href="http://s.apache.org/wicket7migrate">
+    <a class="button" href="http://s.apache.org/wicket4migrate">
 		Wicket 1.4<br />
 		migration guide
     </a>
-    <a class="button" href="http://s.apache.org/wicket6migrate">
+    <a class="button" href="http://s.apache.org/wicket3migrate">
         Wicket 1.3<br />
 		migration guide
     </a>
@@ -191,13 +155,12 @@ provide migration paths between the different Wicket versions.</p>
 <p>If you encounter a change that was not in the migration guide, don’t
 hesitate to notify us.</p>
 <hr />
-<h2 id="getting-help">Getting help</h2>
+<h2 id="support">Getting help</h2>
 <p>Stuck with a problem? See how you can find <a href="/help/index.html">support</a>!</p>
 <hr />
-<h2 id="ide-support">IDE Support</h2>
-<p>Wicket is well supported by the three main Java IDEs (NetBeans,
-IntelliJ and Eclipse). Find <a href="/contribute/ides.html">here</a> how to work with Wicket projects with
-your favourite IDE.</p>
+<h2 id="ides">IDE Support</h2>
+<p>Wicket is well supported by the three main Java IDEs (NetBeans, IntelliJ and Eclipse).
+Find <a href="/contribute/ides.html">here</a> how to work with Wicket projects with your favourite IDE.</p>
 <hr />
 <h2 id="examples">Examples</h2>
 <ul>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/05/24/wicket-1.4.9-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/05/24/wicket-1.4.9-released.html b/content/news/2010/05/24/wicket-1.4.9-released.html
index de75b7a..142904c 100644
--- a/content/news/2010/05/24/wicket-1.4.9-released.html
+++ b/content/news/2010/05/24/wicket-1.4.9-released.html
@@ -54,9 +54,9 @@
     <p>This is the ninth maintenance release of the 1.4.x series and brings over
 fifteen bug fixes and improvements.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12314962">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/05/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/05/index.html b/content/news/2010/05/index.html
index f51316e..cfc3ea4 100644
--- a/content/news/2010/05/index.html
+++ b/content/news/2010/05/index.html
@@ -66,13 +66,12 @@
 	<p>This is the ninth maintenance release of the 1.4.x series and brings over
 fifteen bug fixes and improvements.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12314962">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apach...</code></pre></div>
+    <span class="nt">&lt;groupId&gt;</span>org.apa...</code></pre></div>
 	<a href="/news/2010/05/24/wicket-1.4.9-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/08/11/wicket-1.4.10-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/11/wicket-1.4.10-released.html b/content/news/2010/08/11/wicket-1.4.10-released.html
index 74c81bb..3e0a4a3 100644
--- a/content/news/2010/08/11/wicket-1.4.10-released.html
+++ b/content/news/2010/08/11/wicket-1.4.10-released.html
@@ -54,7 +54,7 @@
 thirty bug fixes and improvements.</p>
 <p>As well as bringing bug fixes and small improvements, 1.4.10 brings two major new features:
 * Delayed component initialization
-* Component configuration </p>
+* Component configuration</p>
 <p>Delayed component initialization allows developers to initialize their components outside of a constructor, when more environment is available to the component instance. From the javadoc:</p>
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Component</span> <span class="o">{</span>
 	<span class="cm">/**</span>
@@ -146,9 +146,9 @@ thirty bug fixes and improvements.</p>
 	<span class="kd">protected</span> <span class="kt">void</span> <span class="nf">onConfigure</span><span class="o">()</span> <span class="o">{}</span>
 <span class="o">}</span></code></pre></div>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10/">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10/">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;pid=12310561&amp;fixfor=12315070">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/08/11/wicket-1.5-M1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/11/wicket-1.5-M1-released.html b/content/news/2010/08/11/wicket-1.5-M1-released.html
index bd00ab3..8252019 100644
--- a/content/news/2010/08/11/wicket-1.5-M1-released.html
+++ b/content/news/2010/08/11/wicket-1.5-M1-released.html
@@ -55,8 +55,8 @@ provide our users with a more powerful and flexible request processing pipeline.
 <p>This release is NOT production-ready, it is more of a technology demo that should facilitate user-feedback we can fold into the next milestone.</p>
 <ul>
   <li><a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Migration notes</a></li>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/">Subversion tag</a> </li>
-  <li>To use in Maven: </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/">Subversion tag</a></li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/08/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/index.html b/content/news/2010/08/index.html
index 1590253..99a6557 100644
--- a/content/news/2010/08/index.html
+++ b/content/news/2010/08/index.html
@@ -57,7 +57,7 @@
   <p><small>11 Aug 2010</small></p>
 	<p>This is the tenth maintenance release of the 1.4.x series and brings over
 thirty bug fixes and improvements.</p>
-<p>As well as bringing bug fixes and small improvements, 1.4.10 brin...</p>
+<p>As well as bringing bug fixes and small improvements, 1.4.10 bri...</p>
 	<a href="/news/2010/08/11/wicket-1.4.10-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/09/09/wicket-1.4.11-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/09/09/wicket-1.4.11-released.html b/content/news/2010/09/09/wicket-1.4.11-released.html
index 22d1226..ad229b0 100644
--- a/content/news/2010/09/09/wicket-1.4.11-released.html
+++ b/content/news/2010/09/09/wicket-1.4.11-released.html
@@ -53,9 +53,9 @@
     <p>This is the eleventh maintenance release of the 1.4.x series and brings over
 fifty bug fixes and improvements.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315236&amp;sorter/field=issuekey&amp;sorter/order=DESC">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/09/17/wicket.1.4.12-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/09/17/wicket.1.4.12-released.html b/content/news/2010/09/17/wicket.1.4.12-released.html
index f9da5e4..1b615c2 100644
--- a/content/news/2010/09/17/wicket.1.4.12-released.html
+++ b/content/news/2010/09/17/wicket.1.4.12-released.html
@@ -52,9 +52,9 @@
     <p class="meta">17 Sep 2010</p>
     <p>This is the twelfth maintenance release of the 1.4.x series. This release brings a fix to a <a href="https://issues.apache.org/jira/browse/WICKET-3040">critical bug</a> which prevented ajax form submits in FireFox.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.12">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.12">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315312&amp;sorter/field=priority&amp;sorter/order=DESC">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/09/17/wicket.1.5-M2.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/09/17/wicket.1.5-M2.1-released.html b/content/news/2010/09/17/wicket.1.5-M2.1-released.html
index 567c834..fd1f711 100644
--- a/content/news/2010/09/17/wicket.1.5-M2.1-released.html
+++ b/content/news/2010/09/17/wicket.1.5-M2.1-released.html
@@ -53,11 +53,11 @@
     <p>This is the second milestone of the new 1.5.x Wicket series. The focus of 1.5.x is to 
 provide our users with a more powerful and flexible request processing pipeline.</p>
 <p>This release is NOT production-ready, it is more of a technology demo that should facilitate user-feedback we can fold into the next milestone.</p>
-<p>New and noteworthy items in this milestone include <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-Intercomponentevents">Inter-component event mechanism</a> which allows components to communicate in a decoupled fashion, and improved <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced">resource caching</a>. </p>
+<p>New and noteworthy items in this milestone include <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-Intercomponentevents">Inter-component event mechanism</a> which allows components to communicate in a decoupled fashion, and improved <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5#MigrationtoWicket1.5-getResourceSettings%2528%2529.setAddLastModifiedTimeToResourceReferenceUrl%2528%2529hasbeenreplaced">resource caching</a>.</p>
 <ul>
   <li><a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Migration notes</a></li>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M2.1">Subversion tag</a> </li>
-  <li>To use in Maven: </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M2.1">Subversion tag</a></li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/09/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/09/index.html b/content/news/2010/09/index.html
index 5f4b54f..b6855fa 100644
--- a/content/news/2010/09/index.html
+++ b/content/news/2010/09/index.html
@@ -52,13 +52,12 @@
 	<p>This is the eleventh maintenance release of the 1.4.x series and brings over
 fifty bug fixes and improvements.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315236&amp;sorter/field=issuekey&amp;sorter/order=DESC">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache...</code></pre></div>
+    <span class="nt">&lt;groupId&gt;</span>org.apac...</code></pre></div>
 	<a href="/news/2010/09/09/wicket-1.4.11-released.html">more</a></li>
 </div>
 <div class="news">
@@ -66,11 +65,10 @@ fifty bug fixes and improvements.</p>
   <p><small>17 Sep 2010</small></p>
 	<p>This is the twelfth maintenance release of the 1.4.x series. This release brings a fix to a <a href="https://issues.apache.org/jira/browse/WICKET-3040">critical bug</a> which prevented ajax form submits in FireFox.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.12">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.12">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315312&amp;sorter/field=priority&amp;sorter/order=DESC">Changelog</a></li>
-  <li>To u...</li>
-</ul>
+  <li>To use in Maven:</li>
+...</ul>
 	<a href="/news/2010/09/17/wicket.1.4.12-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/11/01/wicket-1.4.13-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/11/01/wicket-1.4.13-released.html b/content/news/2010/11/01/wicket-1.4.13-released.html
index 9f615de..925db35 100644
--- a/content/news/2010/11/01/wicket-1.4.13-released.html
+++ b/content/news/2010/11/01/wicket-1.4.13-released.html
@@ -52,9 +52,9 @@
     <p class="meta">01 Nov 2010</p>
     <p>This is thirteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.13">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.13">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315330">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/11/05/wicket-1.5-M3-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/11/05/wicket-1.5-M3-released.html b/content/news/2010/11/05/wicket-1.5-M3-released.html
index 0b87807..5216992 100644
--- a/content/news/2010/11/05/wicket-1.5-M3-released.html
+++ b/content/news/2010/11/05/wicket-1.5-M3-released.html
@@ -52,9 +52,9 @@
     <p class="meta">05 Nov 2010</p>
     <p>This is another milestone release from trunk (in-development branch).  This release includes several enhancments and fixes, which can be seen in the changelog (linked below).</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M3">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M3">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315329">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/11/29/wicket-1.4.14-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/11/29/wicket-1.4.14-released.html b/content/news/2010/11/29/wicket-1.4.14-released.html
index fb49498..09e621c 100644
--- a/content/news/2010/11/29/wicket-1.4.14-released.html
+++ b/content/news/2010/11/29/wicket-1.4.14-released.html
@@ -52,9 +52,9 @@
     <p class="meta">29 Nov 2010</p>
     <p>This is fourteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.14">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.14">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315480">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/11/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/11/index.html b/content/news/2010/11/index.html
index c298a81..ae7d48f 100644
--- a/content/news/2010/11/index.html
+++ b/content/news/2010/11/index.html
@@ -51,13 +51,12 @@
   <p><small>01 Nov 2010</small></p>
 	<p>This is thirteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.13">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.13">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315330">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId...</span></code></pre></div>
+    <span class="nt">&lt;group...</span></code></pre></div>
 	<a href="/news/2010/11/01/wicket-1.4.13-released.html">more</a></li>
 </div>
 <div class="news">
@@ -65,9 +64,8 @@
   <p><small>05 Nov 2010</small></p>
 	<p>This is another milestone release from trunk (in-development branch).  This release includes several enhancments and fixes, which can be seen in the changelog (linked below).</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M3">Subversion tag</a> </li>
-  <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315329">Changelo...</a></li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M3">Subversion tag</a></li>
+  <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315329">Changel...</a></li>
 </ul>
 	<a href="/news/2010/11/05/wicket-1.5-M3-released.html">more</a></li>
 </div>
@@ -85,13 +83,12 @@ willing to do the “grunt work” of creating great test cases for his pa...</p
   <p><small>29 Nov 2010</small></p>
 	<p>This is fourteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.14">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.14">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315480">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId...</span></code></pre></div>
+    <span class="nt">&lt;group...</span></code></pre></div>
 	<a href="/news/2010/11/29/wicket-1.4.14-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/12/24/wicket-1.4.15-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/12/24/wicket-1.4.15-released.html b/content/news/2010/12/24/wicket-1.4.15-released.html
index c80b08a..5094fd1 100644
--- a/content/news/2010/12/24/wicket-1.4.15-released.html
+++ b/content/news/2010/12/24/wicket-1.4.15-released.html
@@ -52,9 +52,9 @@
     <p class="meta">24 Dec 2010</p>
     <p>This is fifteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.15">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.15">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315900">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2010/12/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/12/index.html b/content/news/2010/12/index.html
index d25b9c9..92ba11f 100644
--- a/content/news/2010/12/index.html
+++ b/content/news/2010/12/index.html
@@ -51,13 +51,12 @@
   <p><small>24 Dec 2010</small></p>
 	<p>This is fifteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.15">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.15">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12315900">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupI...</span></code></pre></div>
+    <span class="nt">&lt;grou...</span></code></pre></div>
 	<a href="/news/2010/12/24/wicket-1.4.15-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/01/22/wicket-1.5-RC1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/01/22/wicket-1.5-RC1-released.html b/content/news/2011/01/22/wicket-1.5-RC1-released.html
index a39e9ab..a4a2573 100644
--- a/content/news/2011/01/22/wicket-1.5-RC1-released.html
+++ b/content/news/2011/01/22/wicket-1.5-RC1-released.html
@@ -60,7 +60,7 @@
 <p>Release Artifacts:
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC1">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315483&amp;sorter/field=issuekey&amp;sorter/order=DESC">Changelog</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/02/25/wicket-1.4.16-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/02/25/wicket-1.4.16-released.html b/content/news/2011/02/25/wicket-1.4.16-released.html
index 31173b4..65ce95f 100644
--- a/content/news/2011/02/25/wicket-1.4.16-released.html
+++ b/content/news/2011/02/25/wicket-1.4.16-released.html
@@ -52,9 +52,9 @@
     <p class="meta">25 Feb 2011</p>
     <p>This is sixteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.16">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.16">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316020">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/02/25/wicket-1.5-rc2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/02/25/wicket-1.5-rc2-released.html b/content/news/2011/02/25/wicket-1.5-rc2-released.html
index 2252176..137b0e7 100644
--- a/content/news/2011/02/25/wicket-1.5-rc2-released.html
+++ b/content/news/2011/02/25/wicket-1.5-rc2-released.html
@@ -55,7 +55,7 @@
 <p>Release Artifacts:
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-rc2">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316059">Changelog</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/02/index.html
----------------------------------------------------------------------
diff --git a/content/news/2011/02/index.html b/content/news/2011/02/index.html
index 2389f6c..43526c7 100644
--- a/content/news/2011/02/index.html
+++ b/content/news/2011/02/index.html
@@ -51,13 +51,12 @@
   <p><small>25 Feb 2011</small></p>
 	<p>This is sixteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.16">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.16">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316020">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupI...</span></code></pre></div>
+    <span class="nt">&lt;grou...</span></code></pre></div>
 	<a href="/news/2011/02/25/wicket-1.4.16-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/04/02/wicket-1.4.17-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/04/02/wicket-1.4.17-released.html b/content/news/2011/04/02/wicket-1.4.17-released.html
index 9485a9b..972fc86 100644
--- a/content/news/2011/04/02/wicket-1.4.17-released.html
+++ b/content/news/2011/04/02/wicket-1.4.17-released.html
@@ -52,9 +52,9 @@
     <p class="meta">02 Apr 2011</p>
     <p>This is seventeenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.17">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.17">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316219">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/04/02/wicket-1.5-RC3-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/04/02/wicket-1.5-RC3-released.html b/content/news/2011/04/02/wicket-1.5-RC3-released.html
index 2033c66..2bc21b3 100644
--- a/content/news/2011/04/02/wicket-1.5-RC3-released.html
+++ b/content/news/2011/04/02/wicket-1.5-RC3-released.html
@@ -55,7 +55,7 @@
 <p>Release Artifacts:
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC3">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316220">Changelog</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/04/index.html
----------------------------------------------------------------------
diff --git a/content/news/2011/04/index.html b/content/news/2011/04/index.html
index 5bcf05a..1b52860 100644
--- a/content/news/2011/04/index.html
+++ b/content/news/2011/04/index.html
@@ -51,13 +51,12 @@
   <p><small>02 Apr 2011</small></p>
 	<p>This is seventeenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.17">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.17">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316219">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;...</span></code></pre></div>
+    <span class="nt">&lt;groupI...</span></code></pre></div>
 	<a href="/news/2011/04/02/wicket-1.4.17-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/05/11/wicket-1.5-RC4.2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/05/11/wicket-1.5-RC4.2-released.html b/content/news/2011/05/11/wicket-1.5-RC4.2-released.html
index b4ada49..02c5ac5 100644
--- a/content/news/2011/05/11/wicket-1.5-RC4.2-released.html
+++ b/content/news/2011/05/11/wicket-1.5-RC4.2-released.html
@@ -55,7 +55,7 @@
 <p>Release Artifacts:
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC4.2">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316330">Changelog</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/06/25/wicket-1.5-RC5.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/06/25/wicket-1.5-RC5.1-released.html b/content/news/2011/06/25/wicket-1.5-RC5.1-released.html
index efd5389..751967c 100644
--- a/content/news/2011/06/25/wicket-1.5-RC5.1-released.html
+++ b/content/news/2011/06/25/wicket-1.5-RC5.1-released.html
@@ -55,7 +55,7 @@
 <p>Release Artifacts:
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC5.1">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316423">Changelog</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/08/09/wicket-1.4.18-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/08/09/wicket-1.4.18-released.html b/content/news/2011/08/09/wicket-1.4.18-released.html
index 793d8c9..85362a6 100644
--- a/content/news/2011/08/09/wicket-1.4.18-released.html
+++ b/content/news/2011/08/09/wicket-1.4.18-released.html
@@ -52,9 +52,9 @@
     <p class="meta">09 Aug 2011</p>
     <p>This is eightteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.18">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.18">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316329">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/08/28/1.5-RC7-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/08/28/1.5-RC7-released.html b/content/news/2011/08/28/1.5-RC7-released.html
index d39148b..87fb44d 100644
--- a/content/news/2011/08/28/1.5-RC7-released.html
+++ b/content/news/2011/08/28/1.5-RC7-released.html
@@ -56,7 +56,7 @@
 * <a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-RC7">Subversion tag</a> 
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316657">Changelog RC6</a>
 * <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12317645">Changelog RC7</a>
-* To use in Maven: </p>
+* To use in Maven:</p>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/08/index.html
----------------------------------------------------------------------
diff --git a/content/news/2011/08/index.html b/content/news/2011/08/index.html
index 4de7e88..f1f9e31 100644
--- a/content/news/2011/08/index.html
+++ b/content/news/2011/08/index.html
@@ -51,13 +51,12 @@
   <p><small>09 Aug 2011</small></p>
 	<p>This is eightteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.18">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.18">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12316329">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;...</span></code></pre></div>
+    <span class="nt">&lt;groupI...</span></code></pre></div>
 	<a href="/news/2011/08/09/wicket-1.4.18-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/09/07/wicket-1.5-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/09/07/wicket-1.5-released.html b/content/news/2011/09/07/wicket-1.5-released.html
index deb8464..56166d8 100644
--- a/content/news/2011/09/07/wicket-1.5-released.html
+++ b/content/news/2011/09/07/wicket-1.5-released.html
@@ -80,7 +80,7 @@
   <li>Consistent naming: methods with <code>Javascript</code> in the name have been renamed to use proper capitalization: <code>JavaScript</code></li>
   <li>Switching to HTTPS is as simple as configuring a new root mapper to make Wicket HTTPS aware and annotating a page with @RequireHttps</li>
 </ul>
-<p>A longer list of changes and improvements can be found in our <a href="http://s.apache.org/wicket-1.5-migration">migration guide</a>. </p>
+<p>A longer list of changes and improvements can be found in our <a href="http://s.apache.org/wicket-1.5-migration">migration guide</a>.</p>
 <h3 id="inter-component-events">Inter-component events</h3>
 <p>Wicket 1.5 offers a simple, yet flexible, way for component to communicate with each other in a decoupled manner. The two major interfaces that facilitate this are:</p>
 <div class="highlight"><pre><code class="language-java" data-lang="java"><span class="cm">/**</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/09/29/wicket-1.5.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/09/29/wicket-1.5.1-released.html b/content/news/2011/09/29/wicket-1.5.1-released.html
index ffed5e6..1ff1691 100644
--- a/content/news/2011/09/29/wicket-1.5.1-released.html
+++ b/content/news/2011/09/29/wicket-1.5.1-released.html
@@ -52,9 +52,9 @@
     <p class="meta">29 Sep 2011</p>
     <p>This is the first maintenance release of the Wicket 1.5.x series. This release brings over 40 bug fixes and 15 improvements.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.1">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.1">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?&amp;version=12315430&amp;projectId=12310561">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/09/index.html
----------------------------------------------------------------------
diff --git a/content/news/2011/09/index.html b/content/news/2011/09/index.html
index 183717a..c1307bb 100644
--- a/content/news/2011/09/index.html
+++ b/content/news/2011/09/index.html
@@ -57,13 +57,12 @@
   <p><small>29 Sep 2011</small></p>
 	<p>This is the first maintenance release of the Wicket 1.5.x series. This release brings over 40 bug fixes and 15 improvements.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.1">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.1">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?&amp;version=12315430&amp;projectId=12310561">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupI...</span></code></pre></div>
+    <span class="nt">&lt;grou...</span></code></pre></div>
 	<a href="/news/2011/09/29/wicket-1.5.1-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/10/17/wicket-1.4.19-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/10/17/wicket-1.4.19-released.html b/content/news/2011/10/17/wicket-1.4.19-released.html
index 96a4919..04b0a9d 100644
--- a/content/news/2011/10/17/wicket-1.4.19-released.html
+++ b/content/news/2011/10/17/wicket-1.4.19-released.html
@@ -52,9 +52,9 @@
     <p class="meta">17 Oct 2011</p>
     <p>This is nineteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.19">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.19">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12317570">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/10/24/wicket-1.5.2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/10/24/wicket-1.5.2-released.html b/content/news/2011/10/24/wicket-1.5.2-released.html
index 6c6bb49..48e0c90 100644
--- a/content/news/2011/10/24/wicket-1.5.2-released.html
+++ b/content/news/2011/10/24/wicket-1.5.2-released.html
@@ -52,9 +52,9 @@
     <p class="meta">24 Oct 2011</p>
     <p>This is the second maintenance release of the Wicket 1.5.x series. This release brings over 25 bug fixes and 5 improvements.</p>
 <ul>
-  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.2">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.2">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12318078">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2011/10/index.html
----------------------------------------------------------------------
diff --git a/content/news/2011/10/index.html b/content/news/2011/10/index.html
index 7fa780d..b7ba687 100644
--- a/content/news/2011/10/index.html
+++ b/content/news/2011/10/index.html
@@ -51,13 +51,12 @@
   <p><small>17 Oct 2011</small></p>
 	<p>This is nineteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.19">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.19">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12317570">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId...</span></code></pre></div>
+    <span class="nt">&lt;group...</span></code></pre></div>
 	<a href="/news/2011/10/17/wicket-1.4.19-released.html">more</a></li>
 </div>
 <div class="news">
@@ -65,13 +64,12 @@
   <p><small>24 Oct 2011</small></p>
 	<p>This is the second maintenance release of the Wicket 1.5.x series. This release brings over 25 bug fixes and 5 improvements.</p>
 <ul>
-  <li>
-<a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.2">Subversion tag</a> </li>
+  <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5.2">Subversion tag</a></li>
   <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;version=12318078">Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
 <div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupI...</span></code></pre></div>
+    <span class="nt">&lt;grou...</span></code></pre></div>
 	<a href="/news/2011/10/24/wicket-1.5.2-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2012/09/05/wicket-6.0.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/09/05/wicket-6.0.0-released.html b/content/news/2012/09/05/wicket-6.0.0-released.html
index e15d8c0..057010a 100644
--- a/content/news/2012/09/05/wicket-6.0.0-released.html
+++ b/content/news/2012/09/05/wicket-6.0.0-released.html
@@ -52,12 +52,12 @@
     <p class="meta">05 Sep 2012</p>
     <blockquote>
   <p>“With great pleasure we announce the availability of Apache Wicket 6.0.0”</p>
-  <p>– Martijn Dashorst, Vice President, Apache Wicket </p>
+  <p>– Martijn Dashorst, Vice President, Apache Wicket</p>
 </blockquote>
 <p>Apache Wicket v6.0.0 is the 6th major release of the popular open source Java web framework. Numerous enhancements make Apache Wicket v6.0.0 a solid choice for web
 development:</p>
 <ul>
-  <li>Out-of-the box JQuery integration </li>
+  <li>Out-of-the box JQuery integration</li>
   <li>Complete control over AJAX requests</li>
   <li>Improved event registration in browsers</li>
   <li>Support for large datasets in components</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2012/09/index.html
----------------------------------------------------------------------
diff --git a/content/news/2012/09/index.html b/content/news/2012/09/index.html
index f96e401..ccd6f8b 100644
--- a/content/news/2012/09/index.html
+++ b/content/news/2012/09/index.html
@@ -63,9 +63,9 @@ releases will happen in this branch.</p>
   <p><small>05 Sep 2012</small></p>
 	<blockquote>
   <p>“With great pleasure we announce the availability of Apache Wicket 6.0.0”</p>
-  <p>– Martijn Dashorst, Vice President, Apache Wicket </p>
+  <p>– Martijn Dashorst, Vice President, Apache Wicket</p>
 </blockquote>
-<p>Apache Wicket v6.0.0 is the 6th major release of the popular open source Java web framework. Numerous enhanceme...</p>
+<p>Apache Wicket v6.0.0 is the 6th major release of the popular open source Java web framework. Numerous enhancem...</p>
 	<a href="/news/2012/09/05/wicket-6.0.0-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/02/15/wicket-6.6.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/02/15/wicket-6.6.0-released.html b/content/news/2013/02/15/wicket-6.6.0-released.html
index 3768338..3980e23 100644
--- a/content/news/2013/02/15/wicket-6.6.0-released.html
+++ b/content/news/2013/02/15/wicket-6.6.0-released.html
@@ -58,7 +58,7 @@ to 6.0.0.</p>
 <h3 id="new-and-noteworthy">New and noteworthy</h3>
 <h4 id="wicketfor-attribute-for-html-label-tags">wicket:for attribute for html label tags</h4>
 <p>While already available for some time, the wicket-1.5.xsd now contains
-a valid definition for the <code>wicket:for</code> attribute such that it </p>
+a valid definition for the <code>wicket:for</code> attribute such that it</p>
 <blockquote>
   <p>Can be used in HTML <code>&lt;label&gt;</code> element to automatically link it
 to a form element. The value of this attribute must have the same value of
@@ -112,7 +112,7 @@ migration guide found at</p>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5011">WICKET-5011</a> - Allow Select to work with non-equals objects</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5013">WICKET-5013</a> - Wicket Enclosure fails with more than one component</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5014">WICKET-5014</a> - Changes in WicketObjects.sizeof(final Serializable object) clashes with <code>&lt;header-contribution&gt;</code> in AjaxResponse</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5019">WICKET-5019</a> - Handling of NO_MINIFIED_NAME in PackageResourceReference#internalGetMinifiedName()   </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5019">WICKET-5019</a> - Handling of NO_MINIFIED_NAME in PackageResourceReference#internalGetMinifiedName()</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5020">WICKET-5020</a> - InlineEnclosureHandler always uses “wicket” namespace</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5024">WICKET-5024</a> - Global ajax event for precondition is not called</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5027">WICKET-5027</a> - FormTester#getInputValue() does not support Select/SelectOption nor other custom components</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/04/12/wicket-6.7.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/04/12/wicket-6.7.0-released.html b/content/news/2013/04/12/wicket-6.7.0-released.html
index 65f1501..ef6b457 100644
--- a/content/news/2013/04/12/wicket-6.7.0-released.html
+++ b/content/news/2013/04/12/wicket-6.7.0-released.html
@@ -105,7 +105,7 @@ migration guide found at</p>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-4903">WICKET-4903</a> - relativeUrl’s begins with ./</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-4907">WICKET-4907</a> - UrlResourceReference generates broken relative URLs</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-4942">WICKET-4942</a> - Double slash ‘//’ in starting url makes Url.parse output a relative Url</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-4989">WICKET-4989</a> - WicketTester should send copies of its cookies </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-4989">WICKET-4989</a> - WicketTester should send copies of its cookies</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-4995">WICKET-4995</a> - Using CryptoMapper causes page to render twice</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5039">WICKET-5039</a> - Manual invocation of FunctionsExecutor#notify() is broken</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5041">WICKET-5041</a> - DefaultCssAutoCompleteTextField should have Constructor (String id)</li>
@@ -158,7 +158,7 @@ migration guide found at</p>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5050">WICKET-5050</a> - AutoComplete should not request suggestions if input is no longer active element</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5057">WICKET-5057</a> - FilteringHeaderResponse requires a usage of FilteringHeaderResponse.IHeaderResponseFilter for no reason when FilteredHeaderItem is used</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5062">WICKET-5062</a> - Update the list of HTML void elements with the latest HTML5 ones</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5065">WICKET-5065</a> - Improve UrlRenderer to be able to render urls without scheme and/or host </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5065">WICKET-5065</a> - Improve UrlRenderer to be able to render urls without scheme and/or host</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5066">WICKET-5066</a> - Allow PackageResource to decide itself whether it could be accepted or not</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5074">WICKET-5074</a> - Improvement for MockHttpServletRequest and FormTester to support ‘multiple’ input type of fileUpload</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5079">WICKET-5079</a> - Allow WebApplication-specific Spring configuration</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/06/27/wicket-6.9.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/06/27/wicket-6.9.0-released.html b/content/news/2013/06/27/wicket-6.9.0-released.html
index 41ed872..1e4766c 100644
--- a/content/news/2013/06/27/wicket-6.9.0-released.html
+++ b/content/news/2013/06/27/wicket-6.9.0-released.html
@@ -116,7 +116,7 @@ migration guide found at</p>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5199">WICKET-5199</a> - Component.getBehaviors(Class&lt;M&gt; type) documentation is obsolete</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5207">WICKET-5207</a> - Use documented jQuery APIs for triggering the special event ‘inputchange’</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5208">WICKET-5208</a> - Contribute jQuery 1.x or 2.x depending on the user agent</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5210">WICKET-5210</a> - JQuery problem because component appears twice in DOM while Ajax refresh </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5210">WICKET-5210</a> - JQuery problem because component appears twice in DOM while Ajax refresh</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5211">WICKET-5211</a> - Make CryptoMapper extendable</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5215">WICKET-5215</a> - Better exception message when Page instantiation fails in DefaultPageFactory</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5219">WICKET-5219</a> - ServletWebResponse should call #setHeader() to set Ajax-Location for redirect</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/07/10/wicket-6.9.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/07/10/wicket-6.9.1-released.html b/content/news/2013/07/10/wicket-6.9.1-released.html
index 8777f92..fb7e0aa 100644
--- a/content/news/2013/07/10/wicket-6.9.1-released.html
+++ b/content/news/2013/07/10/wicket-6.9.1-released.html
@@ -63,7 +63,7 @@ release compared to 6.0.0.</p>
 decided to remove deprecated APIs from their codebase from JQuery 1.9
 and up. This means that JQuery plugins using these deprecated APIs no
 longer work. See the JQuery migration guide for more information,
-available from http://jquery.com/upgrade-guide/1.9/ </p>
+available from http://jquery.com/upgrade-guide/1.9/</p>
 <p>If your application depends on these deprecated APIs you can easily
 downgrade to JQuery 1.8.3-the previously provided JQuery that still
 contains these APIs. Download the 1.8.3 release of jquery and add it

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/08/18/wicket-6.10.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/08/18/wicket-6.10.0-released.html b/content/news/2013/08/18/wicket-6.10.0-released.html
index 4516b3b..c270d28 100644
--- a/content/news/2013/08/18/wicket-6.10.0-released.html
+++ b/content/news/2013/08/18/wicket-6.10.0-released.html
@@ -76,7 +76,7 @@ provided by the user application. For example: onclick =&gt; click.</p>
 decided to remove deprecated APIs from their codebase from JQuery 1.9
 and up. This means that JQuery plugins using these deprecated APIs no
 longer work. See the JQuery migration guide for more information,
-available from http://jquery.com/upgrade-guide/1.9/ </p>
+available from http://jquery.com/upgrade-guide/1.9/</p>
 <p>If your application depends on these deprecated APIs you can easily
 downgrade to JQuery 1.8.3-the previously provided JQuery that still
 contains these APIs. Download the 1.8.3 release of jquery and add it

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2013/11/01/wicket-6.12.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2013/11/01/wicket-6.12.0-released.html b/content/news/2013/11/01/wicket-6.12.0-released.html
index cbeaced..ff38fa8 100644
--- a/content/news/2013/11/01/wicket-6.12.0-released.html
+++ b/content/news/2013/11/01/wicket-6.12.0-released.html
@@ -64,7 +64,7 @@ compared to 6.0.0.</p>
   <li>Add Wicket.Event.unsubscribe method</li>
   <li>Allow form components to trim the input themselves</li>
   <li>Allow DebugBar contributors to be removed</li>
-  <li>Session management doesn’t work with Jetty’s JDBCSessionManager </li>
+  <li>Session management doesn’t work with Jetty’s JDBCSessionManager</li>
   <li>HeaderItem to be Serializable</li>
 </ul>
 <h3 id="jquery-update-in-690">JQuery update in 6.9.0</h3>
@@ -155,7 +155,7 @@ migration guide found at</p>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5381">WICKET-5381</a> - Add Wicket.Event.unsubscribe method</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5384">WICKET-5384</a> - Allow form components to trim the input themselves</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5388">WICKET-5388</a> - Allow DebugBar contributors to be removed</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5390">WICKET-5390</a> - Session management doesn’t work with Jetty’s JDBCSessionManager </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5390">WICKET-5390</a> - Session management doesn’t work with Jetty’s JDBCSessionManager</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5395">WICKET-5395</a> - HeaderItem to be Serializable</li>
 </ul>
 <h4 id="wish">Wish</h4>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2014/04/23/wicket-6.15.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2014/04/23/wicket-6.15.0-released.html b/content/news/2014/04/23/wicket-6.15.0-released.html
index 0df9c50..f992e16 100644
--- a/content/news/2014/04/23/wicket-6.15.0-released.html
+++ b/content/news/2014/04/23/wicket-6.15.0-released.html
@@ -59,7 +59,7 @@ to 6.0.0.</p>
 <p>This release fixes 25 bugs and adds the following improvements:</p>
 <ul>
   <li>The second level page store has been disabled by default (see issue <a href="https://issues.apache.org/jira/browse/WICKET-5554">WICKET-5554</a> for more details).</li>
-  <li>Created new placeholder tag to indicate where header contributions should appear. See this <a href="http://wicketinaction.com/2014/03/header-contributions-positioning/">blog post entry</a> or paragraph 15.8 of the official guide. </li>
+  <li>Created new placeholder tag to indicate where header contributions should appear. See this <a href="http://wicketinaction.com/2014/03/header-contributions-positioning/">blog post entry</a> or paragraph 15.8 of the official guide.</li>
 </ul>
 <p>This release also celebrates the 10th birthday of Wicket!</p>
 <h3 id="using-this-release">Using this release</h3>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2014/08/24/wicket-6.17.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2014/08/24/wicket-6.17.0-released.html b/content/news/2014/08/24/wicket-6.17.0-released.html
index 8cd1183..691a445 100644
--- a/content/news/2014/08/24/wicket-6.17.0-released.html
+++ b/content/news/2014/08/24/wicket-6.17.0-released.html
@@ -60,7 +60,7 @@ to 6.0.0.</p>
 <ul>
   <li>Rename log4j.properties in the quickstart when creating a project for WildFly</li>
   <li>Make is possible to position the choice label before/after/around the choice</li>
-  <li>StringResourceModel with custom locale </li>
+  <li>StringResourceModel with custom locale</li>
   <li>Added an HeaderItem for meta data tags such as ‘meta’ or canonical link</li>
 </ul>
 <p>The full list of improvements and fixes can be found at the end of this

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2014/11/05/wicket-6.18.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2014/11/05/wicket-6.18.0-released.html b/content/news/2014/11/05/wicket-6.18.0-released.html
index ec413e7..b9c2f2e 100644
--- a/content/news/2014/11/05/wicket-6.18.0-released.html
+++ b/content/news/2014/11/05/wicket-6.18.0-released.html
@@ -111,7 +111,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5689">WICKET-5689</a> - Nested Redirects and REDIRECT_TO_BUFFER</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5698">WICKET-5698</a> - WebApplication#unmount() unmounts the whole compound mapper if some of its inner ones matches</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5699">WICKET-5699</a> - wicket-atmosphere 0.20 should use wicket-webjars 0.4.3</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5701">WICKET-5701</a> - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5701">WICKET-5701</a> - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5704">WICKET-5704</a> - IllegalArgument exception with wicket:child in ajaxrequest</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5706">WICKET-5706</a> - ResourceUtils.getLocaleFromFilename cannot handle filenames with classifiers</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5711">WICKET-5711</a> - OnChangeAjaxBehavior should listen for both ‘inputchange’ and ‘change’ events for TextField and TextArea</li>
@@ -129,7 +129,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 <ul>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5691">WICKET-5691</a> - Wicket FileUploadField.getFileUploads() should never return null.</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5692">WICKET-5692</a> - Misleading message in PropertyValidator</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5694">WICKET-5694</a> - Add WicketTester assertion methods for component’s markup style, variation and locale </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5694">WICKET-5694</a> - Add WicketTester assertion methods for component’s markup style, variation and locale</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5710">WICKET-5710</a> - StringValidator should set ‘minlength’ attribute to input and textarea</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5715">WICKET-5715</a> - Allow setting ‘async’ attribute on reference <script> elements</script></li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5718">WICKET-5718</a> - Upgrade Atmosphere to 2.2.2</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2014/11/05/wicket-7.0.0-M4-released.html
----------------------------------------------------------------------
diff --git a/content/news/2014/11/05/wicket-7.0.0-M4-released.html b/content/news/2014/11/05/wicket-7.0.0-M4-released.html
index f9095d8..ba5bcf7 100644
--- a/content/news/2014/11/05/wicket-7.0.0-M4-released.html
+++ b/content/news/2014/11/05/wicket-7.0.0-M4-released.html
@@ -123,7 +123,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5326">WICKET-5326</a> - Wicket doesn’t encrypt links and Ajax URLs for mounted pages when CryptoMapper is used</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5689">WICKET-5689</a> - Nested Redirects and REDIRECT_TO_BUFFER</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5698">WICKET-5698</a> - WebApplication#unmount() unmounts the whole compound mapper if some of its inner ones matches</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5701">WICKET-5701</a> - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5701">WICKET-5701</a> - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5704">WICKET-5704</a> - IllegalArgument exception with wicket:child in ajaxrequest</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5706">WICKET-5706</a> - ResourceUtils.getLocaleFromFilename cannot handle filenames with classifiers</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5711">WICKET-5711</a> - OnChangeAjaxBehavior should listen for both ‘inputchange’ and ‘change’ events for TextField and TextArea</li>
@@ -148,7 +148,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5350">WICKET-5350</a> - Enhancement for AbstractChoice and WildcardListModel API</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5691">WICKET-5691</a> - Wicket FileUploadField.getFileUploads() should never return null.</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5692">WICKET-5692</a> - Misleading message in PropertyValidator</li>
-  <li><a href="https://issues.apache.org/jira/browse/WICKET-5694">WICKET-5694</a> - Add WicketTester assertion methods for component’s markup style, variation and locale </li>
+  <li><a href="https://issues.apache.org/jira/browse/WICKET-5694">WICKET-5694</a> - Add WicketTester assertion methods for component’s markup style, variation and locale</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5695">WICKET-5695</a> - Use Log4j 2.x for the archetype</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5697">WICKET-5697</a> - Rework Spring application to use annotations based configuration</li>
   <li><a href="https://issues.apache.org/jira/browse/WICKET-5708">WICKET-5708</a> - Making FormComponent.convertInput() public</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2015/02/13/new-committer-Sebastien-Briquet.html
----------------------------------------------------------------------
diff --git a/content/news/2015/02/13/new-committer-Sebastien-Briquet.html b/content/news/2015/02/13/new-committer-Sebastien-Briquet.html
index d62b72e..b4b812f 100644
--- a/content/news/2015/02/13/new-committer-Sebastien-Briquet.html
+++ b/content/news/2015/02/13/new-committer-Sebastien-Briquet.html
@@ -52,11 +52,11 @@
     <p class="meta">13 Feb 2015</p>
     <p>The Project Management Committee (PMC) for Apache Wicket 
 has asked Sebastien Briquet to become a committer and we are pleased 
-to announce that he has accepted. </p>
+to announce that he has accepted.</p>
 <p>Sebastien has been involved with Wicket for several years now by developing one of the most successful integrations with JavaScript libraries, namely Wicket jQuery UI, reporting bugs, contributing fixes and participating in discussions.</p>
 <p>Being a committer will enable him to help us even easier in the future.</p>
-<p>Please welcome Sebastien Briquet to our team! </p>
-<p>Bienvenue Sebastien! </p>
+<p>Please welcome Sebastien Briquet to our team!</p>
+<p>Bienvenue Sebastien!</p>
 </div>
         </section>
     </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/2015/02/index.html
----------------------------------------------------------------------
diff --git a/content/news/2015/02/index.html b/content/news/2015/02/index.html
index 85fd1c6..2aa540f 100644
--- a/content/news/2015/02/index.html
+++ b/content/news/2015/02/index.html
@@ -66,8 +66,8 @@ with Wicket 6 we us...</p>
   <p><small>13 Feb 2015</small></p>
 	<p>The Project Management Committee (PMC) for Apache Wicket 
 has asked Sebastien Briquet to become a committer and we are pleased 
-to announce that he has accepted. </p>
-<p>Sebastien has been involved with Wicket for several years now by developing one of the most successful integrations with JavaScript libraries, namely Wicket jQuery UI, reporting bugs, contributing fixes...</p>
+to announce that he has accepted.</p>
+<p>Sebastien has been involved with Wicket for several years now by developing one of the most successful integrations with JavaScript libraries, namely Wicket jQuery UI, reporting bugs, contributing fixe...</p>
 	<a href="/news/2015/02/13/new-committer-Sebastien-Briquet.html">more</a></li>
 </div>
 <div class="news">


[2/4] wicket-site git commit: Prepare for Wicket 7.0.0, add button bars, fix some pages

Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/news/index.html
----------------------------------------------------------------------
diff --git a/content/news/index.html b/content/news/index.html
index ff1f2f6..feca1f2 100644
--- a/content/news/index.html
+++ b/content/news/index.html
@@ -522,9 +522,9 @@ Read CVE-2013-2055 for more information.
 	<h3 id="/news/2011/10/24/wicket-1.5.2-released.html">Wicket 1.5.2 released</h3>
     <small>24 Oct 2011</small>
 	<p>This is the second maintenance release of the Wicket 1.5.x series. This release brings over 25 bug fixes and 5 improvements.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
@@ -537,9 +537,9 @@ Read CVE-2013-2055 for more information.
 	<h3 id="/news/2011/10/17/wicket-1.4.19-released.html">Wicket 1.4.19 released</h3>
     <small>17 Oct 2011</small>
 	<p>This is nineteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -552,9 +552,9 @@ Read CVE-2013-2055 for more information.
 	<h3 id="/news/2011/09/29/wicket-1.5.1-released.html">Wicket 1.5.1 released</h3>
     <small>29 Sep 2011</small>
 	<p>This is the first maintenance release of the Wicket 1.5.x series. This release brings over 40 bug fixes and 15 improvements.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket-core&lt;/artifactId&gt;
@@ -585,9 +585,9 @@ Read CVE-2013-2055 for more information.
 	<h3 id="/news/2011/08/09/wicket-1.4.18-released.html">Wicket 1.4.18 released</h3>
     <small>09 Aug 2011</small>
 	<p>This is eightteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -628,9 +628,9 @@ Cheers,
 	<h3 id="/news/2011/04/02/wicket-1.4.17-released.html">Wicket 1.4.17 released</h3>
     <small>02 Apr 2011</small>
 	<p>This is seventeenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -655,9 +655,9 @@ Cheers,
 	<h3 id="/news/2011/02/25/wicket-1.4.16-released.html">Wicket 1.4.16 released</h3>
     <small>25 Feb 2011</small>
 	<p>This is sixteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -681,9 +681,9 @@ Cheers,
 	<h3 id="/news/2010/12/24/wicket-1.4.15-released.html">Wicket 1.4.15 released</h3>
     <small>24 Dec 2010</small>
 	<p>This is fifteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -696,9 +696,9 @@ Cheers,
 	<h3 id="/news/2010/11/29/wicket-1.4.14-released.html">Wicket 1.4.14 released</h3>
     <small>29 Nov 2010</small>
 	<p>This is fourteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -717,9 +717,9 @@ Cheers,
 	<h3 id="/news/2010/11/05/wicket-1.5-M3-released.html">Wicket 1.5-M3 released</h3>
     <small>05 Nov 2010</small>
 	<p>This is another milestone release from trunk (in-development branch).  This release includes several enhancments and fixes, which can be seen in the changelog (linked below).
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -732,9 +732,9 @@ Cheers,
 	<h3 id="/news/2010/11/01/wicket-1.4.13-released.html">Wicket 1.4.13 released</h3>
     <small>01 Nov 2010</small>
 	<p>This is thirteenth release of the Wicket 1.4.x series. This is primarily a minor bugfix release on the 1.4.x (stable) branch.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -753,9 +753,9 @@ Cheers,
 	<h3 id="/news/2010/09/17/wicket.1.4.12-released.html">Wicket 1.4.12 released</h3>
     <small>17 Sep 2010</small>
 	<p>This is the twelfth maintenance release of the 1.4.x series. This release brings a fix to a critical bug which prevented ajax form submits in FireFox.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;
@@ -769,9 +769,9 @@ Cheers,
     <small>09 Sep 2010</small>
 	<p>This is the eleventh maintenance release of the 1.4.x series and brings over
 fifty bug fixes and improvements.
-  Subversion tag 
+  Subversion tag
   Changelog
-  To use in Maven: 
+  To use in Maven:
 &lt;dependency&gt;
     &lt;groupId&gt;org.apache.wicket&lt;/groupId&gt;
     &lt;artifactId&gt;wicket&lt;/artifactId&gt;

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/download.html
----------------------------------------------------------------------
diff --git a/content/start/download.html b/content/start/download.html
index 5d63fd8..91db38e 100644
--- a/content/start/download.html
+++ b/content/start/download.html
@@ -48,152 +48,96 @@
             <p>Wicket is released as a source archive, convenience binaries and through the Maven Central Repository. The most convenient way of getting Wicket is through the Maven dependency management system.</p>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#get-the-production-release"><span class="toc-number">1</span> <span class="toc-text">Get the Production Release</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#get-the-production-release-using-maven"><span class="toc-number">1.1</span> <span class="toc-text">Get the Production Release Using Maven</span></a></li><li class="toc--level-2 toc--section-3"><a href="#download-the-production-release"><span class="toc-number">1.2</span> <span class="toc-text">Download the Production Release</span></a></li><li class="toc--level-2 toc--section-4"><a href="#dont-mix-wicket-versions"><span class="toc-number">1.3</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li><li class="toc--level-2 toc--section-5"><a href="#developer-releases"><span class="toc-number">1.4</span> <span class="toc-text">Developer releases</span></a
 ></li><li class="toc--level-2 toc--section-6"><a href="#requirements"><span class="toc-number">1.5</span> <span class="toc-text">Requirements</span></a></li></ul></li><li class="toc--level-1 toc--section-7"><a href="#migrating-from-earlier-versions"><span class="toc-number">2</span> <span class="toc-text">Migrating from earlier versions</span></a></li><li class="toc--level-1 toc--section-8"><a href="#maven"><span class="toc-number">3</span> <span class="toc-text">Maven</span></a></li><li class="toc--level-1 toc--section-9"><a href="#snapshots-and-latest-bleeding-edge-code"><span class="toc-number">4</span> <span class="toc-text">SNAPSHOTs and latest bleeding-edge code</span></a></li><li class="toc--level-1 toc--section-10"><a href="#looking-for-older-releases"><span class="toc-number">5</span> <span class="toc-text">Looking for older releases?</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#supported-versions"><span class="toc-number">1</span> <span class="toc-text">Supported Versions</span></a></li><li class="toc--level-1 toc--section-2"><a href="#unsupported-releases"><span class="toc-number">2</span> <span class="toc-text">Unsupported Releases</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <h2 id="get-the-production-release">Get the Production Release</h2>
-<p>change
-The current stable, production ready release of Wicket is version
-<strong>6.20.0</strong>. To see what changed in this release (and
-prior releases) you can read the <a href="http://archive.apache.org/dist/wicket/6.20.0/CHANGELOG-6.x">change
-log</a></p>
-<p>All projects intended for production use should use this version. These
-releases follow semantic versioning so upgrades between minor releases
-will not break compatibility.</p>
-<p>You can get the release using Maven or download it manually.</p>
-<h3 id="get-the-production-release-using-maven">Get the Production Release Using Maven</h3>
-<p>Use the following Maven dependency to use Wicket in your project:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>6.20.0<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-<p>Add the snippet above to your project’s POM in the dependency
-(management) section.</p>
-<p>If you are not a Maven user, you can obtain the Wicket release manually.</p>
-<h3 id="download-the-production-release">Download the Production Release</h3>
-<p>Use the following links to download Wicket manually to build Wicket
-from source:</p>
-<ul>
-  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/apache-wicket-6.20.0.tar.gz">apache-wicket-6.20.0.tar.gz</a>
-(<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.asc">PGP</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.md5">MD5</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.sha">SHA</a>
-)</li>
-  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/apache-wicket-6.20.0.zip">apache-wicket-6.20.0.zip</a>
-(<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.asc">PGP</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.md5">MD5</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.sha">SHA</a>
-)</li>
-</ul>
-<p>Or use the following links to get the pre-packaged binaries instead:</p>
-<ul>
-  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz">apache-wicket-6.20.0-bin.tar.gz</a>
-(<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.asc">PGP</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.md5">MD5</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.sha">SHA</a>
-)</li>
-  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip">apache-wicket-6.20.0-bin.zip</a>
-(<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.asc">PGP</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.md5">MD5</a>,
-<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.sha">SHA</a>
-)</li>
-</ul>
-<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
-<p>You cannot mix different Wicket versions in your project. You should
-always use the artifacts from a particular release. For example it is
-<strong>not</strong> possible to use Wicket Extensions 1.5 in a Wicket 6 project.
-The same goes for 3rd party libraries: make sure you always use a
-compatible version of your 3rd party library.</p>
-<p>Apache Wicket 6.20.0 is the current stable release.
-Most users get Apache Wicket using <a href="#maven">Apache Maven’s dependency
-management</a>, which incidentally is the most convenient way of
-obtaining the latest and greatest Wicket.</p>
-<h3 id="developer-releases">Developer releases</h3>
-<p>If you like to live on the cutting edge and help development of Wicket
-further along, you can try out the development milestone releases:</p>
-<ul>
-  <li>Latest <strong>development milestone</strong> release for 7.x: 
-<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">7.0.0-M6</a></li>
-</ul>
-<p>This release is not fit for production use yet: it is only intended for
-developers of Wicket, or for people trying out our development
-versions. API changes will occur between releases.</p>
-<h3 id="requirements">Requirements</h3>
-<h4 id="java-version">Java version</h4>
-<ul>
-  <li>Apache Wicket 7.x requires JDK 7.0 or newer</li>
-  <li>Apache Wicket 6.x requires JDK 6.0 or newer</li>
-  <li>Apache Wicket 1.5.x requires JDK 1.5 or newer</li>
-  <li>Apache Wicket 1.4.x requires JDK 1.5 or newer</li>
-</ul>
-<h4 id="logging">Logging</h4>
-<p>You cannot use Wicket without adding an SLF4J logging implementation to
-your classpath. Most people use
-<a href="http://logging.apache.org/log4j">log4j</a>.</p>
-<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get
-Wicket to use log4j too. If you want to use commons-logging or JDK14
-logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J
-site</a> for more information.</p>
-<h2 id="migrating-from-earlier-versions">Migrating from earlier versions</h2>
-<p>If you are migrating an existing application from earlier versions of
-Wicket you may find our migration guides invaluable:</p>
-<ul>
-  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
-  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
-  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Wicket 1.4 to Wicket 1.5</a></li>
-  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0">Wicket 1.5 to Wicket 6.x</a></li>
-  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Wicket 6.x to Wicket 7.x</a></li>
-</ul>
-<h2 id="maven">Maven</h2>
-<p>Add the following snippet to your Maven project descriptor (<code>pom.xml</code>):</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>6.20.0<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-<p>For the SLF4J log4j binding:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.slf4j<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>slf4j-log4j12<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>1.6.4<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-<h2 id="snapshots-and-latest-bleeding-edge-code">SNAPSHOTs and latest bleeding-edge code</h2>
-<p>If you wish to build the latest code from scratch, master and branches
-live in the Git repository: https://git-wip-us.apache.org/repos/asf/wicket.git</p>
-<p>Branches:</p>
-<ul>
-  <li><strong>7.x</strong>: master</li>
-  <li><strong>6.x</strong>: wicket-6.x</li>
-  <li><strong>1.5.x</strong>: wicket-1.5.x</li>
-  <li><strong>1.4.x</strong>: wicket-1.4.x</li>
-  <li><strong>1.3.x</strong>: wicket-1.3.x</li>
-  <li><strong>1.2.x</strong>: wicket-1.2.x</li>
-</ul>
-<p>There’s also a Maven 2 repository providing SNAPSHOTs available here:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;repositories&gt;</span>
-    <span class="nt">&lt;repository&gt;</span>
-        <span class="nt">&lt;releases&gt;</span>
-            <span class="nt">&lt;enabled&gt;</span>false<span class="nt">&lt;/enabled&gt;</span>
-        <span class="nt">&lt;/releases&gt;</span>
-        <span class="nt">&lt;snapshots&gt;</span>
-            <span class="nt">&lt;enabled&gt;</span>true<span class="nt">&lt;/enabled&gt;</span>
-        <span class="nt">&lt;/snapshots&gt;</span>
-        <span class="nt">&lt;id&gt;</span>apache.snapshots<span class="nt">&lt;/id&gt;</span>
-        <span class="nt">&lt;name&gt;</span>Apache Snapshot Repository<span class="nt">&lt;/name&gt;</span>
-        <span class="nt">&lt;url&gt;</span>https://repository.apache.org/content/groups/snapshots<span class="nt">&lt;/url&gt;</span>
-        <span class="nt">&lt;layout&gt;</span>default<span class="nt">&lt;/layout&gt;</span>
-    <span class="nt">&lt;/repository&gt;</span>
-<span class="nt">&lt;/repositories&gt;</span></code></pre></div>
-<h2 id="looking-for-older-releases">Looking for older releases?</h2>
-<p>If you are looking for older releases of Wicket (1.5 or 1.4), please
-see the <a href="http://archive.apache.org/dist/wicket">download archive</a> for
-more informations on our older releases.</p>
-<ul>
-  <li><strong>Latest 6.x release</strong>: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">6.20.0</a></li>
-  <li><strong>Latest 1.5.x release</strong>: <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">1.5.13</a></li>
-  <li><strong>Latest 1.4.x release</strong> (security updates only): <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">1.4.23</a></li>
-</ul>
+            <div class="button-bar">
+	<a class="button" href="wicket-7.x.html">
+		<i class="fa fa-cloud-download"></i><br />
+		Apache Wicket 7.x
+	</a>
+	<a class="button" href="wicket-6.x.html">
+		<i class="fa fa-cloud-download"></i><br />
+		Apache Wicket 6.x
+	</a>
+	<a class="button" href="wicket-1.5.x.html">
+		<i class="fa fa-cloud-download"></i><br />
+		Apache Wicket 1.5.x
+	</a>
+</div>
+<h2 id="supported-versions">Supported Versions</h2>
+<p>The following releases are supported by the Wicket team.</p>
+<table style="width:100%">
+	<tr>
+		<th>&nbsp;</th>
+		<th>Latest release</th>
+		<th>Status</th>
+		<th>More info</th>
+	</tr>
+	<tr>
+		<td>Wicket 7.x</td>
+		<td>7.0.0</td>
+		<td>current, supported</td>
+		<td><a href="wicket-7.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 6.x</td>
+		<td>6.20.0</td>
+		<td>supported</td>
+		<td><a href="wicket-6.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.5.x</td>
+		<td>1.5.13</td>
+		<td>security fixes only, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.5.x.html">overview</a></td>
+	</tr>
+</table>
+<p>However, if your application is not on the current branch, you should
+consider upgrading at your earliest convenience.</p>
+<hr />
+<h2 id="unsupported-releases">Unsupported Releases</h2>
+<p>The following releases are no longer supported by the Wicket team. You
+should upgrade your project if it still depends on any of these
+versions.</p>
+<table style="width:100%">
+	<tr>
+		<th>&nbsp;</th>
+		<th>Latest release</th>
+		<th>Status</th>
+		<th>More info</th>
+	</tr>
+	<tr>
+		<td>Wicket 1.4.x</td>
+		<td>1.4.23</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.4.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.3.x</td>
+		<td>1.3.7</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td><a href="wicket-1.3.x.html">overview</a></td>
+	</tr>
+	<tr>
+		<td>Wicket 1.2.x</td>
+		<td>1.2.5</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>Wicket 1.1.x</td>
+		<td>1.1.0</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>Wicket 1.0.x</td>
+		<td>1.0.0</td>
+		<td>discontinued, upgrade to 6.x or 7.x</td>
+		<td>&nbsp;</td>
+	</tr>
+</table>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/quickstart.html
----------------------------------------------------------------------
diff --git a/content/start/quickstart.html b/content/start/quickstart.html
index 9b330a0..916ad3e 100644
--- a/content/start/quickstart.html
+++ b/content/start/quickstart.html
@@ -122,10 +122,10 @@ command line to your clipboard.</p>
 	<option value="7.0.0-SNAPSHOT">7.0.0-SNAPSHOT</option>
 	<option value="6.21.0-SNAPSHOT">6.21.0-SNAPSHOT</option>
 	<option value="1.5-SNAPSHOT">1.5-SNAPSHOT</option>
-	<option value="7.0.0-M6">7.0.0-M6</option>
+	<option value="7.0.0" selected="selected">7.0.0</option>
 	<option value="1.4.23">1.4.23</option>
 	<option value="1.5.13">1.5.13</option>
-	<option value="6.20.0" selected="selected">6.20.0</option>
+	<option value="6.20.0">6.20.0</option>
     </select>
   </div>
   <div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/wicket-1.3.x.html
----------------------------------------------------------------------
diff --git a/content/start/wicket-1.3.x.html b/content/start/wicket-1.3.x.html
new file mode 100644
index 0000000..fd62859
--- /dev/null
+++ b/content/start/wicket-1.3.x.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket 1.3.x | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /start/wicket-1.3.x.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /start/wicket-1.3.x.html -->
+    	<li class="active"><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /start/wicket-1.3.x.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /start/wicket-1.3.x.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /start/wicket-1.3.x.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /start/wicket-1.3.x.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Apache Wicket 1.3.x</h1>
+            <p>Here you can learn about the status of Wicket 1.3.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#status"><span class="toc-number">1</span> <span class="toc-text">Status</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#semantic-versioning"><span class="toc-number">1.1</span> <span class="toc-text">Semantic Versioning</span></a></li></ul></li><li class="toc--level-1 toc--section-3"><a href="#download"><span class="toc-number">2</span> <span class="toc-text">Download</span></a><ul><li class="toc--level-2 toc--section-4"><a href="#using-apache-maven"><span class="toc-number">2.1</span> <span class="toc-text">Using Apache Maven</span></a></li><li class="toc--level-2 toc--section-5"><a href="#download-manually"><span class="toc-number">2.2</span> <span class="toc-text">Download Manually</span></a></li></ul></li><li class="toc--level-1 toc--section-6"><a href="#requirements"><span class="toc-number">3</span> <span class="toc-tex
 t">Requirements</span></a><ul><li class="toc--level-2 toc--section-7"><a href="#java-version"><span class="toc-number">3.1</span> <span class="toc-text">Java version</span></a></li><li class="toc--level-2 toc--section-8"><a href="#servlet-api"><span class="toc-number">3.2</span> <span class="toc-text">Servlet API</span></a></li><li class="toc--level-2 toc--section-9"><a href="#dont-mix-wicket-versions"><span class="toc-number">3.3</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li></ul></li><li class="toc--level-1 toc--section-10"><a href="#migrating-from-earlier-versions"><span class="toc-number">4</span> <span class="toc-text">Migrating from earlier versions</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br />Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br />Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br />Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br />Migrate</a>
+</div>
+<h2 id="status">Status</h2>
+<p>The status for Wicket 1.3.x is: <strong>discontinued</strong>.</p>
+<p>This branch is <strong>no longer maintained and will no longer recieve any updates</strong>.</p>
+<p><i class="fa fa-exclamation-circle"></i>
+<strong>You should upgrade to Wicket 7.x at your earliest convenience.</strong></p>
+<h3 id="semantic-versioning">Semantic Versioning</h3>
+<p>This release branch <strong>does not</strong> follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.</p>
+<h2 id="download">Download</h2>
+<p>The most recent release in this branch is: <strong>1.3.7</strong>.</p>
+<p>You can get the release using Maven or download it manually.</p>
+<h3 id="using-apache-maven">Using Apache Maven</h3>
+<p>Use the following Maven dependency to use Wicket in your project:</p>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>wicket<span class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;version&gt;</span>1.3.7<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<p>Add the snippet above to your project’s POM in the dependency
+(management) section.</p>
+<p>You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the <code>artifactId</code>
+accordingly).</p>
+<p>If you are not a Maven user, you can download the Wicket release manually.</p>
+<h3 id="download-manually">Download Manually</h3>
+<p>Use the following links to download Wicket manually to build Wicket
+from source:</p>
+<ul>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7/apache-wicket-1.3.7.tar.gz">apache-wicket-1.3.7.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7/apache-wicket-1.3.7.zip">apache-wicket-1.3.7.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/apache-wicket-1.3.7.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Or use the following links to get the pre-packaged binaries instead:</p>
+<ul>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7/binaries/apache-wicket-1.3.7-bin.tar.gz">apache-wicket-1.3.7-bin.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-7.0.0-bin.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-7.0.0-bin.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-7.0.0-bin.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7/binaries/apache-wicket-1.3.7-bin.zip">apache-wicket-1.3.7-bin.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-1.3.7-bin.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-1.3.7-bin.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.3.7/binaries/apache-wicket-1.3.7-bin.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Note that the binary packages and the source packages don’t contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Apache Wicket has few requirements in order to work properly. In this
+section you’ll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module’s POM for
+more details on the necessary libraries.</p>
+<h3 id="java-version">Java version</h3>
+<p>This Wicket version requires at least the following Java version: <strong>JDK 1.4.0 or newer</strong>.</p>
+<p>Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.</p>
+<h3 id="servlet-api">Servlet API</h3>
+<p>This Wicket version requires at least the following Servlet API
+version: <strong>Servlet API 2.3 or newer</strong>. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.</p>
+<p>In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.</p>
+<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
+<p>You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+<strong>not</strong> possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.</p>
+<h2 id="migrating-from-earlier-versions">Migrating from earlier versions</h2>
+<p>If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:</p>
+<ul>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2015 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/wicket-1.4.x.html
----------------------------------------------------------------------
diff --git a/content/start/wicket-1.4.x.html b/content/start/wicket-1.4.x.html
new file mode 100644
index 0000000..ef4dde0
--- /dev/null
+++ b/content/start/wicket-1.4.x.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket 1.4.x | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /start/wicket-1.4.x.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /start/wicket-1.4.x.html -->
+    	<li class="active"><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /start/wicket-1.4.x.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /start/wicket-1.4.x.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /start/wicket-1.4.x.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /start/wicket-1.4.x.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Apache Wicket 1.4.x</h1>
+            <p>Here you can learn about the status of Wicket 1.4.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#status"><span class="toc-number">1</span> <span class="toc-text">Status</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#semantic-versioning"><span class="toc-number">1.1</span> <span class="toc-text">Semantic Versioning</span></a></li><li class="toc--level-2 toc--section-3"><a href="#change-log"><span class="toc-number">1.2</span> <span class="toc-text">Change log</span></a></li></ul></li><li class="toc--level-1 toc--section-4"><a href="#download"><span class="toc-number">2</span> <span class="toc-text">Download</span></a><ul><li class="toc--level-2 toc--section-5"><a href="#using-apache-maven"><span class="toc-number">2.1</span> <span class="toc-text">Using Apache Maven</span></a></li><li class="toc--level-2 toc--section-6"><a href="#download-manually"><span class="toc-number">2.2</span> <span class="toc-text">Download Manua
 lly</span></a></li></ul></li><li class="toc--level-1 toc--section-7"><a href="#requirements"><span class="toc-number">3</span> <span class="toc-text">Requirements</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#java-version"><span class="toc-number">3.1</span> <span class="toc-text">Java version</span></a></li><li class="toc--level-2 toc--section-9"><a href="#servlet-api"><span class="toc-number">3.2</span> <span class="toc-text">Servlet API</span></a></li><li class="toc--level-2 toc--section-10"><a href="#logging"><span class="toc-number">3.3</span> <span class="toc-text">Logging</span></a></li><li class="toc--level-2 toc--section-11"><a href="#dont-mix-wicket-versions"><span class="toc-number">3.4</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li></ul></li><li class="toc--level-1 toc--section-12"><a href="#migrating-from-earlier-versions"><span class="toc-number">4</span> <span class="toc-text">Migrating from earlier versions</span></a></li><
 /ul></div>
+        </section>
+        <section class="l-two-third left">
+            <div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br />Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br />Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br />Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br />Migrate</a>
+</div>
+<h2 id="status">Status</h2>
+<p>The status for Wicket 1.4.x is: <strong>discontinued</strong>.</p>
+<p>This branch is <strong>no longer maintained and will no longer recieve any updates</strong>.</p>
+<p><i class="fa fa-exclamation-circle"></i>
+<strong>You should upgrade to Wicket 7.x at your earliest convenience.</strong></p>
+<h3 id="semantic-versioning">Semantic Versioning</h3>
+<p>This release branch <strong>does not</strong> follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.</p>
+<h3 id="change-log">Change log</h3>
+<p>To see what changed in this release (and prior releases) you can read
+the <a href="http://archive.apache.org/dist/wicket/1.4.23/CHANGELOG-1.4">change log</a>.</p>
+<h2 id="download">Download</h2>
+<p>The most recent release in this branch is: <strong>1.4.23</strong>.</p>
+<p>You can get the release using Maven or download it manually.</p>
+<h3 id="using-apache-maven">Using Apache Maven</h3>
+<p>Use the following Maven dependency to use Wicket in your project:</p>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>wicket<span class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;version&gt;</span>1.4.23<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<p>Add the snippet above to your project’s POM in the dependency
+(management) section.</p>
+<p>You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the <code>artifactId</code>
+accordingly).</p>
+<p>If you are not a Maven user, you can download the Wicket release manually.</p>
+<h3 id="download-manually">Download Manually</h3>
+<p>Use the following links to download Wicket manually to build Wicket
+from source:</p>
+<ul>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23/apache-wicket-1.4.23.tar.gz">apache-wicket-1.4.23.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23/apache-wicket-1.4.23.zip">apache-wicket-1.4.23.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/apache-wicket-1.4.23.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Or use the following links to get the pre-packaged binaries instead:</p>
+<ul>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23/binaries/apache-wicket-1.4.23-bin.tar.gz">apache-wicket-1.4.23-bin.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-7.0.0-bin.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-7.0.0-bin.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-7.0.0-bin.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23/binaries/apache-wicket-1.4.23-bin.zip">apache-wicket-1.4.23-bin.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-1.4.23-bin.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-1.4.23-bin.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.4.23/binaries/apache-wicket-1.4.23-bin.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Note that the binary packages and the source packages don’t contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Apache Wicket has few requirements in order to work properly. In this
+section you’ll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module’s POM for
+more details on the necessary libraries.</p>
+<h3 id="java-version">Java version</h3>
+<p>This Wicket version requires at least the following Java version: <strong>JDK 5.0 or newer</strong>.</p>
+<p>Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.</p>
+<h3 id="servlet-api">Servlet API</h3>
+<p>This Wicket version requires at least the following Servlet API
+version: <strong>Servlet API 2.3 or newer</strong>. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.</p>
+<p>In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.</p>
+<h3 id="logging">Logging</h3>
+<p>You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+<a href="http://logging.apache.org/log4j">log4j</a>.</p>
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a>
+for more information.</p>
+<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
+<p>You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+<strong>not</strong> possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.</p>
+<h2 id="migrating-from-earlier-versions">Migrating from earlier versions</h2>
+<p>If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:</p>
+<ul>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2015 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/wicket-1.5.x.html
----------------------------------------------------------------------
diff --git a/content/start/wicket-1.5.x.html b/content/start/wicket-1.5.x.html
new file mode 100644
index 0000000..1572681
--- /dev/null
+++ b/content/start/wicket-1.5.x.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket 1.5.x | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /start/wicket-1.5.x.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /start/wicket-1.5.x.html -->
+    	<li class="active"><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /start/wicket-1.5.x.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /start/wicket-1.5.x.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /start/wicket-1.5.x.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /start/wicket-1.5.x.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Apache Wicket 1.5.x</h1>
+            <p>Here you can learn about the status of Wicket 1.5.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#status"><span class="toc-number">1</span> <span class="toc-text">Status</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#semantic-versioning"><span class="toc-number">1.1</span> <span class="toc-text">Semantic Versioning</span></a></li><li class="toc--level-2 toc--section-3"><a href="#change-log"><span class="toc-number">1.2</span> <span class="toc-text">Change log</span></a></li></ul></li><li class="toc--level-1 toc--section-4"><a href="#download"><span class="toc-number">2</span> <span class="toc-text">Download</span></a><ul><li class="toc--level-2 toc--section-5"><a href="#using-apache-maven"><span class="toc-number">2.1</span> <span class="toc-text">Using Apache Maven</span></a></li><li class="toc--level-2 toc--section-6"><a href="#download-manually"><span class="toc-number">2.2</span> <span class="toc-text">Download Manua
 lly</span></a></li></ul></li><li class="toc--level-1 toc--section-7"><a href="#requirements"><span class="toc-number">3</span> <span class="toc-text">Requirements</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#java-version"><span class="toc-number">3.1</span> <span class="toc-text">Java version</span></a></li><li class="toc--level-2 toc--section-9"><a href="#servlet-api"><span class="toc-number">3.2</span> <span class="toc-text">Servlet API</span></a></li><li class="toc--level-2 toc--section-10"><a href="#logging"><span class="toc-number">3.3</span> <span class="toc-text">Logging</span></a></li><li class="toc--level-2 toc--section-11"><a href="#dont-mix-wicket-versions"><span class="toc-number">3.4</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li></ul></li><li class="toc--level-1 toc--section-12"><a href="#migrating-from-earlier-versions"><span class="toc-number">4</span> <span class="toc-text">Migrating from earlier versions</span></a></li><
 /ul></div>
+        </section>
+        <section class="l-two-third left">
+            <div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br />Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br />Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br />Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br />Migrate</a>
+</div>
+<h2 id="status">Status</h2>
+<p>The status for Wicket 1.5.x is: <strong>security fixes only</strong>.</p>
+<p>This branch is <strong>no longer actively maintained</strong> and will only recieve
+backported security fixes when relevant and as long as we are able to
+actually build this branch.</p>
+<p><i class="fa fa-exclamation-circle"></i>
+<strong>You should upgrade to Wicket 7.x at your earliest convenience.</strong></p>
+<h3 id="semantic-versioning">Semantic Versioning</h3>
+<p>This release branch <strong>does not</strong> follow semantic versioning. Upgrading
+between minor versions may break binary compatibility.</p>
+<h3 id="change-log">Change log</h3>
+<p>To see what changed in this release (and prior releases) you can read
+the <a href="http://archive.apache.org/dist/wicket/1.5.13/CHANGELOG-1.5">change log</a>.</p>
+<h2 id="download">Download</h2>
+<p>The most recent release in this branch is: <strong>1.5.13</strong>.</p>
+<p>You can get the release using Maven or download it manually.</p>
+<h3 id="using-apache-maven">Using Apache Maven</h3>
+<p>Use the following Maven dependency to use Wicket in your project:</p>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;version&gt;</span>1.5.13<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<p>Add the snippet above to your project’s POM in the dependency
+(management) section.</p>
+<p>You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the <code>artifactId</code>
+accordingly).</p>
+<p>If you are not a Maven user, you can download the Wicket release manually.</p>
+<h3 id="download-manually">Download Manually</h3>
+<p>Use the following links to download Wicket manually to build Wicket
+from source:</p>
+<ul>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13/apache-wicket-1.5.13.tar.gz">apache-wicket-1.5.13.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13/apache-wicket-1.5.13.zip">apache-wicket-1.5.13.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/apache-wicket-1.5.13.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Or use the following links to get the pre-packaged binaries instead:</p>
+<ul>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.tar.gz">apache-wicket-1.5.13-bin.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.zip">apache-wicket-1.5.13-bin.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/1.5.13/binaries/apache-wicket-1.5.13-bin.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Note that the binary packages and the source packages don’t contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Apache Wicket has few requirements in order to work properly. In this
+section you’ll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module’s POM for
+more details on the necessary libraries.</p>
+<h3 id="java-version">Java version</h3>
+<p>This Wicket version requires at least the following Java version: <strong>JDK 5.0 or newer</strong>.</p>
+<p>Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.</p>
+<h3 id="servlet-api">Servlet API</h3>
+<p>This Wicket version requires at least the following Servlet API
+version: <strong>Servlet API 2.5 or newer</strong>. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.</p>
+<p>In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.</p>
+<h3 id="logging">Logging</h3>
+<p>You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+<a href="http://logging.apache.org/log4j">log4j</a>.</p>
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a>
+for more information.</p>
+<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
+<p>You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+<strong>not</strong> possible to use Wicket Extensions 1.3 in a Wicket 1.5 project,
+or Wicket Spring 1.4.19 in a Wicket 1.5 project. The same goes for 3rd
+party libraries: make sure you always use a compatible version of your
+3rd party library.</p>
+<h2 id="migrating-from-earlier-versions">Migrating from earlier versions</h2>
+<p>If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:</p>
+<ul>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Wicket 1.4 to Wicket 1.5</a></li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2015 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/wicket-6.x.html
----------------------------------------------------------------------
diff --git a/content/start/wicket-6.x.html b/content/start/wicket-6.x.html
new file mode 100644
index 0000000..e9e0b6c
--- /dev/null
+++ b/content/start/wicket-6.x.html
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket 6.x | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /start/wicket-6.x.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /start/wicket-6.x.html -->
+    	<li class="active"><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /start/wicket-6.x.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /start/wicket-6.x.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /start/wicket-6.x.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /start/wicket-6.x.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Apache Wicket 6.x</h1>
+            <p>Here you can learn about the status of Wicket 6.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#status"><span class="toc-number">1</span> <span class="toc-text">Status</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#semantic-versioning"><span class="toc-number">1.1</span> <span class="toc-text">Semantic Versioning</span></a></li><li class="toc--level-2 toc--section-3"><a href="#change-log"><span class="toc-number">1.2</span> <span class="toc-text">Change log</span></a></li></ul></li><li class="toc--level-1 toc--section-4"><a href="#download"><span class="toc-number">2</span> <span class="toc-text">Download</span></a><ul><li class="toc--level-2 toc--section-5"><a href="#using-apache-maven"><span class="toc-number">2.1</span> <span class="toc-text">Using Apache Maven</span></a></li><li class="toc--level-2 toc--section-6"><a href="#download-manually"><span class="toc-number">2.2</span> <span class="toc-text">Download Manua
 lly</span></a></li></ul></li><li class="toc--level-1 toc--section-7"><a href="#requirements"><span class="toc-number">3</span> <span class="toc-text">Requirements</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#java-version"><span class="toc-number">3.1</span> <span class="toc-text">Java version</span></a></li><li class="toc--level-2 toc--section-9"><a href="#servlet-api"><span class="toc-number">3.2</span> <span class="toc-text">Servlet API</span></a></li><li class="toc--level-2 toc--section-10"><a href="#logging"><span class="toc-number">3.3</span> <span class="toc-text">Logging</span></a></li><li class="toc--level-2 toc--section-11"><a href="#dont-mix-wicket-versions"><span class="toc-number">3.4</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li></ul></li><li class="toc--level-1 toc--section-12"><a href="#migrating-from-earlier-versions"><span class="toc-number">4</span> <span class="toc-text">Migrating from earlier versions</span></a></li><
 /ul></div>
+        </section>
+        <section class="l-two-third left">
+            <div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br />Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br />Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br />Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br />Migrate</a>
+</div>
+<h2 id="status">Status</h2>
+<p>The status for Wicket 6.x is: <strong>supported</strong>.</p>
+<p>This is the previous stable, production ready release of Wicket. This
+branch will continue to recieve new features, improvements, bug- and
+security fixes.</p>
+<p><i class="fa fa-info-circle"></i>
+However, this release will cease to receive updates in the future. You
+really should consider upgrading to Wicket 7.x at your earliest
+convenience.</p>
+<h3 id="semantic-versioning">Semantic Versioning</h3>
+<p>These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.</p>
+<h3 id="change-log">Change log</h3>
+<p>To see what changed in this release (and prior releases) you can read
+the <a href="http://archive.apache.org/dist/wicket/6.20.0/CHANGELOG-6.x">change log</a>.</p>
+<h2 id="download">Download</h2>
+<p>The most recent release in this branch is: <strong>6.20.0</strong>.</p>
+<p>You can get the release using Maven or download it manually.</p>
+<h3 id="using-apache-maven">Using Apache Maven</h3>
+<p>Use the following Maven dependency to use Wicket in your project:</p>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;version&gt;</span>6.20.0<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<p>Add the snippet above to your project’s POM in the dependency
+(management) section.</p>
+<p>You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the <code>artifactId</code>
+accordingly).</p>
+<p>If you are not a Maven user, you can download the Wicket release manually.</p>
+<h3 id="download-manually">Download Manually</h3>
+<p>Use the following links to download Wicket manually to build Wicket
+from source:</p>
+<ul>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/apache-wicket-6.20.0.tar.gz">apache-wicket-6.20.0.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/apache-wicket-6.20.0.zip">apache-wicket-6.20.0.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/apache-wicket-6.20.0.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Or use the following links to get the pre-packaged binaries instead:</p>
+<ul>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz">apache-wicket-6.20.0-bin.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip">apache-wicket-6.20.0-bin.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/6.20.0/binaries/apache-wicket-6.20.0-bin.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Note that the binary packages and the source packages don’t contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Apache Wicket has few requirements in order to work properly. In this
+section you’ll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module’s POM for
+more details on the necessary libraries.</p>
+<h3 id="java-version">Java version</h3>
+<p>This Wicket version requires at least the following Java version: <strong>JDK 6.0 or newer</strong>.</p>
+<p>Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.</p>
+<h3 id="servlet-api">Servlet API</h3>
+<p>This Wicket version requires at least the following Servlet API
+version: <strong>Servlet API 2.5 or newer</strong>. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.</p>
+<p>In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.</p>
+<h3 id="logging">Logging</h3>
+<p>You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+<a href="http://logging.apache.org/log4j">log4j</a>.</p>
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a>
+for more information.</p>
+<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
+<p>You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+<strong>not</strong> possible to use Wicket Extensions 1.5 in a Wicket 6 project, or
+Wicket CDI 6.19 in a Wicket 7 project. The same goes for 3rd party
+libraries: make sure you always use a compatible version of your 3rd
+party library.</p>
+<h2 id="migrating-from-earlier-versions">Migrating from earlier versions</h2>
+<p>If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:</p>
+<ul>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Wicket 1.4 to Wicket 1.5</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0">Wicket 1.5 to Wicket 6.x</a></li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2015 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/start/wicket-7.x.html
----------------------------------------------------------------------
diff --git a/content/start/wicket-7.x.html b/content/start/wicket-7.x.html
new file mode 100644
index 0000000..c5a1e7c
--- /dev/null
+++ b/content/start/wicket-7.x.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Apache Wicket 7.x | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+        <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
+        <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" />
+        <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" />
+
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
+
+    </head>
+
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /start/wicket-7.x.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /start/wicket-7.x.html -->
+    	<li class="active"><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /start/wicket-7.x.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /start/wicket-7.x.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /start/wicket-7.x.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /start/wicket-7.x.html -->
+    	<li class=""><a href="/apache">Apache</a></li>
+    </ul>
+</nav>
+        <div class="logo">
+    <a href="/"><img src="/img/logo-apachewicket-white.svg" alt="Apache Wicket"></a>
+</div>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Apache Wicket 7.x</h1>
+            <p>Here you can learn about the status of Wicket 7.x, find links to download it, learn how to configure your Maven POM to use Wicket, find the minimal requirements, and migrate your existing application to this Wicket version.</p>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#status"><span class="toc-number">1</span> <span class="toc-text">Status</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#semantic-versioning"><span class="toc-number">1.1</span> <span class="toc-text">Semantic versioning</span></a></li><li class="toc--level-2 toc--section-3"><a href="#change-log"><span class="toc-number">1.2</span> <span class="toc-text">Change log</span></a></li></ul></li><li class="toc--level-1 toc--section-4"><a href="#download"><span class="toc-number">2</span> <span class="toc-text">Download</span></a><ul><li class="toc--level-2 toc--section-5"><a href="#maven"><span class="toc-number">2.1</span> <span class="toc-text">Using Apache Maven</span></a></li><li class="toc--level-2 toc--section-6"><a href="#manually"><span class="toc-number">2.2</span> <span class="toc-text">Download Manually</span></a></li></u
 l></li><li class="toc--level-1 toc--section-7"><a href="#requirements"><span class="toc-number">3</span> <span class="toc-text">Requirements</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#java-version"><span class="toc-number">3.1</span> <span class="toc-text">Java version</span></a></li><li class="toc--level-2 toc--section-9"><a href="#servlet-api"><span class="toc-number">3.2</span> <span class="toc-text">Servlet API</span></a></li><li class="toc--level-2 toc--section-10"><a href="#logging"><span class="toc-number">3.3</span> <span class="toc-text">Logging</span></a></li><li class="toc--level-2 toc--section-11"><a href="#dont-mix-wicket-versions"><span class="toc-number">3.4</span> <span class="toc-text">Don’t mix Wicket versions</span></a></li></ul></li><li class="toc--level-1 toc--section-12"><a href="#migrate"><span class="toc-number">4</span> <span class="toc-text">Migrating from earlier versions</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <div class="button-bar">
+	<a class="button" href="#status"><i class="fa fa-info-circle"></i><br />Status</a>
+	<a class="button" href="#download"><i class="fa fa-download"></i><br />Download</a>
+	<a class="button" href="#requirements"><i class="fa fa-exclamation-triangle"></i><br />Requirements</a>
+	<a class="button" href="#migrate"><i class="fa fa-history"></i><br />Migrate</a>
+</div>
+<h2 id="status">Status</h2>
+<p>The status for Wicket 7.x is: <strong>supported</strong>.</p>
+<p>This is the current stable, <strong>production ready</strong> release of Wicket. All
+projects intended for production use should use this version.</p>
+<h3 id="semantic-versioning">Semantic versioning</h3>
+<p>These releases follow semantic versioning so upgrades between minor
+releases will not break compatibility.</p>
+<h3 id="change-log">Change log</h3>
+<p>To see what changed in these releases you can read the
+<a href="http://archive.apache.org/dist/wicket/7.0.0/CHANGELOG-7.x">change log</a>.</p>
+<h2 id="download">Download</h2>
+<p>The most recent release in this branch is: <strong>7.0.0</strong>. 
+You can get the release using <a href="#maven">Maven</a> or <a href="#manually">download it manually</a>.</p>
+<h3 id="maven">Using Apache Maven</h3>
+<p>Use the following Maven dependency to use Wicket in your project:</p>
+<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span class="nt">&lt;/groupId&gt;</span>
+    <span class="nt">&lt;artifactId&gt;</span>wicket-core<span class="nt">&lt;/artifactId&gt;</span>
+    <span class="nt">&lt;version&gt;</span>7.0.0<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<p>Add the snippet above to your project’s POM in the dependency
+(management) section.</p>
+<p>You can add more Wicket modules to your project by adding more
+dependencies (copy above snippet and change the <code>artifactId</code>
+accordingly).</p>
+<p>If you are not a Maven user, you can download the Wicket release manually.</p>
+<h3 id="manually">Download Manually</h3>
+<p>Use the following links to download Wicket manually to build Wicket
+from source:</p>
+<ul>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0/apache-wicket-7.0.0.tar.gz">apache-wicket-7.0.0.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download source <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0/apache-wicket-7.0.0.zip">apache-wicket-7.0.0.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/apache-wicket-7.0.0.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Or use the following links to get the pre-packaged binaries instead:</p>
+<ul>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.tar.gz">apache-wicket-7.0.0-bin.tar.gz</a>
+(<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.tar.gz.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.tar.gz.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.tar.gz.sha">SHA</a>
+)</li>
+  <li>Download binaries <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.zip">apache-wicket-7.0.0-bin.zip</a>
+(<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.zip.asc">PGP</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.zip.md5">MD5</a>,
+<a href="http://archive.apache.org/dist/wicket/7.0.0/binaries/apache-wicket-7.0.0-bin.zip.sha">SHA</a>
+)</li>
+</ul>
+<p>Note that the binary packages and the source packages don’t contain any
+dependencies necessary to have your project working out of the box. We
+strongly urge you to use Maven (or Buildr, or Gradle) as your
+dependency management system.</p>
+<h2 id="requirements">Requirements</h2>
+<p>Apache Wicket has few requirements in order to work properly. In this
+section you’ll find the minimum requirements for all Wicket modules.
+Specific modules may need additional libraries, such as file upload,
+date time APIs, CDI specifications, and more. See the module’s POM for
+more details on the necessary libraries.</p>
+<h3 id="java-version">Java version</h3>
+<p>This Wicket version requires at least the following Java version: <strong>JDK 7.0 or newer</strong>.</p>
+<p>Not only is a particular version of Java necessary, Wicket also needs
+access to specific APIs.</p>
+<h3 id="servlet-api">Servlet API</h3>
+<p>This Wicket version requires at least the following Servlet API
+version: <strong>Servlet API 3.0 or newer</strong>. This is provided by your
+container, please see the documentation of your container to see which
+version of the Servlet specification is supported.</p>
+<p>In addition to the Servlet API, Wicket uses SLF4J to let you choose
+your own implementation of a logging framework.</p>
+<h3 id="logging">Logging</h3>
+<p>You cannot use Wicket without adding an SLF4J logging implementation to
+your classpath. Most people use
+<a href="http://logging.apache.org/log4j">log4j</a>.</p>
+<p>If you do, just include <strong>slf4j-log4j12.jar</strong> on your classpath to get
+Wicket to use log4j too. If you want to use commons-logging or JDK14
+logging or something else, please see the <a href="http://www.slf4j.org/faq.html">SLF4J site</a>
+for more information.</p>
+<h3 id="dont-mix-wicket-versions">Don’t mix Wicket versions</h3>
+<p>You cannot mix different Wicket versions in your project. You should
+always use the artifacts from a particular release. For example it is
+<strong>not</strong> possible to use Wicket Extensions 1.5 in a Wicket 6 project, or
+Wicket CDI 6.19 in a Wicket 7 project. The same goes for 3rd party
+libraries: make sure you always use a compatible version of your 3rd
+party library.</p>
+<h2 id="migrate">Migrating from earlier versions</h2>
+<p>If you are migrating an existing application from earlier versions of
+Wicket you may find our migration guides invaluable:</p>
+<ul>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.3">Wicket 1.2 to Wicket 1.3</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migrating+to+Wicket+1.4">Wicket 1.3 to Wicket 1.4</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5">Wicket 1.4 to Wicket 1.5</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0">Wicket 1.5 to Wicket 6.x</a></li>
+  <li>Migrating from <a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Wicket 6.x to Wicket 7.x</a></li>
+</ul>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2015 — The Apache Software Foundation. Apache Wicket,
+    Wicket, Apache, the Apache feather logo, and the Apache Wicket
+    project logo are trademarks of The Apache Software Foundation. All
+    other marks mentioned may be trademarks or registered trademarks of
+    their respective owners.
+</div>
+        </footer>
+    </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/contribute/index.md
----------------------------------------------------------------------
diff --git a/contribute/index.md b/contribute/index.md
index 4ef0dee..ffb9922 100644
--- a/contribute/index.md
+++ b/contribute/index.md
@@ -52,7 +52,9 @@ organisation at Github:
 On this page you will find a button with the caption "Fork". Click it
 or use the button below.
 
-<a class="button" rel="nofollow" href="https://github.com/apache/wicket/fork">Fork us on Github</a>
+<a class="button" rel="nofollow" href="https://github.com/apache/wicket/fork">
+	<i class="fa fa-github"></i> Fork us on github
+</a>
 
 Now you have your own copy of Wicket to hack on. You can edit directly
 in the Github web interface--good for minor fixes like documentation
@@ -84,24 +86,57 @@ shows the corresponding branch for each Wicket version.
         <tr>
             <th>Wicket version</th>
             <th>Branch name</th>
+			<th>Status</th>
         </tr>
     </thead>
     <tbody>
         <tr>
+            <td>7.x</td>
+            <td>master</td>
+			<td>active</td>
+        </tr>
+        <tr>
             <td>6.x</td>
             <td>wicket-6.x</td>
+			<td>supported</td>
         </tr>
         <tr>
-            <td>7.x</td>
-            <td>master</td>
+            <td>1.5.x</td>
+            <td>wicket-1.5.x</td>
+			<td>security fixes only</td>
+        </tr>
+        <tr>
+            <td><s>1.4.x</s></td>
+            <td><s>wicket-1.4.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.3.x</s></td>
+            <td><s>wicket-1.3.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.2.x</s></td>
+            <td><s>wicket-1.2.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.1.x</s></td>
+            <td><s>wicket-1.1.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.0.x</s></td>
+            <td><s>wicket-1.0.x</s></td>
+			<td><s>discontinued</s></td>
         </tr>
     </tbody>
 </table>    
-            
-If you want to work on an issue for Wicket 6, you need to check out the
-_wicket-6.x_ branch.
 
-If you want to work on Wicket 7, then you need to check out _master_.
+If you want to work on Wicket 7, you need to check out _master_.
+
+If you want to work on an issue for Wicket 6, you'll need to check out
+the _wicket-6.x_ branch.
 
 When you are ready with your change you can ask us to review your
 changes and to integrate it into Wicket by creating a Pull Request.
@@ -137,9 +172,6 @@ Here's a list of tasks that only committers can do:
 
 - <a href="{{ site.baseurl }}/contribute/release.html">Build a release</a>
 
-
-
-
 ### Subscribing and unsubscribing ##
 
 <a href="mailto:dev@wicket.apache.org">Wicket development list</a>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/learn/blogs.md
----------------------------------------------------------------------
diff --git a/learn/blogs.md b/learn/blogs.md
index 3e686cb..92b4d87 100644
--- a/learn/blogs.md
+++ b/learn/blogs.md
@@ -1,13 +1,14 @@
 ---
 layout: default
 title: Wicket related blogs
+active_link: documentation
 ---
 
-Any (open source) project exists solely because a community wants to support
-it. The Wicket community consists of the users and developers. There are many
-who want to share their experiences with Wicket and do so on the mailing
-lists , on several online media portals (for example The ServerSide and
-JavaLobby ), and on their blogs.
+Any (open source) project exists solely because a community wants to support it.
+The Wicket community consists of the users and developers. 
+There are many who want to share their experiences with Wicket and do so on the mailing lists, on several online media portals (for example The ServerSide and JavaLobby), and on their blogs.
+
+## Wicket blogs
 
 Here is a list of regular Wicket bloggers, consisting of core contributers and enthusiastic users.
 
@@ -23,7 +24,5 @@ Here is a list of regular Wicket bloggers, consisting of core contributers and e
 
 ## Get your blog listed!
 
-If you think your blog is missing, then please send a message to one of the
-core contributors or the mailinglist. In the mean time you can add your blog
-to our wiki's [special blog
-page](https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs).
+If you think your blog is missing, then please send a message to one of the core contributors or the mailinglist.
+In the mean time you can add your blog to our wiki's [special blog page](https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs).


[4/4] wicket-site git commit: Prepare for Wicket 7.0.0, add button bars, fix some pages

Posted by da...@apache.org.
Prepare for Wicket 7.0.0, add button bars, fix some pages


Project: http://git-wip-us.apache.org/repos/asf/wicket-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket-site/commit/8ec6434b
Tree: http://git-wip-us.apache.org/repos/asf/wicket-site/tree/8ec6434b
Diff: http://git-wip-us.apache.org/repos/asf/wicket-site/diff/8ec6434b

Branch: refs/heads/asf-site
Commit: 8ec6434bb2c2afea7042ad92e99f3a54ddc83d07
Parents: 8ae24c5
Author: Martijn Dashorst <da...@apache.org>
Authored: Tue Jul 28 11:33:30 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Tue Jul 28 11:33:30 2015 +0200

----------------------------------------------------------------------
 _config.yml                                     |  27 +-
 _includes/mainmenu.html                         |   4 +-
 _sass/main.scss                                 |  15 ++
 content/atom.xml                                |  54 ++--
 content/contribute/index.html                   |  47 +++-
 content/contribute/release.html                 |   6 +-
 content/contribute/write.html                   |   2 +-
 content/css/style.css                           |  10 +
 content/doap.rdf                                |   4 +-
 content/help/index.html                         |   8 +-
 content/help/reportabug.html                    |   4 +-
 content/help/security.html                      |   2 +-
 content/learn/blogs.html                        |  19 +-
 content/learn/books/awc.html                    |  34 ++-
 content/learn/books/ewdww.html                  |   6 +-
 content/learn/books/iaw6.html                   |  34 ++-
 content/learn/books/index.html                  |  26 +-
 content/learn/books/koda.html                   |  48 ++--
 content/learn/books/kwij.html                   |  31 +--
 content/learn/books/praxisbuchwicket.html       |   6 +-
 content/learn/books/prowicket.html              |   2 +-
 content/learn/books/wia.html                    |   6 +-
 content/learn/books/wicket-jp.html              |  22 +-
 content/learn/examples/dropdownchoice.html      |   2 +-
 content/learn/index.html                        | 111 +++-----
 .../news/2010/05/24/wicket-1.4.9-released.html  |   4 +-
 content/news/2010/05/index.html                 |   7 +-
 .../news/2010/08/11/wicket-1.4.10-released.html |   6 +-
 .../news/2010/08/11/wicket-1.5-M1-released.html |   4 +-
 content/news/2010/08/index.html                 |   2 +-
 .../news/2010/09/09/wicket-1.4.11-released.html |   4 +-
 .../news/2010/09/17/wicket.1.4.12-released.html |   4 +-
 .../2010/09/17/wicket.1.5-M2.1-released.html    |   6 +-
 content/news/2010/09/index.html                 |  14 +-
 .../news/2010/11/01/wicket-1.4.13-released.html |   4 +-
 .../news/2010/11/05/wicket-1.5-M3-released.html |   4 +-
 .../news/2010/11/29/wicket-1.4.14-released.html |   4 +-
 content/news/2010/11/index.html                 |  19 +-
 .../news/2010/12/24/wicket-1.4.15-released.html |   4 +-
 content/news/2010/12/index.html                 |   7 +-
 .../2011/01/22/wicket-1.5-RC1-released.html     |   2 +-
 .../news/2011/02/25/wicket-1.4.16-released.html |   4 +-
 .../2011/02/25/wicket-1.5-rc2-released.html     |   2 +-
 content/news/2011/02/index.html                 |   7 +-
 .../news/2011/04/02/wicket-1.4.17-released.html |   4 +-
 .../2011/04/02/wicket-1.5-RC3-released.html     |   2 +-
 content/news/2011/04/index.html                 |   7 +-
 .../2011/05/11/wicket-1.5-RC4.2-released.html   |   2 +-
 .../2011/06/25/wicket-1.5-RC5.1-released.html   |   2 +-
 .../news/2011/08/09/wicket-1.4.18-released.html |   4 +-
 content/news/2011/08/28/1.5-RC7-released.html   |   2 +-
 content/news/2011/08/index.html                 |   7 +-
 .../news/2011/09/07/wicket-1.5-released.html    |   2 +-
 .../news/2011/09/29/wicket-1.5.1-released.html  |   4 +-
 content/news/2011/09/index.html                 |   7 +-
 .../news/2011/10/17/wicket-1.4.19-released.html |   4 +-
 .../news/2011/10/24/wicket-1.5.2-released.html  |   4 +-
 content/news/2011/10/index.html                 |  14 +-
 .../news/2012/09/05/wicket-6.0.0-released.html  |   4 +-
 content/news/2012/09/index.html                 |   4 +-
 .../news/2013/02/15/wicket-6.6.0-released.html  |   4 +-
 .../news/2013/04/12/wicket-6.7.0-released.html  |   4 +-
 .../news/2013/06/27/wicket-6.9.0-released.html  |   2 +-
 .../news/2013/07/10/wicket-6.9.1-released.html  |   2 +-
 .../news/2013/08/18/wicket-6.10.0-released.html |   2 +-
 .../news/2013/11/01/wicket-6.12.0-released.html |   4 +-
 .../news/2014/04/23/wicket-6.15.0-released.html |   2 +-
 .../news/2014/08/24/wicket-6.17.0-released.html |   2 +-
 .../news/2014/11/05/wicket-6.18.0-released.html |   4 +-
 .../2014/11/05/wicket-7.0.0-M4-released.html    |   4 +-
 .../02/13/new-committer-Sebastien-Briquet.html  |   6 +-
 content/news/2015/02/index.html                 |   4 +-
 content/news/index.html                         |  48 ++--
 content/start/download.html                     | 232 ++++++----------
 content/start/quickstart.html                   |   4 +-
 content/start/wicket-1.3.x.html                 | 160 +++++++++++
 content/start/wicket-1.4.x.html                 | 172 ++++++++++++
 content/start/wicket-1.5.x.html                 | 175 ++++++++++++
 content/start/wicket-6.x.html                   | 178 ++++++++++++
 content/start/wicket-7.x.html                   | 174 ++++++++++++
 contribute/index.md                             |  52 +++-
 learn/blogs.md                                  |  17 +-
 learn/books/awc.md                              |  34 ++-
 learn/books/ewdww.md                            |   3 +-
 learn/books/iaw6.md                             |  32 ++-
 learn/books/index.md                            |  26 +-
 learn/books/koda.md                             |  48 ++--
 learn/books/kwij.md                             |  31 +--
 learn/books/praxisbuchwicket.md                 |   3 +-
 learn/books/prowicket.md                        |   1 +
 learn/books/wia.md                              |   5 +-
 learn/books/wicket-jp.md                        |  21 +-
 learn/index.md                                  | 122 +++------
 start/download.md                               | 270 +++++++------------
 start/wicket-1.3.x.md                           | 130 +++++++++
 start/wicket-1.4.x.md                           | 146 ++++++++++
 start/wicket-1.5.x.md                           | 149 ++++++++++
 start/wicket-6.x.md                             | 153 +++++++++++
 start/wicket-7.x.md                             | 146 ++++++++++
 99 files changed, 2375 insertions(+), 908 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 839845f..c616568 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,24 +15,31 @@ excerpt_separator: <!--more-->
 sass:
     sass_dir: _sass
 wicket:
-  version:    6.20.0
-  version_70: 7.0.0-M6
+  version:    7.0.0
+  version_70: 7.0.0
   version_60: 6.20.0
   version_15: 1.5.13
   version_14: 1.4.23
-  released:   2015-06-14
-  versions:   [6.20.0, 1.5.13, 1.4.23, 7.0.0-M6, 1.5-SNAPSHOT, 6.21.0-SNAPSHOT, 7.0.0-SNAPSHOT]
+  version_13: 1.3.7
+  released:   2015-07-10
+  versions:   [6.20.0, 1.5.13, 1.4.23, 7.0.0, 1.5-SNAPSHOT, 6.21.0-SNAPSHOT, 7.0.0-SNAPSHOT]
 
 navigation:
-- text: Quick Start
+- id: start
+  text: Quick Start
   url: /start/quickstart.html
-- text: Download
+- id: download
+  text: Download
   url: /start/download.html
-- text: Documentation
+- id: documentation
+  text: Documentation
   url: /learn
-- text: Support
+- id: support
+  text: Support
   url: /help
-- text: Contribute
+- id: contribute
+  text: Contribute
   url: /contribute
-- text: Apache
+- id: apache
+  text: Apache
   url: /apache

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_includes/mainmenu.html
----------------------------------------------------------------------
diff --git a/_includes/mainmenu.html b/_includes/mainmenu.html
index a2d357c..82b6380 100644
--- a/_includes/mainmenu.html
+++ b/_includes/mainmenu.html
@@ -7,7 +7,9 @@
         {% assign linkurl = link.url|remove:'/index.html' %}
         {% assign linkurl = link.url|remove:'/index.md' %}
 		<!-- {{ linkurl }} || {{ url }} -->
-    	{% if url == "" and link.url == "/" %}
+		{% if page.active_link == link.id %}
+			{% assign active = 'active' %}
+    	{% elsif url == "" and link.url == "/" %}
     		{% assign active = 'active' %}
     	{% elsif url == link.url or page.url == link.url %}
     		{% assign active = 'active' %}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_sass/main.scss
----------------------------------------------------------------------
diff --git a/_sass/main.scss b/_sass/main.scss
index 7e2d5c1..c655f24 100755
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -155,3 +155,18 @@ article+article {
         }
     }
 }
+
+th { 
+	text-align: left; 
+}
+
+.media-bar {
+	clear: both;
+	a {
+		border: none;
+
+		> img {
+			width: 100%;
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/atom.xml
----------------------------------------------------------------------
diff --git a/content/atom.xml b/content/atom.xml
index b6f44ad..fd16912 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml" rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2015-07-20T11:17:31+02:00</updated>
+    <updated>2015-07-28T11:31:08+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
@@ -136,16 +136,16 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 
 &lt;pre&gt;&lt;code&gt;* [WICKET-5790] - VariableInterpolator &amp;amp; #getThrowExceptionOnMissingResource
 * [WICKET-5814] - CryptoMapper clears feedback messages
-* [WICKET-5816] - Apps can't use Application.setName instead of WicketFilter for e.g. JMX names
+* [WICKET-5816] - Apps can&#39;t use Application.setName instead of WicketFilter for e.g. JMX names
 * [WICKET-5822] - AjaxSelfUpdatingTimer stops working after ajax download
 * [WICKET-5825] - Deployment of wicket-examples.war fails in Tomcat
 * [WICKET-5828] - PageProvider not serializable
 * [WICKET-5834] - NPE in DefaultPropertyResolver
-* [WICKET-5835] - InlineEnclosure doesn't call child.configure() before updating its visilbity
+* [WICKET-5835] - InlineEnclosure doesn&#39;t call child.configure() before updating its visilbity
 * [WICKET-5837] - JUnit tests may fail because of AbstractDefaultAjaxBehavior
 * [WICKET-5838] - Last-modified header of external markup is ignored
 * [WICKET-5841] - continueToOriginalDestination() discards new cookies
-* [WICKET-5843] - CryptoMapper doesn't work with context relative UrlResourceReferences
+* [WICKET-5843] - CryptoMapper doesn&#39;t work with context relative UrlResourceReferences
 * [WICKET-5845] - AuthenticatedWebSession.get() returns a new session with signedIn false
 * [WICKET-5850] - LazyInitProxyFactory causes NoClassDefFound org/apache/wicket/proxy/ILazyInitProxy in case of multimodule deployment
 * [WICKET-5851] - PackageResourceTest#packageResourceGuard test fails under Windows
@@ -157,7 +157,7 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5861] - BigDecimalConverter does not allow parsing of values great than Double.MAX_VALUE
 * [WICKET-5862] - Wicket Container visibility bug
 * [WICKET-5864] - Multipart Ajax form submit does not release the channel in case of connection failure
-* [WICKET-5869] - Kittencaptcha doesn't calculate click y-coordinate correctly
+* [WICKET-5869] - Kittencaptcha doesn&#39;t calculate click y-coordinate correctly
 * [WICKET-5870] - wicket-event-jquery.js: Wicket.Browser.isIE11() does not return boolean
 * [WICKET-5874] - WicketTester TagTester does not work as expected when using non self closing tags
 * [WICKET-5879] - Using an AjaxSubmitLink to hide its form results in an exception
@@ -178,7 +178,7 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5912] - NPE in Page#hasInvisibleTransparentChild
 * [WICKET-5915] - The application can not find /META-INF/wicket/**.properties on Windows systems
 * [WICKET-5916] - StackOverflowError when calling getObject() from load() in LDM
-* [WICKET-5917] - Do not use jQuery's $ in String snippets in Java code
+* [WICKET-5917] - Do not use jQuery&#39;s $ in String snippets in Java code
 &lt;/code&gt;&lt;/pre&gt;
 
 &lt;h4 id=&quot;improvement&quot;&gt;Improvement&lt;/h4&gt;
@@ -187,12 +187,12 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5749] - Wicket-auth-roles should deal with resource authorization
 * [WICKET-5789] - Make org.apache.wicket.protocol.ws.javax.WicketServerEndpointConfig publicly visible
 * [WICKET-5801] - Responsive Images
-* [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it's functionality
+* [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce copy/paste while extending it&#39;s functionality
 * [WICKET-5829] - rename PageSettings#recreateMountedPagesAfterExpiry
 * [WICKET-5831] - Improve unsafe Id reporting in the AbstractRepeater
-* [WICKET-5832] - Do not fail at CDI's ConversationPropagator when running in non-http thread
+* [WICKET-5832] - Do not fail at CDI&#39;s ConversationPropagator when running in non-http thread
 * [WICKET-5833] - Add a way to get all opened web socket connections per user session
-* [WICKET-5840] - WicketTester doesn't support #clickLink() for ExternalLink component
+* [WICKET-5840] - WicketTester doesn&#39;t support #clickLink() for ExternalLink component
 * [WICKET-5859] - Add Hebrew and Arabic translations
 * [WICKET-5860] - Cross-Site Websocket Hijacking protection
 * [WICKET-5863] - Overiding disableCaching in ServletWebResponse is ignored when responce is buffered
@@ -391,15 +391,15 @@ migration guide found at&lt;/p&gt;
         <id>http://wicket.apache.org/news/2015/02/13/new-committer-Sebastien-Briquet</id>
         <content type="html">&lt;p&gt;The Project Management Committee (PMC) for Apache Wicket 
 has asked Sebastien Briquet to become a committer and we are pleased 
-to announce that he has accepted. &lt;/p&gt;
+to announce that he has accepted.&lt;/p&gt;
 
 &lt;p&gt;Sebastien has been involved with Wicket for several years now by developing one of the most successful integrations with JavaScript libraries, namely Wicket jQuery UI, reporting bugs, contributing fixes and participating in discussions.&lt;/p&gt;
 
 &lt;p&gt;Being a committer will enable him to help us even easier in the future.&lt;/p&gt;
 
-&lt;p&gt;Please welcome Sebastien Briquet to our team! &lt;/p&gt;
+&lt;p&gt;Please welcome Sebastien Briquet to our team!&lt;/p&gt;
 
-&lt;p&gt;Bienvenue Sebastien! &lt;/p&gt;
+&lt;p&gt;Bienvenue Sebastien!&lt;/p&gt;
 </content>
     </entry>
 
@@ -513,18 +513,18 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5748&quot;&gt;WICKET-5748&lt;/a&gt; - StackOverflowError while trying to get the Markup of WicketHeadContainer&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5751&quot;&gt;WICKET-5751&lt;/a&gt; - NullPointerException in IntHashMap&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5752&quot;&gt;WICKET-5752&lt;/a&gt; - ReplacementResourceBundleReference should return the dependencies for the replacing resource ref&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt; - AjaxRequestAttributes extra parameters aren't properly handled in getCallbackFunction()&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt; - AjaxRequestAttributes extra parameters aren&#39;t properly handled in getCallbackFunction()&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5770&quot;&gt;WICKET-5770&lt;/a&gt; - PageParametersEncoder should not decode parameters with no name&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5772&quot;&gt;WICKET-5772&lt;/a&gt; - LoadableDetachableModel caches null value if load() fails, bug in getObject() {attached = true;}&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5777&quot;&gt;WICKET-5777&lt;/a&gt; - Reload of page leads to WicketRuntimeException&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5782&quot;&gt;WICKET-5782&lt;/a&gt; - Missing escaping in MultiFileUploadField.js - sort of XSS&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt; - Multiple events in AjaxEventBehavior with prefix 'on'&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt; - Multiple events in AjaxEventBehavior with prefix &#39;on&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5784&quot;&gt;WICKET-5784&lt;/a&gt; - arraycopy with bad length in AbstractRequestLogger:172&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5793&quot;&gt;WICKET-5793&lt;/a&gt; - Request for static resource creating a session in 6.13.0+&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5800&quot;&gt;WICKET-5800&lt;/a&gt; - wicket:enclosure within FormComponentPanel causes exception related to dequeueing&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5809&quot;&gt;WICKET-5809&lt;/a&gt; - URL IPv6 parsing&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5811&quot;&gt;WICKET-5811&lt;/a&gt; - Infinite loop issue in PropertyValidator#createUnresolvablePropertyMessage(FormComponent&amp;lt;&amp;gt;)&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt; - AtmosphereBehavior wrongly sets Ajax base url to '.'&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt; - AtmosphereBehavior wrongly sets Ajax base url to &#39;.&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5817&quot;&gt;WICKET-5817&lt;/a&gt; - Wicket-JMX should depend on asm-util&lt;/li&gt;
 &lt;/ul&gt;
 
@@ -533,8 +533,8 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
 &lt;ul&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-4703&quot;&gt;WICKET-4703&lt;/a&gt; - StringResourceModel should provide an overridable getString(Component) method&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5746&quot;&gt;WICKET-5746&lt;/a&gt; - Fire an event once all JS event listeners are registered&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt; - It is impossible to determine the form submitting component's inputName when AjaxFormSubmitBehavior is used&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt; - (String)ResourceModel's defaultValue could be an IModel&amp;lt;String&amp;gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt; - It is impossible to determine the form submitting component&#39;s inputName when AjaxFormSubmitBehavior is used&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt; - (String)ResourceModel&#39;s defaultValue could be an IModel&amp;lt;String&amp;gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5756&quot;&gt;WICKET-5756&lt;/a&gt; - Allow to use custom ciphers when using SunJceCrypt class&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5758&quot;&gt;WICKET-5758&lt;/a&gt; - Portuguese translation&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5760&quot;&gt;WICKET-5760&lt;/a&gt; - Add constructor (String, Serializable, String) to AttributeAppender&lt;/li&gt;
@@ -561,7 +561,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5806&quot;&gt;WICKET-5806&lt;/a&gt; - Wicket.Log should log (at least errors) in the browser console even when Wicket Ajax Debug window is disabled&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5808&quot;&gt;WICKET-5808&lt;/a&gt; - SpringBean, support generic beans&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5818&quot;&gt;WICKET-5818&lt;/a&gt; - Add support for httpOnly cookies to CookieDefaults&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5820&quot;&gt;WICKET-5820&lt;/a&gt; - improve StringResourceModel's resource key interpolation for null&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5820&quot;&gt;WICKET-5820&lt;/a&gt; - improve StringResourceModel&#39;s resource key interpolation for null&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h4 id=&quot;new-features&quot;&gt;New Features&lt;/h4&gt;
@@ -671,15 +671,15 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5747&quot;&gt;WICKET-5747&lt;/a&gt; - Wicket Ajax Click handling gets requeued in OnDomReady so fire out of order&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5752&quot;&gt;WICKET-5752&lt;/a&gt; - ReplacementResourceBundleReference should return the dependencies for the replacing resource ref&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5755&quot;&gt;WICKET-5755&lt;/a&gt; - Restoring focus after Ajax replace no longer works in IE8&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt; - AjaxRequestAttributes extra parameters aren't properly handled in getCallbackFunction()&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt; - AjaxRequestAttributes extra parameters aren&#39;t properly handled in getCallbackFunction()&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5770&quot;&gt;WICKET-5770&lt;/a&gt; - PageParametersEncoder should not decode parameters with no name&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5782&quot;&gt;WICKET-5782&lt;/a&gt; - Missing escaping in MultiFileUploadField.js - sort of XSS&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt; - Multiple events in AjaxEventBehavior with prefix 'on'&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt; - Multiple events in AjaxEventBehavior with prefix &#39;on&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5784&quot;&gt;WICKET-5784&lt;/a&gt; - arraycopy with bad length in AbstractRequestLogger:172&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5793&quot;&gt;WICKET-5793&lt;/a&gt; - Request for static resource creating a session in 6.13.0+&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5809&quot;&gt;WICKET-5809&lt;/a&gt; - URL IPv6 parsing&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5811&quot;&gt;WICKET-5811&lt;/a&gt; - Infinite loop issue in PropertyValidator#createUnresolvablePropertyMessage(FormComponent&amp;lt;&amp;gt;)&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt; - AtmosphereBehavior wrongly sets Ajax base url to '.'&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt; - AtmosphereBehavior wrongly sets Ajax base url to &#39;.&#39;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h4 id=&quot;improvement&quot;&gt;Improvement&lt;/h4&gt;
@@ -687,8 +687,8 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 &lt;ul&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-4703&quot;&gt;WICKET-4703&lt;/a&gt; - StringResourceModel should provide an overridable getString(Component) method&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5746&quot;&gt;WICKET-5746&lt;/a&gt; - Fire an event once all JS event listeners are registered&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt; - It is impossible to determine the form submitting component's inputName when AjaxFormSubmitBehavior is used&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt; - (String)ResourceModel's defaultValue could be an IModel&amp;lt;String&amp;gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt; - It is impossible to determine the form submitting component&#39;s inputName when AjaxFormSubmitBehavior is used&lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt; - (String)ResourceModel&#39;s defaultValue could be an IModel&amp;lt;String&amp;gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5756&quot;&gt;WICKET-5756&lt;/a&gt; - Allow to use custom ciphers when using SunJceCrypt class&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5758&quot;&gt;WICKET-5758&lt;/a&gt; - Portuguese translation&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5760&quot;&gt;WICKET-5760&lt;/a&gt; - Add constructor (String, Serializable, String) to AttributeAppender&lt;/li&gt;
@@ -830,7 +830,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5326&quot;&gt;WICKET-5326&lt;/a&gt; - Wicket doesn’t encrypt links and Ajax URLs for mounted pages when CryptoMapper is used&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5689&quot;&gt;WICKET-5689&lt;/a&gt; - Nested Redirects and REDIRECT_TO_BUFFER&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5698&quot;&gt;WICKET-5698&lt;/a&gt; - WebApplication#unmount() unmounts the whole compound mapper if some of its inner ones matches&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt; - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work &lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt; - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5704&quot;&gt;WICKET-5704&lt;/a&gt; - IllegalArgument exception with wicket:child in ajaxrequest&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5706&quot;&gt;WICKET-5706&lt;/a&gt; - ResourceUtils.getLocaleFromFilename cannot handle filenames with classifiers&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5711&quot;&gt;WICKET-5711&lt;/a&gt; - OnChangeAjaxBehavior should listen for both ‘inputchange’ and ‘change’ events for TextField and TextArea&lt;/li&gt;
@@ -857,7 +857,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5350&quot;&gt;WICKET-5350&lt;/a&gt; - Enhancement for AbstractChoice and WildcardListModel API&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5691&quot;&gt;WICKET-5691&lt;/a&gt; - Wicket FileUploadField.getFileUploads() should never return null.&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5692&quot;&gt;WICKET-5692&lt;/a&gt; - Misleading message in PropertyValidator&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt; - Add WicketTester assertion methods for component’s markup style, variation and locale &lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt; - Add WicketTester assertion methods for component’s markup style, variation and locale&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5695&quot;&gt;WICKET-5695&lt;/a&gt; - Use Log4j 2.x for the archetype&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5697&quot;&gt;WICKET-5697&lt;/a&gt; - Rework Spring application to use annotations based configuration&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5708&quot;&gt;WICKET-5708&lt;/a&gt; - Making FormComponent.convertInput() public&lt;/li&gt;
@@ -987,7 +987,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5689&quot;&gt;WICKET-5689&lt;/a&gt; - Nested Redirects and REDIRECT_TO_BUFFER&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5698&quot;&gt;WICKET-5698&lt;/a&gt; - WebApplication#unmount() unmounts the whole compound mapper if some of its inner ones matches&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5699&quot;&gt;WICKET-5699&lt;/a&gt; - wicket-atmosphere 0.20 should use wicket-webjars 0.4.3&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt; - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work &lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt; - WebSocketRequestHandler is not set as a scheduled and thus RequestCycle#find(AjaxRequestTarget.class) doesn’t work&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5704&quot;&gt;WICKET-5704&lt;/a&gt; - IllegalArgument exception with wicket:child in ajaxrequest&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5706&quot;&gt;WICKET-5706&lt;/a&gt; - ResourceUtils.getLocaleFromFilename cannot handle filenames with classifiers&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5711&quot;&gt;WICKET-5711&lt;/a&gt; - OnChangeAjaxBehavior should listen for both ‘inputchange’ and ‘change’ events for TextField and TextArea&lt;/li&gt;
@@ -1007,7 +1007,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 &lt;ul&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5691&quot;&gt;WICKET-5691&lt;/a&gt; - Wicket FileUploadField.getFileUploads() should never return null.&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5692&quot;&gt;WICKET-5692&lt;/a&gt; - Misleading message in PropertyValidator&lt;/li&gt;
-  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt; - Add WicketTester assertion methods for component’s markup style, variation and locale &lt;/li&gt;
+  &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt; - Add WicketTester assertion methods for component’s markup style, variation and locale&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5710&quot;&gt;WICKET-5710&lt;/a&gt; - StringValidator should set ‘minlength’ attribute to input and textarea&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5715&quot;&gt;WICKET-5715&lt;/a&gt; - Allow setting ‘async’ attribute on reference &lt;script&gt; elements&lt;/script&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href=&quot;https://issues.apache.org/jira/browse/WICKET-5718&quot;&gt;WICKET-5718&lt;/a&gt; - Upgrade Atmosphere to 2.2.2&lt;/li&gt;

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/index.html b/content/contribute/index.html
index bb91c1b..80b1a7c 100644
--- a/content/contribute/index.html
+++ b/content/contribute/index.html
@@ -87,7 +87,9 @@ organisation at Github:</p>
 </ul>
 <p>On this page you will find a button with the caption “Fork”. Click it
 or use the button below.</p>
-<p><a class="button" rel="nofollow" href="https://github.com/apache/wicket/fork">Fork us on Github</a></p>
+<p><a class="button" rel="nofollow" href="https://github.com/apache/wicket/fork">
+	<i class="fa fa-github"></i> Fork us on github
+</a></p>
 <p>Now you have your own copy of Wicket to hack on. You can edit directly
 in the Github web interface–good for minor fixes like documentation
 errors–or clone the project to your workstation.</p>
@@ -108,22 +110,55 @@ shows the corresponding branch for each Wicket version.</p>
         <tr>
             <th>Wicket version</th>
             <th>Branch name</th>
+			<th>Status</th>
         </tr>
     </thead>
     <tbody>
         <tr>
+            <td>7.x</td>
+            <td>master</td>
+			<td>active</td>
+        </tr>
+        <tr>
             <td>6.x</td>
             <td>wicket-6.x</td>
+			<td>supported</td>
         </tr>
         <tr>
-            <td>7.x</td>
-            <td>master</td>
+            <td>1.5.x</td>
+            <td>wicket-1.5.x</td>
+			<td>security fixes only</td>
+        </tr>
+        <tr>
+            <td><s>1.4.x</s></td>
+            <td><s>wicket-1.4.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.3.x</s></td>
+            <td><s>wicket-1.3.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.2.x</s></td>
+            <td><s>wicket-1.2.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.1.x</s></td>
+            <td><s>wicket-1.1.x</s></td>
+			<td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.0.x</s></td>
+            <td><s>wicket-1.0.x</s></td>
+			<td><s>discontinued</s></td>
         </tr>
     </tbody>
 </table>
-<p>If you want to work on an issue for Wicket 6, you need to check out the
-<em>wicket-6.x</em> branch.</p>
-<p>If you want to work on Wicket 7, then you need to check out <em>master</em>.</p>
+<p>If you want to work on Wicket 7, you need to check out <em>master</em>.</p>
+<p>If you want to work on an issue for Wicket 6, you’ll need to check out
+the <em>wicket-6.x</em> branch.</p>
 <p>When you are ready with your change you can ask us to review your
 changes and to integrate it into Wicket by creating a Pull Request.</p>
 <h3 id="pullrequest">Create a Pull Request</h3>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/release.html
----------------------------------------------------------------------
diff --git a/content/contribute/release.html b/content/contribute/release.html
index 19e96b0..592c7e9 100644
--- a/content/contribute/release.html
+++ b/content/contribute/release.html
@@ -86,11 +86,11 @@
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent --sign pom.xml</span>
 <span class="go">rm pom.xml.asc</span></code></pre></div>
 <ul>
-  <li>Create release branch: </li>
+  <li>Create release branch:</li>
 </ul>
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span></code></pre></div>
 <ul>
-  <li>Checkout the release branch: </li>
+  <li>Checkout the release branch:</li>
 </ul>
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-$NEWVERSION</span></code></pre></div>
 <ul>
@@ -132,7 +132,7 @@
 <h4 id="staging-the-build">Staging the build</h4>
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
 <span class="go">scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></div>
-<p><strong>TODO</strong> figure out how to let <code>release:perform</code> work from a local checkout, such that we can actually <em>stage</em> the build instead of having to push the tag to our git repo. </p>
+<p><strong>TODO</strong> figure out how to let <code>release:perform</code> work from a local checkout, such that we can actually <em>stage</em> the build instead of having to push the tag to our git repo.</p>
 <p>The following steps are ONLY necessary as long as the above TODO has not been resolved.</p>
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
 <span class="go">git push -tags origin</span></code></pre></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/write.html
----------------------------------------------------------------------
diff --git a/content/contribute/write.html b/content/contribute/write.html
index c5b982c..7931285 100644
--- a/content/contribute/write.html
+++ b/content/contribute/write.html
@@ -87,7 +87,7 @@ any modified files.</p>
 <p>You can check out the website running at <a href="http://localhost:4000">localhost, port 4000</a>.</p>
 <h2 id="write">Write some documentation</h2>
 <p>Jekyll can render HTML from markdown syntax and textile syntax. <strong>For our site
-we use markdown</strong>. </p>
+we use markdown</strong>.</p>
 <h3 id="page-template">Page template</h3>
 <p>Each page needs to have a YAML preamble that specifies the rendered template
 and other variables. If it doesn’t include the YAML preamble, it won’t be

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index 1e8a48f..86a6501 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -934,3 +934,13 @@ article + article {
       margin-left: 0.5rem; }
     .button-bar .button i {
       font-size: 3rem; }
+
+th {
+  text-align: left; }
+
+.media-bar {
+  clear: both; }
+  .media-bar a {
+    border: none; }
+    .media-bar a > img {
+      width: 100%; }

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/doap.rdf
----------------------------------------------------------------------
diff --git a/content/doap.rdf b/content/doap.rdf
index 2377f83..7d87120 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -25,8 +25,8 @@
 		<release>
 			<Version>
 				<name>Latest Stable Release</name>
-				<created>2015-06-14</created>
-				<revision>6.20.0</revision>
+				<created>2015-07-10</created>
+				<revision>7.0.0</revision>
 			</Version>
 		</release>
 		<repository>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/index.html
----------------------------------------------------------------------
diff --git a/content/help/index.html b/content/help/index.html
index a5fa083..bfac963 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -88,7 +88,7 @@ way</a>.</p>
 <p>The Apache Software Foundation takes a very active stance in
 eliminating security problems against the Apache Wicket web framework.</p>
 <p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately. </p>
+Wicket PMC privately.</p>
 <p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER **</strong></p>
 <p>The issue tracker for Wicket is not the appropriate venue for reporting
 security issues as the issue tracker is publicly accessible. Instead,
@@ -113,7 +113,7 @@ for normal, non-security bugs.</p>
 problem via the <a href="https://issues.apache.org/jira/browse/WICKET">Issue
 Tracker</a>. You may also
 find it useful to discuss your issues with the community on one of the
-Mailing Lists. </p>
+Mailing Lists.</p>
 <p>Before asking for help with your issue, it’s a very good idea to search
 for your issue in the mailing list archives and the FAQ. The majority
 of issues can be solved in this manner without having to send an email
@@ -145,12 +145,12 @@ bug has been solved in a recent version. So if for instance you
 discover a bug in Wicket 6.2.0, it might be fixed in a newer version
 (the current version of Wicket 6.x is 6.20.0).</p>
 <p>So we ask you to try the latest version of the branch of Wicket you are
-working on. If the bug still remains,  </p>
+working on. If the bug still remains,</p>
 <p>Check if your version is no longer maintained on our download page. If
 your version is no longer maintained we kindly ask you to upgrade your
 project to a newer, maintained version of Wicket. For example if you
 have a project that depends on Wicket 1.3.7, please consider upgrading
-to Wicket 6.20.0. </p>
+to Wicket 7.0.0.</p>
 <h3 id="compatible">Using Compatible Versions of Supporting Libraries</h3>
 <p>If you are using a supporting library from either the Wicket project,
 Wicket Stuff or another project, please ensure that the version you use

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/reportabug.html
----------------------------------------------------------------------
diff --git a/content/help/reportabug.html b/content/help/reportabug.html
index daef430..0be3849 100644
--- a/content/help/reportabug.html
+++ b/content/help/reportabug.html
@@ -64,7 +64,7 @@ functionality is pretty good, so do have go.</li>
   <li><strong>Be clear and concise in your language.</strong> Wording a short but useful 
 summary, with a description that contains all the steps leading up to the
 error plus any extra circumstantial evidence, is not always easy, but its
-vital to getting the issue resolved, and really valuable. </li>
+vital to getting the issue resolved, and really valuable.</li>
   <li><strong>Watch the bug.</strong> The developers may ask you for more information via the
 issue comments, so its good practices to check in on the issue whilst its
 still open.</li>
@@ -146,7 +146,7 @@ Wicket code base.</p>
   <li>The plugin should automagically resolve the quickstart’s Wicket dependency from the project rather than a .jar</li>
   <li>Find WicketApplication.java</li>
   <li>Click through to WebApplication class from the extends section of the class definition.</li>
-  <li>If all is well, you should be taken to the Wicket project .java version of WebApplication rather than a .class file from a .jar  </li>
+  <li>If all is well, you should be taken to the Wicket project .java version of WebApplication rather than a .class file from a .jar</li>
 </ul>
 <h3 id="proving-a-bug-exists">Proving a bug exists</h3>
 <ul>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/security.html
----------------------------------------------------------------------
diff --git a/content/help/security.html b/content/help/security.html
index bcd121e..50b45ff 100644
--- a/content/help/security.html
+++ b/content/help/security.html
@@ -53,7 +53,7 @@
 <p>The Apache Software Foundation takes a very active stance in
 eliminating security problems against the Apache Wicket web framework.</p>
 <p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately. </p>
+Wicket PMC privately.</p>
 <p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER **</strong></p>
 <p>The issue tracker for Wicket is not the appropriate venue for reporting
 security issues as the issue tracker is publicly accessible. Instead,

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/blogs.html
----------------------------------------------------------------------
diff --git a/content/learn/blogs.html b/content/learn/blogs.html
index aff19ef..b70c6ee 100644
--- a/content/learn/blogs.html
+++ b/content/learn/blogs.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/blogs.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/blogs.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/blogs.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/blogs.html -->
@@ -46,14 +46,13 @@
             <h1>Wicket related blogs</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#get-your-blog-listed"><span class="toc-number">1</span> <span class="toc-text">Get your blog listed!</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#wicket-blogs"><span class="toc-number">1</span> <span class="toc-text">Wicket blogs</span></a></li><li class="toc--level-1 toc--section-2"><a href="#get-your-blog-listed"><span class="toc-number">2</span> <span class="toc-text">Get your blog listed!</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <p>Any (open source) project exists solely because a community wants to support
-it. The Wicket community consists of the users and developers. There are many
-who want to share their experiences with Wicket and do so on the mailing
-lists , on several online media portals (for example The ServerSide and
-JavaLobby ), and on their blogs.</p>
+            <p>Any (open source) project exists solely because a community wants to support it.
+The Wicket community consists of the users and developers. 
+There are many who want to share their experiences with Wicket and do so on the mailing lists, on several online media portals (for example The ServerSide and JavaLobby), and on their blogs.</p>
+<h2 id="wicket-blogs">Wicket blogs</h2>
 <p>Here is a list of regular Wicket bloggers, consisting of core contributers and enthusiastic users.</p>
 <ul>
   <li><a href="http://wicketinaction.com/">Wicket in Action</a> - Igor Vaynberg, Martijn Dashorst</li>
@@ -67,10 +66,8 @@ JavaLobby ), and on their blogs.</p>
   <li><a href="http://mysticcoders.com/blog">Mystic Coders</a> - Andrew Lombardi</li>
 </ul>
 <h2 id="get-your-blog-listed">Get your blog listed!</h2>
-<p>If you think your blog is missing, then please send a message to one of the
-core contributors or the mailinglist. In the mean time you can add your blog
-to our wiki’s <a href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs">special blog
-page</a>.</p>
+<p>If you think your blog is missing, then please send a message to one of the core contributors or the mailinglist.
+In the mean time you can add your blog to our wiki’s <a href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs">special blog page</a>.</p>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/awc.html
----------------------------------------------------------------------
diff --git a/content/learn/books/awc.html b/content/learn/books/awc.html
index 7b6129e..493e61e 100644
--- a/content/learn/books/awc.html
+++ b/content/learn/books/awc.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/awc.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/awc.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/awc.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/awc.html -->
@@ -50,10 +50,17 @@
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Apache Wicket is one of the most famous Java web application frameworks. Wicket simplifies web development and makes it fun. Are you bored of going through countless pages of theory to find out how to get your web development done? With this book in hand, you don’t need to go through hundreds of pages to figure out how you will actually build a web application. You will get practical solutions to your common everyday development tasks to pace up your development activities.</p>
-<p>Apache Wicket Cookbook provides you with information that gets your problems solved quickly without beating around the bush. This book is perfect for you if you are ready to take the next step from tutorials and step into the practical world. It will take you beyond the basics of using Apache Wicket and show you how to leverage Wicket’s advanced features to create simpler and more maintainable solutions to what at first may seem complex problems.</p>
-<p>You will learn how to integrate with client-side technologies such as JavaScript libraries or Flash components, which will help you to build your application faster. You will discover how to use Wicket paradigms to factor out commonly used code into custom Components, which will reduce the maintenance cost of your application, and how to leverage the existing Wicket Components to make your own code simpler.</p>
-<p>A straightforward Cookbook with highly focused practical recipes to make your web application development easier with the Wicket web framework</p>
+<p>Apache Wicket is one of the most famous Java web application frameworks.
+Wicket simplifies web development and makes it fun.
+Are you bored of going through countless pages of theory to find out how to get your web development done?
+With this book in hand, you don’t need to go through hundreds of pages to figure out how you will actually build a web application.
+You will get practical solutions to your common everyday development tasks to pace up your development activities.</p>
+<p>Apache Wicket Cookbook provides you with information that gets your problems solved quickly without beating around the bush.
+This book is perfect for you if you are ready to take the next step from tutorials and step into the practical world.
+It will take you beyond the basics of using Apache Wicket and show you how to leverage Wicket’s advanced features to create simpler and more maintainable solutions to what at first may seem complex problems.</p>
+<p>You will learn how to integrate with client-side technologies such as JavaScript libraries or Flash components, which will help you to build your application faster.
+You will discover how to use Wicket paradigms to factor out commonly used code into custom Components, which will reduce the maintenance cost of your application, and how to leverage the existing Wicket Components to make your own code simpler.</p>
+<p>A straightforward Cookbook with highly focused practical recipes to make your web application development easier with the Wicket web framework.</p>
 <h2 id="what-you-will-learn-from-this-book">What you will learn from this book</h2>
 <ul>
   <li>Leverage Wicket to implement a wide variety of both simple and advanced use cases in a narrative that gets straight to the point</li>
@@ -68,11 +75,22 @@
   <li>An application cannot be built with Wicket alone; see how to make it play nice with other frameworks</li>
 </ul>
 <h2 id="approach">Approach</h2>
-<p>This is a hands-on practical guide to a large variety of topics and use cases. This book tries to use real-world examples when possible, but is not afraid to come up with a contrived pretext if it makes explaining the problem simpler. Unlike a lot of other books, this one does not try to maintain a continuous theme from chapter to chapter, such as demonstrating solutions on the same fictional application; doing so would be almost impossible given the wide variety of recipes presented here. Instead, this book concentrates on focused problems users are likely to encounter and shows clear solutions in a step-by-step manner. This book tries to teach by example and is not afraid to show a lot of code because, after all, it is for coders.</p>
+<p>This is a hands-on practical guide to a large variety of topics and use cases.
+This book tries to use real-world examples when possible, but is not afraid to come up with a contrived pretext if it makes explaining the problem simpler.
+Unlike a lot of other books, this one does not try to maintain a continuous theme from chapter to chapter, such as demonstrating solutions on the same fictional application; doing so would be almost impossible given the wide variety of recipes presented here.
+Instead, this book concentrates on focused problems users are likely to encounter and shows clear solutions in a step-by-step manner.
+This book tries to teach by example and is not afraid to show a lot of code because, after all, it is for coders.</p>
 <h2 id="who-this-book-is-written-for">Who this book is written for</h2>
-<p>This book is for current users of the Apache Wicket framework; it is not an introduction to Wicket that will bore you with tons of theory. You are expected to have built or maintained a simple Wicket application in the past and to be looking to learn new and better ways of using Wicket. If you are ready to take your Wicket skills to the next level this book is for you.</p>
+<p>This book is for current users of the Apache Wicket framework; it is not an introduction to Wicket that will bore you with tons of theory.
+You are expected to have built or maintained a simple Wicket application in the past and to be looking to learn new and better ways of using Wicket. 
+If you are ready to take your Wicket skills to the next level this book is for you.</p>
 <h2 id="about-the-author">About the author</h2>
-<p>Igor Vaynberg is a software architect with more than ten years of experience in the software field. His liking for computers was sparked when his parents got him a Sinclair Z80 when he was but ten years old. Since then he has worked with companies both large and small building modular and scalable web applications. Igor’s main interest is finding ways to simplify the development of complex user interfaces required by modern web applications. Igor is a committer for the Apache Wicket framework, the aim of which is to simplify the programming model as well as reintroduce OOP to the web UI tier. In his AFK time he enjoys snowboarding with his beautiful wife and playing with his amazing children.</p>
+<p>Igor Vaynberg is a software architect with more than ten years of experience in the software field.
+His liking for computers was sparked when his parents got him a Sinclair Z80 when he was but ten years old.
+Since then he has worked with companies both large and small building modular and scalable web applications.
+Igor’s main interest is finding ways to simplify the development of complex user interfaces required by modern web applications.
+Igor is a committer for the Apache Wicket framework, the aim of which is to simplify the programming model as well as reintroduce OOP to the web UI tier.
+In his AFK time he enjoys snowboarding with his beautiful wife and playing with his amazing children.</p>
 <h2 id="book-details">Book details</h2>
 <table>
 	<tr>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/ewdww.html
----------------------------------------------------------------------
diff --git a/content/learn/books/ewdww.html b/content/learn/books/ewdww.html
index ff84468..279c8bb 100644
--- a/content/learn/books/ewdww.html
+++ b/content/learn/books/ewdww.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books — Enjoying Web Development with Wicket | Apache Wicket</title>
+        <title>Books — Enjoying Web Development with Wicket | Apache Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/ewdww.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/ewdww.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/ewdww.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/ewdww.html -->
@@ -43,7 +43,7 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books — Enjoying Web Development with Wicket</h1>
+            <h1>Books — Enjoying Web Development with Wicket</h1>
         </header>
         <section class="l-one-third right">
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/iaw6.html
----------------------------------------------------------------------
diff --git a/content/learn/books/iaw6.html b/content/learn/books/iaw6.html
index 17ecb46..8a026ed 100644
--- a/content/learn/books/iaw6.html
+++ b/content/learn/books/iaw6.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/iaw6.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/iaw6.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/iaw6.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/iaw6.html -->
@@ -46,13 +46,20 @@
             <h1>Books — Instant Apache Wicket 6</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#what-you-will-learn-from-this-book"><span class="toc-number">2</span> <span class="toc-text">What you will learn from this book</span></a></li><li class="toc--level-1 toc--section-3"><a href="#approach"><span class="toc-number">3</span> <span class="toc-text">Approach</span></a></li><li class="toc--level-1 toc--section-4"><a href="#who-this-book-is-written-for"><span class="toc-number">4</span> <span class="toc-text">Who this book is written for</span></a></li><li class="toc--level-1 toc--section-5"><a href="#about-the-authors"><span class="toc-number">5</span> <span class="toc-text">About the authors</span></a></li><li class="toc--level-1 toc--section-6"><a href="#book-details"><span class="toc-n
 umber">6</span> <span class="toc-text">Book details</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#what-you-will-learn-from-this-book"><span class="toc-number">2</span> <span class="toc-text">What you will learn from this book</span></a></li><li class="toc--level-1 toc--section-3"><a href="#approach"><span class="toc-number">3</span> <span class="toc-text">Approach</span></a></li><li class="toc--level-1 toc--section-4"><a href="#who-this-book-is-written-for"><span class="toc-number">4</span> <span class="toc-text">Who this book is written for</span></a></li><li class="toc--level-1 toc--section-5"><a href="#about-the-authors"><span class="toc-number">5</span> <span class="toc-text">About the authors</span></a><ul><li class="toc--level-2 toc--section-6"><a href="#joo-svio-ceregatti-longo"><span c
 lass="toc-number">5.1</span> <span class="toc-text">João Sávio Ceregatti Longo</span></a></li><li class="toc--level-2 toc--section-7"><a href="#felipe-fedel-pinto"><span class="toc-number">5.2</span> <span class="toc-text">Felipe Fedel Pinto</span></a></li></ul></li><li class="toc--level-1 toc--section-8"><a href="#book-details"><span class="toc-number">6</span> <span class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Wicket is a component-based Java web framework. In Wicket, the server side state is automatically managed as it is associated with components. With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, Apache Wicket makes developing web-apps simple and enjoyable. There are no configuration files to learn in Wicket as it has powerful and reusable components written with plain Java and HTML. Instant Apache Wicket 6 will take you through the entire process of building web application using the Wicket frame work.</p>
-<p>Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an amazing Java framework. After you finish this book, you will be capable of developing Wicket applications, using the knowledge acquired in the book to explore more of the technology, and even contribute to Wicket’s community.</p>
-<p>Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advantages, and then goes on to show how to set up the Wicket environment and how to build a “hello world” and a sign-in/sign-out application. After you learn the Wicket core concepts and apply them to the sign-in/sign-out app, you will use Maven in Eclipse to build Wicket applications. You will learn important concepts like lifecycle (objects and requests), models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, wicket:extend, and wicket:child), and behaviors.</p>
+<p>Wicket is a component-based Java web framework.
+In Wicket, the server side state is automatically managed as it is associated with components.
+With proper mark-up/logic separation, a POJO data model, and a refreshing lack of XML, Apache Wicket makes developing web-apps simple and enjoyable.
+There are no configuration files to learn in Wicket as it has powerful and reusable components written with plain Java and HTML.
+Instant Apache Wicket 6 will take you through the entire process of building web application using the Wicket frame work.</p>
+<p>Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an amazing Java framework.
+After you finish this book, you will be capable of developing Wicket applications, using the knowledge acquired in the book to explore more of the technology, and even contribute to Wicket’s community.</p>
+<p>Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its advantages, and then goes on to show how to set up the Wicket environment and how to build a “hello world” and a sign-in/sign-out application.
+After you learn the Wicket core concepts and apply them to the sign-in/sign-out app, you will use Maven in Eclipse to build Wicket applications.
+You will learn important concepts like lifecycle (objects and requests), models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, wicket:extend, and wicket:child), and behaviors.</p>
 <h2 id="what-you-will-learn-from-this-book">What you will learn from this book</h2>
 <ul>
   <li>Learn something new in an Instant! A short, fast, focused guide delivering immediate results</li>
@@ -61,15 +68,20 @@
   <li>Understand the lifecycle of Wicket</li>
 </ul>
 <h2 id="approach">Approach</h2>
-<p>Get to grips with a new technology, understand what it is and what it can do for you, and then get to work with the most important features and tasks. This Starter style guide takes the reader through the basic workflow of Apache Wicket in a practical and friendly style.</p>
+<p>Get to grips with a new technology, understand what it is and what it can do for you, and then get to work with the most important features and tasks.
+This Starter style guide takes the reader through the basic workflow of Apache Wicket in a practical and friendly style.</p>
 <h2 id="who-this-book-is-written-for">Who this book is written for</h2>
-<p>Instant Apache Wicket 6 is for people who want to learn the basics of Apache Wicket 6 and who already have some experience with Java and object-oriented programming. Basic knowledge of web concepts like HTTP and Ajax will be an added advantage.</p>
+<p>Instant Apache Wicket 6 is for people who want to learn the basics of Apache Wicket 6 and who already have some experience with Java and object-oriented programming.
+Basic knowledge of web concepts like HTTP and Ajax will be an added advantage.</p>
 <h2 id="about-the-authors">About the authors</h2>
 <p>About the Authors</p>
-<p>João Sávio Ceregatti Longo</p>
-<p>João Sávio Ceregatti Longo has a Bachelor’s and Master’s degree in Computer Science. He also has a strong background in the Java programming language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast. He is currently working at Daitan Group - http://www.daitangroup.com.</p>
-<p>Felipe Fedel Pinto</p>
-<p>Felipe Fedel Pinto holds a Bachelor’s degree in Computer Science and has been developing and managing projects using Wicket since 2010. He also collaborates on open source Wicket projects. He is partner and Software Architect at Ampliato - http://www.ampliato.com.br.</p>
+<h3 id="joo-svio-ceregatti-longo">João Sávio Ceregatti Longo</h3>
+<p>João Sávio Ceregatti Longo has a Bachelor’s and Master’s degree in Computer Science.
+He also has a strong background in the Java programming language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast.
+He is currently working at Daitan Group - http://www.daitangroup.com.</p>
+<h3 id="felipe-fedel-pinto">Felipe Fedel Pinto</h3>
+<p>Felipe Fedel Pinto holds a Bachelor’s degree in Computer Science and has been developing and managing projects using Wicket since 2010.
+He also collaborates on open source Wicket projects. He is partner and Software Architect at Ampliato - http://www.ampliato.com.br.</p>
 <h2 id="book-details">Book details</h2>
 <table>
 	<tr>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/index.html
----------------------------------------------------------------------
diff --git a/content/learn/books/index.html b/content/learn/books/index.html
index a0c0999..176e84c 100644
--- a/content/learn/books/index.html
+++ b/content/learn/books/index.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books -->
@@ -50,15 +50,21 @@
         <section class="l-two-third left">
             <p>Several books have been written about Apache Wicket, 5 in English, 3 in German
 and 1 in Japanese. Click on a cover to learn more about each book.</p>
-<p><a href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
-<a href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
-<a href="wia.html"><img src="wia.png" alt="Wicket in Action cover" title="Wicket in Action" /></a>
-<a href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
-<a href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
-<a href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" title="Pro Wicket" /></a>
-<a href="praxisbuchwicket.html"><img src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
-<a href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
-<a href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" title="Wicket Japanese" /></a></p>
+<div class="media-bar">
+<a class="l-one-quarter" href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
+<a class="l-one-quarter" href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" title="Apache Wicket Cookbook" /></a>
+<a class="l-one-quarter" href="wia.html"><img src="wia.png" alt="Wicket in Action cover" title="Wicket in Action" /></a>
+<a class="l-one-quarter" href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und objektorientiert - das alternative Java-Webframework cover" title=" Komponentenbasiert und objektorientiert- das alternative Java-Webframework" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with Wicket cover" title="Enjoying Web Development with Wicket" /></a>
+<a class="l-one-quarter" href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" title="Pro Wicket" /></a>
+<a class="l-one-quarter" href="praxisbuchwicket.html"><img src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
+<a class="l-one-quarter" href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen in Java" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" title="Wicket Japanese" /></a>
+</div>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/koda.html
----------------------------------------------------------------------
diff --git a/content/learn/books/koda.html b/content/learn/books/koda.html
index b89971e..a38afe8 100644
--- a/content/learn/books/koda.html
+++ b/content/learn/books/koda.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework | Apache Wicket</title>
+        <title>Books — Komponentenbasiert und objektorientiert - das alternative Java-Webframework | Apache Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -43,42 +43,28 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books —  Komponentenbasiert und objektorientiert - das alternative Java-Webframework</h1>
+            <h1>Books — Komponentenbasiert und objektorientiert - das alternative Java-Webframework</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a><ul><li class="toc--level-2 toc--section-2"><a href="#zielgruppe"><span class="toc-number">1.1</span> <span class="toc-text">Zielgruppe</span></a></li></ul></li><li class="toc--level-1 toc--section-3"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-4"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Apache Wicket ist ein komponentbasiertes Webframework, das sich in den
-letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung
-gemausert hat. Man könnte diese Beliebtheit mit der einfachen
-Integration von Ajax oder der rigorosen Trennung von Markup und Logik
-erklären. Aber was Wicket wirklich über die Masse konkurrierender
-Frameworks erhebt, sind der Verzicht auf eine eigene Markup-Sprache
-und das objektorientierte Programmiermodell. Dadurch rücken Java und
-seine Sprachmittel stark in den Vordergrund. Das ermöglicht es
-erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket
-einzusteigen und auch komplexeste Anwendungen umzusetzen.</p>
-<p>Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu
-vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte
-einzugehen. Hierzu wird eine Beispielanwendung entwickelt und Schritt
-für Schritt erweitert. Anhand detaillierte Codebeispiele werden
-Sachverhalte wie der Wicket Request Cycle, Models, Validierung und
-JUnit Testing erklärt. Des Weiteren werden Themen wie
-Deplyoment-Szenarien (JEE6, Spring, …) , jQuery-Integration und
-Performance-Tuning in separaten Kapiteln behandelt. Durch Studium
-dieses Buchs soll ein Entwickler befähigt werden, skalierbare,
-wartbare Webanwendungen in Wicket zu bauen, und er soll lernen,
-eigene, wiederverwendbare Komponenten zu entwickeln und fremde
-Komponenten zu erweitern.
-Zielgruppe
-Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der
-wichtigen Webtechnologien wie HTML und CSS</p>
+<p>Apache Wicket ist ein komponentbasiertes Webframework, das sich in den letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung gemausert hat.
+Man könnte diese Beliebtheit mit der einfachen Integration von Ajax oder der rigorosen Trennung von Markup und Logik erklären.
+Aber was Wicket wirklich über die Masse konkurrierender Frameworks erhebt, sind der Verzicht auf eine eigene Markup-Sprache und das objektorientierte Programmiermodell.
+Dadurch rücken Java und seine Sprachmittel stark in den Vordergrund.
+Das ermöglicht es erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket einzusteigen und auch komplexeste Anwendungen umzusetzen.</p>
+<p>Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte einzugehen.
+Hierzu wird eine Beispielanwendung entwickelt und Schritt für Schritt erweitert.
+Anhand detaillierte Codebeispiele werden Sachverhalte wie der Wicket Request Cycle, Models, Validierung und JUnit Testing erklärt.
+Des Weiteren werden Themen wie Deplyoment-Szenarien (JEE6, Spring, …), jQuery-Integration und Performance-Tuning in separaten Kapiteln behandelt.
+Durch Studium dieses Buchs soll ein Entwickler befähigt werden, skalierbare, wartbare Webanwendungen in Wicket zu bauen, und er soll lernen, eigene, wiederverwendbare Komponenten zu entwickeln und fremde Komponenten zu erweitern.</p>
+<h3 id="zielgruppe">Zielgruppe</h3>
+<p>Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der wichtigen Webtechnologien wie HTML und CSS.</p>
 <h2 id="about-the-author">About the author</h2>
-<p>Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und
-Entwicklung. Derzeit ist er bei der Senacor Technologies AG für
-verschiedene Wicket-Projekte als Technical Lead verantwortlich.</p>
+<p>Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und Entwicklung.
+Derzeit ist er bei der Senacor Technologies AG für verschiedene Wicket-Projekte als Technical Lead verantwortlich.</p>
 <h2 id="book-details">Book details</h2>
 <p>Titel   Wicket: Komponentenbasiert und objektorientiert- das alternative Java-Webframework
 Autor   Jochen Mader

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/kwij.html
----------------------------------------------------------------------
diff --git a/content/learn/books/kwij.html b/content/learn/books/kwij.html
index a8ef2d9..a5f360c 100644
--- a/content/learn/books/kwij.html
+++ b/content/learn/books/kwij.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/kwij.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/kwij.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/kwij.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/kwij.html -->
@@ -49,27 +49,16 @@
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <p>The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart. It
-was published by dpunkt.verlag in December 2009.</p>
+            <p>The book was written by Roland Förther, Carl-Eric Menzel and Olaf Siefart.
+It was published by dpunkt.verlag in December 2009.</p>
 <h2 id="description">Description</h2>
-<p>Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache
-rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer,
-XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
-Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und
-kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare
-Komponenten radikal vereinfacht. Dieses Buch bietet Java-Entwicklern eine
-praxisorientierte Einführung in Wicket und zeigt, wie die Entwicklung von
-Webanwendungen in Java beschleunigt werden kann und wieder Spaß macht. Dazu
-werden die zugrunde liegenden Konzepte umfassend erklärt und anhand einer
-konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel Schritt
-für Schritt entwickelt wird. Nach der Lektüre des Buches sind Sie in der Lage,
-professionelle Webanwendungen mit Wicket zu schreiben, Komponenten für die
-eigenen Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
-Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket
-architektonisch sauber aufgebaut werden können. Umsteiger von anderen
-Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket
-kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen
-schrittweise nach Wicket zu migrieren.</p>
+<p>Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer, XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
+Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare Komponenten radikal vereinfacht.</p>
+<p>Dieses Buch bietet Java-Entwicklern eine praxisorientierte Einführung in Wicket und zeigt, wie die Entwicklung von Webanwendungen in Java beschleunigt werden kann und wieder Spaß macht.
+Dazu werden die zugrunde liegenden Konzepte umfassend erklärt und anhand einer konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel Schritt für Schritt entwickelt wird.
+Nach der Lektüre des Buches sind Sie in der Lage, professionelle Webanwendungen mit Wicket zu schreiben, Komponenten für die eigenen Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
+Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket architektonisch sauber aufgebaut werden können.
+Umsteiger von anderen Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen schrittweise nach Wicket zu migrieren.</p>
 <p>Aus dem Inhalt:</p>
 <ul>
   <li>Aufbau einer Wicket-Anwendung</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/praxisbuchwicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/praxisbuchwicket.html b/content/learn/books/praxisbuchwicket.html
index 4180dd2..020af2c 100644
--- a/content/learn/books/praxisbuchwicket.html
+++ b/content/learn/books/praxisbuchwicket.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books — Praxisbuch Wicket | Apache Wicket</title>
+        <title>Books — Praxisbuch Wicket | Apache Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/praxisbuchwicket.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/praxisbuchwicket.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/praxisbuchwicket.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/praxisbuchwicket.html -->
@@ -43,7 +43,7 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books — Praxisbuch Wicket</h1>
+            <h1>Books — Praxisbuch Wicket</h1>
         </header>
         <section class="l-one-third right">
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#description"><span class="toc-number">1</span> <span class="toc-text">Description</span></a></li><li class="toc--level-1 toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> <span class="toc-text">About the author</span></a></li><li class="toc--level-1 toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span class="toc-text">Book details</span></a></li></ul></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/prowicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/prowicket.html b/content/learn/books/prowicket.html
index 5718e19..e514148 100644
--- a/content/learn/books/prowicket.html
+++ b/content/learn/books/prowicket.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/prowicket.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/prowicket.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/prowicket.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/prowicket.html -->

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/wia.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wia.html b/content/learn/books/wia.html
index 359b1a1..f1dd3c4 100644
--- a/content/learn/books/wia.html
+++ b/content/learn/books/wia.html
@@ -26,7 +26,7 @@
 		<!-- /start/download.html || /learn/books/wia.html -->
     	<li class=""><a href="/start/download.html">Download</a></li>
 		<!-- /learn || /learn/books/wia.html -->
-    	<li class=""><a href="/learn">Documentation</a></li>
+    	<li class="active"><a href="/learn">Documentation</a></li>
 		<!-- /help || /learn/books/wia.html -->
     	<li class=""><a href="/help">Support</a></li>
 		<!-- /contribute || /learn/books/wia.html -->
@@ -49,9 +49,7 @@
         </section>
         <section class="l-two-third left">
             <p>Wicket in Action is written by Martijn Dashorst and Eelco Hillenius and is
-published by Manning. The book is currently in the final stages of production
-and will soon be available as a hard copy. Early access to the manuscript is
-available from the publishers site.</p>
+published by Manning.</p>
 <h3 id="description">Description</h3>
 <p>There are dozens of Java frameworks out there, but most of them require you to
 learn special coding techniques and new, often rigid, patterns of development.