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:[email protected]";>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).

Reply via email to