You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/11/16 22:10:00 UTC

[22/23] wicket-site git commit: Rebuild the site

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/contribute/release.html
----------------------------------------------------------------------
diff --git a/content/contribute/release.html b/content/contribute/release.html
index 70fe96f..e5dbbf1 100644
--- a/content/contribute/release.html
+++ b/content/contribute/release.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /contribute/release.html -->
+		<!-- /start/quickstart.html || /contribute/release -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /contribute/release.html -->
+		<!-- /start/download.html || /contribute/release -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /contribute/release.html -->
+		<!-- /learn || /contribute/release -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /contribute/release.html -->
+		<!-- /help || /contribute/release -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /contribute/release.html -->
+		<!-- /contribute || /contribute/release -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /contribute/release.html -->
+		<!-- /community || /contribute/release -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /contribute/release.html -->
+		<!-- /apache || /contribute/release -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -75,24 +75,24 @@
 <ul>
   <li>Start gpg-agent as a daemon (OS X, using homebrew installation of gpg, gpg-agent, pinentry):</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">    eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`</code></pre></figure>
 <ul>
   <li>Create an environment variable such that you can copy/paste several of the following commands (substitute 6.0.0 with the number you’re actually going to release):</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">export NEWVERSION=6.0.0</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">export NEWVERSION=6.0.0</code></pre></figure>
 <ul>
   <li>Sign pom.xml such that gpg-agent has enabled your key (and remove the .asc file). This triggers the pinentry program and sets the stage for gpg-agent:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent --sign pom.xml</span>
-<span class="go">rm pom.xml.asc</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">gpg --armor --detach-sign --use-agent --sign pom.xml
+rm pom.xml.asc</code></pre></figure>
 <ul>
   <li>Create release branch:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</code></pre></figure>
 <ul>
   <li>Checkout the release branch:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-$NEWVERSION</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git checkout build/wicket-$NEWVERSION</code></pre></figure>
 <ul>
   <li>
     <p>Update archetypes/quickstart/src/main/archetype-resources/pom.xml to use NEWVERSION of Wicket and commit</p>
@@ -106,71 +106,71 @@
     </ul>
   </li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:prepare</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">mvn release:prepare</code></pre></figure>
 <ul>
   <li>Remove last commit such that HEAD points to the NEWVERSION release, not the new development version</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git reset HEAD^ --hard</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git reset HEAD^ --hard</code></pre></figure>
 <ul>
   <li>Create source archive:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git archive --format=tar.gz --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.tar.gz wicket-$NEWVERSION</span>
-<span class="go">git archive --format=zip --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.zip wicket-$NEWVERSION</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git archive --format=tar.gz --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.tar.gz wicket-$NEWVERSION
+git archive --format=zip --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.zip wicket-$NEWVERSION</code></pre></figure>
 <ul>
   <li><strong>NOTE 1</strong> the trailing ‘/’ after –prefix=NEWVERSION is vital for the tarball</li>
   <li><strong>NOTE 2</strong> you can ignore the gpg generated messages telling ‘You need a passphrase to unlock the secret key for’, unless an error occurred—these messages are not error messages</li>
   <li>Sign the packages, the git tag and create the digests:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.tar.gz</span>
-<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.zip</span>
-<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION.tar.gz &gt; apache-wicket-$NEWVERSION.tar.gz.sha</span>
-<span class="go">gpg --print-md MD5  apache-wicket-$NEWVERSION.tar.gz &gt; apache-wicket-$NEWVERSION.tar.gz.md5</span>
-<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION.zip &gt; apache-wicket-$NEWVERSION.zip.sha</span>
-<span class="go">gpg --print-md MD5  apache-wicket-$NEWVERSION.zip &gt; apache-wicket-$NEWVERSION.zip.md5</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.tar.gz
+gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION.zip
+gpg --print-md SHA1 apache-wicket-$NEWVERSION.tar.gz &gt; apache-wicket-$NEWVERSION.tar.gz.sha
+gpg --print-md MD5  apache-wicket-$NEWVERSION.tar.gz &gt; apache-wicket-$NEWVERSION.tar.gz.md5
+gpg --print-md SHA1 apache-wicket-$NEWVERSION.zip &gt; apache-wicket-$NEWVERSION.zip.sha
+gpg --print-md MD5  apache-wicket-$NEWVERSION.zip &gt; apache-wicket-$NEWVERSION.zip.md5</code></pre></figure>
 <p>To sign the tag (overwrites the maven generated tag), execute:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git tag -s --force wicket-$NEWVERSION</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git tag -s --force wicket-$NEWVERSION</code></pre></figure>
 <h4 id="staging-the-build">Staging the build</h4>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
-<span class="go">scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION
+scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION</code></pre></figure>
 <p><strong>TODO</strong> figure out how to let <code>release:perform</code> work from a local checkout, such that we can actually <em>stage</em> the build instead of having to push the tag to our git repo.</p>
 <p>The following steps are ONLY necessary as long as the above TODO has not been resolved.</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
-<span class="go">git push -tags origin</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION
+git push -tags origin</code></pre></figure>
 <p>The step below uploads the artifacts to a staging area for Maven.
 * assumes you have an Apache nexus account
 * will checkout a fresh copy and build it (ask Maven for why)
 * artifacts will have different signature than in previous release:prepare build (due to times changing)</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:perform</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">mvn release:perform</code></pre></figure>
 <p>This will upload artifacts and signatures to Apache nexus in a staging repository.</p>
 <h4 id="create-a-binary-release">Create a binary release</h4>
 <p>As we don’t vote on binary packages, but do want to cater to developers not using Maven, it is very convenient to create a download for non-Maven users.</p>
 <p>The binary distribution should contain the same jar files that are uploaded to Maven Central. Unfortunately the Maven build creates duplicate jar files, but with different manifests (due to the inclusion of date/time of build), and the jar files have different signatures. Therefore it is necessary to create a distribution of the artifacts generated by the <code>mvn release:perform</code> command.</p>
 <p>Perform the following commands in the root of your Wicket checkout to create the binary release files.</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mkdir apache-wicket-$NEWVERSION</span>
