http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/learn/examples/markupinheritance.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/markupinheritance.html 
b/content/learn/examples/markupinheritance.html
index d25b0e0..874b249 100644
--- a/content/learn/examples/markupinheritance.html
+++ b/content/learn/examples/markupinheritance.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-               <!-- /start/quickstart.html || 
/learn/examples/markupinheritance.html -->
+               <!-- /start/quickstart.html || 
/learn/examples/markupinheritance -->
        <li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-               <!-- /start/download.html || 
/learn/examples/markupinheritance.html -->
+               <!-- /start/download.html || /learn/examples/markupinheritance 
-->
        <li class=""><a href="/start/download.html">Download</a></li>
-               <!-- /learn || /learn/examples/markupinheritance.html -->
+               <!-- /learn || /learn/examples/markupinheritance -->
        <li class=""><a href="/learn">Documentation</a></li>
-               <!-- /help || /learn/examples/markupinheritance.html -->
+               <!-- /help || /learn/examples/markupinheritance -->
        <li class=""><a href="/help">Support</a></li>
-               <!-- /contribute || /learn/examples/markupinheritance.html -->
+               <!-- /contribute || /learn/examples/markupinheritance -->
        <li class=""><a href="/contribute">Contribute</a></li>
-               <!-- /community || /learn/examples/markupinheritance.html -->
+               <!-- /community || /learn/examples/markupinheritance -->
        <li class=""><a href="/community">Community</a></li>
-               <!-- /apache || /learn/examples/markupinheritance.html -->
+               <!-- /apache || /learn/examples/markupinheritance -->
        <li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -54,8 +54,8 @@ and panel layouts.</p>
 <p>In all the Wicket examples, you have to put all files in the same package
 directory. This means putting the markup files and the java files next to one
 another. It is possible to alter this behavior, but that is beyond the scope
-of this example. The only exception is the obligatory <code>web.xml</code> 
file which
-should reside in the <code>WEB-INF/</code> directory of your web application 
root
+of this example. The only exception is the obligatory <code 
class="highlighter-rouge">web.xml</code> file which
+should reside in the <code class="highlighter-rouge">WEB-INF/</code> directory 
of your web application root
 folder.</p>
 <p>In this example we assume you already have read and understood the other
 examples which give you information on the structure and nature of Wicket
@@ -71,23 +71,23 @@ focuses on one strategy: markup inheritance.</p>
 <p>In Java you can extend classes. This same concept has been fitted into the
 markup parsing of Java. Markup containers that have files associated (page
 and panels) can inherit the markup of their super containers.</p>
-<p>This is done using two special Wicket tags: 
<code>&lt;wicket:child&gt;</code> and
-<code>&lt;wicket:extend&gt;</code>. In the super markup you define where the 
child markup
+<p>This is done using two special Wicket tags: <code 
class="highlighter-rouge">&lt;wicket:child&gt;</code> and
+<code class="highlighter-rouge">&lt;wicket:extend&gt;</code>. In the super 
markup you define where the child markup
 should be put, and in the sub markup you delineate where the child markup
 starts and ends.</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
     <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
     <span class="nt">&lt;body&gt;</span>
         This is in the super markup.<span class="nt">&lt;br&gt;</span>
         <span class="nt">&lt;wicket:child</span> <span class="nt">/&gt;</span>
         This is in the super markup.<span class="nt">&lt;br&gt;</span>
     <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
-<p>In this markup you see two sentences that surround the 
<code>&lt;wicket:child&gt;</code> tag.
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
+<p>In this markup you see two sentences that surround the <code 
class="highlighter-rouge">&lt;wicket:child&gt;</code> tag.
 All markup in this file will remain when a sub class of this page is created,
-only the <code>&lt;wicket:child&gt;</code> tag will be replaced with the child 
markup. So if we
+only the <code class="highlighter-rouge">&lt;wicket:child&gt;</code> tag will 
be replaced with the child markup. So if we
 look at the following markup:</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     This is in de child markup.<span class="nt">&lt;br&gt;</span>
@@ -96,12 +96,12 @@ look at the following markup:</p>
     <span class="nt">&lt;/wicket:extend&gt;</span>
     This is in the child markup.<span class="nt">&lt;br&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <p>we can see the markup that should be included in the parent. Only the markup
-between the <code>&lt;wicket:extend&gt;</code> tags is included in the final 
page. Take a look
+between the <code class="highlighter-rouge">&lt;wicket:extend&gt;</code> tags 
is included in the final page. Take a look
 at the following markup which is the final markup when you would use this in
 a Wicket application.</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     This is in the super markup.<span class="nt">&lt;br&gt;</span>
@@ -110,9 +110,9 @@ a Wicket application.</p>
     <span class="nt">&lt;/wicket:extend&gt;&lt;/wicket:child&gt;</span>
     This is in the super markup.<span class="nt">&lt;br&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
-<p>Here you can see that the <code>&lt;wicket:child /&gt;</code> tag has been 
expanded, and its
-contents filled with exactly the markup between the 
<code>&lt;wicket:extend&gt;</code> tags.
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
+<p>Here you can see that the <code class="highlighter-rouge">&lt;wicket:child 
/&gt;</code> tag has been expanded, and its
+contents filled with exactly the markup between the <code 
class="highlighter-rouge">&lt;wicket:extend&gt;</code> tags.
 If you want to get rid of the special Wicket tags, you can disable that on
 the markup settings
 (see <a 
href="https://ci.apache.org/projects/wicket/apidocs/6.x/org/apache/wicket/settings/IMarkupSettings.html";>IMarkupSettings</a>
 for Wikcet6
@@ -120,7 +120,7 @@ or <a 
href="https://ci.apache.org/projects/wicket/apidocs/7.x/org/apache/wicket/
 <h2 id="implementing-the-basepage">Implementing the BasePage</h2>
 <p>Now that we have seen the basics for markup inheritance, we can take a
 look at the example at hand. Let’s first create the base page.</p>
-<div 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>
+<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.WebPage</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="kn">import</span> <span 
class="nn">wicket.markup.html.link.BookmarkablePageLink</span><span 
class="o">;</span>
@@ -130,11 +130,11 @@ look at the example at hand. Let’s first create the 
base page.</p>
                <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>
        <span class="o">}</span>
-<span class="o">}</span></code></pre></div>
+<span class="o">}</span></code></pre></figure>
 <p>The two links should go into the header, and the footer in the footer of the
 page. Note that the abstract keyword isn’t required, but considered a good
 practise. Now let’s take a look at the markup for the BasePage</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
 <span class="nt">&lt;div</span> <span class="na">id=</span><span 
class="s">"header"</span><span class="nt">&gt;</span>
@@ -148,33 +148,33 @@ practise. Now let’s take a look at the markup for the 
BasePage</p>
        <span class="nt">&lt;span</span> <span 
