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

[37/53] [abbrv] [partial] wicket-site git commit: Preparing for wicket 7 site relaunch

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/contribute/build.html
----------------------------------------------------------------------
diff --git a/content/contribute/build.html b/content/contribute/build.html
index 830dff7..55efcc2 100644
--- a/content/contribute/build.html
+++ b/content/contribute/build.html
@@ -1,218 +1,73 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Build from source</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Build from source | 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 || /contribute/build.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/build.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/build.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/build.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/build.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/build.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 id="contentbody">
-			<h1>Build from source</h1>
-			<p>The Wicket projects are built using a multi-module build as proposed by the
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Build from source</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#getting-your-wicket-version"><span class="toc-number">1</span> <span class="toc-text">Getting your Wicket version</span></a></li><li class="toc--level-1 toc--section-2"><a href="#building-wicket"><span class="toc-number">2</span> <span class="toc-text">Building Wicket</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#coping-with-test-failures"><span class="toc-number">2.1</span> <span class="toc-text">Coping with test failures</span></a></li><li class="toc--level-2 toc--section-4"><a href="#using-your-own-built-artifacts"><span class="toc-number">2.2</span> <span class="toc-text">Using your own built artifacts</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>The Wicket projects are built using a multi-module build as proposed by the
 Maven project. We use Maven to build our projects and distributions. To be
 able to build Wicket directly from subversion, you will need an understanding
 of Maven.</p>
-
 <p>This document contains the following sections.</p>
-
 <ol>
   <li>Getting your Wicket version</li>
   <li>Building Wicket</li>
   <li>Coping with test failures</li>
   <li>Using your own built artifacts</li>
 </ol>
-
 <p>For more information on the project structure, please read the ‘Better Builds
 With Maven’ book which has a detailed description on how to structure a
 maintainable, enterprise ready build. The book is available for free from the
 Mergere website.</p>
-
 <h2 id="getting-your-wicket-version">Getting your Wicket version</h2>
-
 <p>Clone the master branch from Apache Git Wicket repository</p>
-
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> git clone https://git-wip-us.apache.org/repos/asf/wicket.git</code></pre></div>
-
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> git clone http://git-wip-us.apache.org/repos/asf/wicket.git</code></pre></div>
 <p>This will give you a directory structure like the following directory tree:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">wicket</span>
 <span class="go">wicket/wicket-core</span>
 <span class="go">wicket/wicket-extensions</span>
@@ -221,45 +76,31 @@ Mergere website.</p>
 <span class="go">wicket/wicket-examples</span>
 <span class="go">wicket/wicket-spring-annot</span>
 <span class="go">...</span></code></pre></div>
-
 <p>To check out a different branch use:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="gp">$</span> <span class="nb">cd </span>wicket
 <span class="gp">$</span> git checkout -b release/wicket-x.y.z release/wicket-x.y.z
 <span class="gp">#</span> verify the branch with:
 <span class="gp">$</span> git branch</code></pre></div>
-
 <p>In this document we focus at the maven project descriptor located in the top
 level directory, which enforces default settings for all Wicket projects such
 as plug-in settings, versioning of the Wicket projects, managing the various
 dependencies and more.</p>
-
 <p>The artifacts in this project are there only for having a consistent build.
 This top-level project doesn’t have sources for itself.</p>
-
 <h2 id="building-wicket">Building Wicket</h2>
-
 <p>The current development version of Wicket requires at least jdk 6.</p>
-
 <p>If you want to ensure that your Wicket version is built using JDK-6 and
 fully compatible with that Java version, you will need to build it with a Java
 6 compiler and runtime library.</p>
-
 <p>If you haven’t done so already change into the Wicket root directory:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">cd wicket</span></code></pre></div>
-
 <p>Now building all of Wicket is as simple as issuing the following command:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn install</span></code></pre></div>
-
 <p>This will compile, test, package and install all Wicket projects. Installation
 means putting the jar files into your local Maven repository, including the
 source, but without the javadoc jars (this is a Wicket specific configuration,
 because build javadoc takes a long time).</p>
-
 <p>The following commands are useful:</p>
-
 <table>
 <tr><th>Commandline</th><th>Description</th></tr>
 <tr><td>`mvn clean`</td><td>cleans up build artifacts</td></tr>
@@ -268,45 +109,48 @@ because build javadoc takes a long time).</p>
 <tr><td>`mvn install`</td><td>installs the jar files in your local repository</td></tr>
 <tr><td>`mvn -Prelease package`</td><td>generates the javadoc/source jars as well</td></tr>
 </table>
-
 <p>You can just run the install target, as Maven will build the previous stages
 automatically.</p>
-
 <h3 id="coping-with-test-failures">Coping with test failures</h3>
-
 <p>As this is our main development you might/will encounter failing unit tests.
 These can be skipped using:</p>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn -Dmaven.test.skip=true install</span></code></pre></div>
-
 <p>Of course, all bets are off then and your mileage may vary if you use such a
 built jar.</p>
-
 <h3 id="using-your-own-built-artifacts">Using your own built artifacts</h3>