-<span class="go">cd apache-wicket-$NEWVERSION</span>
-<span class="go">find ../target/checkout ! \( -type d -name &quot;WEB-INF&quot; -prune \) -regex &quot;.*wicket-.*.[jw]ar&quot; ! -name &quot;*-sources*&quot; ! -name &quot;*-javadoc*&quot; ! -name &quot;*wicket-archetype-quickstart*&quot; ! -name &quot;wicket-common-tests*&quot;  -type f -exec cp {} . \;</span>
-<span class="go">find ../target/checkout ! \( -type d -name &quot;WEB-INF&quot; -prune \) -regex &quot;.*wicket-.*.[jw]ar\.asc&quot; ! -name &quot;*-sources*&quot; ! -name &quot;*-javadoc*&quot; ! -name &quot;*wicket-archetype-quickstart*&quot; ! -name &quot;wicket-common-tests*&quot;  -type f -exec cp {} . \;</span>
-<span class="go">cp ../LICENSE .</span>
-<span class="go">cp ../README .</span>
-<span class="go">cp ../NOTICE .</span>
-<span class="go">cd ..</span>
-<span class="go">tar xfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION</span>
-<span class="go">zip apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION</span>
-<span class="go">gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz</span>
-<span class="go">gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.zip</span>
-<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.tar.gz &gt; apache-wicket-$NEWVERSION-bin.tar.gz.sha</span>
-<span class="go">gpg --print-md MD5  apache-wicket-$NEWVERSION-bin.tar.gz &gt; apache-wicket-$NEWVERSION-bin.tar.gz.md5</span>
-<span class="go">gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip &gt; apache-wicket-$NEWVERSION.-binzip.sha</span>
-<span class="go">gpg --print-md MD5  apache-wicket-$NEWVERSION-bin.zip &gt; apache-wicket-$NEWVERSION-bin.zip.md5</span>
-<span class="go">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin</span>
-<span class="go">scp apache-wicket-*bin.* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION/bin</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">mkdir apache-wicket-$NEWVERSION
+cd apache-wicket-$NEWVERSION
+find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*"  -type f -exec cp {} . \;
+find ../target/checkout ! \( -type d -name "WEB-INF" -prune \) -regex ".*wicket-.*.[jw]ar\.asc" ! -name "*-sources*" ! -name "*-javadoc*" ! -name "*wicket-archetype-quickstart*" ! -name "wicket-common-tests*"  -type f -exec cp {} . \;
+cp ../LICENSE .
+cp ../README .
+cp ../NOTICE .
+cd ..
+tar xfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION
+zip apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION
+gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz
+gpg --armor --detached-sig --use-agent --sign apache-wicket-$NEWVERSION-bin.zip
+gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.tar.gz &gt; apache-wicket-$NEWVERSION-bin.tar.gz.sha
+gpg --print-md MD5  apache-wicket-$NEWVERSION-bin.tar.gz &gt; apache-wicket-$NEWVERSION-bin.tar.gz.md5
+gpg --print-md SHA1 apache-wicket-$NEWVERSION-bin.zip &gt; apache-wicket-$NEWVERSION.-binzip.sha
+gpg --print-md MD5  apache-wicket-$NEWVERSION-bin.zip &gt; apache-wicket-$NEWVERSION-bin.zip.md5
+ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin
+scp apache-wicket-*bin.* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION/bin</code></pre></figure>
 <p>This binary release contains all required files to comply with the release policy, and the binary artefacts generated by our Maven release build, including the experimental modules and examples.</p>
 <h4 id="vote-the-build">Vote the build</h4>
 <p>Start a vote on dev@ for this release. Allow for at least 72 hours, and ensure you take into account weekends.</p>
 <h4 id="promoting-the-build">Promoting the build</h4>
 <p>The following two steps are only necessary when the previous TODO is resolved (you can’t push the tag twice).</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
-<span class="go">git push -tags origin</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION
+git push -tags origin</code></pre></figure>
 <p>You only need to do them if you haven’t done so yet.</p>
 <p>See also <a href="#nexus">managing nexus</a> for the steps needed to publish the artifacts to Maven Central. And don’t forget to announce the release!</p>
 <h2 id="release-14">Releasing Apache Wicket 1.4.x+</h2>
@@ -183,16 +183,16 @@
 (you can use JIRA for this list: go to “releases”, and under “unreleased”, next to your version, there’s a release notes link)</li>
 </ul>
 <p>Make sure your <code>~/.m2/settings.xml</code> contains the following definition</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">&lt;?xml version=&quot;1.0&quot;?&gt;</span>
-<span class="go">&lt;settings&gt;</span>
-<span class="go">&lt;servers&gt;</span>
-<span class="go">        &lt;server&gt;</span>
-<span class="go">            &lt;id&gt;apache.releases.https&lt;/id&gt;</span>
-<span class="go">            &lt;username&gt;$your_apache_username&lt;/username&gt;</span>
-<span class="go">            &lt;password&gt;$your_apache_password&lt;/password&gt;</span>
-<span class="go">        &lt;/server&gt;</span>
-<span class="go">&lt;/servers&gt;</span>
-<span class="go">&lt;/settings&gt;</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">&lt;?xml version="1.0"?&gt;
+&lt;settings&gt;
+&lt;servers&gt;
+        &lt;server&gt;
+            &lt;id&gt;apache.releases.https&lt;/id&gt;
+            &lt;username&gt;$your_apache_username&lt;/username&gt;
+            &lt;password&gt;$your_apache_password&lt;/password&gt;
+        &lt;/server&gt;
+&lt;/servers&gt;
+&lt;/settings&gt;</code></pre></figure>
 <ul>
   <li>Make sure you have a GnuPG key which is added to <a href="https://svn.apache.org/repos/asf/wicket/common/KEYS">KEYS</a>.
 Read the header of KEYS file to see how to add it.</li>
@@ -204,18 +204,18 @@ will copy the assemblies to your people.apache.org account.</li>
   <li>Wait requisite 72 hours for the vote to pass (we hope)</li>
   <li>Copy release to apache mirrors</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh people.apache.org</span>