class="na">wicket:id=</span><span class="s">"footer"</span><span 
class="nt">&gt;&lt;/span&gt;</span>
 <span class="nt">&lt;/div&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <p>In this markup file you see the specific basic layout: we have 3 div
 elements:</p>
 <ol>
-  <li><code>&lt;div id="header"&gt;...&lt;/div&gt;</code></li>
-  <li><code>&lt;div id="body"&gt;...&lt;/div&gt;</code></li>
-  <li><code>&lt;div id="footer"&gt;...&lt;/div&gt;</code></li>
+  <li><code class="highlighter-rouge">&lt;div 
id="header"&gt;...&lt;/div&gt;</code></li>
+  <li><code class="highlighter-rouge">&lt;div 
id="body"&gt;...&lt;/div&gt;</code></li>
+  <li><code class="highlighter-rouge">&lt;div 
id="footer"&gt;...&lt;/div&gt;</code></li>
 </ol>
 <p>Note that these aren’t Wicket components, just plain markup. We could have
-made them components, such as a <code>Panel</code> but for brevity we keep it 
this way.
-Now that we have the <code>BasePage</code> finished, we can implement the two 
subclasses
+made them components, such as a <code class="highlighter-rouge">Panel</code> 
but for brevity we keep it this way.
+Now that we have the <code class="highlighter-rouge">BasePage</code> finished, 
we can implement the two subclasses
 to finish this example.</p>
 <h2 id="implementing-the-sub-pages">Implementing the sub pages</h2>
-<p>We need to build two pages: <code>Page1</code> and <code>Page2</code>. Each 
page needs its own
-markup file and Java class. Let’s first implement <code>Page1</code>.</p>
-<div 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>
+<p>We need to build two pages: <code class="highlighter-rouge">Page1</code> 
and <code class="highlighter-rouge">Page2</code>. Each page needs its own
+markup file and Java class. Let’s first implement <code 
class="highlighter-rouge">Page1</code>.</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">Page1</span> <span class="kd">extends</span> <span 
class="n">BasePage</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></div>
+<span class="o">}</span></code></pre></figure>
 <p>In this example you see that we add a new label component to the page:
-<code>label1</code>. This component is only available for <code>Page1</code>, 
as such <code>Page2</code> can
+<code class="highlighter-rouge">label1</code>. This component is only 
available for <code class="highlighter-rouge">Page1</code>, as such <code 
class="highlighter-rouge">Page2</code> can
 define its own component hierarchy. Let’s take a look at the markup for
-<code>Page1</code>:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span 
class="o">&lt;</span><span class="n">html</span><span class="o">&gt;</span>
+<code class="highlighter-rouge">Page1</code>:</p>
+<figure class="highlight"><pre><code class="language-java" 
data-lang="java"><span class="o">&lt;</span><span class="n">html</span><span 
class="o">&gt;</span>
 <span class="o">&lt;</span><span class="n">head</span><span 
class="o">&gt;&lt;/</span><span class="n">head</span><span class="o">&gt;</span>
 <span class="o">&lt;</span><span class="n">body</span><span 
class="o">&gt;</span>
 <span class="o">&lt;</span><span class="nl">wicket:</span><span 
class="n">extend</span><span class="o">&gt;</span>
@@ -182,19 +182,19 @@ define its own component hierarchy. Let’s take a look 
at the markup for
     <span class="o">&lt;</span><span class="n">span</span> <span 
class="nl">wicket:</span><span class="n">id</span><span class="o">=</span><span 
class="s">"label1"</span><span class="o">&gt;&lt;/</span><span 
class="n">span</span><span class="o">&gt;</span>
 <span class="o">&lt;/</span><span class="nl">wicket:</span><span 
class="n">extend</span><span class="o">&gt;</span>
 <span class="o">&lt;/</span><span class="n">body</span><span 
class="o">&gt;</span>
-<span class="o">&lt;/</span><span class="n">html</span><span 
class="o">&gt;</span></code></pre></div>
-<p>Here you see that we added the <code>Label</code> component in the markup 
between the
-<code>&lt;wicket:extend&gt;</code> tags. If we were to add the component 
outside those tags,
+<span class="o">&lt;/</span><span class="n">html</span><span 
class="o">&gt;</span></code></pre></figure>
+<p>Here you see that we added the <code class="highlighter-rouge">Label</code> 
component in the markup between the
+<code class="highlighter-rouge">&lt;wicket:extend&gt;</code> tags. If we were 
to add the component outside those tags,
 Wicket will not be able to render the component in the final page.</p>
-<p>Now, let’s do the same for <code>Page2</code>.</p>
-<div 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>
+<p>Now, let’s do the same for <code 
class="highlighter-rouge">Page2</code>.</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="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></div>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<span class="o">}</span></code></pre></figure>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
 <span class="nt">&lt;wicket:extend&gt;</span>
@@ -202,11 +202,11 @@ Wicket will not be able to render the component in the 
final page.</p>
     <span class="nt">&lt;span</span> <span class="na">wicket:id=</span><span 
class="s">"label2"</span><span class="nt">&gt;&lt;/span&gt;</span>
 <span class="nt">&lt;/wicket:extend&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
-<p>In <code>Page2</code> you see that we have a different component structure 
(<code>label2</code>
-instead of <code>label1</code>), and as such that the pages are quite 
different.</p>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
+<p>In <code class="highlighter-rouge">Page2</code> you see that we have a 
different component structure (<code class="highlighter-rouge">label2</code>
+instead of <code class="highlighter-rouge">label1</code>), and as such that 
the pages are quite different.</p>
 <p>If you paste this code into a Wicket quickstart application, you can see it
-immediately working (don’t forget to set the homepage to <code>Page1</code> 
or <code>Page2</code>).</p>
+immediately working (don’t forget to set the homepage to <code 
class="highlighter-rouge">Page1</code> or <code 
class="highlighter-rouge">Page2</code>).</p>
 <h2 id="conclusion">Conclusion</h2>
 <p>With markup inheritance you can get a standard layout for your application
 without too much hassle. It follows the natural inheritance strategy for Java
@@ -214,9 +214,9 @@ code and makes encapsulation of your component hierarchy 
possible.</p>
 <p>In this example we haven’t touched on the other possible features of 
markup
 inheritance:</p>
 <ul>
-  <li>contributing to the <code>&lt;head&gt;</code> section from your sub 
pages</li>
+  <li>contributing to the <code class="highlighter-rouge">&lt;head&gt;</code> 
section from your sub pages</li>
   <li>multiple layers of inheritance (this just works)</li>
-  <li>markup inheritance used with <code>Panel</code> components</li>
+  <li>markup inheritance used with <code 
class="highlighter-rouge">Panel</code> components</li>
 </ul>
 <p>However, this example should get you up and running.</p>
         </section>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/learn/examples/navomatic.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/navomatic.html 