-
 <p>Now you have built your own fresh Wicket jar you must be anxious to use it.
 This is now as simple as adding a snapshot dependency on the specific Wicket
 version. So in your pom.xml you can use:</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.0-SNAPSHOT<span class="nt">&lt;/version&gt;</span>
     <span class="nt">&lt;scope&gt;</span>compile<span class="nt">&lt;/scope&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span></code></pre></div>
-
-<p>Read <a href="../learn/ides.html">IDE support</a> to learn how to continue from here with an IDE.</p>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; 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.
-</span></div>
-
+<p>And adding this to your Eclipse, NetBeans or IntelliJ IDEA project classpath
+is then as simple as:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn eclipse:eclipse</span></code></pre></div>
+<p>or opening the project using Netbeans or IDEAs Maven integration.</p>
+<p>Maven will then add all the necessary JAR files to the project’s classpath.</p>
+<p>One thing you need to make sure is that you have set the <code>M2_REPO</code> classpath
+variable in Eclipse (or a similar construct in Netbeans), and point it to your
+local repository, typically found in <code>C:\Documents and Settings\username\.m2\repo</code>
+or (for unix buffs) <code>~/.m2/repo</code></p>
+<p>You can add this setting using maven:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</span></code></pre></div>
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — 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>
-</body>
+        </footer>
+    </body>
+
 </html>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/230d6865/content/contribute/ides.html
----------------------------------------------------------------------
diff --git a/content/contribute/ides.html b/content/contribute/ides.html
new file mode 100644
index 0000000..72e145d
--- /dev/null
+++ b/content/contribute/ides.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>IDE Support for Wicket development | 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 || /contribute/ides.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/ides.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/ides.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/ides.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/ides.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/ides.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>IDE Support for Wicket development</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#wicket-plugins"><span class="toc-number">1</span> <span class="toc-text">Wicket Plugins</span></a></li><li class="toc--level-1 toc--section-2"><a href="#setting-up-your-ide"><span class="toc-number">2</span> <span class="toc-text">Setting up your IDE</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#eclipse"><span class="toc-number">2.1</span> <span class="toc-text">Eclipse</span></a></li><li class="toc--level-2 toc--section-4"><a href="#netbeans"><span class="toc-number">2.2</span> <span class="toc-text">NetBeans</span></a></li><li class="toc--level-2 toc--section-5"><a href="#idea"><span class="toc-number">2.3</span> <span class="toc-text">IDEA</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="wicket-plugins">Wicket Plugins</h2>
+<p>For all leading IDE’s support is under development. Here’s a list of efforts
+for the major IDE’s.</p>
+<ul>
+  <li>Eclipse: <a href="http://code.google.com/p/qwickie">Qwickie</a>, <a href="https://github.com/42Lines/wicket-source/wiki">Wicket Source</a></li>
+  <li>Netbeans: <a href="http://plugins.netbeans.org/plugin/3586/wicket-1-4-support">NB Wicket Support</a></li>
+  <li>IntelliJ IDEA: <a href="http://wicketforge.googlecode.com/">Wicket Forge</a>, <a href="https://github.com/armhold/wicket-source-intellij">Wicket Source</a></li>
+</ul>
+<p>These projects are not maintained or supported by the core Wicket team, but
+by their respective development teams.</p>
+<h2 id="setting-up-your-ide">Setting up your IDE</h2>
+<h3 id="eclipse">Eclipse</h3>
+<p>Eclipse offers a good support for Maven based projects with <a href="http://www.eclipse.org/m2e/">plugin M2Eclipse</a>. Once installed you can go to ‘Import…-&gt;Existing Maven Projects’ and import one or more Maven projects into your workspace.</p>
+<p>Alternatively, you can generate an Eclipse project typing the following command on project’s root:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn eclipse:eclipse</span></code></pre></div>
+<p>Maven will add all the necessary JAR files to the project’s classpath. Now the sources can be imported in Eclipse using the “Existing Projects into Workspace” wizard.</p>
+<p>If not already present the <code>M2_REPO</code> classpath variable has to point to your local Maven repository.
+The repository is typically found in <code>C:\Documents and Settings\&lt;username&gt;\.m2\repo</code> or (for unix buffs) <code>~/.m2/repo</code>. It can be set within Eclipse (Preferences-&gt;Java-&gt;Build Path-&gt;Classpath Variables) or with the help of Maven:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn -Declipse.workspace=&lt;path-to-eclipse-workspace&gt; eclipse:add-maven-repo</span></code></pre></div>
+<p>If you want to go along with the Wicket way of code formatting you should import the Wicket code format profile into your workspace (Preferences-&gt;Java-&gt;Code Style-&gt;Formatter), found in:</p>
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">&lt;path-to-eclipse-workspace&gt;/wicket-core/EclipseCodeFormat.xml</span></code></pre></div>
+<p>Finally configure the editor to automatically format all edited lines and organize imports on save (Preferences-&gt;Java-&gt;Editor-&gt;Save Actions).</p>
+<h3 id="netbeans">NetBeans</h3>
+<p>NetBeans comes with Maven integration. Further help can be found at their <a href="http://wiki.netbeans.org/MavenBestPractices" title="NetBeans Community Wiki">Wiki</a></p>
+<h3 id="idea">IDEA</h3>
+<p>IntelliJ IDEA comes with <a href="http://www.jetbrains.com/idea/webhelp/maven.html" title="IDEA Web Help">Maven support</a> too.</p>
+<p>With the <a href="http://plugins.jetbrains.com/plugin/6546">Eclipse Code Formatter plugin</a> the Wicket format profile can be used in IntelliJ IDEA too. Configure the IDE to prevent star imports (Settings-&gt;Code Style-&gt;Imports).</p>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — 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/230d6865/content/contribute/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/index.html b/content/contribute/index.html
index 52fe86d..3f82f69 100644
--- a/content/contribute/index.html
+++ b/content/contribute/index.html
@@ -1,203 +1,174 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Contribute</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>How to contribute to Apache Wicket | Apache Wicket</title>
+        <meta charset="utf8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
+        <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" />
 
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
-</div>
-
-		<div id="contentbody">
-			<h1>Contribute</h1>
-			<p>TODO</p>
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
 
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; 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.
-</span></div>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /contribute -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute -->
+    	<li class="active"><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute -->
+    	<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>
-</body>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>How to contribute to Apache Wicket</h1>
+            <h2>You can contribute to Apache Wicket in many ways, so join us and make Wicket better!</h2>
+        </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="#contribute"><span class="toc-number">1</span> <span class="toc-text">Ways to Contribute to Apache Wicket</span></a></li><li class="toc--level-1 toc--section-2"><a href="#github"><span class="toc-number">2</span> <span class="toc-text">Github Mirror for Easy Contributing</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#fork"><span class="toc-number">2.1</span> <span class="toc-text">Fork Wicket to your Account</span></a></li><li class="toc--level-2 toc--section-4"><a href="#clone"><span class="toc-number">2.2</span> <span class="toc-text">Clone Wicket to your Workstation</span></a></li><li class="toc--level-2 toc--section-5"><a href="#checkout"><span class="toc-number">2.3</span> <span class="toc-text">Start with the Correct Branch</span></a></li><li class="toc--level-2 toc--section-6"><a href="#pullrequest"><span class="toc-nu
 mber">2.4</span> <span class="toc-text">Create a Pull Request</span></a></li></ul></li><li class="toc--level-1 toc--section-7"><a href="#documentation"><span class="toc-number">3</span> <span class="toc-text">Documentation for contributors</span></a><ul><li class="toc--level-2 toc--section-8"><a href="#how-to-contribute"><span class="toc-number">3.1</span> <span class="toc-text">How to contribute</span></a></li><li class="toc--level-2 toc--section-9"><a href="#committers"><span class="toc-number">3.2</span> <span class="toc-text">Committers</span></a></li><li class="toc--level-2 toc--section-10"><a href="#subscribing-and-unsubscribing"><span class="toc-number">3.3</span> <span class="toc-text">Subscribing and unsubscribing</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <h2 id="contribute">Ways to Contribute to Apache Wicket</h2>