-<span class="go">mkdir /www/www.apache.org/dist/wicket/x.y.z</span>
-<span class="go">mv ~/public_html/wicket-x.y.z/dist/* /www/www.apache.org/dist/wicket/x.y.z</span>
-<span class="go">chown -R :wicket /www/www.apache.org/dist/wicket/x.y.z</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">ssh people.apache.org
+mkdir /www/www.apache.org/dist/wicket/x.y.z
+mv ~/public_html/wicket-x.y.z/dist/* /www/www.apache.org/dist/wicket/x.y.z
+chown -R :wicket /www/www.apache.org/dist/wicket/x.y.z</code></pre></figure>
 <ul>
   <li>Login to <a href="https://repository.apache.org">Apache Nexus Staging repo</a>, select the closed repository and click <strong>Release</strong>.  It will be accessible immediately through the apache release repo and then within 1-2 hours through maven central.</li>
   <li>If the release is voted down you can <strong>Drop</strong> the staged release and then restage later after incorporating the necessary changes.</li>
   <li>Tag the release in Git:</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-x.y.z</span>
-<span class="go">git tag release/wicket-x.y.z</span>
-<span class="go">git push --tags</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">git checkout build/wicket-x.y.z
+git tag release/wicket-x.y.z
+git push --tags</code></pre></figure>
 <ul>
   <li>Wait until repo1.maven.org has picked up the release artifacts.</li>
   <li>Wait 24 hours until mirrors picked up release artifacts</li>
@@ -229,16 +229,16 @@ will copy the assemblies to your people.apache.org account.</li>
 <p>Maven sends a username/password when attempting to upload the artifacts.</p>
 <p>The <code>&lt;id&gt;</code> of the staging repository is: <strong>apache.releases.https</strong>.</p>
 <p>Place a <code>&lt;server&gt;</code> definition in your <code>~/.m2/settings.xml</code> file like this:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">&lt;?xml version=&quot;1.0&quot;?&gt;</span>
-<span class="go">&lt;settings&gt;</span>
-<span class="go">&lt;servers&gt;</span>
-<span class="go">        &lt;server&gt;</span>
-<span class="go">            &lt;id&gt;apache.releases.https&lt;/id&gt;</span>
-<span class="go">            &lt;username&gt;$username&lt;/username&gt;</span>
-<span class="go">            &lt;password&gt;$password&lt;/password&gt;</span>
-<span class="go">        &lt;/server&gt;</span>
-<span class="go">&lt;/servers&gt;</span>
-<span class="go">&lt;/settings&gt;</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">&lt;?xml version="1.0"?&gt;
+&lt;settings&gt;
+&lt;servers&gt;
+        &lt;server&gt;
+            &lt;id&gt;apache.releases.https&lt;/id&gt;
+            &lt;username&gt;$username&lt;/username&gt;
+            &lt;password&gt;$password&lt;/password&gt;
+        &lt;/server&gt;
+&lt;/servers&gt;
+&lt;/settings&gt;</code></pre></figure>
 <p>This works if you can deploy artifacts into the repository.apache.org properly (i.e. you don’t see failures mentioning 401 errors).</p>
 <h3 id="managing-staged-artifacts">Managing Staged Artifacts</h3>
 <p>By logging in with your Apache committer credentials to <a href="https://repository.apache.org">Apache Nexus Staging repo</a> you can access the management interface for the staged artifacts.</p>
@@ -251,10 +251,10 @@ will copy the assemblies to your people.apache.org account.</li>
 <h2 id="announcing">Announcing the release</h2>
 <p>Edit the _config.yaml file. This file contains a site wide configuration
 section specific to Wicket:</p>
-<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="l-Scalar-Plain">wicket</span><span class="p-Indicator">:</span>
-    <span class="l-Scalar-Plain">version</span><span class="p-Indicator">:</span>    <span class="l-Scalar-Plain">1.4.10</span>
-    <span class="l-Scalar-Plain">released</span><span class="p-Indicator">:</span>   <span class="l-Scalar-Plain">2010-08-11</span>
-    <span class="l-Scalar-Plain">versions</span><span class="p-Indicator">:</span>   <span class="p-Indicator">[</span><span class="nv">1.3.7</span><span class="p-Indicator">,</span> <span class="nv">1.3-SNAPSHOT</span><span class="p-Indicator">,</span> <span class="nv">1.4.9</span><span class="p-Indicator">,</span> <span class="nv">1.4.10</span><span class="p-Indicator">,</span> <span class="nv">1.4-SNAPSHOT</span><span class="p-Indicator">,</span> <span class="nv">1.5-M1</span><span class="p-Indicator">,</span> <span class="nv">1.5-SNAPSHOT</span><span class="p-Indicator">]</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="s">wicket</span><span class="pi">:</span>
+    <span class="s">version</span><span class="pi">:</span>    <span class="s">1.4.10</span>
+    <span class="s">released</span><span class="pi">:</span>   <span class="s">2010-08-11</span>
+    <span class="s">versions</span><span class="pi">:</span>   <span class="pi">[</span><span class="nv">1.3.7</span><span class="pi">,</span> <span class="nv">1.3-SNAPSHOT</span><span class="pi">,</span> <span class="nv">1.4.9</span><span class="pi">,</span> <span class="nv">1.4.10</span><span class="pi">,</span> <span class="nv">1.4-SNAPSHOT</span><span class="pi">,</span> <span class="nv">1.5-M1</span><span class="pi">,</span> <span class="nv">1.5-SNAPSHOT</span><span class="pi">]</span></code></pre></figure>
 <p>You’ll need to edit this part: modify the version, update the released date,
 and add the new version to the versions list (remove any stale releases,
 typically just leave the previous release as well).</p>
@@ -273,14 +273,14 @@ contains your announcement.</li>
 <a href="https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4">https://svn.apache.org/repos/asf/wicket/common/site/apidocs/1.4</a>
 svnpubsub will push this directly to our website. (example script below)</li>
 </ul>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">#</span> <span class="k">do</span> this in your locally-checked-out release branch <span class="o">(</span>i.e. svn.../releases/wicket-1.4.13<span class="o">)</span>
-<span class="go">mvn javadoc:aggregate</span>
-<span class="gp">#</span> note that you may need to tweak these paths to fit your configuration:
-<span class="go">cp -r target/site/apidocs/* ../wicket-common/site/apidocs/1.4/</span>
-<span class="go">cd ../wicket-common/</span>
-<span class="gp">#</span> call <span class="s2">&quot;svn add&quot;</span> <span class="k">for</span> files that are new <span class="o">(</span>there<span class="err">&#39;</span>s probably an easier way to <span class="k">do</span> this<span class="o">)</span>
-<span class="go">svn stat | grep -e &#39;^?&#39; | sed &#39;s/\?\W*//&#39; | xargs svn add</span>
-<span class="go">svn commit -m &quot;changes to update javadocs to latest release&quot;</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console"># do this in your locally-checked-out release branch (i.e. svn.../releases/wicket-1.4.13)
+mvn javadoc:aggregate
+# note that you may need to tweak these paths to fit your configuration:
+cp -r target/site/apidocs/* ../wicket-common/site/apidocs/1.4/
+cd ../wicket-common/
+# call "svn add" for files that are new (there's probably an easier way to do this)
+svn stat | grep -e '^?' | sed 's/\?\W*//' | xargs svn add
+svn commit -m "changes to update javadocs to latest release"</code></pre></figure>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/contribute/userguide.html
----------------------------------------------------------------------
diff --git a/content/contribute/userguide.html b/content/contribute/userguide.html
index 81fbc7b..8e6c8fd 100644
--- a/content/contribute/userguide.html
+++ b/content/contribute/userguide.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /contribute/userguide.html -->
+		<!-- /start/quickstart.html || /contribute/userguide -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /contribute/userguide.html -->
+		<!-- /start/download.html || /contribute/userguide -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /contribute/userguide.html -->
+		<!-- /learn || /contribute/userguide -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /contribute/userguide.html -->
+		<!-- /help || /contribute/userguide -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /contribute/userguide.html -->
+		<!-- /contribute || /contribute/userguide -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /contribute/userguide.html -->
+		<!-- /community || /contribute/userguide -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /contribute/userguide.html -->
+		<!-- /apache || /contribute/userguide -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/contribute/write.html
----------------------------------------------------------------------
diff --git a/content/contribute/write.html b/content/contribute/write.html
index 2ca1698..475d6f3 100644
--- a/content/contribute/write.html
+++ b/content/contribute/write.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /contribute/write.html -->
+		<!-- /start/quickstart.html || /contribute/write -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /contribute/write.html -->
+		<!-- /start/download.html || /contribute/write -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /contribute/write.html -->
+		<!-- /learn || /contribute/write -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /contribute/write.html -->
+		<!-- /help || /contribute/write -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /contribute/write.html -->
+		<!-- /contribute || /contribute/write -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /contribute/write.html -->
+		<!-- /community || /contribute/write -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /contribute/write.html -->
+		<!-- /apache || /contribute/write -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -69,19 +69,19 @@ announcements, adding new committers and other important Wicket related news.</p
 <h2 id="install">Install Jekyll</h2>
 <p>Follow the instructions available on the <a href="http://github.com/mojombo/jekyll">Jekyll
 website</a>. Basically it boils down to:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">gem install jekyll</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">gem install jekyll</code></pre></figure>
 <p>You also need to install the Pygments Python module.</p>
 <h2 id="checkout">Check out from SVN</h2>
 <p>Before you can edit the site, you need to check it out from SVN:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">svn co https://svn.apache.org/repos/asf/wicket/common/site/trunk wicket-site</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">svn co https://svn.apache.org/repos/asf/wicket/common/site/trunk wicket-site</code></pre></figure>
 <h2 id="generate">Generating the site</h2>
 <p>You can regenerate the site in the checked out directory:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./regenerate.sh</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">./regenerate.sh</code></pre></figure>
 <p>Note that this script restores Subversion (<code>.svn</code>) subfolders
 inside <code>_site</code>, which are erased when Jekyll is generating the content.</p>
 <h2 id="run">Run the site</h2>
 <p>You can run the website and edit it live:</p>
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">./liveedit.sh</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">./liveedit.sh</code></pre></figure>
 <p>This not only runs the server, but watches for modifications and regenerates
 any modified files.</p>
 <p>You can check out the website running at <a href="http://localhost:4000">localhost, port 4000</a>.</p>
