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

[2/3] wicket-site git commit: Unified download links for wicket 6.x, 7.x, 8.x

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/contribute/release.html
----------------------------------------------------------------------
diff --git a/content/contribute/release.html b/content/contribute/release.html
index e5eca0f..404f83b 100644
--- a/content/contribute/release.html
+++ b/content/contribute/release.html
@@ -75,24 +75,24 @@
 <ul>
   <li>Start gpg-agent as a daemon (OS X, using homebrew installation of gpg, gpg-agent, pinentry):</li>
 </ul>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">    eval `gpg-agent --daemon --pinentry-program /usr/local/bin/pinentry`</span></code></pre></figure>
+<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\u2019re actually going to release):</li>
 </ul>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">export NEWVERSION=6.0.0</span></code></pre></figure>
+<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>
 <figure class="highlight"><pre><code class="language-console" data-lang="console">gpg --armor --detach-sign --use-agent --sign pom.xml
-<span class="err">rm pom.xml.asc</span></code></pre></figure>
+rm pom.xml.asc</code></pre></figure>
 <ul>
   <li>Create release branch:</li>
 </ul>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">mvn release:branch -DbranchName=build/wicket-$NEWVERSION</span></code></pre></figure>
+<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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">git checkout build/wicket-$NEWVERSION</span></code></pre></figure>
+<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,16 +106,16 @@
     </ul>
   </li>
 </ul>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">mvn release:prepare</span></code></pre></figure>
+<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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">git reset HEAD^ --hard</span></code></pre></figure>
+<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>
 <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
-<span class="err">git archive --format=zip --prefix=apache-wicket-$NEWVERSION/ -o apache-wicket-$NEWVERSION.zip wicket-$NEWVERSION</span></code></pre></figure>
+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 \u2018/\u2019 after \u2013prefix=NEWVERSION is vital for the tarball</li>
   <li><strong>NOTE 2</strong> you can ignore the gpg generated messages telling \u2018You need a passphrase to unlock the secret key for\u2019, unless an error occurred\u2014these messages are not error messages</li>
@@ -126,21 +126,21 @@ 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
-<span class="err">gpg --print-md MD5  apache-wicket-$NEWVERSION.zip &gt; apache-wicket-$NEWVERSION.zip.md5</span></code></pre></figure>
+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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">git tag -s --force wicket-$NEWVERSION</span></code></pre></figure>
+<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>
 <figure class="highlight"><pre><code class="language-console" data-lang="console">ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION
-<span class="err">scp apache-wicket-* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION</span></code></pre></figure>
+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 class="highlighter-rouge">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>
 <figure class="highlight"><pre><code class="language-console" data-lang="console">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION
-<span class="err">git push -tags origin</span></code></pre></figure>
+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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">mvn release:perform</span></code></pre></figure>
+<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\u2019t 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>
@@ -163,14 +163,14 @@ gpg --print-md MD5  apache-wicket-$NEWVERSION-bin.tar.gz &gt; apache-wicket-$NEW
 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
-<span class="err">scp apache-wicket-*bin.* APACHE_ID@people.apache.org:public_html/wicket-$NEWVERSION/bin</span></code></pre></figure>
+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\u2019t push the tag twice).</p>
 <figure class="highlight"><pre><code class="language-console" data-lang="console">git push origin build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION
-<span class="err">git push -tags origin</span></code></pre></figure>
+git push -tags origin</code></pre></figure>
 <p>You only need to do them if you haven\u2019t 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\u2019t forget to announce the release!</p>
 <h2 id="release-14">Releasing Apache Wicket 1.4.x+</h2>
@@ -192,7 +192,7 @@ ssh APACHE_ID@people.apache.org mkdir public_html/wicket-$NEWVERSION/bin
             &lt;password&gt;$your_apache_password&lt;/password&gt;
         &lt;/server&gt;
 &lt;/servers&gt;
-<span class="err">&lt;/settings&gt;</span></code></pre></figure>
+&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>
@@ -207,7 +207,7 @@ will copy the assemblies to your people.apache.org account.</li>
 <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
-<span class="err">chown -R :wicket /www/www.apache.org/dist/wicket/x.y.z</span></code></pre></figure>
+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>
@@ -215,7 +215,7 @@ mv ~/public_html/wicket-x.y.z/dist/* /www/www.apache.org/dist/wicket/x.y.z
 </ul>
 <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
-<span class="err">git push --tags</span></code></pre></figure>
+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>
@@ -238,7 +238,7 @@ git tag release/wicket-x.y.z
             &lt;password&gt;$password&lt;/password&gt;
         &lt;/server&gt;
 &lt;/servers&gt;
-<span class="err">&lt;/settings&gt;</span></code></pre></figure>
+&lt;/settings&gt;</code></pre></figure>
 <p>This works if you can deploy artifacts into the repository.apache.org properly (i.e. you don\u2019t 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>
@@ -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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="ni"># </span><span class="nc">do</span><span class="kv"> this in your locally-checked-out release branch (i.e. svn.../releases/wicket-1.4.13)
-</span>mvn javadoc:aggregate
-<span class="ni"># </span><span class="nc">note</span><span class="kv"> that you may need to tweak these paths to fit your configuration:
-</span>cp -r target/site/apidocs/* ../wicket-common/site/apidocs/1.4/
+<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/
-<span class="ni"># </span><span class="nc">call</span><span class="kv"> "svn add" for files that are new (there's probably an easier way to do this)
-</span>svn stat | grep -e '^?' | sed 's/\?\W*//' | xargs svn add
-<span class="err">svn commit -m "changes to update javadocs to latest release"</span></code></pre></figure>
+# 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/5fb1aa89/content/contribute/write.html
----------------------------------------------------------------------
diff --git a/content/contribute/write.html b/content/contribute/write.html
index 41a6b9e..1c99ffc 100644
--- a/content/contribute/write.html
+++ b/content/contribute/write.html
@@ -69,14 +69,14 @@ 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>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">gem install jekyll</span></code></pre></figure>
+<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="clone">Clone wicket-site</h2>
 <p>Before you can edit the site, you need to clone it:</p>
 <figure class="highlight"><pre><code class="language-bash" data-lang="bash">git clone git@github.com:apache/wicket-site.git</code></pre></figure>
 <h2 id="run">Run the site</h2>
 <p>You can run the website and edit it live:</p>