+<p>A lot of work goes into maintaining a project like Wicket and we can
+use your help!</p>
+<p>You can help us in many ways:</p>
+<ul>
+  <li>Help out other users at our <a href="../help/email.html">user list</a></li>
+  <li>Answer questions on <a href="http://stackoverflow.com/questions/tagged/wicket" rel="nofollow">Stackoverflow</a></li>
+  <li><a href="userguide.html">Improve our user guide</a></li>
+  <li>Report <a href="../help/#reportbug">your bugs</a></li>
+  <li>Implement <a href="patch.html">new features or fix bugs</a></li>
+  <li><a href="write.html">Improve this site</a></li>
+</ul>
+<p>If you want to help out with one of our bugs or want to implement a
+feature, consider using our <a href="#github">Github mirror</a>.</p>
+<hr />
+<h2 id="github">Github Mirror for Easy Contributing</h2>
+<p>Wicket is mirrored on github so you can contribute with ease:</p>
+<ol>
+  <li>Fork Wicket</li>
+  <li>Implement your feature or fix the bug, and</li>
+  <li>Send a pull request.</li>
+</ol>
+<p>The Github/Apache integration will send the pull request to our
+contributors list, and we will look at your pull request as soon as we
+can.</p>
+<h3 id="fork">Fork Wicket to your Account</h3>
+<p>So you have an account registered at Github and are ready to start
+hacking at Wicket. First you need to <em>fork the code</em> to your own Github
+account.</p>
+<p>You can find the official mirror for the Apache Wicket project at the
+following location in the official Apache Software Foundation
+organisation at Github:</p>
+<ul>
+  <li>Apache Wicket Github mirror: <a href="https://github.com/apache/wicket" rel="nofollow">https://github.com/apache/wicket</a></li>
+</ul>
+<p>On this page you will find a button with the caption “Fork”. Click it
+or use the button below.</p>
+<p><a class="button" rel="nofollow" href="https://github.com/apache/wicket/fork">Fork us on Github</a></p>
+<p>Now you have your own copy of Wicket to hack on. You can edit directly
+in the Github web interface–good for minor fixes like documentation
+errors–or clone the project to your workstation.</p>
+<h3 id="clone">Clone Wicket to your Workstation</h3>
+<p>You can use the tooling for Github to get a copy on your workstation or
+use the commandline:</p>
+<div class="highlight"><pre><code class="language-bash" data-lang="bash"><span class="nv">$ </span>git clone git@github.com:&lt;your userid&gt;/wicket.git</code></pre></div>
+<p><strong>NB</strong> Ensure that you replace <em>&lt;your userid&gt;</em> with your actual
+Github user id, otherwise your clone command will fail.</p>
+<p>This shell command will create a local checkout of the git repository.
+Now you can check out the correct branch.</p>
+<h3 id="checkout">Start with the Correct Branch</h3>
+<p>Wicket is developed in several version branches. Depending on what you
+want to work on you need to select the right one. The following table
+shows the corresponding branch for each Wicket version.</p>
+<table>
+    <thead>
+        <tr>
+            <th>Wicket version</th>
+            <th>Branch name</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>6.x</td>
+            <td>wicket-6.x</td>
+        </tr>
+        <tr>
+            <td>7.x</td>
+            <td>master</td>
+        </tr>
+    </tbody>
+</table>
+<p>If you want to work on an issue for Wicket 6, you need to check out the
+<em>wicket-6.x</em> branch.</p>
+<p>If you want to work on Wicket 7, then you need to check out <em>master</em>.</p>
+<p>When you are ready with your change you can ask us to review your
+changes and to integrate it into Wicket by creating a Pull Request.</p>
+<h3 id="pullrequest">Create a Pull Request</h3>
+<p>Make sure you have pushed your changes to your Github repository. To
+create a pull request on GitHub follow the instructions you can find <a href="https://help.github.com/articles/creating-a-pull-request/" rel="nofollow">here</a>. Once you have finished to work on you pull
+request, send us an email using <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#119;&#105;&#099;&#107;&#101;&#116;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">devs</a>
+mailing list.</p>
+<p>The Github–Apache integration will automatically send a message to the
+Wicket project that a new pull request is waiting for us.</p>
+<h2 id="documentation">Documentation for contributors</h2>
+<p>This section is particularly of interest for those who want to
+contribute to Wicket.</p>
+<h3 id="how-to-contribute">How to contribute</h3>
+<p>Here’s a list of documents that explain how you can best help the Wicket team:</p>
+<ul>
+  <li><a href="/contribute/userguide.html">Write documentation</a> - Contribute to improve our user guide.</li>
+  <li><a href="/contribute/patch.html">Provide a patch or a pull request</a> - Think you have found a bug or just want to propose a new feature? Do it sending us a patch or creating a pull request on GitHub.</li>
+  <li><a href="/contribute/write.html">Contribute to the site</a> - Help us to improve our site.</li>
+</ul>
+<h3 id="committers">Committers</h3>
+<p>Here’s a list of tasks that only committers can do:</p>
+<ul>
+  <li><a href="/contribute/release.html">Build a release</a></li>
+</ul>
+<h3 id="subscribing-and-unsubscribing">Subscribing and unsubscribing</h3>
+<p><a href="mailto:dev@wicket.apache.org">Wicket development list</a>
+Medium traffic
+<a href="http://mail-archives.apache.org/mod_mbox/wicket-dev/">Archives</a>
+<a href="http://wicket-dev.markmail.org/">Search</a>
+<a href="mailto:dev-subscribe@wicket.apache.org?subject=Subscribe to Apache Wicket development list">Subscribe</a>
+<a href="mailto:dev-unsubscribe@wicket.apache.org?subject=Unsubscribe from Apache Wicket development list">Unsubscribe</a>
+<a href="mailto:dev-help@wicket.apache.org?subject=Help for Apache Wicket development list">Help</a></p>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — 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/230d6865/content/contribute/patch.html
----------------------------------------------------------------------
diff --git a/content/contribute/patch.html b/content/contribute/patch.html
index 56eb811..79b20be 100644
--- a/content/contribute/patch.html
+++ b/content/contribute/patch.html
@@ -1,225 +1,140 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Submit a patch</title>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Improve Wicket with fixes and new features! | 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="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
+        <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" />
 
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
-</div>
-
-		<div id="contentbody">
-			<h1>Submit a patch</h1>
-			<p>TODO: this is just a set of basic instructions.  We need to add more information here.</p>
-
-<h2 id="high-level">High level:</h2>
-<p>The steps to submitting a patch for Wicket are:</p>
-
-<ul>
-  <li>Identify an issue that you want to fix or improve</li>
-  <li>Search <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a> and the mailing list to see if it’s already been discussed</li>
-  <li>If it’s a bug or a feature request, open a <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a></li>
-  <li><a href="../start/quickstart.html">Create a quickstart</a> that you can use for prototyping the feature or demonstrating the bug</li>
-  <li>Attach this quickstart to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA issue</a> if it’s representing a bug report.</li>
-  <li>Get <a href="http://git-scm.com/">Git</a> running</li>
-  <li><a href="../start/download.html#snapshots-and-latest-bleeding-edge-code">Checkout out the code</a></li>
-  <li>Make your changes</li>
-  <li>Create the patch:</li>
-</ul>
-
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git add any_files_you_created_modified_or_deleted</span>
-<span class="go">git diff --cached &gt; /tmp/fix-WICKET-NNNN.patch</span></code></pre></div>
+		<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
 