@@ -95,28 +95,28 @@ rendered correctly.</p>
 <p>The default layout supports a property to specify the main title for the page and 
 another property for an additional subtitle.</p>
 <p>For example: (the <code>---</code> must be included):</p>
-<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
-<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">default</span>
-<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Main title</span>
-<span class="l-Scalar-Plain">subtitle</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Subtitle</span>
-<span class="nn">---</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="s">layout</span><span class="pi">:</span> <span class="s">default</span>
+<span class="s">title</span><span class="pi">:</span> <span class="s">Main title</span>
+<span class="s">subtitle</span><span class="pi">:</span> <span class="s">Subtitle</span>
+<span class="nn">---</span></code></pre></figure>
 <p>A more advanced feature for the default layout is the ability to specify more files to include
 in the final page. This can be done with property <code>additionalContents</code> where we can list additional files
 with an id for their section tag and a value for the CSS class:</p>
-<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
-<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">default</span>
-<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Welcome to Apache Wicket</span>
-<span class="l-Scalar-Plain">subtitle</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Discover why developers love Wicket!</span>
-<span class="l-Scalar-Plain">additionalContents</span><span class="p-Indicator">:</span>
-  <span class="p-Indicator">-</span>
-   <span class="l-Scalar-Plain">path</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">anotherPage.html</span>
-   <span class="l-Scalar-Plain">sectionId</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">anotherPage</span>
-   <span class="l-Scalar-Plain">cssClass</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">sectionClass</span>
-  <span class="p-Indicator">-</span>
-   <span class="l-Scalar-Plain">path</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherPage.html</span>
-   <span class="l-Scalar-Plain">sectionId</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherPage</span>
-   <span class="l-Scalar-Plain">cssClass</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">yetAnotherSectionClass</span>
-<span class="nn">---</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="s">layout</span><span class="pi">:</span> <span class="s">default</span>
+<span class="s">title</span><span class="pi">:</span> <span class="s">Welcome to Apache Wicket</span>
+<span class="s">subtitle</span><span class="pi">:</span> <span class="s">Discover why developers love Wicket!</span>
+<span class="s">additionalContents</span><span class="pi">:</span>
+  <span class="pi">-</span>
+   <span class="s">path</span><span class="pi">:</span> <span class="s">anotherPage.html</span>
+   <span class="s">sectionId</span><span class="pi">:</span> <span class="s">anotherPage</span>
+   <span class="s">cssClass</span><span class="pi">:</span> <span class="s">sectionClass</span>
+  <span class="pi">-</span>
+   <span class="s">path</span><span class="pi">:</span> <span class="s">yetAnotherPage.html</span>
+   <span class="s">sectionId</span><span class="pi">:</span> <span class="s">yetAnotherPage</span>
+   <span class="s">cssClass</span><span class="pi">:</span> <span class="s">yetAnotherSectionClass</span>
+<span class="nn">---</span></code></pre></figure>
 <h4 id="additional-conventions">Additional conventions</h4>
 <p>The following conventions have been adopted for the templeates of the site pages:</p>
 <ul>
@@ -137,10 +137,10 @@ automatically added to the front page and the RSS feed.</p>
 <p>The blog items are written using the normal Jekyll syntax. The filename needs
 to be formatted as <code>yyyy-mm-dd-title.md</code> and the blog item should start with a
 YAML preamble, similar to normal pages:</p>
-<div class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
-<span class="l-Scalar-Plain">layout</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">post</span>
-<span class="l-Scalar-Plain">title</span><span class="p-Indicator">:</span> <span class="l-Scalar-Plain">Wicket 1.4.7 released</span>
-<span class="nn">---</span></code></pre></div>
+<figure class="highlight"><pre><code class="language-yaml" data-lang="yaml"><span class="nn">---</span>
+<span class="s">layout</span><span class="pi">:</span> <span class="s">post</span>
+<span class="s">title</span><span class="pi">:</span> <span class="s">Wicket 1.4.7 released</span>
+<span class="nn">---</span></code></pre></figure>
 <h2 id="update">Update the site</h2>
 <p>When you’re done with making your changes, please check the following:</p>
 <ul>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/doap.rdf
----------------------------------------------------------------------
diff --git a/content/doap.rdf b/content/doap.rdf
index eb99e83..bda1770 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -25,7 +25,7 @@
 		<release>
 			<Version>
 				<name>Latest Stable Release</name>
-				<created>2015-07-10</created>
+				<created>2015-10-25</created>
 				<revision>7.1.0</revision>
 			</Version>
 		</release>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/dtds.data/index.html
----------------------------------------------------------------------
diff --git a/content/dtds.data/index.html b/content/dtds.data/index.html
index 7d23673..b6b3c17 100644
--- a/content/dtds.data/index.html
+++ b/content/dtds.data/index.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /dtds.data -->
+		<!-- /start/quickstart.html || /dtds.data/ -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /dtds.data -->
+		<!-- /start/download.html || /dtds.data/ -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /dtds.data -->
+		<!-- /learn || /dtds.data/ -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /dtds.data -->
+		<!-- /help || /dtds.data/ -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /dtds.data -->
+		<!-- /contribute || /dtds.data/ -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /dtds.data -->
+		<!-- /community || /dtds.data/ -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /dtds.data -->
+		<!-- /apache || /dtds.data/ -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/email.html
----------------------------------------------------------------------
diff --git a/content/help/email.html b/content/help/email.html
index 9dba2cc..4bef4e0 100644
--- a/content/help/email.html
+++ b/content/help/email.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help/email.html -->
+		<!-- /start/quickstart.html || /help/email -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help/email.html -->
+		<!-- /start/download.html || /help/email -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help/email.html -->
+		<!-- /learn || /help/email -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help/email.html -->
+		<!-- /help || /help/email -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /help/email.html -->
+		<!-- /contribute || /help/email -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help/email.html -->
+		<!-- /community || /help/email -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help/email.html -->
+		<!-- /apache || /help/email -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/index.html
----------------------------------------------------------------------
diff --git a/content/help/index.html b/content/help/index.html
index 12dc869..c1b7be5 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help -->
+		<!-- /start/quickstart.html || /help/ -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help -->
+		<!-- /start/download.html || /help/ -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help -->
+		<!-- /learn || /help/ -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help -->
-    	<li class="active"><a href="/help">Support</a></li>
-		<!-- /contribute || /help -->
+		<!-- /help || /help/ -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /help/ -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help -->
+		<!-- /community || /help/ -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help -->
+		<!-- /apache || /help/ -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -145,7 +145,7 @@ experience to it, possibly including a <a href="#bugquickstart">quick start</a>.
 <p>Wicket releases new versions on a regular basis. Chances are that your
 bug has been solved in a recent version. So if for instance you
 discover a bug in Wicket 6.2.0, it might be fixed in a newer version