-<figure class="highlight"><pre><code class="language-console" data-lang="console"><span class="err">jekyll serve -w</span></code></pre></figure>
+<figure class="highlight"><pre><code class="language-console" data-lang="console">jekyll serve -w</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>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 00bac7b..354dd57 100644
--- a/content/index.html
+++ b/content/index.html
@@ -247,8 +247,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2">http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2</a></li>
-  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2/binaries">http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2">8.0.0-M2 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/8.0.0-M2/binaries">8.0.0-M2 binary download</a></li>
 </ul>
         <a href="/news/2016/10/26/wicket-8.0.0-M2-released.html">Read more...</a> 
     </article>
@@ -275,8 +275,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.5.0">http://www.apache.org/dyn/closer.cgi/wicket/7.5.0</a></li>
-  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.5.0/binaries">http://www.apache.org/dyn/closer.cgi/wicket/7.5.0/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.5.0">7.5.0 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/7.5.0/binaries">7.5.0 binary download</a></li>
 </ul>
         <a href="/news/2016/10/26/wicket-7.5.0-released.html">Read more...</a> 
     </article>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/ajaxcounter.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/ajaxcounter.html b/content/learn/examples/ajaxcounter.html
index 8d5a002..b20898d 100644
--- a/content/learn/examples/ajaxcounter.html
+++ b/content/learn/examples/ajaxcounter.html
@@ -81,15 +81,15 @@ how it works on the Java side:</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.link.Link</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.model.Model</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Index</span> <span class="kd">extends</span> <span class="n">QuickStartPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Index</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Index</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">model</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;()</span> <span class="o">{</span>
             <span class="kd">private</span> <span class="kt">int</span> <span class="n">counter</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-            <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">getObject</span><span class="o">()</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="n">Integer</span> <span class="n">getObject</span><span class="o">()</span> <span class="o">{</span>
                 <span class="k">return</span> <span class="n">counter</span><span class="o">++;</span>
             <span class="o">}</span>
         <span class="o">};</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Link</span><span class="o">(</span><span class="s">"link"</span><span class="o">)</span> <span class="o">{</span>
-            <span class="kd">public</span> <span class="kt">void</span> <span class="nf">onClick</span><span class="o">()</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="kt">void</span> <span class="n">onClick</span><span class="o">()</span> <span class="o">{</span>
                 <span class="c1">// do nothing.</span>
             <span class="o">}</span>
         <span class="o">});</span>
@@ -117,15 +117,15 @@ provides a fallback to a normal request in case no Ajax is available.</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.model.Model</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Index</span> <span class="kd">extends</span> <span class="n">QuickStartPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Index</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Index</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">model</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;()</span> <span class="o">{</span>
             <span class="kd">private</span> <span class="kt">int</span> <span class="n">counter</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-            <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">getObject</span><span class="o">()</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="n">Integer</span> <span class="n">getObject</span><span class="o">()</span> <span class="o">{</span>
                 <span class="k">return</span> <span class="n">counter</span><span class="o">++;</span>
             <span class="o">}</span>
         <span class="o">};</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">AjaxFallbackLink</span><span class="o">(</span><span class="s">"link"</span><span class="o">)</span> <span class="o">{</span>
-            <span class="kd">public</span> <span class="kt">void</span> <span class="nf">onClick</span><span class="o">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">)</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="kt">void</span> <span class="n">onClick</span><span class="o">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">)</span> <span class="o">{</span>
                 <span class="c1">// add the components that need to be updated to </span>
                 <span class="c1">// the target</span>
             <span class="o">}</span>
@@ -145,17 +145,17 @@ request target.</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.model.Model</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Index</span> <span class="kd">extends</span> <span class="n">QuickStartPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Index</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Index</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">model</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Model</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;()</span> <span class="o">{</span>
             <span class="kd">private</span> <span class="kt">int</span> <span class="n">counter</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-            <span class="kd">public</span> <span class="n">Integer</span> <span class="nf">getObject</span><span class="o">()</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="n">Integer</span> <span class="n">getObject</span><span class="o">()</span> <span class="o">{</span>
                 <span class="k">return</span> <span class="n">counter</span><span class="o">++;</span>
             <span class="o">}</span>
         <span class="o">};</span>
         <span class="kd">final</span> <span class="n">Label</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;</span> <span class="n">label</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Label</span><span class="o">&lt;</span><span class="n">Integer</span><span class="o">&gt;(</span><span class="s">"counter"</span><span class="o">,</span> <span class="n">model</span><span class="o">);</span>
         <span class="n">label</span><span class="o">.</span><span class="na">setOutputMarkupId</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">AjaxFallbackLink</span><span class="o">(</span><span class="s">"link"</span><span class="o">)</span> <span class="o">{</span>
-            <span class="kd">public</span> <span class="kt">void</span> <span class="nf">onClick</span><span class="o">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">)</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="kt">void</span> <span class="n">onClick</span><span class="o">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">)</span> <span class="o">{</span>
                 <span class="k">if</span> <span class="o">(</span><span class="n">target</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
                     <span class="c1">// target is only available in an Ajax request</span>
                     <span class="n">target</span><span class="o">.</span><span class="na">addComponent</span><span class="o">(</span><span class="n">label</span><span class="o">);</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/dropdownchoice.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/dropdownchoice.html b/content/learn/examples/dropdownchoice.html
index df13971..eabf1c1 100644
--- a/content/learn/examples/dropdownchoice.html
+++ b/content/learn/examples/dropdownchoice.html
@@ -69,13 +69,13 @@ select the manager of an employee.</p>
     <span class="cm">/**
      * Used to display the person.
      */</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="n">toString</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">name</span><span class="o">;</span>
     <span class="o">}</span>
     <span class="cm">/**
      * Gets the list of possible managers from the database.
      */</span>
-    <span class="kd">public</span> <span class="kd">static</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="nf">getManagers</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kd">static</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="n">getManagers</span><span class="o">()</span> <span class="o">{</span>
         <span class="c1">// gets the managers from the database</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -115,7 +115,7 @@ The <code class="highlighter-rouge">&lt;option&gt;</code> tags are there for pre
 with the generated choices.</p>
 <p>Let\u2019s see how the page looks like from the Java side:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AssignManagerPage</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">AssignManagerPage</span><span class="o">(</span><span class="n">Person</span> <span class="n">employee</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">AssignManagerPage</span><span class="o">(</span><span class="n">Person</span> <span class="n">employee</span><span class="o">)</span> <span class="o">{</span>
         <span class="n">Form</span> <span class="n">form</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Form</span><span class="o">(</span><span class="s">"form"</span><span class="o">);</span>
         <span class="n">add</span><span class="o">(</span><span class="n">form</span><span class="o">);</span>
         <span class="n">form</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"name"</span><span class="o">,</span> <span class="k">new</span> <span class="n">PropertyModel</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;(</span><span class="n">employee</span><span class="o">,</span> <span class="s">"name"</span><span class="o">)));</span>