-<ul>
-  <li>Attach that file (/tmp/fix-WICKET-NNNN.patch) to the <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a></li>
-</ul>
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; 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.
-</span></div>
+    </head>
 
+    <body class="">
+        <div class="header default">
+    <div class="l-container">
+<nav class="mainmenu">
+    <ul>
+		<!-- /start/quickstart.html || /contribute/patch.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/patch.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/patch.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/patch.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/patch.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/patch.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>
-</body>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Improve Wicket with fixes and new features!</h1>
+        </header>
+        <section class="l-one-third right">
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a href="#create-and-set-an-issue-on-jira"><span class="toc-number">1</span> <span class="toc-text">Create and set an issue on JIRA</span></a></li><li class="toc--level-1 toc--section-2"><a href="#time-for-some-coding"><span class="toc-number">2</span> <span class="toc-text">Time for some coding</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#github"><span class="toc-number">2.1</span> <span class="toc-text">Create a pull request</span></a></li><li class="toc--level-2 toc--section-4"><a href="#create-a-patch"><span class="toc-number">2.2</span> <span class="toc-text">Create a patch</span></a></li></ul></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <section class="l-two-third">
+  <h1 id="reportbug">So you have found a bug…</h1>
+  <p>As developers we all strive to produce a flawless software. However, in
+the real world we might find that our code contains errors or bugs.
+Wicket like many other Apache projects uses
+<a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a> to track bugs and
+new feature. If you think you have found a bug follow these simple
+steps before opening a new issue on JIRA:</p>
+  <ul>
+    <li>
+      <p>Test the very last version of Wicket to see if the bug was already
+fixed</p>
+    </li>
+    <li>
+      <p>Search <a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a> and the
+mailing list to see if it’s already been discussed</p>
+    </li>
+    <li>
+      <p>Simply ask to the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#119;&#105;&#099;&#107;&#101;&#116;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">devs</a> mailing list
+if you are unsure.</p>
+    </li>
+  </ul>
+  <h2 id="create-and-set-an-issue-on-jira">Create and set an issue on JIRA</h2>
+  <p>Either you have spotted a bug or you want to propose a new feature, the
+first thing to do is to create and set an issue on JIRA with the
+following steps:</p>
+  <ul>
+    <li>
+      <p>Create a new <a href="https://issues.apache.org/jira/browse/WICKET">JIRA
+issue</a>. The issue might
+alredy exist if you have found a regression.</p>
+    </li>
+    <li>
+      <p>Write a short description of the issue. If this one is a bug, report
+the affected version as well.</p>
+    </li>
+    <li>
+      <p><a href="../start/quickstart.html">Create a quickstart</a> that you can use for
+prototyping the feature or demonstrating the bug.</p>
+    </li>
+  </ul>
+  <h2 id="time-for-some-coding">Time for some coding</h2>
+  <p>Wicket uses Get <a href="http://git-scm.com/">Git</a> as versioning system, so you
+need to have it properly installed and configured to start work on
+Wicket code base. The main git repository is hosted on <a href="https://git-wip-us.apache.org/repos/asf/wicket.git">Apache git
+server</a> but is
+mirrored on <a href="https://github.com/apache/wicket">GitHub</a>. To work on
+Wicket code you can decide to create a pull request forking the GitHub
+mirror or you can clone the official repository and generate a patch
+file.</p>
+  <p><strong>NOTE:</strong> when you are working on Wicket code, please follow our code
+format rules. You can find them <a href="https://github.com/apache/wicket/blob/master/wicket-core/Eclipse
+CodeFormat.xml">inside wicket-core
+module</a> as Eclipse code formatter profile.</p>
+  <h3 id="github">Create a pull request</h3>
+  <p>To create a pull request on GitHub follow the instructions you can find
+<a href="https://help.github.com/articles/creating-a-pull-request/">here</a>. Once
+you have finished to work on you pull request, send us an email using
+<a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#119;&#105;&#099;&#107;&#101;&#116;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">devs</a> mailing list.</p>
+  <h3 id="create-a-patch">Create a patch</h3>
+  <p>If you prefer to work on our main repository, <a href="../start/download.html#snapshots-and-latest-bleeding-edge-code">clone it with
+Git</a>
+and when you have finished your work create a patch with the following
+commands:</p>
+  <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git add any_files_you_created_modified_or_deleted</span>
+<span class="go">git diff --cached &gt; /tmp/WICKET-NNNN.patch</span></code></pre></div>
+  <p>where NNNN is the issue number. Finally, attach that file
+(/tmp/WICKET-NNNN.patch) to the
+<a href="https://issues.apache.org/jira/browse/WICKET">JIRA</a></p>
+</section>
+<section class="l-one-third">
+  <h1 id="table-of-contents">Table of Contents</h1>
+</section>
+        </section>
+    </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — 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/230d6865/content/contribute/release.html
----------------------------------------------------------------------
diff --git a/content/contribute/release.html b/content/contribute/release.html
index 8bd7675..a987620 100644
--- a/content/contribute/release.html
+++ b/content/contribute/release.html
@@ -1,192 +1,57 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>Apache Wicket - Build a release</title>
-
-	<link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
-
-    <!--[if lt ie 7]>
-	<link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen" />
-    <![endif]-->
-    <link rel="shortcut icon" href="/favicon.ico" type="image/vnd.microsoft.icon" />
-	<link rel="alternate" type="application/atom+xml" href="/atom.xml" />
-	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<div id="container">
-    <div id="content">
-        <div id="header"><a href="/"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
-		<div id="navigation">
-	<h5><a name="Navigation-Wicket"></a>Meet Wicket</h5>
-	<ul>
-		<li>
-			<a href="/" title="Index">Home</a>
-		</li>
-		<li>
-			<a href="/meet/introduction.html" title="Introduction">Introduction</a>
-		</li>
-		<li>
-			<a href="/meet/features.html" title="Features">Features</a>
-		</li>
-		<li>
-			<a href="/meet/buzz.html" title="Buzz">Buzz</a>
-		</li>
-		<li>
-			<a href="/meet/vision.html" title="Vision">Vision</a>
-		</li>
-		<li>
-			<a href="/meet/blogs.html" title="Blogs">Blogs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-GettingStarted" id="Navigation-GettingStarted"></a>Get Started
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/download.html" title="Download Wicket">Download Wicket</a>
-		</li>
-		<li>
-			<a href="/start/quickstart.html" title="Getting started via a Maven Archetype">Quickstart</a>
-		</li>
-		<li>
-			<a href="http://www.jweekend.com/dev/LegUp" rel="nofollow">More archetypes</a>
-		</li>
-		<li>
-			<a href="/help" title="Get help">Get help</a>
-		</li>
-		<li>
-			<a href="/help/email.html" title="Wicket Mailing Lists">Mailing Lists</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Documentation" id="Navigation-Documentation"></a>Learn
-	</h5>
-	<ul>
-		<li>
-			<a href="/start/userguide.html" title="User Guide">User Guide</a>
-		</li>
-		<li>
-			<a href="/learn/examples" title="Examples">Examples</a>
-		</li>
-		<li>
-			<a href="http://www.wicket-library.com/wicket-examples/compref/">Components</a>
-		</li>
-		<li>
-			<a href="/learn/projects/" title="Projects extending basic Wicket">Projects</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET">Wiki</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Reference+library">Reference guide</a>
-		</li>
-		<li>
-			<a href="/learn/books" title="Books">Books</a>
-		</li>
-		<li>
-			<a href="/learn/ides.html" title="IDEs">IDEs</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Releases" id="Navigation-Releases"></a>Releases
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/6.20.0">Wicket 6.20</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.5.13">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.23">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/1.3.7">Wicket 1.3</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.2" class="external-link" rel="nofollow">Wicket 1.2</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.1" class="external-link" rel="nofollow">Wicket 1.1</a>
-		</li>
-		<li>
-			<a href="http://wicket.sf.net/wicket-1.0" class="external-link" rel="nofollow">Wicket 1.0</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Docs" id="Navigation-Docs"></a>API Docs
-	</h5>
-	<ul>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/6.x/" title="JavaDocs of Apache Wicket 6.x">Wicket 6.x</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.5.x/" title="JavaDocs of Apache Wicket 1.5.x">Wicket 1.5</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.4.x" title="JavaDocs of Apache Wicket 1.4.x">Wicket 1.4</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/1.3.x" title="JavaDocs of Apache Wicket 1.3.x">Wicket 1.3</a>
-		</li>
-	</ul>
-	<h5>Wicket 7.x</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/dyn/closer.cgi/wicket/7.0.0-M6">Download M6</a>
-		</li>
-		<li>
-			<a href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+7.0">Migration guide</a>
-		</li>
-		<li>
-			<a href="http://ci.apache.org/projects/wicket/apidocs/7.x/" title="JavaDocs of Apache Wicket 7.x">API Docs 7.x</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Developers" id="Navigation-Developers"></a>Contribute
-	</h5>
-	<ul>
-		<li>
-			<a href="/contribute/write.html" title="Writing documentation">Writing docs</a>
-		</li>
-		<li>
-			<a href="/contribute/build.html" title="Building from SVN">Build Wicket</a>
-		</li>
-		<li>
-			<a href="/contribute/patch.html" title="Provide a patch">Provide a patch</a>
-		</li>
-		<li>
-			<a href="/contribute/release.html" title="Release Wicket">Release Wicket</a>
-		</li>
-		<li>
-			<a href="https://fisheye6.atlassian.com/browse/wicket-git" title="Git Overview" class="external-link" rel="nofollow">Fisheye</a>
-		</li>
-	</ul>
-	<h5>
-		<a name="Navigation-Apache" id="Navigation-Apache"></a>Apache
-	</h5>
-	<ul>
-		<li>
-			<a href="http://www.apache.org/" class="external-link" rel="nofollow">Apache</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/licenses/" class="external-link" rel="nofollow">License</a>
-		</li>
-		<li>
-			<a href="http://www.apache.org/foundation/sponsorship.html" class="external-link" rel="nofollow">Sponsorship</a>
-		</li>
-		<li>
-			<a href="http://apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a>
-		</li>
-		<li>
-			<a href="/apache/friends.html" title="Apache projects using Wicket">Friends</a>
-		</li>
-	</ul>
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <title>Build a release | 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 || /contribute/release.html -->
+    	<li class=""><a href="/start/quickstart.html">Quick Start</a></li>
+		<!-- /start/download.html || /contribute/release.html -->
+    	<li class=""><a href="/start/download.html">Download</a></li>
+		<!-- /learn || /contribute/release.html -->
+    	<li class=""><a href="/learn">Documentation</a></li>
+		<!-- /help || /contribute/release.html -->
+    	<li class=""><a href="/help">Support</a></li>
+		<!-- /contribute || /contribute/release.html -->
+    	<li class=""><a href="/contribute">Contribute</a></li>
+		<!-- /apache || /contribute/release.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 id="contentbody">
-			<h1>Build a release</h1>
-			<h2 id="contents">Contents</h2>
+    </div>
+</div>
+<main>
+    <div class="l-container">
+        <header class="l-full preamble">
+            <h1>Build a release</h1>
+            <h2>How-to documentation for building Wicket releases</h2>
+        </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="#contents"><span class="toc-number">1</span> <span class="toc-text">Contents</span></a></li><li class="toc--level-1 toc--section-2"><a href="#release-60"><span class="toc-number">2</span> <span class="toc-text">Releasing Apache Wicket 6.x</span></a><ul><li class="toc--level-2 toc--section-3"><a href="#building-the-release"><span class="toc-number">2.1</span> <span class="toc-text">Building the Release</span></a></li></ul></li><li class="toc--level-1 toc--section-4"><a href="#release-14"><span class="toc-number">3</span> <span class="toc-text">Releasing Apache Wicket 1.4.x+</span></a><ul><li class="toc--level-2 toc--section-5"><a href="#building-the-release-1"><span class="toc-number">3.1</span> <span class="toc-text">Building the Release</span></a></li></ul></li><li class="toc--level-1 toc--section-6"><a href="#nexus"><span class="toc-number"
 >4</span> <span class="toc-text">Staging Releases using the Apache Nexus Staging Repository</span></a><ul><li class="toc--level-2 toc--section-7"><a href="#staging-artifacts"><span class="toc-number">4.1</span> <span class="toc-text">Staging Artifacts</span></a></li><li class="toc--level-2 toc--section-8"><a href="#managing-staged-artifacts"><span class="toc-number">4.2</span> <span class="toc-text">Managing Staged Artifacts</span></a></li></ul></li><li class="toc--level-1 toc--section-9"><a href="#announcing"><span class="toc-number">5</span> <span class="toc-text">Announcing the release</span></a></li><li class="toc--level-1 toc--section-10"><a href="#additional-tasks---additional-"><span class="toc-number">6</span> <span class="toc-text">Additional tasks ## { #additional }</span></a></li></ul></div>