-(the current version of Wicket 6.x is 6.20.0).</p>
+(the current version of Wicket 6.x is 6.21.0).</p>
 <p>So we ask you to try the latest version of the branch of Wicket you are
 working on. If the bug still remains,</p>
 <p>Check if your version is no longer maintained on our download page. If
@@ -159,18 +159,18 @@ Wicket Stuff or another project, please ensure that the version you use
 is compatible with your Wicket version.</p>
 <p>You can’t use Wicket 1.5.x libraries with Wicket 6.x, Wicket 7.x or Wicket 8.x. It
 should be safe to use a library compatible with Wicket 6.0 with
-6.20.0</p>
+6.21.0</p>
 <p>For example:</p>
 <ul>
-  <li>wicket-extensions-1.5.12.jar is not compatible with wicket-core-6.20.0</li>
+  <li>wicket-extensions-1.5.12.jar is not compatible with wicket-core-6.21.0</li>
 </ul>
 <p>Possible, but not advisable:</p>
 <ul>
-  <li>wicket-extensions-6.10.0 should be compatible with wicket-core-6.20.0</li>
+  <li>wicket-extensions-6.10.0 should be compatible with wicket-core-6.21.0</li>
 </ul>
 <p>Advised:</p>
 <ul>
-  <li>Use wicket-extensions-6.20.0 with wicket-core-6.20.0</li>
+  <li>Use wicket-extensions-6.21.0 with wicket-core-6.21.0</li>
 </ul>
 <p>This also holds true for release of our sister project <em>Wicket Stuff</em>.</p>
 <h3 id="bugquickstart">Provide a Quick Start</h3>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/irc.html
----------------------------------------------------------------------
diff --git a/content/help/irc.html b/content/help/irc.html
index e851f07..b4210f7 100644
--- a/content/help/irc.html
+++ b/content/help/irc.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help/irc.html -->
+		<!-- /start/quickstart.html || /help/irc -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help/irc.html -->
+		<!-- /start/download.html || /help/irc -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help/irc.html -->
+		<!-- /learn || /help/irc -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help/irc.html -->
+		<!-- /help || /help/irc -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /help/irc.html -->
+		<!-- /contribute || /help/irc -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help/irc.html -->
+		<!-- /community || /help/irc -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help/irc.html -->
+		<!-- /apache || /help/irc -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/reportabug.html
----------------------------------------------------------------------
diff --git a/content/help/reportabug.html b/content/help/reportabug.html
index 2fe63f5..c0b804a 100644
--- a/content/help/reportabug.html
+++ b/content/help/reportabug.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help/reportabug.html -->
+		<!-- /start/quickstart.html || /help/reportabug -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help/reportabug.html -->
+		<!-- /start/download.html || /help/reportabug -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help/reportabug.html -->
+		<!-- /learn || /help/reportabug -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help/reportabug.html -->
+		<!-- /help || /help/reportabug -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /help/reportabug.html -->
+		<!-- /contribute || /help/reportabug -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help/reportabug.html -->
+		<!-- /community || /help/reportabug -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help/reportabug.html -->
+		<!-- /apache || /help/reportabug -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/security.html
----------------------------------------------------------------------
diff --git a/content/help/security.html b/content/help/security.html
index f2b36f0..44fac1e 100644
--- a/content/help/security.html
+++ b/content/help/security.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help/security.html -->
+		<!-- /start/quickstart.html || /help/security -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help/security.html -->
+		<!-- /start/download.html || /help/security -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help/security.html -->
+		<!-- /learn || /help/security -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help/security.html -->
+		<!-- /help || /help/security -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /help/security.html -->
+		<!-- /contribute || /help/security -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help/security.html -->
+		<!-- /community || /help/security -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help/security.html -->
+		<!-- /apache || /help/security -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/help/support.html
----------------------------------------------------------------------
diff --git a/content/help/support.html b/content/help/support.html
index b45497a..4750174 100644
--- a/content/help/support.html
+++ b/content/help/support.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /help/support.html -->
+		<!-- /start/quickstart.html || /help/support -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /help/support.html -->
+		<!-- /start/download.html || /help/support -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /help/support.html -->
+		<!-- /learn || /help/support -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /help/support.html -->
+		<!-- /help || /help/support -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /help/support.html -->
+		<!-- /contribute || /help/support -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /help/support.html -->
+		<!-- /community || /help/support -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /help/support.html -->
+		<!-- /apache || /help/support -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 5007591..6947f42 100644
--- a/content/index.html
+++ b/content/index.html
@@ -23,19 +23,19 @@
 	<a href="start/wicket-7.x.html"><img src="img/apachewicket7.svg"></a>
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html ||  -->
+		<!-- /start/quickstart.html || / -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html ||  -->
+		<!-- /start/download.html || / -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn ||  -->
+		<!-- /learn || / -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help ||  -->
+		<!-- /help || / -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute ||  -->
+		<!-- /contribute || / -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community ||  -->
+		<!-- /community || / -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache ||  -->
+		<!-- /apache || / -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -244,110 +244,79 @@ The release consist of almost 300 features, improvements and fixes. In accordanc
 </div>
 <div class="l-two-third">
     <article>
-        <h2>Apache Wicket 7.1.0 released</h2>
-        <small>25 Oct 2015</small>
-        <p>The Apache Wicket PMC is proud to announce Apache Wicket 7.1.0!</p>
-<p>This release marks another minor release of Wicket 7. We
+        <h2>Apache Wicket 6.21.0 released</h2>
+        <small>16 Nov 2015</small>
+        <p>The Apache Wicket PMC is proud to announce Apache Wicket 6.21.0!</p>
+<p>This release marks another minor release of Wicket 6. We
 use semantic versioning for the development of Wicket, and as such no
 API breaks are present breaks are present in this release compared to
-7.0.0.</p>
-<h4 id="new-and-noteworthy">New and noteworthy</h4>
-<p>Significant improvement in performance while adding components to
-the component hierarchy. There was a regression in performance
-introduced by component queuing. The algorithm checked if there were
-any components to be dequeued, but did so in a O(n^2) way. This was
-fixed.</p>
-<p>Upon further investigation we found that adding components is O(n^2)
-since 1.3 (when memory was scarce and expensive). We fixed that and
-made it roughly O(1).</p>
-<p>This means that when you have a page with 10k components on it, the
-adding won’t slow you down any more, and the new way of adding
-components will scrape a few ms off your overall average response time.</p>
-<p>This release also fixes several bugs where head sections were not rendered,
-i18n JavaScript resources could not be loaded, Range: header parsing and
-a couple of component queuing issues.</p>
-<h4 id="using-this-release">Using this release</h4>
+6.0.0.</p>
+<h3 id="using-this-release">Using this release</h3>
 <p>With Apache Maven update your dependency to (and don’t forget to
 update any other dependencies on Wicket projects to the same version):</p>