b/content/learn/examples/navomatic.html
index aa7fb0f..f8ef5c8 100644
--- a/content/learn/examples/navomatic.html
+++ b/content/learn/examples/navomatic.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-               <!-- /start/quickstart.html || /learn/examples/navomatic.html 
-->
+               <!-- /start/quickstart.html || /learn/examples/navomatic -->
        <li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-               <!-- /start/download.html || /learn/examples/navomatic.html -->
+               <!-- /start/download.html || /learn/examples/navomatic -->
        <li class=""><a href="/start/download.html">Download</a></li>
-               <!-- /learn || /learn/examples/navomatic.html -->
+               <!-- /learn || /learn/examples/navomatic -->
        <li class=""><a href="/learn">Documentation</a></li>
-               <!-- /help || /learn/examples/navomatic.html -->
+               <!-- /help || /learn/examples/navomatic -->
        <li class=""><a href="/help">Support</a></li>
-               <!-- /contribute || /learn/examples/navomatic.html -->
+               <!-- /contribute || /learn/examples/navomatic -->
        <li class=""><a href="/contribute">Contribute</a></li>
-               <!-- /community || /learn/examples/navomatic.html -->
+               <!-- /community || /learn/examples/navomatic -->
        <li class=""><a href="/community">Community</a></li>
-               <!-- /apache || /learn/examples/navomatic.html -->
+               <!-- /apache || /learn/examples/navomatic -->
        <li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -67,7 +67,7 @@ in italics. Also the message box shows that we are viewing 
Page2 instead of
 Page1.</p>
 <h2 id="navigation-component">Navigation component</h2>
 <p>To create a reusable navigation component we are going to use a
-<code>org.apache.wicket.markup.html.border.Border</code> component. From the 
Border
+<code 
class="highlighter-rouge">org.apache.wicket.markup.html.border.Border</code> 
component. From the Border
 Javadoc:</p>
 <blockquote>
   <p>A border component has associated markup which is drawn and determines
@@ -75,35 +75,35 @@ placement of any markup and/or components nested within the 
border
 component.</p>
 </blockquote>
 <p>The portion of the border’s associated markup file which is to be used in
-rendering the border is denoted by a <code>&lt;wicket:border&gt;</code> tag. 
The children of the
+rendering the border is denoted by a <code 
class="highlighter-rouge">&lt;wicket:border&gt;</code> tag. The children of the
 border component instance are then inserted into this markup, replacing the
-first <code>&lt;wicket:body/&gt;</code> tag in the border’s associated 
markup.</p>
+first <code class="highlighter-rouge">&lt;wicket:body/&gt;</code> tag in the 
border’s associated markup.</p>
 <p>For example, here is markup for a simple Border subclass, a usage of that
 border, and the markup which would be output on rendering:</p>
 <h3 id="border-markup">Border markup</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;wicket:border&gt;</span>
         First <span class="nt">&lt;wicket:body/&gt;</span> Last
     <span class="nt">&lt;/wicket:border&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <h3 id="border-usage">Border usage</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
   <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span 
class="err"> </span><span class="s">"myBorder"</span><span 
class="nt">&gt;</span>
       Middle
   <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <h3 id="rendered-markup">Rendered markup</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
       First Middle Last
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
-<p>In other words, the markup around the <code>&lt;wicket:body/&gt;</code> tag 
in the border
-component is sort of “wrapped around” the body of the 
<code>&lt;span&gt;</code> tag where the
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
+<p>In other words, the markup around the <code 
class="highlighter-rouge">&lt;wicket:body/&gt;</code> tag in the border
+component is sort of “wrapped around” the body of the <code 
class="highlighter-rouge">&lt;span&gt;</code> tag where the
 border is used. This seems simple in this example, but keep in mind that
 nested components and even nested borders can appear anywhere in either markup
 file. This can be used to create quite complex effects with relatively little
@@ -111,7 +111,7 @@ code.</p>
 <h3 id="navomaticapplicationjava">NavomaticApplication.java</h3>
 <p>Just as in the Hello World! example, we need to define our application. In
 this case, we set Page1 to be our home page.</p>
-<div 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>
+<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="n">NavomaticApplication</span><span class="o">()</span> <span 
class="o">{</span>
@@ -119,51 +119,51 @@ this case, we set Page1 to be our home page.</p>
     <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></div>
+<span class="o">}</span></code></pre></figure>
 <h3 id="page1java">Page1.java</h3>
 <p>The Page1 Java and HTML files look like this:</p>
-<div 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>
+<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="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></div>
+<span class="o">}</span></code></pre></figure>
 <h3 id="page1html">Page1.html</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span> 
     <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span 
class="err"> </span><span class="s">"navomaticBorder"</span><span 
class="nt">&gt;</span>
         You are viewing Page1
     <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
-<p>Notice that the NavomaticBorder component is attached to the 
<code>&lt;span&gt;</code> tag
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
+<p>Notice that the NavomaticBorder component is attached to the <code 
class="highlighter-rouge">&lt;span&gt;</code> tag
 because the name of the component in the Java code is “navomaticBorder” and
-the <code>&lt;span&gt;</code> tag’s wicket:id attribute is set to 
“navomaticBorder”. Because the
+the <code class="highlighter-rouge">&lt;span&gt;</code> tag’s wicket:id 
attribute is set to “navomaticBorder”. Because the
 two names match, Wicket associates the NavomaticBorder Java component with the
-<code>&lt;span&gt;</code> tag.</p>
+<code class="highlighter-rouge">&lt;span&gt;</code> tag.</p>
 <h3 id="page2java">Page2.java</h3>
 <p>The Page2 Java and HTML files look almost identical (and we’ll omit the
 sources for Page3 altogether because it follows the same pattern):</p>
-<div 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>
+<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="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></div>
+<span class="o">}</span></code></pre></figure>
 <h3 id="page2html">Page2.html</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;span</span> <span class="na">wicket:id =</span><span 
class="err"> </span><span class="s">"navomaticBorder"</span><span 
class="nt">&gt;</span>
         You are viewing Page2
     <span class="nt">&lt;/span&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <h3 id="navomaticborderjava">NavomaticBorder.java</h3>
 <p>So how does NavomaticBorder work? Glad you asked. The Java code below simply
 adds the two BoxBorder components you see. These components are nested borders
 which each draw a thin black line around their contents. The rest of the magic
 is in the NavomaticBorder markup.</p>
-<div 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>
+<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.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>
@@ -172,9 +172,9 @@ is in the NavomaticBorder markup.</p>
         <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>
     <span class="o">}</span>
-<span class="o">}</span></code></pre></div>
+<span class="o">}</span></code></pre></figure>
 <h3 id="navomaticborderhtml">NavomaticBorder.html</h3>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;wicket:border&gt;</span> 
         <span class="nt">&lt;p&gt;</span>