+        </section>
+        <section class="l-two-third left">
+            <p>Learn how to build and release one of the Wicket branches.</p>
+<h2 id="contents">Contents</h2>
 <ul>
   <li><a href="#release-60">Releasing Apache Wicket 6.x</a></li>
   <li><a href="#release-14">Releasing Apache Wicket 1.4.x+</a></li>
@@ -195,60 +60,39 @@
   <li><a href="#announcing">Announcing the release</a></li>
   <li><a href="#additional">Additional tasks</a></li>
 </ul>
-
 <h2 id="release-60">Releasing Apache Wicket 6.x</h2>
-
 <p>Per <a href="http://apache.org/dev/release.html">Apache release policy</a> we need to build, vote on and release a source distribution. As a convenience to our users, we can also provide binary packages, that are uploaded to Maven Central, and a binary archive for folks that for whatever reason don’t use Maven.</p>
-
 <h3 id="building-the-release">Building the Release</h3>
-
 <h4 id="required-software">Required software</h4>
-
 <p>This assumes running a unix-y environment (i.e. OS X, Linux) and that you have the necessary tools installed, such as recent Maven, Java 6, gpg (-agent).</p>
-
 <h4 id="preparing">Preparing</h4>
-
 <ul>
   <li>Pull changes</li>
   <li>Checkout master</li>
   <li>Update changelog and commit them</li>
 </ul>