-<dependency>
-    <groupid>org.apache.wicket</groupid>
-    <artifactid>wicket-core</artifactid>
-    <version>7.1.0</version>
-</dependency>
+<figure 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.21.0<span class="nt">&lt;/version&gt;</span>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
-<div class="highlight"><pre>
- * Source: http://www.apache.org/dyn/closer.cgi/wicket/7.1.0
- * Binary: http://www.apache.org/dyn/closer.cgi/wicket/7.1.0/binaries
-</pre></div>
-<h4 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h4>
-<p>If you upgrade from 7.y.z this release is a drop in replacement. If
-you come from a version prior to 7.0.0, please read our Wicket 7
+<ul>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.21.0">http://www.apache.org/dyn/closer.cgi/wicket/6.21.0</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.21.0/binaries">http://www.apache.org/dyn/closer.cgi/wicket/6.21.0/binaries</a></li>
+</ul>
+<h3 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h3>
+<p>If you upgrade from 6.y.z this release is a drop in replacement. If
+you come from a version prior to 6.0.0, please read our Wicket 6
 migration guide found at</p>
 <ul>
-  <li>http://s.apache.org/wicket7migrate</li>
+  <li><a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+6.0">migration to Wicket 6</a></li>
 </ul>
-<h4 id="the-signatures-for-the-source-release-artefacts">The signatures for the source release artefacts:</h4>
-<p>Signature for apache-wicket-7.1.0.zip:</p>
-<div class="highlight"><pre>
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-iEYEABECAAYFAlYldl4ACgkQJBX8W/xy/UWlUgCbBKvmDioyZceDBykv52eWYNai
-b9AAn2AUlg5FotVMaQtOdtQsQfuy4X/D
-=Vuhh
------END PGP SIGNATURE-----
-</pre></div>
-<p>Signature for apache-wicket-7.1.0.tar.gz:</p>
-<div class="highlight"><pre>
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-iEYEABECAAYFAlYldl4ACgkQJBX8W/xy/UXNzgCgtL4H8bRjZewltF1BX7H3F+Ph
-6KUAnA0k2BVi5E//uw9RLm7MklYJOdV+
-=Za2v
------END PGP SIGNATURE-----
-</pre></div>
-<h4 id="changelog-for-710">CHANGELOG for 7.1.0:</h4>
+<p>Have fun!</p>
+<p>— The Wicket team</p>
+<h3 id="this-release">This release</h3>
+<h4 id="changelog-for-6210">CHANGELOG for 6.21.0:</h4>
+<p>The following changes were made in Wicket for this release.</p>
 <h4 id="bug">Bug</h4>