@@ -202,19 +202,19 @@ is in the NavomaticBorder markup.</p>
         <span class="nt">&lt;/p&gt;</span>
     <span class="nt">&lt;/wicket:border&gt;</span>
  <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <p>Notice that the markup above encloses the entire contents of the markup 
file’s
-<code>&lt;body&gt;</code> with a <code>&lt;wicket:border&gt;</code> tag, as we 
described earlier. This lets the
+<code class="highlighter-rouge">&lt;body&gt;</code> with a <code 
class="highlighter-rouge">&lt;wicket:border&gt;</code> tag, as we described 
earlier. This lets the
 NavomaticBorder know how much of its markup to use when it wraps itself around
 the markup it finds in the context where it is used. Notice also the
-<code>&lt;wicket:body/&gt;</code> marker which designates where to put 
whatever is found inside
+<code class="highlighter-rouge">&lt;wicket:body/&gt;</code> marker which 
designates where to put whatever is found inside
 the tag at the use context.</p>
-<p>Next, notice that the navigation links and the border’s 
<code>&lt;wicket:body/&gt;</code> are
-both enclosed in <code>&lt;span&gt;</code> tags which have wicket:id 
attributes that associate
+<p>Next, notice that the navigation links and the border’s <code 
class="highlighter-rouge">&lt;wicket:body/&gt;</code> are
+both enclosed in <code class="highlighter-rouge">&lt;span&gt;</code> tags 
which have wicket:id attributes that associate
 those tags with the BoxBorder components added in the NavomaticBorder
 constructor. These nested border components will each draw a thin black line
 around their contents.</p>
-<p>Finally, the <code>&lt;wicket:link&gt;</code> tag is used to mark the links 
in the navigation
+<p>Finally, the <code class="highlighter-rouge">&lt;wicket:link&gt;</code> tag 
is used to mark the links in the navigation
 as automatic links. Ordinarily, you would need to create link components and
 attach them to your page manually, but anchor links that are marked as
 automatic are parsed and hooked up to link components for you, as appropriate.
@@ -225,7 +225,7 @@ current page (since the link would be useless) and 
italicizes the link text.</p>
 <p>In order to get this application up and running, we need to register the
 application with the Wicket servlet in the web.xml file. The following
 sections need to be added to the web.xml in the WEB-INF folder.</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;servlet&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;servlet&gt;</span>
     <span class="nt">&lt;servlet-name&gt;</span>NavomaticApplication<span 
class="nt">&lt;/servlet-name&gt;</span>
     <span 
class="nt">&lt;servlet-class&gt;</span>org.apache.wicket.protocol.http.WicketServlet<span
 class="nt">&lt;/servlet-class&gt;</span>
     <span class="nt">&lt;init-param&gt;</span>
@@ -237,7 +237,7 @@ sections need to be added to the web.xml in the WEB-INF 
folder.</p>
 <span class="nt">&lt;servlet-mapping&gt;</span>
     <span class="nt">&lt;servlet-name&gt;</span>NavomaticApplication<span 
