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)

Reply via email to