-<pre><code>* [WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE
-* [WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update
-* [WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11
-* [WICKET-5960] - Page header isn't rendered for pages where URL has changed during render
-* [WICKET-5964] - Queuing a component within an enclosure
-* [WICKET-5965] - Queuing a component in head
-* [WICKET-5966] - ResourceUtils.getLocaleFromFilename can't handle minimized resources well
-* [WICKET-5967] - Unable to load i18n minified js
-* [WICKET-5968] - CachingResourceLocator lookup key doesn't take strict into account
-* [WICKET-5970] - UrlRenderer does not render fragments
-* [WICKET-5973] - IllegalArgumentException 'bytes' cannot be negative. on opening Inspector
-* [WICKET-5975] - AjaxFallbackOrderByBorder wicketOrder[Up|Down|None] class missing
-* [WICKET-5978] - LazyInitProxyFactory fills permgen space
-* [WICKET-5980] - When using Servlet 3.0 filter Wicket calculates filter path wrong
-* [WICKET-5981] - Significant Performance Degradation From Wicket 6.20.0 to Wicket 7.0.0
-* [WICKET-5983] - O(n^2) complexity in MarkupContainer.add
-* [WICKET-5988] - WICKET-5981 breaks forms inside borders
-* [WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with &lt;wicket:header-items&gt;&lt;/wicket:header&gt; placeholder
-* [WICKET-5993] - AjaxButton - image is not shown even though type="image" is in html-template 
-* [WICKET-5994] - Mounted TemplateResourceReference throws  org.apache.wicket.WicketRuntimeException when https is used
-* [WICKET-5995] - "Range" header parsing is broken
-* [WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url.
-* [WICKET-5997] - Compatibility problem with Websphere liberty profile
-* [WICKET-5999] - AjaxFormValidatingBehavior not updates initially hidden feedback component
-* [WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent
-</code></pre>
+<ul>
+  <li>[WICKET-5882] - AutoComplete suggestion list disappear when I click on autoComplete scrollbar in IE</li>
+  <li>[WICKET-5898] - StackOverflowError after form submit with a validation error</li>
+  <li>[WICKET-5925] - wicket-examples DataTablePage is broken</li>
+  <li>[WICKET-5927] - Velocity remote code execution</li>
+  <li>[WICKET-5939] - AjaxEventBehavior should not lower-case the event name</li>
+  <li>[WICKET-5941] - Headers not rendered for components inside TransparentWebMarkupContainer on ajax update</li>
+  <li>[WICKET-5944] - CSRF prevention does not work with https URLs on the default port</li>
+  <li>[WICKET-5946] - JavaScript/Css PackageResource should use the same charset for compressing</li>
+  <li>[WICKET-5959] - HTML input placeholder text breaks AutoCompleteTextField in IE11</li>
+  <li>[WICKET-5960] - Page header isn’t rendered for pages where URL has changed during render</li>
+  <li>[WICKET-5968] - CachingResourceLocator lookup key doesn’t take strict into account</li>
+  <li>[WICKET-5970] - UrlRenderer does not render fragments</li>
+  <li>[WICKET-5973] - IllegalArgumentException ‘bytes’ cannot be negative. on opening Inspector</li>
+  <li>[WICKET-5978] - LazyInitProxyFactory fills permgen space</li>
+  <li>[WICKET-5989] - BaseWicketTester#startComponentInPage fails for pages with <wicket:header-items>&lt;/wicket:header&gt; placeholder</wicket:header-items></li>
+  <li>[WICKET-5994] - Mounted TemplateResourceReference throws org.apache.wicket.WicketRuntimeException when https is used</li>
+  <li>[WICKET-5996] - Mounted packages throw IllegalArgumentException when visiting base package url.</li>
+  <li>[WICKET-6005] - WicketRuntimeException from AjaxPagingNavigator#onAjaxEvent</li>
+</ul>
 <h4 id="improvement">Improvement</h4>
-<pre><code>* [WICKET-5948] - wicket-ajax.js probably doesn't traverse the children of &lt;div&gt; or &lt;span&gt;
-* [WICKET-5971] - Code cleanup in ServletWebResponse
-* [WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)
-* [WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)
-* [WICKET-5984] - ReplaceHandlerException lacks an accessor for the replacement RequestHandler
-* [WICKET-5986] - NumberTextField&lt;N&gt; should use Models for minimum, maximum and step
-</code></pre>
+<ul>
+  <li>[WICKET-5926] - Arquillian Support with Container ServletContext in BaseWicketTester/WicketTester.</li>
+  <li>[WICKET-5930] - Upgrade Atmosphere to 2.2.7</li>
+  <li>[WICKET-5932] - Allow empty column list for DataTable</li>
+  <li>[WICKET-5933] - Avoid serialization of untouched page after ajax request</li>
+  <li>[WICKET-5935] - IoC Guice: cache proxies and fail on creation when binding is missing</li>
+  <li>[WICKET-5945] - add a new topic/listener that notifies of Ajax calls done</li>
+  <li>[WICKET-5948] - wicket-ajax.js probably doesn’t traverse the children of &lt;div&gt; or <span></span></li>
+  <li>[WICKET-5955] - error from WebPage # reportMissingHead</li>
+  <li>[WICKET-5974] - Change AjaxPagingNavigator#onAjaxEvent() to only consider parent components that have setOutputMarkupId(true)</li>
+  <li>[WICKET-5976] - Improve the documentation of FeedbackMessages first(int level)</li>
+  <li>[WICKET-5986] - NumberTextField<n> should use Models for minimum, maximum and step</n></li>
+</ul>
 <h4 id="task">Task</h4>
-<pre><code>* [WICKET-5951] - Upgrade Atmosphere to 2.2.8
-</code></pre>
-<p>Have fun!</p>
-<p>— The Wicket team</p>
-        <a href="/news/2015/10/25/wicket-7.1.0-released.html">Read more...</a> 
+<ul>
+  <li>[WICKET-5951] - Upgrade Atmosphere to 2.2.8</li>
+</ul>
+        <a href="/news/2015/11/16/wicket-6-21-0-released.html">Read more...</a> 
     </article>
 </div>
 <div class="l-one-third news">
@@ -359,34 +328,34 @@ title="Atom 1.0 feed" href="/atom.xml">RSS feed</a> to
 get updates in your favorite RSS reader the moment they happen.</p>
 <ul>
 <li>
+    <h3>Apache Wicket 1.4.x end of life</h3>
+    <small>15 Nov 2015</small>
+    The Apache Wicket team announces that support for Apache Wicket 1.4.x ends on 16 November 2015. On the same day Wicket 1.5.x enters “security fixes”...
+    <a href="/news/2015/11/15/wicket-1-4-x-eol.html">more</a>
+</li>
+<li>
+    <h3>Apache Wicket 7.1.0 released</h3>
+    <small>25 Oct 2015</small>
+    The Apache Wicket PMC is proud to announce Apache Wicket 7.1.0! This release marks another minor release of Wicket 7. We use semantic versioning for...
+    <a href="/news/2015/10/25/wicket-7-1-0-released.html">more</a>
+</li>
+<li>
     <h3>Wicket 1.5.14 released</h3>
     <small>24 Oct 2015</small>
     This is the fourteenth maintenance release of the Wicket 1.5.x series. This release brings over 4 bug fixes and 1 improvement. CHANGELOG for 1.5.14: **...
-    <a href="/news/2015/10/24/wicket-1.5.14-released.html">more</a>
+    <a href="/news/2015/10/24/wicket-1-5-14-released.html">more</a>
 </li>
 <li>
     <h3>Apache Wicket v7.0 released</h3>
     <small>28 Jul 2015</small>
     The Apache Software Foundation announces Apache Wicket™ v7.0 Open Source Java web framework that powers thousands of web applications and web sites for governments, stores,...
-    <a href="/news/2015/07/28/wicket-7.0-released.html">more</a>
+    <a href="/news/2015/07/28/wicket-7-0-released.html">more</a>
 </li>
 <li>
     <h3>Apache Wicket 7.0.0-M6 released</h3>
     <small>21 Jun 2015</small>
     The Apache Wicket PMC is proud to announce Apache Wicket 7.0.0-M6! We have released another milestone release for Apache Wicket 7. We aim to finalise...
-    <a href="/news/2015/06/21/wicket-7.0.0-M6-released.html">more</a>
-</li>
-<li>
-    <h3>Apache Wicket 6.20.0 released</h3>
-    <small>14 Jun 2015</small>
-    The Apache Wicket PMC is proud to announce Apache Wicket 6.20.0! This release marks another minor release of Wicket 6. Starting with Wicket 6 we...
-    <a href="/news/2015/06/14/wicket-6.20.0-released.html">more</a>
-</li>
-<li>
-    <h3>Wicket 1.5.13 released</h3>
-    <small>13 Feb 2015</small>
-    This is the thirteenth maintenance release of the Wicket 1.5.x series. This release brings over 1 bug fix and 1 improvement. Git tag Changelog To...
-    <a href="/news/2015/02/13/wicket-1.5.13-released.html">more</a>
+    <a href="/news/2015/06/21/wicket-7-0-0-m6-released.html">more</a>
 </li>
 </ul>
 </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/blogs.html
----------------------------------------------------------------------
diff --git a/content/learn/blogs.html b/content/learn/blogs.html
index c9373e3..35c06dd 100644
--- a/content/learn/blogs.html
+++ b/content/learn/blogs.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/blogs.html -->
+		<!-- /start/quickstart.html || /learn/blogs -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/blogs.html -->
+		<!-- /start/download.html || /learn/blogs -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/blogs.html -->
+		<!-- /learn || /learn/blogs -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/blogs.html -->
+		<!-- /help || /learn/blogs -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/blogs.html -->
+		<!-- /contribute || /learn/blogs -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/blogs.html -->
+		<!-- /community || /learn/blogs -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/blogs.html -->
+		<!-- /apache || /learn/blogs -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/awc.html
----------------------------------------------------------------------
diff --git a/content/learn/books/awc.html b/content/learn/books/awc.html
index d6fc62e..c6c88d4 100644
--- a/content/learn/books/awc.html
+++ b/content/learn/books/awc.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/awc.html -->
+		<!-- /start/quickstart.html || /learn/books/awc -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/awc.html -->
+		<!-- /start/download.html || /learn/books/awc -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/awc.html -->
+		<!-- /learn || /learn/books/awc -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/awc.html -->
+		<!-- /help || /learn/books/awc -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/awc.html -->
+		<!-- /contribute || /learn/books/awc -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/awc.html -->
+		<!-- /community || /learn/books/awc -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/awc.html -->
+		<!-- /apache || /learn/books/awc -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/ewdww.html
----------------------------------------------------------------------
diff --git a/content/learn/books/ewdww.html b/content/learn/books/ewdww.html
index f37f2ab..d6cf5cf 100644
--- a/content/learn/books/ewdww.html
+++ b/content/learn/books/ewdww.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/ewdww.html -->
+		<!-- /start/quickstart.html || /learn/books/ewdww -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/ewdww.html -->
+		<!-- /start/download.html || /learn/books/ewdww -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/ewdww.html -->
+		<!-- /learn || /learn/books/ewdww -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/ewdww.html -->
+		<!-- /help || /learn/books/ewdww -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/ewdww.html -->
+		<!-- /contribute || /learn/books/ewdww -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/ewdww.html -->
+		<!-- /community || /learn/books/ewdww -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/ewdww.html -->
+		<!-- /apache || /learn/books/ewdww -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/iaw6.html
----------------------------------------------------------------------
diff --git a/content/learn/books/iaw6.html b/content/learn/books/iaw6.html
index e521904..fd71388 100644
--- a/content/learn/books/iaw6.html
+++ b/content/learn/books/iaw6.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/iaw6.html -->
+		<!-- /start/quickstart.html || /learn/books/iaw6 -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/iaw6.html -->
+		<!-- /start/download.html || /learn/books/iaw6 -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/iaw6.html -->
+		<!-- /learn || /learn/books/iaw6 -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/iaw6.html -->
+		<!-- /help || /learn/books/iaw6 -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/iaw6.html -->
+		<!-- /contribute || /learn/books/iaw6 -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/iaw6.html -->
+		<!-- /community || /learn/books/iaw6 -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/iaw6.html -->
+		<!-- /apache || /learn/books/iaw6 -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/index.html
----------------------------------------------------------------------
diff --git a/content/learn/books/index.html b/content/learn/books/index.html
index d07ae06..8d99a2a 100644
--- a/content/learn/books/index.html
+++ b/content/learn/books/index.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books -->
+		<!-- /start/quickstart.html || /learn/books/ -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books -->
+		<!-- /start/download.html || /learn/books/ -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books -->
+		<!-- /learn || /learn/books/ -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books -->
+		<!-- /help || /learn/books/ -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books -->
+		<!-- /contribute || /learn/books/ -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books -->
+		<!-- /community || /learn/books/ -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books -->
+		<!-- /apache || /learn/books/ -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/koda.html
----------------------------------------------------------------------
diff --git a/content/learn/books/koda.html b/content/learn/books/koda.html
index 85d7d5f..ddabb3e 100644
--- a/content/learn/books/koda.html
+++ b/content/learn/books/koda.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/koda.html -->
+		<!-- /start/quickstart.html || /learn/books/koda -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/koda.html -->
+		<!-- /start/download.html || /learn/books/koda -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/koda.html -->
+		<!-- /learn || /learn/books/koda -->
     	<li class=""><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/koda.html -->
+		<!-- /help || /learn/books/koda -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/koda.html -->
+		<!-- /contribute || /learn/books/koda -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/koda.html -->
+		<!-- /community || /learn/books/koda -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/koda.html -->
+		<!-- /apache || /learn/books/koda -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/kwij.html
----------------------------------------------------------------------
diff --git a/content/learn/books/kwij.html b/content/learn/books/kwij.html
index b3630c4..e135136 100644
--- a/content/learn/books/kwij.html
+++ b/content/learn/books/kwij.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/kwij.html -->
+		<!-- /start/quickstart.html || /learn/books/kwij -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/kwij.html -->
+		<!-- /start/download.html || /learn/books/kwij -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/kwij.html -->
+		<!-- /learn || /learn/books/kwij -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/kwij.html -->
+		<!-- /help || /learn/books/kwij -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/kwij.html -->
+		<!-- /contribute || /learn/books/kwij -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/kwij.html -->
+		<!-- /community || /learn/books/kwij -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/kwij.html -->
+		<!-- /apache || /learn/books/kwij -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/praxisbuchwicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/praxisbuchwicket.html b/content/learn/books/praxisbuchwicket.html
index e55777a..cd41667 100644
--- a/content/learn/books/praxisbuchwicket.html
+++ b/content/learn/books/praxisbuchwicket.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/praxisbuchwicket.html -->
+		<!-- /start/quickstart.html || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/praxisbuchwicket.html -->
+		<!-- /start/download.html || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/praxisbuchwicket.html -->
+		<!-- /learn || /learn/books/praxisbuchwicket -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/praxisbuchwicket.html -->
+		<!-- /help || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/praxisbuchwicket.html -->
+		<!-- /contribute || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/praxisbuchwicket.html -->
+		<!-- /community || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/praxisbuchwicket.html -->
+		<!-- /apache || /learn/books/praxisbuchwicket -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/prowicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/prowicket.html b/content/learn/books/prowicket.html
index c41da03..de1db01 100644
--- a/content/learn/books/prowicket.html
+++ b/content/learn/books/prowicket.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/prowicket.html -->
+		<!-- /start/quickstart.html || /learn/books/prowicket -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/prowicket.html -->
+		<!-- /start/download.html || /learn/books/prowicket -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/prowicket.html -->
+		<!-- /learn || /learn/books/prowicket -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/prowicket.html -->
+		<!-- /help || /learn/books/prowicket -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/prowicket.html -->
+		<!-- /contribute || /learn/books/prowicket -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/prowicket.html -->
+		<!-- /community || /learn/books/prowicket -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/prowicket.html -->
+		<!-- /apache || /learn/books/prowicket -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/wia.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wia.html b/content/learn/books/wia.html
index 3bb62b0..5ea1bc9 100644
--- a/content/learn/books/wia.html
+++ b/content/learn/books/wia.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/wia.html -->
+		<!-- /start/quickstart.html || /learn/books/wia -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/wia.html -->
+		<!-- /start/download.html || /learn/books/wia -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/wia.html -->
+		<!-- /learn || /learn/books/wia -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/wia.html -->
+		<!-- /help || /learn/books/wia -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/wia.html -->
+		<!-- /contribute || /learn/books/wia -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/wia.html -->
+		<!-- /community || /learn/books/wia -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/wia.html -->
+		<!-- /apache || /learn/books/wia -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/2118a439/content/learn/books/wicket-jp.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wicket-jp.html b/content/learn/books/wicket-jp.html
index 73c27eb..2af9eaa 100644
--- a/content/learn/books/wicket-jp.html
+++ b/content/learn/books/wicket-jp.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-		<!-- /start/quickstart.html || /learn/books/wicket-jp.html -->
+		<!-- /start/quickstart.html || /learn/books/wicket-jp -->
     	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-		<!-- /start/download.html || /learn/books/wicket-jp.html -->
+		<!-- /start/download.html || /learn/books/wicket-jp -->
     	<li class=""><a href="/start/download.html">Download</a></li>
-		<!-- /learn || /learn/books/wicket-jp.html -->
+		<!-- /learn || /learn/books/wicket-jp -->
     	<li class="active"><a href="/learn">Documentation</a></li>
-		<!-- /help || /learn/books/wicket-jp.html -->
+		<!-- /help || /learn/books/wicket-jp -->
     	<li class=""><a href="/help">Support</a></li>
-		<!-- /contribute || /learn/books/wicket-jp.html -->
+		<!-- /contribute || /learn/books/wicket-jp -->
     	<li class=""><a href="/contribute">Contribute</a></li>
-		<!-- /community || /learn/books/wicket-jp.html -->
+		<!-- /community || /learn/books/wicket-jp -->
     	<li class=""><a href="/community">Community</a></li>
-		<!-- /apache || /learn/books/wicket-jp.html -->
+		<!-- /apache || /learn/books/wicket-jp -->
     	<li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>