class="nt">&lt;/servlet-name&gt;</span>
     <span class="nt">&lt;url-pattern&gt;</span>/app/*<span 
class="nt">&lt;/url-pattern&gt;</span>
-<span class="nt">&lt;/servlet-mapping&gt;</span></code></pre></div>
+<span class="nt">&lt;/servlet-mapping&gt;</span></code></pre></figure>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/learn/examples/usingfragments.html
----------------------------------------------------------------------
diff --git a/content/learn/examples/usingfragments.html 
b/content/learn/examples/usingfragments.html
index 12711d1..f1835bc 100644
--- a/content/learn/examples/usingfragments.html
+++ b/content/learn/examples/usingfragments.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-               <!-- /start/quickstart.html || 
/learn/examples/usingfragments.html -->
+               <!-- /start/quickstart.html || /learn/examples/usingfragments 
-->
        <li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-               <!-- /start/download.html || 
/learn/examples/usingfragments.html -->
+               <!-- /start/download.html || /learn/examples/usingfragments -->
        <li class=""><a href="/start/download.html">Download</a></li>
-               <!-- /learn || /learn/examples/usingfragments.html -->
+               <!-- /learn || /learn/examples/usingfragments -->
        <li class=""><a href="/learn">Documentation</a></li>
-               <!-- /help || /learn/examples/usingfragments.html -->
+               <!-- /help || /learn/examples/usingfragments -->
        <li class=""><a href="/help">Support</a></li>
-               <!-- /contribute || /learn/examples/usingfragments.html -->
+               <!-- /contribute || /learn/examples/usingfragments -->
        <li class=""><a href="/contribute">Contribute</a></li>
-               <!-- /community || /learn/examples/usingfragments.html -->
+               <!-- /community || /learn/examples/usingfragments -->
        <li class=""><a href="/community">Community</a></li>
-               <!-- /apache || /learn/examples/usingfragments.html -->
+               <!-- /apache || /learn/examples/usingfragments -->
        <li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -52,12 +52,12 @@
             <p>This example shows you how to use fragments (Wicket 1.2 
feature) to lessen
 the burden on extra markup files. Fragments are ‘inline panels’ and are a
 quick way of using panel type components in pages without having to create a
-<code>Panel</code> markup file and class.</p>
+<code class="highlighter-rouge">Panel</code> markup file and class.</p>
 <p>In all the Wicket examples, you have to put all files in the same package
 directory. This means putting the markup files and the java files next to one
 another. It is possible to alter this behavior, but that is beyond the scope
-of this example. The only exception is the obligatory <code>web.xml</code> 
file which
-should reside in the <code>WEB-INF/</code> directory of your web application 
root
+of this example. The only exception is the obligatory <code 
class="highlighter-rouge">web.xml</code> file which
+should reside in the <code class="highlighter-rouge">WEB-INF/</code> directory 
of your web application root
 folder.</p>
 <p>In this example we assume you already have read and understood the other
 examples which give you information on the structure and nature of Wicket
@@ -67,7 +67,7 @@ example</a>.</p>
 <p>First things first, let’s create a page that we can add our fragments to. 
We
 will add a Loop that will repeat markup and choose a different Fragment for
 each item in the loop.</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;ul&gt;</span>
@@ -76,13 +76,13 @@ each item in the loop.</p>
     <span class="nt">&lt;wicket:fragment</span> <span 
class="na">wicket:id=</span><span class="s">"fragment1"</span><span 
class="nt">&gt;</span>panel 1<span class="nt">&lt;/wicket:fragment&gt;</span>
     <span class="nt">&lt;wicket:fragment</span> <span 
class="na">wicket:id=</span><span class="s">"fragment2"</span><span 
class="nt">&gt;</span>panel 2<span class="nt">&lt;/wicket:fragment&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <p>As you can see in this markup file, we already took care of adding the
-fragment markup to the page in the <code>&lt;wicket:fragment&gt;</code> tags. 
Each fragment
+fragment markup to the page in the <code 
class="highlighter-rouge">&lt;wicket:fragment&gt;</code> tags. Each fragment
 can contain its own markup and components. Those components need to be added
 to the Fragment instance in the Java file, just as you would do with a panel
 and web markup container.</p>
-<div 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>
+<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.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>
@@ -95,17 +95,17 @@ and web markup container.</p>
         <span class="o">};</span>
         <span class="n">add</span><span class="o">(</span><span 
class="n">loop</span><span class="o">);</span>
     <span class="o">}</span>
-<span class="o">}</span></code></pre></div>
-<p>The Loop will render 5 items, and the <code>populateItem</code> method will 
be called
+<span class="o">}</span></code></pre></figure>
+<p>The Loop will render 5 items, and the <code 
class="highlighter-rouge">populateItem</code> method will be called
 for each item. In each item we construct a fragment identifier that
-corresponds to the identifier in the <code>&lt;wicket:fragment&gt;</code>. The 
<code>Fragment</code>
+corresponds to the identifier in the <code 
class="highlighter-rouge">&lt;wicket:fragment&gt;</code>. The <code 
class="highlighter-rouge">Fragment</code>
 constructor takes the identifier of the markup it needs to attach to, and the
 fragment identifier telling it where to find the specific markup in the 
file.</p>
 <h2 id="adding-components-to-fragments">Adding components to fragments</h2>
 <p>In the previous example we just showed different markup for each fragment,
 but you can add components to the fragments as well. Let’s add a label to
 fragment 1.</p>
-<div class="highlight"><pre><code class="language-html" data-lang="html"><span 
class="nt">&lt;html&gt;</span>
+<figure class="highlight"><pre><code class="language-html" 
data-lang="html"><span class="nt">&lt;html&gt;</span>
 <span class="nt">&lt;head&gt;&lt;/head&gt;</span>
 <span class="nt">&lt;body&gt;</span>
     <span class="nt">&lt;ul&gt;</span>
@@ -114,10 +114,10 @@ fragment 1.</p>
     <span class="nt">&lt;wicket:fragment</span> <span 
class="na">wicket:id=</span><span class="s">"fragment1"</span><span 
class="nt">&gt;</span>panel 1 <span class="nt">&lt;span</span> <span 
class="na">wicket:id=</span><span class="s">"label"</span><span 
class="nt">&gt;&lt;/span&gt;&lt;/wicket:fragment&gt;</span>
     <span class="nt">&lt;wicket:fragment</span> <span 
class="na">wicket:id=</span><span class="s">"fragment2"</span><span 
class="nt">&gt;</span>panel 2<span class="nt">&lt;/wicket:fragment&gt;</span>
 <span class="nt">&lt;/body&gt;</span>
-<span class="nt">&lt;/html&gt;</span></code></pre></div>
+<span class="nt">&lt;/html&gt;</span></code></pre></figure>
 <p>In order to add the component to the first fragment we’ll introduce a
 subclass for fragment one to encapsulate the component.</p>
-<div 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>
+<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="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>
@@ -142,15 +142,15 @@ subclass for fragment one to encapsulate the 
component.</p>
         <span class="o">};</span>
         <span class="n">add</span><span class="o">(</span><span 
class="n">loop</span><span class="o">);</span>
     <span class="o">}</span>
-<span class="o">}</span></code></pre></div>
-<p>The class <code>Fragment1</code> adds the label to itself. In the loop’s 
<code>populateItem</code>
-we alternate the fragments type between <code>Fragment</code> and 
<code>Fragment1</code>. This
-means that in the final page on one line you’ll see <code>"panel 1 Hello, 
World!"</code>
-and on the other line just <code>"panel 2"</code>.</p>
+<span class="o">}</span></code></pre></figure>
+<p>The class <code class="highlighter-rouge">Fragment1</code> adds the label 
to itself. In the loop’s <code class="highlighter-rouge">populateItem</code>
+we alternate the fragments type between <code 
class="highlighter-rouge">Fragment</code> and <code 
class="highlighter-rouge">Fragment1</code>. This
+means that in the final page on one line you’ll see <code 
class="highlighter-rouge">"panel 1 Hello, World!"</code>
+and on the other line just <code class="highlighter-rouge">"panel 
2"</code>.</p>
 <h2 id="summary">Summary</h2>
 <p>Fragments make a quick way to add encapsulated components without having to
 resort to setting the visibility flag on a markup container. For fragments we
-introduced a new Wicket tag: <code>&lt;wicket:fragment&gt;</code>.</p>
+introduced a new Wicket tag: <code 
class="highlighter-rouge">&lt;wicket:fragment&gt;</code>.</p>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/learn/index.html
----------------------------------------------------------------------
diff --git a/content/learn/index.html b/content/learn/index.html
index b859a21..693426a 100644
--- a/content/learn/index.html
+++ b/content/learn/index.html
@@ -19,19 +19,19 @@
     <div class="l-container">
 <nav class="mainmenu">
     <ul>
-               <!-- /start/quickstart.html || /learn -->
+               <!-- /start/quickstart.html || /learn/ -->
        <li class=""><a href="/start/quickstart.html">Quick Start</a></li>
-               <!-- /start/download.html || /learn -->
+               <!-- /start/download.html || /learn/ -->
        <li class=""><a href="/start/download.html">Download</a></li>
-               <!-- /learn || /learn -->
-       <li class="active"><a href="/learn">Documentation</a></li>
-               <!-- /help || /learn -->
+               <!-- /learn || /learn/ -->
+       <li class=""><a href="/learn">Documentation</a></li>
+               <!-- /help || /learn/ -->
        <li class=""><a href="/help">Support</a></li>
-               <!-- /contribute || /learn -->
+               <!-- /contribute || /learn/ -->
        <li class=""><a href="/contribute">Contribute</a></li>
-               <!-- /community || /learn -->
+               <!-- /community || /learn/ -->
        <li class=""><a href="/community">Community</a></li>
-               <!-- /apache || /learn -->
+               <!-- /apache || /learn/ -->
        <li class=""><a href="/apache">Apache</a></li>
     </ul>
 </nav>
@@ -105,7 +105,7 @@ projects.</p>
       <li><a 
href="http://ci.apache.org/projects/wicket/guide/7.x/guide/single.pdf";>PDF</a></li>
     </ul>
   </li>
-  <li>Wicket 6.x 
+  <li>Wicket 6.x
     <ul>
       <li><a 
href="http://ci.apache.org/projects/wicket/guide/6.x/";>HTML</a></li>
       <li><a 
href="http://ci.apache.org/projects/wicket/guide/6.x/guide/single.html";>HTML 
(single page)</a></li>
@@ -138,8 +138,8 @@ link to it from emails or websites:</p>
 newer version you can run into all of the changes that were applied to
 Wicket’s API. We have done our best to document all the changes and
 provide migration paths between the different Wicket versions.</p>
-<p>Here’s a list of the migration guides:
-&lt;div class="button-bar"&gt;
+<p>Here’s a list of the migration guides:</p>
+<div class="button-bar">
     <a class="button" href="http://s.apache.org/wicket8migration";>
         Wicket 8<br />
                migration guide
@@ -152,8 +152,8 @@ provide migration paths between the different Wicket 
versions.</p>
         Wicket 6<br />
                migration guide
     </a>
-&lt;/div&gt;
-&lt;div class="button-bar"&gt;
+</div>
+<div class="button-bar">
     <a class="button" href="http://s.apache.org/wicket5migrate";>
         Wicket 1.5<br />
                migration guide
@@ -166,7 +166,7 @@ provide migration paths between the different Wicket 
versions.</p>
         Wicket 1.3<br />
                migration guide
     </a>
-&lt;/div&gt;</p>
+</div>
 <p>If you encounter a change that was not in the migration guide, don’t
 hesitate to notify us.</p>
 <hr />

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/07/30/wicket-1.3.7-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/07/30/wicket-1.3.7-released.html 
b/content/news/2009/07/30/wicket-1.3.7-released.html
index b7f4523..3267aa0 100644
--- a/content/news/2009/07/30/wicket-1.3.7-released.html
+++ b/content/news/2009/07/30/wicket-1.3.7-released.html
@@ -87,11 +87,11 @@ can find it through the following link:</p>
 <p>http://www.apache.org/dyn/closer.cgi/wicket/1.3.7/</p>
 <p>For the Maven and Ivy fans out there: update your pom’s to the following, 
and
 everything will be downloaded automatically:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.3.7<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <p>Substitute the artifact ID with the projects of your liking to get the other
 projects.</p>
 <p>Please note that we don’t prescribe a Logging implementation for SLF4J. 
You

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/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 9e9b6ff..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
@@ -64,11 +64,11 @@ components.</p>
 <p>You can download the release here:
 http://www.apache.org/dyn/closer.cgi/wicket/1.4.0</p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>1.4.0<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <p>You will need to upgrade all modules (i.e. wicket, wicket-extensions) to
 their 1.4 counterparts. It is not possible to mix Wicket 1.3 libraries with
 1.4 libraries due to API changes.</p>
@@ -76,8 +76,8 @@ their 1.4 counterparts. It is not possible to mix Wicket 1.3 
libraries with
 <p>From all the changes that went into this release, the following are the most
 important ones:</p>
 <ul>
-  <li>Generified <code>IModel</code> interface and implementations increases 
type safety in your Wicket applications</li>
-  <li><code>Component#getModel()</code> and <code>Component#setModel()</code> 
have been renamed to <code>getDefaultModel()</code> and 
<code>setDefaultModel()</code> to better support generified models</li>
+  <li>Generified <code class="highlighter-rouge">IModel</code> interface and 
implementations increases type safety in your Wicket applications</li>
+  <li><code class="highlighter-rouge">Component#getModel()</code> and <code 
class="highlighter-rouge">Component#setModel()</code> have been renamed to 
<code class="highlighter-rouge">getDefaultModel()</code> and <code 
class="highlighter-rouge">setDefaultModel()</code> to better support generified 
models</li>
   <li>The Spring modules have been merged (wicket-spring-annot is now 
obsolete, all you need is wicket-spring)</li>
   <li>Many API’s have been altered to better work with Java 5’s idioms</li>
   <li>Wicket jars are now packaged with metadata that makes them OSGI 
bundles</li>
@@ -90,17 +90,17 @@ about all the improvements and new features that went into 
this release,
 check the solved issue list in our JIRA instance.</p>
 <h2 id="increased-type-safety">Increased type safety</h2>
 <p>Moving towards Java 5 has given us the opportunity to utilize generics and
-clarify our API’s. For example, take a look at 
<code>DropDownChoice</code>—one of the
+clarify our API’s. For example, take a look at <code 
class="highlighter-rouge">DropDownChoice</code>—one of the
 components with the most questions on our list prior to 1.4. A
-<code>DropDownChoice</code> component is a form component that displays a list 
of
+<code class="highlighter-rouge">DropDownChoice</code> component is a form 
component that displays a list of
 available choices in a drop down box, and allows one selection to be made.
 DropDownChoice components are typically used to display a list of countries,
 nationalities, credit card processors, etc.</p>
-<p>The signature of a constructor for the <code>DropDownChoice</code> 
component in Wicket
+<p>The signature of a constructor for the <code 
class="highlighter-rouge">DropDownChoice</code> component in Wicket
 1.3 was:</p>
-<div 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>
+<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="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></div>
+<span class="o">}</span></code></pre></figure>
 <p>As you can see, this constructor doesn’t give much insight into what goes
 where (other than the names of the parameters). The first parameter is the
 component identifier, the second parameter is the model that contains the
@@ -109,26 +109,26 @@ choices from which the user can select one. You’ll have 
to read the JavaDoc
 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>
-<div 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>
+<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="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></div>
-<p>Here we communicate that the first <code>IModel</code> parameter is a 
<code>T</code>, which is the
-single value that will be provided when the <code>DropDownChoice</code> 
selects one
-value. The second parameter provides a <code>List</code> of objects that 
extend <code>T</code>, the
+<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
+value. The second parameter provides a <code 
class="highlighter-rouge">List</code> of objects that extend <code 
class="highlighter-rouge">T</code>, the
 choices from which to select one value. This was not apparent in the Wicket
 1.3 API, and the type safety brought by generics make this much more clear,
 albeit much more verbose.</p>
 <h2 id="removal-of-default-model-from-component">Removal of default model from 
component</h2>
-<p>In Wicket 1.3 each component had by default a model: a <code>Label</code> 
had a model, a
-<code>Link</code> and even <code>WebMarkupContainer</code> had a model 
property (all because they
-extend <code>Component</code> which has a model property). When we generified 
<code>IModel</code>,
-this had averse effects on <code>Component</code>: suddenly all components had 
to be
+<p>In Wicket 1.3 each component had by default a model: a <code 
class="highlighter-rouge">Label</code> had a model, a
+<code class="highlighter-rouge">Link</code> and even <code 
class="highlighter-rouge">WebMarkupContainer</code> had a model property (all 
because they
+extend <code class="highlighter-rouge">Component</code> which has a model 
property). When we generified <code class="highlighter-rouge">IModel</code>,
+this had averse effects on <code class="highlighter-rouge">Component</code>: 
suddenly all components had to be
 generified and had to take the type parameter of the model that was
 associated with it. But that poses problems for components that either do not
 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>
-<div 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>
+<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="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="n">onClick</span><span class="o">()</span> <span class="o">{</span>
@@ -137,7 +137,7 @@ the extra type information, leading to clean code like 
this:</p>
                 <span class="o">}</span>
             <span class="o">});</span>
         <span class="o">}</span>
-    <span class="o">};</span></code></pre></div>
+    <span class="o">};</span></code></pre></figure>
 </div>
         </section>
     </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/08/21/wicket-1.4.1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/08/21/wicket-1.4.1-released.html 
b/content/news/2009/08/21/wicket-1.4.1-released.html
index 2a8f7d6..d0f7875 100644
--- a/content/news/2009/08/21/wicket-1.4.1-released.html
+++ b/content/news/2009/08/21/wicket-1.4.1-released.html
@@ -56,11 +56,11 @@ of Apache Wicket 1.4.</p>
 <p>You can download the release here:
 <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.1";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.1</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.1<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>The most notable change in this release is the transparent support for
 multipart form submissions via Ajax. Wicket is now smart enough to submit a

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/10/12/wicket-1.4.2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/10/12/wicket-1.4.2-released.html 
b/content/news/2009/10/12/wicket-1.4.2-released.html
index 794a715..7774f72 100644
--- a/content/news/2009/10/12/wicket-1.4.2-released.html
+++ b/content/news/2009/10/12/wicket-1.4.2-released.html
@@ -55,11 +55,11 @@ of Apache Wicket 1.4.</p>
 <h3 id="download-apache-wicket-142">Download Apache Wicket 1.4.2</h3>
 <p>You can download the release here: <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.2";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.2</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.2<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found
 <a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12314163&amp;sorter/field=priority&amp;sorter/order=DESC";>here</a>.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/10/24/wicket-1.4.3-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/10/24/wicket-1.4.3-released.html 
b/content/news/2009/10/24/wicket-1.4.3-released.html
index 9c8c4c0..fc8cf33 100644
--- a/content/news/2009/10/24/wicket-1.4.3-released.html
+++ b/content/news/2009/10/24/wicket-1.4.3-released.html
@@ -55,11 +55,11 @@ of Apache Wicket 1.4.</p>
 <h3 id="download-apache-wicket-143">Download Apache Wicket 1.4.3</h3>
 <p>You can download the release here: <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.3";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.3</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.3<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found
 <a 
href="https://issues.apache.org/jira/browse/WICKET/fixforversion/12314250";>here</a>.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/12/13/wicket-1.4.4-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/12/13/wicket-1.4.4-released.html 
b/content/news/2009/12/13/wicket-1.4.4-released.html
index d7f7107..ca94507 100644
--- a/content/news/2009/12/13/wicket-1.4.4-released.html
+++ b/content/news/2009/12/13/wicket-1.4.4-released.html
@@ -56,11 +56,11 @@ of Apache Wicket 1.4.</p>
 <p>You can download the release here:
 <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.4";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.4</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.4<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found
 <a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12314323&amp;sorter/field=priority&amp;sorter/order=DESC";>here</a>.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2009/12/21/wicket-1.4.5-released.html
----------------------------------------------------------------------
diff --git a/content/news/2009/12/21/wicket-1.4.5-released.html 
b/content/news/2009/12/21/wicket-1.4.5-released.html
index 7075462..99b8e49 100644
--- a/content/news/2009/12/21/wicket-1.4.5-released.html
+++ b/content/news/2009/12/21/wicket-1.4.5-released.html
@@ -58,11 +58,11 @@ environments.</p>
 <h3 id="download-apache-wicket-14">Download Apache Wicket 1.4</h3>
 <p>You can download the release here: <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.5";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.5</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.5<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found
 <a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;pid=12310561&amp;fixfor=12314441";>here</a>.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/02/01/wicket-1.4.6-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/02/01/wicket-1.4.6-released.html 
b/content/news/2010/02/01/wicket-1.4.6-released.html
index a5a3ce6..845ebc2 100644
--- a/content/news/2010/02/01/wicket-1.4.6-released.html
+++ b/content/news/2010/02/01/wicket-1.4.6-released.html
@@ -56,11 +56,11 @@ that make Wicket 1.4 even more stable in production 
environments.</p>
 <h3 id="download-apache-wicket-146">Download Apache Wicket 1.4.6</h3>
 <p>You can download the release here: <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.6";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.6</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.6<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found
 <a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;pid=12310561&amp;fixfor=12314470";>here</a>.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/03/05/wicket-1.4.7-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/03/05/wicket-1.4.7-released.html 
b/content/news/2010/03/05/wicket-1.4.7-released.html
index 62844f8..eea4383 100644
--- a/content/news/2010/03/05/wicket-1.4.7-released.html
+++ b/content/news/2010/03/05/wicket-1.4.7-released.html
@@ -54,11 +54,11 @@
 <h3 id="download-apache-wicket-147">Download Apache Wicket 1.4.7</h3>
 <p>You can download the release here: <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.7";>http://www.apache.org/dyn/closer.cgi/wicket/1.4.7</a></p>
 <p>Or use this in your Maven pom’s to upgrade to the new version:</p>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.7<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <h3 id="changes">Changes</h3>
 <p>A complete list of changes can be found <a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310561&amp;fixfor=12314560";>here</a>.</p>
 <p>We thank you for your patience and support.</p>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/05/03/wicket-1.4.8-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/05/03/wicket-1.4.8-released.html 
b/content/news/2010/05/03/wicket-1.4.8-released.html
index da7641b..167d7fc 100644
--- a/content/news/2010/05/03/wicket-1.4.8-released.html
+++ b/content/news/2010/05/03/wicket-1.4.8-released.html
@@ -57,11 +57,11 @@
   <li><a 
href="https://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.8";>SVN 
tag</a></li>
   <li>Using Maven:</li>
 </ul>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.8<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <ul>
   <li><a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.8";>Download</a></li>
   <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310561&amp;fixfor=12314811";>Change
 log</a></li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/05/24/wicket-1.4.9-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/05/24/wicket-1.4.9-released.html 
b/content/news/2010/05/24/wicket-1.4.9-released.html
index ffc4332..b740b71 100644
--- a/content/news/2010/05/24/wicket-1.4.9-released.html
+++ b/content/news/2010/05/24/wicket-1.4.9-released.html
@@ -54,15 +54,15 @@
     <p>This is the ninth maintenance release of the 1.4.x series and brings 
over
 fifteen bug fixes and improvements.</p>
 <ul>
-  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/";>Subversion 
tag</a> </li>
+  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/";>Subversion 
tag</a></li>
   <li><a 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12314962";>Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.9<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <ul>
   <li>Download the <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.9";>full
 distribution</a> (including
@@ -72,7 +72,7 @@ source)</li>
 <a href="https://issues.apache.org/jira/browse/WICKET-2846";>WICKET-2846</a> 
will be
 reverted in the next release because the community has shown a preference for
 this. So, it would be wise not to take advantage of the
-<code>InheritableThreadLocal</code> that was put into version 1.4.9.</p>
+<code class="highlighter-rouge">InheritableThreadLocal</code> that was put 
into version 1.4.9.</p>
 <h2 id="release-notes---wicket---version-149">Release Notes - Wicket - Version 
1.4.9</h2>
 <h3 id="bugs">Bugs</h3>
 <ul>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/05/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/05/index.html b/content/news/2010/05/index.html
index 0206555..0642edc 100644
--- a/content/news/2010/05/index.html
+++ b/content/news/2010/05/index.html
@@ -56,8 +56,8 @@
   <li><a 
href="https://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.8";>SVN 
tag</a></li>
   <li>Using Maven:</li>
 </ul>
-<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...</code></pre></div>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org...</code></pre></figure>
        <a href="/news/2010/05/03/wicket-1.4.8-released.html">more</a></li>
 </div>
 <div class="news">
@@ -66,13 +66,12 @@
        <p>This is the ninth maintenance release of the 1.4.x series and brings 
over
 fifteen bug fixes and improvements.</p>
 <ul>
-  <li>
-<a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/";>Subversion 
tag</a> </li>
+  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.9/";>Subversion 
tag</a></li>
   <li><a 
href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310561&amp;styleName=Html&amp;version=12314962";>Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
-<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.apach...</code></pre></div>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
+    <span class="nt">&lt;groupId&gt;</span>org.apa...</code></pre></figure>
        <a href="/news/2010/05/24/wicket-1.4.9-released.html">more</a></li>
 </div>
         </div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/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 2688117..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
@@ -54,9 +54,9 @@
 thirty bug fixes and improvements.</p>
 <p>As well as bringing bug fixes and small improvements, 1.4.10 brings two 
major new features:
 * Delayed component initialization
-* Component configuration </p>
+* Component configuration</p>
 <p>Delayed component initialization allows developers to initialize their 
components outside of a constructor, when more environment is available to the 
component instance. From the javadoc:</p>
-<div 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>
+<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>
        <span class="cm">/**
         * This method is meant to be used as an alternative to initialize 
components. Usually the
         * component's constructor is used for this task, but sometimes a 
component cannot be
@@ -82,9 +82,9 @@ thirty bug fixes and improvements.</p>
         * 
         */</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></div>