-
 <h4 id="building">Building</h4>
-
 <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>
-
 <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>
-  <li>And create an environment variable for your Apache username for uploading the release:</li>
+  <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>
-<span class="go">export APACHEID=apacheid</span></code></pre></div>
-
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">export NEWVERSION=6.0.0</span></code></pre></div>
 <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>
-
 <ul>
-  <li>Create release branch: </li>
+  <li>Create release branch:</li>
 </ul>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span></code></pre></div>
-
 <ul>
-  <li>Checkout the release branch: </li>
+  <li>Checkout the release branch:</li>
 </ul>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">git checkout build/wicket-$NEWVERSION</span></code></pre></div>
-
 <ul>
   <li>
     <p>Update archetypes/quickstart/src/main/archetype-resources/pom.xml to use NEWVERSION of Wicket and commit</p>
@@ -262,61 +106,46 @@
     </ul>
   </li>
 </ul>
-
 <div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">mvn release:prepare</span></code></pre></div>
-
 <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>
-
 <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>
-
 <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>
-
 <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>
-
 <h4 id="staging-the-build">Staging the build</h4>
-
-<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
-<span class="go">scp apache-wicket-* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></div>
-
+<div class="highlight"><pre><code class="language-console" data-lang="console"><span class="go">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION</span>
+<span class="go">scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></div>
+<p><strong>TODO</strong> figure out how to let <code>release:perform</code> work from a local checkout, such that we can actually <em>stage</em> the build instead of having to push the tag to our git repo.</p>
+<p>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>
 <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>