@@ -124,7 +124,7 @@ with the generated choices.</p>
                     <span class="k">new</span> <span class="n">PropertyModel</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;(</span><span class="n">employee</span><span class="o">,</span> <span class="s">"managedBy"</span><span class="o">),</span>
                     <span class="k">new</span> <span class="n">LoadableDetachableModel</span><span class="o">&lt;</span><span class="n">List</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;&gt;()</span> <span class="o">{</span>
                         <span class="nd">@Override</span>
-                        <span class="kd">protected</span> <span class="n">Object</span> <span class="nf">load</span><span class="o">()</span> <span class="o">{</span> 
+                        <span class="kd">protected</span> <span class="n">Object</span> <span class="n">load</span><span class="o">()</span> <span class="o">{</span> 
                             <span class="k">return</span> <span class="n">Person</span><span class="o">.</span><span class="na">getManagers</span><span class="o">();</span>
                         <span class="o">}</span>
                     <span class="o">}</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/guestbook.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/guestbook.html b/content/learn/examples/guestbook.html
index b28250b..eb0ead4 100644
--- a/content/learn/examples/guestbook.html
+++ b/content/learn/examples/guestbook.html
@@ -66,25 +66,25 @@ of this example.</p>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Comment</span> <span class="kd">implements</span> <span class="n">IClusterable</span> <span class="o">{</span>
     <span class="kd">private</span> <span class="n">String</span> <span class="n">text</span><span class="o">;</span>
     <span class="kd">private</span> <span class="n">Date</span> <span class="n">date</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Date</span><span class="o">();</span>
-    <span class="kd">public</span> <span class="nf">Comment</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Comment</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="nf">Comment</span><span class="o">(</span><span class="kd">final</span> <span class="n">Comment</span> <span class="n">comment</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Comment</span><span class="o">(</span><span class="kd">final</span> <span class="n">Comment</span> <span class="n">comment</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">text</span> <span class="o">=</span> <span class="n">comment</span><span class="o">.</span><span class="na">text</span><span class="o">;</span>
         <span class="k">this</span><span class="o">.</span><span class="na">date</span> <span class="o">=</span> <span class="n">comment</span><span class="o">.</span><span class="na">date</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getText</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="n">getText</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">text</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setText</span><span class="o">(</span><span class="n">String</span> <span class="n">text</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setText</span><span class="o">(</span><span class="n">String</span> <span class="n">text</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">text</span> <span class="o">=</span> <span class="n">text</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">Date</span> <span class="nf">getDate</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Date</span> <span class="n">getDate</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">date</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">setDate</span><span class="o">(</span><span class="n">Date</span> <span class="n">date</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="n">setDate</span><span class="o">(</span><span class="n">Date</span> <span class="n">date</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">this</span><span class="o">.</span><span class="na">date</span> <span class="o">=</span> <span class="n">date</span><span class="o">;</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">String</span> <span class="nf">toString</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="n">toString</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="s">"[Comment date = "</span> <span class="o">+</span> <span class="n">date</span> <span class="o">+</span> <span class="s">", text = "</span> <span class="o">+</span> <span class="n">text</span> <span class="o">+</span> <span class="s">"]"</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -123,13 +123,13 @@ accomplished in just a few lines of code.</p>
     <span class="cm">/**
      * Constructor that is invoked when page is invoked without a session.
      */</span>
-    <span class="kd">public</span> <span class="nf">GuestBook</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">GuestBook</span><span class="o">()</span> <span class="o">{</span>
         <span class="c1">// Add comment form</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">CommentForm</span><span class="o">(</span><span class="s">"commentForm"</span><span class="o">));</span>
         <span class="c1">// Add commentListView of existing comments</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">PropertyListView</span><span class="o">&lt;</span><span class="n">Comment</span><span class="o">&gt;(</span><span class="s">"comments"</span><span class="o">,</span> <span class="n">commentList</span><span class="o">)</span> <span class="o">{</span>
             <span class="nd">@Override</span>
-            <span class="kd">public</span> <span class="kt">void</span> <span class="nf">populateItem</span><span class="o">(</span><span class="kd">final</span> <span class="n">ListItem</span><span class="o">&lt;</span><span class="n">Comment</span><span class="o">&gt;</span> <span class="n">listItem</span><span class="o">)</span> <span class="o">{</span>
+            <span class="kd">public</span> <span class="kt">void</span> <span class="n">populateItem</span><span class="o">(</span><span class="kd">final</span> <span class="n">ListItem</span><span class="o">&lt;</span><span class="n">Comment</span><span class="o">&gt;</span> <span class="n">listItem</span><span class="o">)</span> <span class="o">{</span>
                 <span class="n">listItem</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"date"</span><span class="o">));</span>
                 <span class="n">listItem</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">MultiLineLabel</span><span class="o">(</span><span class="s">"text"</span><span class="o">));</span>
             <span class="o">}</span>
@@ -139,7 +139,7 @@ accomplished in just a few lines of code.</p>
      * A form that allows a user to add a comment.
      */</span>
     <span class="kd">public</span> <span class="kd">final</span> <span class="kd">class</span> <span class="nc">CommentForm</span> <span class="kd">extends</span> <span class="n">Form</span><span class="o">&lt;</span><span class="n">ValueMap</span><span class="o">&gt;</span> <span class="o">{</span>
-        <span class="kd">public</span> <span class="nf">CommentForm</span><span class="o">(</span><span class="kd">final</span> <span class="n">String</span> <span class="n">id</span><span class="o">)</span> <span class="o">{</span>
+        <span class="kd">public</span> <span class="n">CommentForm</span><span class="o">(</span><span class="kd">final</span> <span class="n">String</span> <span class="n">id</span><span class="o">)</span> <span class="o">{</span>
             <span class="c1">// Construct form with no validation listener</span>
             <span class="kd">super</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="k">new</span> <span class="n">CompoundPropertyModel</span><span class="o">&lt;</span><span class="n">ValueMap</span><span class="o">&gt;(</span><span class="k">new</span> <span class="n">ValueMap</span><span class="o">()));</span>
             <span class="c1">// this is just to make the unit test happy</span>
@@ -153,7 +153,7 @@ accomplished in just a few lines of code.</p>
          * Show the resulting valid edit
          */</span>
         <span class="nd">@Override</span>
-        <span class="kd">public</span> <span class="kd">final</span> <span class="kt">void</span> <span class="nf">onSubmit</span><span class="o">()</span> <span class="o">{</span>
+        <span class="kd">public</span> <span class="kd">final</span> <span class="kt">void</span> <span class="n">onSubmit</span><span class="o">()</span> <span class="o">{</span>
             <span class="n">ValueMap</span> <span class="n">values</span> <span class="o">=</span> <span class="n">getModelObject</span><span class="o">();</span>
             <span class="c1">// check if the honey pot is filled</span>
             <span class="k">if</span> <span class="o">(</span><span class="n">StringUtils</span><span class="o">.</span><span class="na">isNotBlank</span><span class="o">((</span><span class="n">String</span><span class="o">)</span><span class="n">values</span><span class="o">.</span><span class="na">get</span><span class="o">(</span><span class="s">"comment"</span><span class="o">)))</span> <span class="o">{</span>
@@ -173,7 +173,7 @@ accomplished in just a few lines of code.</p>
     <span class="cm">/**
      * Clears the comments.
      */</span>
-    <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">clear</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="n">clear</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">commentList</span><span class="o">.</span><span class="na">clear</span><span class="o">();</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -236,10 +236,10 @@ final treat the modifications to the <code class="highlighter-rouge">web.xml</co
 <span class="kn">import</span> <span class="nn">org.apache.wicket.Page</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.examples.WicketExampleApplication</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">GuestBookApplication</span> <span class="kd">extends</span> <span class="n">WicketExampleApplication</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">GuestBookApplication</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">GuestBookApplication</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
     <span class="nd">@Override</span>
-    <span class="kd">public</span> <span class="n">Class</span><span class="o">&lt;</span> <span class="o">?</span> <span class="kd">extends</span> <span class="n">Page</span><span class="o">&gt;</span> <span class="nf">getHomePage</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Class</span><span class="o">&lt;</span> <span class="o">?</span> <span class="kd">extends</span> <span class="n">Page</span><span class="o">&gt;</span> <span class="n">getHomePage</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">GuestBook</span><span class="o">.</span><span class="na">class</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/helloworld.html b/content/learn/examples/helloworld.html
index 8676bab..3a25549 100644
--- a/content/learn/examples/helloworld.html
+++ b/content/learn/examples/helloworld.html
@@ -68,13 +68,13 @@ without having to go through the whole build-deploy cycle.</p>
 defines what the home page is, and allows for some configuration.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">import</span> <span class="nn">org.apache.wicket.protocol.http.WebApplication</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloWorldApplication</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">HelloWorldApplication</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">HelloWorldApplication</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
     <span class="cm">/**
      * @see org.apache.wicket.Application#getHomePage()
      */</span>
     <span class="nd">@Override</span>
-    <span class="kd">public</span> <span class="n">Class</span> <span class="nf">getHomePage</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Class</span> <span class="n">getHomePage</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">HelloWorld</span><span class="o">.</span><span class="na">class</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -85,7 +85,7 @@ rendered by the HelloWorld page is returned.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.WebPage</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">HelloWorld</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">HelloWorld</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">HelloWorld</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"message"</span><span class="o">,</span> <span class="s">"Hello World!"</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/markupinheritance.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/markupinheritance.html b/content/learn/examples/markupinheritance.html
index 04ce4fc..874b249 100644
--- a/content/learn/examples/markupinheritance.html
+++ b/content/learn/examples/markupinheritance.html
@@ -125,7 +125,7 @@ look at the example at hand. Let\u2019s first create the base page.</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.link.BookmarkablePageLink</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">abstract</span> <span class="kd">class</span> <span class="nc">BasePage</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
-	<span class="kd">public</span> <span class="nf">BasePage</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">BasePage</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">BookmarkablePageLink</span><span class="o">(</span><span class="s">"page1"</span><span class="o">,</span> <span class="n">Page1</span><span class="o">.</span><span class="na">class</span><span class="o">));</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">BookmarkablePageLink</span><span class="o">(</span><span class="s">"page2"</span><span class="o">,</span> <span class="n">Page2</span><span class="o">.</span><span class="na">class</span><span class="o">));</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"footer"</span><span class="o">,</span> <span class="s">"This is in the footer"</span><span class="o">));</span>
@@ -166,7 +166,7 @@ markup file and Java class. Let\u2019s first implement <code class="highlighter-rou
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">quickstart</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page1</span> <span class="kd">extends</span> <span class="n">BasePage</span> <span class="o">{</span>
-	<span class="kd">public</span> <span class="nf">Page1</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">Page1</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"label1"</span><span class="o">,</span> <span class="s">"This is in the subclass Page1"</span><span class="o">));</span>
 	<span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -190,7 +190,7 @@ Wicket will not be able to render the component in the final page.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">quickstart</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.basic.Label</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page2</span> <span class="kd">extends</span> <span class="n">BasePage</span> <span class="o">{</span>
-	<span class="kd">public</span> <span class="nf">Page2</span><span class="o">()</span> <span class="o">{</span>
+	<span class="kd">public</span> <span class="n">Page2</span><span class="o">()</span> <span class="o">{</span>
 		<span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"label2"</span><span class="o">,</span> <span class="s">"This is in the subclass Page2"</span><span class="o">));</span>
 	<span class="o">}</span>
 <span class="o">}</span></code></pre></figure>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/navomatic.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/navomatic.html b/content/learn/examples/navomatic.html
index 2eab22e..f8ef5c8 100644
--- a/content/learn/examples/navomatic.html
+++ b/content/learn/examples/navomatic.html
@@ -114,9 +114,9 @@ this case, we set Page1 to be our home page.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">wicket</span><span class="o">.</span><span class="na">examples</span><span class="o">.</span><span class="na">navomatic</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.protocol.http.WebApplication</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">NavomaticApplication</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">NavomaticApplication</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">NavomaticApplication</span><span class="o">()</span> <span class="o">{</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="n">Class</span> <span class="nf">getHomePage</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Class</span> <span class="n">getHomePage</span><span class="o">()</span> <span class="o">{</span>
         <span class="k">return</span> <span class="n">Page1</span><span class="o">.</span><span class="na">class</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -125,7 +125,7 @@ this case, we set Page1 to be our home page.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kn">package</span> <span class="n">wicket</span><span class="o">.</span><span class="na">examples</span><span class="o">.</span><span class="na">navomatic</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.WebPage</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page1</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Page1</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Page1</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">NavomaticBorder</span><span class="o">(</span><span class="s">"navomaticBorder"</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -146,7 +146,7 @@ two names match, Wicket associates the NavomaticBorder Java component with the
 <p>The Page2 Java and HTML files look almost identical (and we\u2019ll omit the
 sources for Page3 altogether because it follows the same pattern):</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Page2</span> <span class="kd">extends</span> <span class="n">WebPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Page2</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Page2</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">NavomaticBorder</span><span class="o">(</span><span class="s">"navomaticBorder"</span><span class="o">));</span>
     <span class="o">}</span>
 <span class="o">}</span></code></pre></figure>
@@ -167,7 +167,7 @@ is in the NavomaticBorder markup.</p>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.border.Border</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">org.apache.wicket.markup.html.border.BoxBorder</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">NavomaticBorder</span> <span class="kd">extends</span> <span class="n">Border</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">NavomaticBorder</span><span class="o">(</span><span class="kd">final</span> <span class="n">String</span> <span class="n">componentName</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">NavomaticBorder</span><span class="o">(</span><span class="kd">final</span> <span class="n">String</span> <span class="n">componentName</span><span class="o">)</span> <span class="o">{</span>
         <span class="kd">super</span><span class="o">(</span><span class="n">componentName</span><span class="o">);</span>
         <span class="n">addToBorder</span><span class="o">(</span><span class="k">new</span> <span class="n">BoxBorder</span><span class="o">(</span><span class="s">"navigationBorder"</span><span class="o">));</span>
         <span class="n">addToBorder</span><span class="o">(</span><span class="k">new</span> <span class="n">BoxBorder</span><span class="o">(</span><span class="s">"bodyBorder"</span><span class="o">));</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/learn/examples/usingfragments.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/usingfragments.html b/content/learn/examples/usingfragments.html
index 660a46e..f1835bc 100644
--- a/content/learn/examples/usingfragments.html
+++ b/content/learn/examples/usingfragments.html
@@ -86,9 +86,9 @@ and web markup container.</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.list.Loop</span><span class="o">;</span>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.panel.Fragment</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Index</span> <span class="kd">extends</span> <span class="n">QuickStartPage</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="nf">Index</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Index</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">Loop</span> <span class="n">loop</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Loop</span><span class="o">(</span><span class="s">"list"</span><span class="o">,</span> <span class="mi">5</span><span class="o">)</span> <span class="o">{</span>
-            <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">populateItem</span><span class="o">(</span><span class="n">LoopItem</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
+            <span class="kd">protected</span> <span class="kt">void</span> <span class="n">populateItem</span><span class="o">(</span><span class="n">LoopItem</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
                 <span class="n">String</span> <span class="n">fragmentId</span> <span class="o">=</span> <span class="s">"fragment"</span> <span class="o">+</span> <span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getIteration</span><span class="o">()</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">+</span> <span class="mi">1</span><span class="o">);</span>
                 <span class="n">item</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Fragment</span><span class="o">(</span><span class="s">"panel"</span><span class="o">,</span> <span class="n">fragmentId</span><span class="o">,</span> <span class="n">Index</span><span class="o">.</span><span class="na">this</span><span class="o">));</span>
             <span class="o">}</span>
@@ -123,14 +123,14 @@ subclass for fragment one to encapsulate the component.</p>
 <span class="kn">import</span> <span class="nn">wicket.markup.html.panel.Fragment</span><span class="o">;</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Index</span> <span class="kd">extends</span> <span class="n">QuickStartPage</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="kd">class</span> <span class="nc">Fragment1</span> <span class="kd">extends</span> <span class="n">Fragment</span> <span class="o">{</span>
-        <span class="kd">public</span> <span class="nf">Fragment1</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">String</span> <span class="n">markupId</span><span class="o">)</span> <span class="o">{</span>
+        <span class="kd">public</span> <span class="n">Fragment1</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">String</span> <span class="n">markupId</span><span class="o">)</span> <span class="o">{</span>
             <span class="kd">super</span><span class="o">(</span><span class="n">id</span><span class="o">,</span> <span class="n">markupId</span><span class="o">,</span> <span class="n">Index</span><span class="o">.</span><span class="na">this</span><span class="o">);</span>
             <span class="n">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Label</span><span class="o">(</span><span class="s">"label"</span><span class="o">,</span> <span class="s">"Hello, World!"</span><span class="o">));</span>
         <span class="o">}</span>
     <span class="o">}</span>
-    <span class="kd">public</span> <span class="nf">Index</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="n">Index</span><span class="o">()</span> <span class="o">{</span>
         <span class="n">Loop</span> <span class="n">loop</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Loop</span><span class="o">(</span><span class="s">"list"</span><span class="o">,</span> <span class="mi">5</span><span class="o">)</span> <span class="o">{</span>
-            <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">populateItem</span><span class="o">(</span><span class="n">LoopItem</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
+            <span class="kd">protected</span> <span class="kt">void</span> <span class="n">populateItem</span><span class="o">(</span><span class="n">LoopItem</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
                 <span class="kt">int</span> <span class="n">index</span> <span class="o">=</span> <span class="o">(</span><span class="n">item</span><span class="o">.</span><span class="na">getIteration</span><span class="o">()</span> <span class="o">%</span> <span class="mi">2</span> <span class="o">+</span> <span class="mi">1</span><span class="o">);</span>
                 <span class="n">String</span> <span class="n">fragmentId</span> <span class="o">=</span> <span class="s">"fragment"</span> <span class="o">+</span> <span class="n">index</span><span class="o">;</span>
                 <span class="k">if</span> <span class="o">(</span><span class="n">index</span> <span class="o">==</span> <span class="mi">1</span><span class="o">)</span> <span class="o">{</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2009/07/30/wicket-1.4-takes-typesafety-to-the-next-level.html
----------------------------------------------------------------------
diff --git a/content/news/2009/07/30/wicket-1.4-takes-typesafety-to-the-next-level.html b/content/news/2009/07/30/wicket-1.4-takes-typesafety-to-the-next-level.html
index eb4880b..e99a3c5 100644
--- a/content/news/2009/07/30/wicket-1.4-takes-typesafety-to-the-next-level.html
+++ b/content/news/2009/07/30/wicket-1.4-takes-typesafety-to-the-next-level.html
@@ -99,7 +99,7 @@ nationalities, credit card processors, etc.</p>
 <p>The signature of a constructor for the <code class="highlighter-rouge">DropDownChoice</code> component in Wicket
 1.3 was:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">DropDownChoice</span> <span class="kd">extends</span> <span class="o">...</span>
-    <span class="kd">public</span> <span class="nf">DropDownChoice</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">IModel</span> <span class="n">model</span><span class="o">,</span> <span class="n">IModel</span> <span class="n">choices</span><span class="o">)</span>
+    <span class="kd">public</span> <span class="n">DropDownChoice</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">IModel</span> <span class="n">model</span><span class="o">,</span> <span class="n">IModel</span> <span class="n">choices</span><span class="o">)</span>
 <span class="o">}</span></code></pre></figure>
 <p>As you can see, this constructor doesn\u2019t give much insight into what goes
 where (other than the names of the parameters). The first parameter is the
@@ -110,7 +110,7 @@ to assign the right IModel values to the right parameters. Now take a look at
 the same constructor, but now in Wicket 1.4. The signature for our generified
 constructor looks like the following example.</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="o">&lt;</span><span class="n">T</span><span class="o">&gt;</span> <span class="n">DropDownChoice</span> <span class="kd">extends</span> <span class="o">...</span>
-    <span class="kd">public</span> <span class="nf">DropDownChoice</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">IModel</span><span class="o">&lt;</span><span class="n">T</span><span class="o">&gt;</span> <span class="n">model</span><span class="o">,</span> <span class="n">IModel</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">List</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">T</span><span class="o">&gt;&gt;</span> <span class="n">choices</span><span class="o">)</span>
+    <span class="kd">public</span> <span class="n">DropDownChoice</span><span class="o">(</span><span class="n">String</span> <span class="n">id</span><span class="o">,</span> <span class="n">IModel</span><span class="o">&lt;</span><span class="n">T</span><span class="o">&gt;</span> <span class="n">model</span><span class="o">,</span> <span class="n">IModel</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">List</span><span class="o">&lt;?</span> <span class="kd">extends</span> <span class="n">T</span><span class="o">&gt;&gt;</span> <span class="n">choices</span><span class="o">)</span>
 <span class="o">}</span></code></pre></figure>
 <p>Here we communicate that the first <code class="highlighter-rouge">IModel</code> parameter is a <code class="highlighter-rouge">T</code>, which is the
 single value that will be provided when the <code class="highlighter-rouge">DropDownChoice</code> selects one
@@ -129,9 +129,9 @@ use a model or use two different model types: which one should be in the
 lead? We chose to generify only the components that clearly benefited from
 the extra type information, leading to clean code like this:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">ListView</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="n">peopleListView</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ListView</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;(</span><span class="s">"people"</span><span class="o">,</span> <span class="n">people</span><span class="o">)</span> <span class="o">{</span>
-        <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">populateItem</span><span class="o">(</span><span class="n">ListItem</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
+        <span class="kd">protected</span> <span class="kt">void</span> <span class="n">populateItem</span><span class="o">(</span><span class="n">ListItem</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="n">item</span><span class="o">)</span> <span class="o">{</span>
             <span class="n">item</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Link</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;(</span><span class="s">"editPerson"</span><span class="o">,</span> <span class="n">item</span><span class="o">.</span><span class="na">getModel</span><span class="o">()){</span>
-                <span class="kd">public</span> <span class="kt">void</span> <span class="nf">onClick</span><span class="o">()</span> <span class="o">{</span>
+                <span class="kd">public</span> <span class="kt">void</span> <span class="n">onClick</span><span class="o">()</span> <span class="o">{</span>
                     <span class="n">Person</span> <span class="n">p</span> <span class="o">=</span> <span class="n">getModelObject</span><span class="o">();</span>
                     <span class="n">setResponsePage</span><span class="o">(</span><span class="k">new</span> <span class="n">EditPersonPage</span><span class="o">(</span><span class="n">p</span><span class="o">));</span>
                 <span class="o">}</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2010/08/11/wicket-1.4.10-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/11/wicket-1.4.10-released.html b/content/news/2010/08/11/wicket-1.4.10-released.html
index 27bbd3b..9f11979 100644
--- a/content/news/2010/08/11/wicket-1.4.10-released.html
+++ b/content/news/2010/08/11/wicket-1.4.10-released.html
@@ -81,7 +81,7 @@ thirty bug fixes and improvements.</p>
 	 * &lt;/p&gt;
 	 * 
 	 */</span>
-	<span class="kd">protected</span> <span class="kt">void</span> <span class="nf">onInitialize</span><span class="o">()</span> <span class="o">{}</span>
+	<span class="kd">protected</span> <span class="kt">void</span> <span class="n">onInitialize</span><span class="o">()</span> <span class="o">{}</span>
 <span class="o">}</span></code></pre></figure>
 <p>Component configuration allows developers to easier configure component states such as visibility, enabled, etc. From the javadoc:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Component</span> <span class="o">{</span>
@@ -143,7 +143,7 @@ thirty bug fixes and improvements.</p>
 	 * }
 	 * &lt;/pre&gt;
 	 */</span>
-	<span class="kd">protected</span> <span class="kt">void</span> <span class="nf">onConfigure</span><span class="o">()</span> <span class="o">{}</span>
+	<span class="kd">protected</span> <span class="kt">void</span> <span class="n">onConfigure</span><span class="o">()</span> <span class="o">{}</span>
 <span class="o">}</span></code></pre></figure>
 <ul>
   <li><a href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10/">Subversion tag</a></li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2011/08/23/cve-2011-2712.html
----------------------------------------------------------------------
diff --git a/content/news/2011/08/23/cve-2011-2712.html b/content/news/2011/08/23/cve-2011-2712.html
index d6c99e4..1647819 100644
--- a/content/news/2011/08/23/cve-2011-2712.html
+++ b/content/news/2011/08/23/cve-2011-2712.html
@@ -61,7 +61,7 @@ With multi window support application configuration and special query parameters
 <p>Mitigation:
 Either disable multi window support with</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyApp</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span> 
-    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="n">init</span><span class="o">()</span> <span class="o">{</span>
         <span class="kd">super</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
         <span class="n">getPageSettings</span><span class="o">.</span><span class="na">setAutomaticMultiWindowSupport</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
     <span class="o">}</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2011/09/07/wicket-1.5-released.html
----------------------------------------------------------------------
diff --git a/content/news/2011/09/07/wicket-1.5-released.html b/content/news/2011/09/07/wicket-1.5-released.html
index 2e8ba44..0495373 100644
--- a/content/news/2011/09/07/wicket-1.5-released.html
+++ b/content/news/2011/09/07/wicket-1.5-released.html
@@ -87,7 +87,7 @@
  * Objects that can send events
  */</span>
 <span class="kd">public</span> <span class="kd">interface</span> <span class="nc">IEventSource</span> <span class="o">{</span>
-    <span class="o">&lt;</span><span class="n">T</span><span class="o">&gt;</span> <span class="kt">void</span> <span class="nf">send</span><span class="o">(</span><span class="n">IEventSink</span> <span class="n">sink</span><span class="o">,</span> <span class="n">Broadcast</span> <span class="n">broadcast</span><span class="o">,</span> <span class="n">T</span> <span class="n">payload</span><span class="o">);</span>
+    <span class="o">&lt;</span><span class="n">T</span><span class="o">&gt;</span> <span class="kt">void</span> <span class="n">send</span><span class="o">(</span><span class="n">IEventSink</span> <span class="n">sink</span><span class="o">,</span> <span class="n">Broadcast</span> <span class="n">broadcast</span><span class="o">,</span> <span class="n">T</span> <span class="n">payload</span><span class="o">);</span>
 <span class="o">}</span></code></pre></figure>
 <p>and</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="cm">/**
@@ -98,7 +98,7 @@
     <span class="cm">/**
      * Called when an event is sent to this sink
      */</span>
-    <span class="kt">void</span> <span class="nf">onEvent</span><span class="o">(</span><span class="n">IEvent</span><span class="o">&lt;?&gt;</span> <span class="n">event</span><span class="o">);</span>
+    <span class="kt">void</span> <span class="n">onEvent</span><span class="o">(</span><span class="n">IEvent</span><span class="o">&lt;?&gt;</span> <span class="n">event</span><span class="o">);</span>
 <span class="o">}</span></code></pre></figure>
 <p>The classes that implement these interfaces, and can thus participate in the event mechanism are: <code class="highlighter-rouge">Component</code>, <code class="highlighter-rouge">RequestCycle</code>, <code class="highlighter-rouge">Session</code>, and <code class="highlighter-rouge">Application</code>.</p>
 <p>The mechanism allows for different event broadcast methods defined here:</p>
@@ -115,14 +115,14 @@
 <p>Applications can register custom event dispatchers in <code class="highlighter-rouge">FrameworkSettings</code>; the dispatchers can be used to build custom event delivery mechanisms. For example a custom <code class="highlighter-rouge">IEventDispatcher</code> mechanism can route events to annotated methods, for example:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyComponent</span> <span class="kd">extends</span> <span class="n">Component</span> <span class="o">{</span>
     <span class="nd">@OnEvent</span>
-    <span class="kd">private</span> <span class="kt">void</span> <span class="nf">onUserAdded</span><span class="o">(</span><span class="n">UserAddedEvent</span> <span class="n">event</span><span class="o">)</span> <span class="o">{...}</span>
+    <span class="kd">private</span> <span class="kt">void</span> <span class="n">onUserAdded</span><span class="o">(</span><span class="n">UserAddedEvent</span> <span class="n">event</span><span class="o">)</span> <span class="o">{...}</span>
 <span class="o">}</span></code></pre></figure>
 <p>where <code class="highlighter-rouge">UserAddedEvent</code> is the event payload object.</p>
 <p>The default <code class="highlighter-rouge">Component#onEvent</code> method will be called even if custom dispatchers are registered.</p>
 <p>A default event is raised whenever Wicket begins to create an AJAX response. The payload of the event is the <code class="highlighter-rouge">AjaxRequestTarget</code> used for event. Sample implementation:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// component that always adds itself to the ajax response</span>
 <span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyComponent</span> <span class="kd">extends</span> <span class="n">Component</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">onEvent</span><span class="o">(</span><span class="n">IEvent</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="n">onEvent</span><span class="o">(</span><span class="n">IEvent</span> <span class="n">event</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">if</span> <span class="o">(</span><span class="n">event</span><span class="o">.</span><span class="na">getPayload</span><span class="o">()</span> <span class="k">instanceof</span> <span class="n">AjaxRequestTarget</span><span class="o">)</span> <span class="o">{</span>
             <span class="o">((</span><span class="n">AjaxRequestTarget</span><span class="o">)</span><span class="n">event</span><span class="o">.</span><span class="na">getPayload</span><span class="o">()).</span><span class="na">add</span><span class="o">(</span><span class="k">this</span><span class="o">);</span>
          <span class="o">}</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/03/22/wicket-cve-2012-1089.html
----------------------------------------------------------------------
diff --git a/content/news/2012/03/22/wicket-cve-2012-1089.html b/content/news/2012/03/22/wicket-cve-2012-1089.html
index 5a8ed71..d9394e2 100644
--- a/content/news/2012/03/22/wicket-cve-2012-1089.html
+++ b/content/news/2012/03/22/wicket-cve-2012-1089.html
@@ -69,7 +69,7 @@ org.apache.wicket.markup.html.SecurePackageResourceGuard with a preconfigured
 list of allowed file extensions.
 Either setup SecurePackageResourceGuard with code like:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyApp</span> <span class="kd">extends</span> <span class="n">WebApplication</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">init</span><span class="o">()</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kt">void</span> <span class="n">init</span><span class="o">()</span> <span class="o">{</span>
         <span class="kd">super</span><span class="o">.</span><span class="na">init</span><span class="o">();</span>
         <span class="n">SecurePackageResourceGuard</span> <span class="n">guard</span> <span class="o">=</span> <span class="k">new</span> <span class="n">SecurePackageResourceGuard</span><span class="o">();</span>
         <span class="n">guard</span><span class="o">.</span><span class="na">addPattern</span><span class="o">(...);</span>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/05/29/wicket-6.0.0-beta2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/05/29/wicket-6.0.0-beta2-released.html b/content/news/2012/05/29/wicket-6.0.0-beta2-released.html
index 15e50d4..2691591 100644
--- a/content/news/2012/05/29/wicket-6.0.0-beta2-released.html
+++ b/content/news/2012/05/29/wicket-6.0.0-beta2-released.html
@@ -56,12 +56,12 @@ This release brings over many improvements over the 1.5.x series.</p>
 <h4 id="wicket-atmosphere">Wicket Atmosphere</h4>
 <p>The Beta 2 contains a new experimental module Wicket Atmosphere, which brings serverside push to Wicket and provides a great way to render serverside markup and send it to the browsers of your users. Check out the atmosphere example in our Examples project to see it in action.</p>
 <p>In your application\u2019s init method you need to register the push event bus:</p>
-<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="k">new</span> <span class="n">EventBus</span><span class="o">(</span><span class="k">this</span><span class="o">);</span></code></pre></figure>
+<figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="k">new</span> <span class="nf">EventBus</span><span class="p">(</span><span class="k">this</span><span class="o">);</span></code></pre></figure>
 <p>Somewhere where you want to push your changes to the client, you need to publish your event to the push <code class="highlighter-rouge">EventBus</code>:</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">EventBus</span><span class="o">.</span><span class="na">get</span><span class="o">().</span><span class="na">post</span><span class="o">(</span><span class="n">input</span><span class="o">.</span><span class="na">getModelObject</span><span class="o">());</span></code></pre></figure>
 <p>And finally you need to subscribe your page (or component) to the <code class="highlighter-rouge">EventBus</code>\u2019s events with <code class="highlighter-rouge">@Subscribe</code>, taking in the typed parameter you post to the EventBus (in this case a <code class="highlighter-rouge">String</code>):</p>
 <figure class="highlight"><pre><code class="language-java" data-lang="java"><span class="nd">@Subscribe</span>
-<span class="kd">public</span> <span class="kt">void</span> <span class="nf">receiveMessage</span><span class="o">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">,</span> <span class="n">String</span> <span class="n">message</span><span class="o">)</span> <span class="o">{</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">receiveMessage</span><span class="p">(</span><span class="n">AjaxRequestTarget</span> <span class="n">target</span><span class="o">,</span> <span class="n">String</span> <span class="n">message</span><span class="o">)</span> <span class="o">{</span>
 	<span class="n">label</span><span class="o">.</span><span class="na">setDefaultModelObject</span><span class="o">(</span><span class="n">message</span><span class="o">);</span>
 	<span class="n">target</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">label</span><span class="o">);</span>
 <span class="o">}</span></code></pre></figure>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/10/04/wicket-6.1.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/10/04/wicket-6.1.0-released.html b/content/news/2012/10/04/wicket-6.1.0-released.html
index 9a0fe2b..1b3f9ab 100644
--- a/content/news/2012/10/04/wicket-6.1.0-released.html
+++ b/content/news/2012/10/04/wicket-6.1.0-released.html
@@ -79,8 +79,8 @@ be filtered</li>
 <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>
 <ul>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.0">6.1.0 sources</a></li>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.0/binaries">6.1.0 binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.0">6.1.0 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.0/binaries">6.1.0 binary download</a></li>
 </ul>
 <h3 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h3>
 <p>If you upgrade from 6.0.0, this release is a drop in replacement. If you come from a version prior to 6.0.0, please read our <a href="http://s.apache.org/wicket-6.0-migration">Wicket 6 migration guide</a> found at http://s.apache.org/wicket-6.0-migration</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/10/08/wicket-6.1.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/10/08/wicket-6.1.1-released.html b/content/news/2012/10/08/wicket-6.1.1-released.html
index fdb5b37..c7ae5eb 100644
--- a/content/news/2012/10/08/wicket-6.1.1-released.html
+++ b/content/news/2012/10/08/wicket-6.1.1-released.html
@@ -74,8 +74,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.1">http://www.apache.org/dyn/closer.cgi/wicket/6.1.1</a></li>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.1/binaries">http://www.apache.org/dyn/closer.cgi/wicket/6.1.1/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.1">6.1.1 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.1.1/binaries">6.1.1 binary download</a></li>
 </ul>
 <h2 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h2>
 <p>If you upgrade from 6.0.0 or 6.1.0, this release is a drop in 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/10/23/wicket-6.2.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/10/23/wicket-6.2.0-released.html b/content/news/2012/10/23/wicket-6.2.0-released.html
index ee91621..b61f110 100644
--- a/content/news/2012/10/23/wicket-6.2.0-released.html
+++ b/content/news/2012/10/23/wicket-6.2.0-released.html
@@ -74,8 +74,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.2.0">http://www.apache.org/dyn/closer.cgi/wicket/6.2.0</a></li>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.2.0/binaries">http://www.apache.org/dyn/closer.cgi/wicket/6.2.0/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.2.0">6.2.0 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.2.0/binaries">6.2.0 binary download</a></li>
 </ul>
 <h2 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h2>
 <p>If you upgrade from 6.0.0 or 6.1.0, this release is a drop in 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/11/16/wicket-6.3.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/11/16/wicket-6.3.0-released.html b/content/news/2012/11/16/wicket-6.3.0-released.html
index 316927b..0d3bdfd 100644
--- a/content/news/2012/11/16/wicket-6.3.0-released.html
+++ b/content/news/2012/11/16/wicket-6.3.0-released.html
@@ -76,8 +76,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.3.0">http://www.apache.org/dyn/closer.cgi/wicket/6.3.0</a></li>
-  <li><a href="http://www.apache.org/dyn/closer.cgi/wicket/6.3.0/binaries">http://www.apache.org/dyn/closer.cgi/wicket/6.3.0/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.3.0">6.3.0 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.3.0/binaries">6.3.0 binary download</a></li>
 </ul>
 <h2 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h2>
 <p>If you upgrade from 6.0.0, 6.1.0, or 6.2.0 this release is a drop in 

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/5fb1aa89/content/news/2012/12/14/wicket-6.4.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2012/12/14/wicket-6.4.0-released.html b/content/news/2012/12/14/wicket-6.4.0-released.html
index d920091..dbedcec 100644
--- a/content/news/2012/12/14/wicket-6.4.0-released.html
+++ b/content/news/2012/12/14/wicket-6.4.0-released.html
@@ -95,8 +95,8 @@ update any other dependencies on Wicket projects to the same version):</p>
 <p>Or download and build the distribution yourself, or use our
 convenience binary package</p>
 <ul>
-  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.4.0">http://www.apache.org/dyn/closer.cgi/wicket/6.4.0</a></li>
-  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.4.0/binaries">http://www.apache.org/dyn/closer.cgi/wicket/6.4.0/binaries</a></li>
+  <li>Source: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.4.0">6.4.0 source download</a></li>
+  <li>Binary: <a href="http://www.apache.org/dyn/closer.cgi/wicket/6.4.0/binaries">6.4.0 binary download</a></li>
 </ul>
 <h3 id="upgrading-from-earlier-versions">Upgrading from earlier versions</h3>
 <p>If you upgrade from 6.0.0, 6.1.0, 6.2.0 or 6.3.0 this release is a drop in