+<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>
-<div 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>
+<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>
        <span class="cm">/**
         * Called once per request on components before they are about to be 
rendered. This method
         * should be used to configure such things as visibility and enabled 
flags.
@@ -144,17 +144,17 @@ thirty bug fixes and improvements.</p>
         * &lt;/pre&gt;
         */</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></div>
+<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>
+  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.10/";>Subversion
 tag</a></li>
   <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;mode=hide&amp;sorter/order=DESC&amp;sorter/field=priority&amp;pid=12310561&amp;fixfor=12315070";>Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.10<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <ul>
   <li>Download the <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.10";>full
 distribution</a> (including

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/08/11/wicket-1.5-M1-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/11/wicket-1.5-M1-released.html 
b/content/news/2010/08/11/wicket-1.5-M1-released.html
index 49dda99..e9de8ae 100644
--- a/content/news/2010/08/11/wicket-1.5-M1-released.html
+++ b/content/news/2010/08/11/wicket-1.5-M1-released.html
@@ -55,14 +55,14 @@ provide our users with a more powerful and flexible request 
processing pipeline.
 <p>This release is NOT production-ready, it is more of a technology demo that 
should facilitate user-feedback we can fold into the next milestone.</p>
 <ul>
   <li><a 
href="https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5";>Migration
 notes</a></li>
-  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/";>Subversion
 tag</a> </li>
-  <li>To use in Maven: </li>
+  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.5-M1/";>Subversion
 tag</a></li>
+  <li>To use in Maven:</li>
 </ul>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.5-M1<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <ul>
   <li>Download the <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.5-M1";>full
 distribution</a> (including source)</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/08/index.html
----------------------------------------------------------------------
diff --git a/content/news/2010/08/index.html b/content/news/2010/08/index.html
index f5ac504..9f86f57 100644
--- a/content/news/2010/08/index.html
+++ b/content/news/2010/08/index.html
@@ -57,7 +57,7 @@
   <p><small>11 Aug 2010</small></p>
        <p>This is the tenth maintenance release of the 1.4.x series and brings 
over
 thirty bug fixes and improvements.</p>
-<p>As well as bringing bug fixes and small improvements, 1.4.10 brin...</p>
+<p>As well as bringing bug fixes and small improvements, 1.4.10 bri...</p>
        <a href="/news/2010/08/11/wicket-1.4.10-released.html">more</a></li>
 </div>
 <div class="news">

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/0588c401/content/news/2010/09/09/wicket-1.4.11-released.html
----------------------------------------------------------------------
diff --git a/content/news/2010/09/09/wicket-1.4.11-released.html 
b/content/news/2010/09/09/wicket-1.4.11-released.html
index 09b5b40..babb780 100644
--- a/content/news/2010/09/09/wicket-1.4.11-released.html
+++ b/content/news/2010/09/09/wicket-1.4.11-released.html
@@ -53,15 +53,15 @@
     <p>This is the eleventh maintenance release of the 1.4.x series and brings 
over
 fifty bug fixes and improvements.</p>
 <ul>
-  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/";>Subversion
 tag</a> </li>
+  <li><a 
href="http://svn.apache.org/repos/asf/wicket/releases/wicket-1.4.11/";>Subversion
 tag</a></li>
   <li><a 
href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;&amp;pid=12310561&amp;fixfor=12315236&amp;sorter/field=issuekey&amp;sorter/order=DESC";>Changelog</a></li>
-  <li>To use in Maven: </li>
+  <li>To use in Maven:</li>
 </ul>
-<div class="highlight"><pre><code class="language-xml" data-lang="xml"><span 
class="nt">&lt;dependency&gt;</span>
+<figure class="highlight"><pre><code class="language-xml" 
data-lang="xml"><span class="nt">&lt;dependency&gt;</span>
     <span class="nt">&lt;groupId&gt;</span>org.apache.wicket<span 
class="nt">&lt;/groupId&gt;</span>
     <span class="nt">&lt;artifactId&gt;</span>wicket<span 
class="nt">&lt;/artifactId&gt;</span>
     <span class="nt">&lt;version&gt;</span>1.4.11<span 
class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span></code></pre></div>
+<span class="nt">&lt;/dependency&gt;</span></code></pre></figure>
 <ul>
   <li>Download the <a 
href="http://www.apache.org/dyn/closer.cgi/wicket/1.4.11";>full distribution</a> 
(including source)</li>
 </ul>

Reply via email to