-
 <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>
@@ -325,49 +154,35 @@
 <span class="go">cp ../README .</span>
 <span class="go">cp ../NOTICE .</span>
 <span class="go">cd ..</span>
-<span class="go">tar cfz apache-wicket-$NEWVERSION-bin.tar.gz apache-wicket-$NEWVERSION</span>
-<span class="go">zip -r apache-wicket-$NEWVERSION-bin.zip apache-wicket-$NEWVERSION</span>
-<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.tar.gz</span>
-<span class="go">gpg --armor --detach-sign --use-agent --sign apache-wicket-$NEWVERSION-bin.zip</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-bin.zip.sha</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 $APACHEID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin</span>
-<span class="go">scp apache-wicket-*bin.* $APACHEID@people.apache.org:public_html/wicket-$NEWVERSION/bin</span></code></pre></div>
-
+<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>
 <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>When the vote has passed successfully (at least 3 binding +1’s) push the branch and the tag to Apache git:</p>
-
+<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>
-
 <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>
-
 <h3 id="building-the-release-1">Building the Release</h3>
-
 <h4 id="preparing-1">Preparing</h4>
-
 <ul>
   <li>Ask the dev@ mailing list if there are any issues that still need to be in the release (looking at JIRA is a good start)</li>
   <li><a href="https://issues.apache.org/jira/plugins/servlet/project-config/WICKET/versions">Release</a> the version in JIRA</li>
   <li>Assuming there are none, and you are now in build mode, update the CHANGELOG-x.y file
 (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>
@@ -378,7 +193,6 @@
 <span class="go">        &lt;/server&gt;</span>
 <span class="go">&lt;/servers&gt;</span>
 <span class="go">&lt;/settings&gt;</span></code></pre></div>
-
 <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>
@@ -390,44 +204,31 @@ 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>
-
 <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>
-
 <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>
   <li>Announce (see <a href="#announcing">below</a>)</li>
 </ul>
-
 <h2 id="nexus">Staging Releases using the Apache Nexus Staging Repository</h2>
-
 <p>The key to stage and manage repositories on <a href="https://repository.apache.org">Apache Nexus Staging repo</a> are your Apache Commiter credentials.</p>
-
 <h3 id="staging-artifacts">Staging Artifacts</h3>
-
 <p><strong>Note</strong>: The steps below are part of release-igor.sh script!</p>
-
 <p>When you run <strong>mvn -P release deploy</strong> the generated artifacts will be uploaded into a Nexus staging repository.</p>
-
 <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>
@@ -438,35 +239,25 @@ will copy the assemblies to your people.apache.org account.</li>
 <span class="go">        &lt;/server&gt;</span>
 <span class="go">&lt;/servers&gt;</span>
 <span class="go">&lt;/settings&gt;</span></code></pre></div>
-
 <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>
-
 <p>The interface will allow you to:
 * View the staging repositories.
 * Close staging repositories.
 * Release closed repository artifacts (into the release repo and after 1-2 hours into central as well).
 * Drop open and closed staging repositories.</p>
-
 <p>More information is available at: <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven">Publishing Maven Artifacts</a></p>
-
 <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>
-
 <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>
-
 <ul>
   <li>Write an announcement in the _posts directory</li>
   <li>Restart jekyll to regenerate the pages: it will automatically generate the
@@ -476,15 +267,12 @@ contains your announcement.</li>
   <li>Send email to: users@wicket.apache.org, dev@wicket.apache.org, announce@wicket.apache.org, announce@apache.org</li>
   <li>Misc. websites like javalobby, serverside, onjava etc.</li>
 </ul>
-
 <h2 id="additional-tasks---additional-">Additional tasks ## { #additional }</h2>
-
 <ul>
   <li>Commit the JavaDocs to
 <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:
@@ -493,18 +281,19 @@ svnpubsub will push this directly to our website. (example script below)</li>
 <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>
-
-
-		</div>
-        <div id="clearer"></div>
-		<div id="footer"><span>
-Copyright &copy; 2015 &mdash; 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.
-</span></div>
-
+        </section>
     </div>
+</main>
+        <footer class="l-container">
+            <div class="l-full">
+    <img height="60px" src="/img/asf_logo.gif" style="float:left">
+    Copyright © 2014 — 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>
-</body>
+        </footer>
+    </body>
+
 </html>