Prepare for Wicket 7.0.0, add button bars, fix some pages

Project: http://git-wip-us.apache.org/repos/asf/wicket-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket-site/commit/8ec6434b
Tree: http://git-wip-us.apache.org/repos/asf/wicket-site/tree/8ec6434b
Diff: http://git-wip-us.apache.org/repos/asf/wicket-site/diff/8ec6434b

Branch: refs/heads/asf-site
Commit: 8ec6434bb2c2afea7042ad92e99f3a54ddc83d07
Parents: 8ae24c5
Author: Martijn Dashorst <[email protected]>
Authored: Tue Jul 28 11:33:30 2015 +0200
Committer: Martijn Dashorst <[email protected]>
Committed: Tue Jul 28 11:33:30 2015 +0200

----------------------------------------------------------------------
 _config.yml                                     |  27 +-
 _includes/mainmenu.html                         |   4 +-
 _sass/main.scss                                 |  15 ++
 content/atom.xml                                |  54 ++--
 content/contribute/index.html                   |  47 +++-
 content/contribute/release.html                 |   6 +-
 content/contribute/write.html                   |   2 +-
 content/css/style.css                           |  10 +
 content/doap.rdf                                |   4 +-
 content/help/index.html                         |   8 +-
 content/help/reportabug.html                    |   4 +-
 content/help/security.html                      |   2 +-
 content/learn/blogs.html                        |  19 +-
 content/learn/books/awc.html                    |  34 ++-
 content/learn/books/ewdww.html                  |   6 +-
 content/learn/books/iaw6.html                   |  34 ++-
 content/learn/books/index.html                  |  26 +-
 content/learn/books/koda.html                   |  48 ++--
 content/learn/books/kwij.html                   |  31 +--
 content/learn/books/praxisbuchwicket.html       |   6 +-
 content/learn/books/prowicket.html              |   2 +-
 content/learn/books/wia.html                    |   6 +-
 content/learn/books/wicket-jp.html              |  22 +-
 content/learn/examples/dropdownchoice.html      |   2 +-
 content/learn/index.html                        | 111 +++-----
 .../news/2010/05/24/wicket-1.4.9-released.html  |   4 +-
 content/news/2010/05/index.html                 |   7 +-
 .../news/2010/08/11/wicket-1.4.10-released.html |   6 +-
 .../news/2010/08/11/wicket-1.5-M1-released.html |   4 +-
 content/news/2010/08/index.html                 |   2 +-
 .../news/2010/09/09/wicket-1.4.11-released.html |   4 +-
 .../news/2010/09/17/wicket.1.4.12-released.html |   4 +-
 .../2010/09/17/wicket.1.5-M2.1-released.html    |   6 +-
 content/news/2010/09/index.html                 |  14 +-
 .../news/2010/11/01/wicket-1.4.13-released.html |   4 +-
 .../news/2010/11/05/wicket-1.5-M3-released.html |   4 +-
 .../news/2010/11/29/wicket-1.4.14-released.html |   4 +-
 content/news/2010/11/index.html                 |  19 +-
 .../news/2010/12/24/wicket-1.4.15-released.html |   4 +-
 content/news/2010/12/index.html                 |   7 +-
 .../2011/01/22/wicket-1.5-RC1-released.html     |   2 +-
 .../news/2011/02/25/wicket-1.4.16-released.html |   4 +-
 .../2011/02/25/wicket-1.5-rc2-released.html     |   2 +-
 content/news/2011/02/index.html                 |   7 +-
 .../news/2011/04/02/wicket-1.4.17-released.html |   4 +-
 .../2011/04/02/wicket-1.5-RC3-released.html     |   2 +-
 content/news/2011/04/index.html                 |   7 +-
 .../2011/05/11/wicket-1.5-RC4.2-released.html   |   2 +-
 .../2011/06/25/wicket-1.5-RC5.1-released.html   |   2 +-
 .../news/2011/08/09/wicket-1.4.18-released.html |   4 +-
 content/news/2011/08/28/1.5-RC7-released.html   |   2 +-
 content/news/2011/08/index.html                 |   7 +-
 .../news/2011/09/07/wicket-1.5-released.html    |   2 +-
 .../news/2011/09/29/wicket-1.5.1-released.html  |   4 +-
 content/news/2011/09/index.html                 |   7 +-
 .../news/2011/10/17/wicket-1.4.19-released.html |   4 +-
 .../news/2011/10/24/wicket-1.5.2-released.html  |   4 +-
 content/news/2011/10/index.html                 |  14 +-
 .../news/2012/09/05/wicket-6.0.0-released.html  |   4 +-
 content/news/2012/09/index.html                 |   4 +-
 .../news/2013/02/15/wicket-6.6.0-released.html  |   4 +-
 .../news/2013/04/12/wicket-6.7.0-released.html  |   4 +-
 .../news/2013/06/27/wicket-6.9.0-released.html  |   2 +-
 .../news/2013/07/10/wicket-6.9.1-released.html  |   2 +-
 .../news/2013/08/18/wicket-6.10.0-released.html |   2 +-
 .../news/2013/11/01/wicket-6.12.0-released.html |   4 +-
 .../news/2014/04/23/wicket-6.15.0-released.html |   2 +-
 .../news/2014/08/24/wicket-6.17.0-released.html |   2 +-
 .../news/2014/11/05/wicket-6.18.0-released.html |   4 +-
 .../2014/11/05/wicket-7.0.0-M4-released.html    |   4 +-
 .../02/13/new-committer-Sebastien-Briquet.html  |   6 +-
 content/news/2015/02/index.html                 |   4 +-
 content/news/index.html                         |  48 ++--
 content/start/download.html                     | 232 ++++++----------
 content/start/quickstart.html                   |   4 +-
 content/start/wicket-1.3.x.html                 | 160 +++++++++++
 content/start/wicket-1.4.x.html                 | 172 ++++++++++++
 content/start/wicket-1.5.x.html                 | 175 ++++++++++++
 content/start/wicket-6.x.html                   | 178 ++++++++++++
 content/start/wicket-7.x.html                   | 174 ++++++++++++
 contribute/index.md                             |  52 +++-
 learn/blogs.md                                  |  17 +-
 learn/books/awc.md                              |  34 ++-
 learn/books/ewdww.md                            |   3 +-
 learn/books/iaw6.md                             |  32 ++-
 learn/books/index.md                            |  26 +-
 learn/books/koda.md                             |  48 ++--
 learn/books/kwij.md                             |  31 +--
 learn/books/praxisbuchwicket.md                 |   3 +-
 learn/books/prowicket.md                        |   1 +
 learn/books/wia.md                              |   5 +-
 learn/books/wicket-jp.md                        |  21 +-
 learn/index.md                                  | 122 +++------
 start/download.md                               | 270 +++++++------------
 start/wicket-1.3.x.md                           | 130 +++++++++
 start/wicket-1.4.x.md                           | 146 ++++++++++
 start/wicket-1.5.x.md                           | 149 ++++++++++
 start/wicket-6.x.md                             | 153 +++++++++++
 start/wicket-7.x.md                             | 146 ++++++++++
 99 files changed, 2375 insertions(+), 908 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 839845f..c616568 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,24 +15,31 @@ excerpt_separator: <!--more-->
 sass:
     sass_dir: _sass
 wicket:
-  version:    6.20.0
-  version_70: 7.0.0-M6
+  version:    7.0.0
+  version_70: 7.0.0
   version_60: 6.20.0
   version_15: 1.5.13
   version_14: 1.4.23
-  released:   2015-06-14
-  versions:   [6.20.0, 1.5.13, 1.4.23, 7.0.0-M6, 1.5-SNAPSHOT, 
6.21.0-SNAPSHOT, 7.0.0-SNAPSHOT]
+  version_13: 1.3.7
+  released:   2015-07-10
+  versions:   [6.20.0, 1.5.13, 1.4.23, 7.0.0, 1.5-SNAPSHOT, 6.21.0-SNAPSHOT, 
7.0.0-SNAPSHOT]
 
 navigation:
-- text: Quick Start
+- id: start
+  text: Quick Start
   url: /start/quickstart.html
-- text: Download
+- id: download
+  text: Download
   url: /start/download.html
-- text: Documentation
+- id: documentation
+  text: Documentation
   url: /learn
-- text: Support
+- id: support
+  text: Support
   url: /help
-- text: Contribute
+- id: contribute
+  text: Contribute
   url: /contribute
-- text: Apache
+- id: apache
+  text: Apache
   url: /apache

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_includes/mainmenu.html
----------------------------------------------------------------------
diff --git a/_includes/mainmenu.html b/_includes/mainmenu.html
index a2d357c..82b6380 100644
--- a/_includes/mainmenu.html
+++ b/_includes/mainmenu.html
@@ -7,7 +7,9 @@
         {% assign linkurl = link.url|remove:'/index.html' %}
         {% assign linkurl = link.url|remove:'/index.md' %}
                <!-- {{ linkurl }} || {{ url }} -->
-       {% if url == "" and link.url == "/" %}
+               {% if page.active_link == link.id %}
+                       {% assign active = 'active' %}
+       {% elsif url == "" and link.url == "/" %}
                {% assign active = 'active' %}
        {% elsif url == link.url or page.url == link.url %}
                {% assign active = 'active' %}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/_sass/main.scss
----------------------------------------------------------------------
diff --git a/_sass/main.scss b/_sass/main.scss
index 7e2d5c1..c655f24 100755
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -155,3 +155,18 @@ article+article {
         }
     }
 }
+
+th { 
+       text-align: left; 
+}
+
+.media-bar {
+       clear: both;
+       a {
+               border: none;
+
+               > img {
+                       width: 100%;
+               }
+       }
+}

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/atom.xml
----------------------------------------------------------------------
diff --git a/content/atom.xml b/content/atom.xml
index b6f44ad..fd16912 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml"; rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2015-07-20T11:17:31+02:00</updated>
+    <updated>2015-07-28T11:31:08+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
@@ -136,16 +136,16 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 
 &lt;pre&gt;&lt;code&gt;* [WICKET-5790] - VariableInterpolator &amp;amp; 
#getThrowExceptionOnMissingResource
 * [WICKET-5814] - CryptoMapper clears feedback messages
-* [WICKET-5816] - Apps can't use Application.setName instead of WicketFilter 
for e.g. JMX names
+* [WICKET-5816] - Apps can&#39;t use Application.setName instead of 
WicketFilter for e.g. JMX names
 * [WICKET-5822] - AjaxSelfUpdatingTimer stops working after ajax download
 * [WICKET-5825] - Deployment of wicket-examples.war fails in Tomcat
 * [WICKET-5828] - PageProvider not serializable
 * [WICKET-5834] - NPE in DefaultPropertyResolver
-* [WICKET-5835] - InlineEnclosure doesn't call child.configure() before 
updating its visilbity
+* [WICKET-5835] - InlineEnclosure doesn&#39;t call child.configure() before 
updating its visilbity
 * [WICKET-5837] - JUnit tests may fail because of AbstractDefaultAjaxBehavior
 * [WICKET-5838] - Last-modified header of external markup is ignored
 * [WICKET-5841] - continueToOriginalDestination() discards new cookies
-* [WICKET-5843] - CryptoMapper doesn't work with context relative 
UrlResourceReferences
+* [WICKET-5843] - CryptoMapper doesn&#39;t work with context relative 
UrlResourceReferences
 * [WICKET-5845] - AuthenticatedWebSession.get() returns a new session with 
signedIn false
 * [WICKET-5850] - LazyInitProxyFactory causes NoClassDefFound 
org/apache/wicket/proxy/ILazyInitProxy in case of multimodule deployment
 * [WICKET-5851] - PackageResourceTest#packageResourceGuard test fails under 
Windows
@@ -157,7 +157,7 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5861] - BigDecimalConverter does not allow parsing of values great 
than Double.MAX_VALUE
 * [WICKET-5862] - Wicket Container visibility bug
 * [WICKET-5864] - Multipart Ajax form submit does not release the channel in 
case of connection failure
-* [WICKET-5869] - Kittencaptcha doesn't calculate click y-coordinate correctly
+* [WICKET-5869] - Kittencaptcha doesn&#39;t calculate click y-coordinate 
correctly
 * [WICKET-5870] - wicket-event-jquery.js: Wicket.Browser.isIE11() does not 
return boolean
 * [WICKET-5874] - WicketTester TagTester does not work as expected when using 
non self closing tags
 * [WICKET-5879] - Using an AjaxSubmitLink to hide its form results in an 
exception
@@ -178,7 +178,7 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5912] - NPE in Page#hasInvisibleTransparentChild
 * [WICKET-5915] - The application can not find /META-INF/wicket/**.properties 
on Windows systems
 * [WICKET-5916] - StackOverflowError when calling getObject() from load() in 
LDM
-* [WICKET-5917] - Do not use jQuery's $ in String snippets in Java code
+* [WICKET-5917] - Do not use jQuery&#39;s $ in String snippets in Java code
 &lt;/code&gt;&lt;/pre&gt;
 
 &lt;h4 id=&quot;improvement&quot;&gt;Improvement&lt;/h4&gt;
@@ -187,12 +187,12 @@ yPIAoMU7z9Go0pn5ZFKZwq+VDA0cvoh4
 * [WICKET-5749] - Wicket-auth-roles should deal with resource authorization
 * [WICKET-5789] - Make 
org.apache.wicket.protocol.ws.javax.WicketServerEndpointConfig publicly visible
 * [WICKET-5801] - Responsive Images
-* [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce 
copy/paste while extending it's functionality
+* [WICKET-5823] - DefaultAuthenticationStrategy should be modified to reduce 
copy/paste while extending it&#39;s functionality
 * [WICKET-5829] - rename PageSettings#recreateMountedPagesAfterExpiry
 * [WICKET-5831] - Improve unsafe Id reporting in the AbstractRepeater
-* [WICKET-5832] - Do not fail at CDI's ConversationPropagator when running in 
non-http thread
+* [WICKET-5832] - Do not fail at CDI&#39;s ConversationPropagator when running 
in non-http thread
 * [WICKET-5833] - Add a way to get all opened web socket connections per user 
session
-* [WICKET-5840] - WicketTester doesn't support #clickLink() for ExternalLink 
component
+* [WICKET-5840] - WicketTester doesn&#39;t support #clickLink() for 
ExternalLink component
 * [WICKET-5859] - Add Hebrew and Arabic translations
 * [WICKET-5860] - Cross-Site Websocket Hijacking protection
 * [WICKET-5863] - Overiding disableCaching in ServletWebResponse is ignored 
when responce is buffered
@@ -391,15 +391,15 @@ migration guide found at&lt;/p&gt;
         
<id>http://wicket.apache.org/news/2015/02/13/new-committer-Sebastien-Briquet</id>
         <content type="html">&lt;p&gt;The Project Management Committee (PMC) 
for Apache Wicket 
 has asked Sebastien Briquet to become a committer and we are pleased 
-to announce that he has accepted. &lt;/p&gt;
+to announce that he has accepted.&lt;/p&gt;
 
 &lt;p&gt;Sebastien has been involved with Wicket for several years now by 
developing one of the most successful integrations with JavaScript libraries, 
namely Wicket jQuery UI, reporting bugs, contributing fixes and participating 
in discussions.&lt;/p&gt;
 
 &lt;p&gt;Being a committer will enable him to help us even easier in the 
future.&lt;/p&gt;
 
-&lt;p&gt;Please welcome Sebastien Briquet to our team! &lt;/p&gt;
+&lt;p&gt;Please welcome Sebastien Briquet to our team!&lt;/p&gt;
 
-&lt;p&gt;Bienvenue Sebastien! &lt;/p&gt;
+&lt;p&gt;Bienvenue Sebastien!&lt;/p&gt;
 </content>
     </entry>
 
@@ -513,18 +513,18 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5748&quot;&gt;WICKET-5748&lt;/a&gt;
 - StackOverflowError while trying to get the Markup of 
WicketHeadContainer&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5751&quot;&gt;WICKET-5751&lt;/a&gt;
 - NullPointerException in IntHashMap&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5752&quot;&gt;WICKET-5752&lt;/a&gt;
 - ReplacementResourceBundleReference should return the dependencies for the 
replacing resource ref&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt;
 - AjaxRequestAttributes extra parameters aren't properly handled in 
getCallbackFunction()&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt;
 - AjaxRequestAttributes extra parameters aren&#39;t properly handled in 
getCallbackFunction()&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5770&quot;&gt;WICKET-5770&lt;/a&gt;
 - PageParametersEncoder should not decode parameters with no name&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5772&quot;&gt;WICKET-5772&lt;/a&gt;
 - LoadableDetachableModel caches null value if load() fails, bug in 
getObject() {attached = true;}&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5777&quot;&gt;WICKET-5777&lt;/a&gt;
 - Reload of page leads to WicketRuntimeException&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5782&quot;&gt;WICKET-5782&lt;/a&gt;
 - Missing escaping in MultiFileUploadField.js - sort of XSS&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt;
 - Multiple events in AjaxEventBehavior with prefix 'on'&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt;
 - Multiple events in AjaxEventBehavior with prefix &#39;on&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5784&quot;&gt;WICKET-5784&lt;/a&gt;
 - arraycopy with bad length in AbstractRequestLogger:172&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5793&quot;&gt;WICKET-5793&lt;/a&gt;
 - Request for static resource creating a session in 6.13.0+&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5800&quot;&gt;WICKET-5800&lt;/a&gt;
 - wicket:enclosure within FormComponentPanel causes exception related to 
dequeueing&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5809&quot;&gt;WICKET-5809&lt;/a&gt;
 - URL IPv6 parsing&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5811&quot;&gt;WICKET-5811&lt;/a&gt;
 - Infinite loop issue in 
PropertyValidator#createUnresolvablePropertyMessage(FormComponent&amp;lt;&amp;gt;)&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt;
 - AtmosphereBehavior wrongly sets Ajax base url to '.'&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt;
 - AtmosphereBehavior wrongly sets Ajax base url to &#39;.&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5817&quot;&gt;WICKET-5817&lt;/a&gt;
 - Wicket-JMX should depend on asm-util&lt;/li&gt;
 &lt;/ul&gt;
 
@@ -533,8 +533,8 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
 &lt;ul&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-4703&quot;&gt;WICKET-4703&lt;/a&gt;
 - StringResourceModel should provide an overridable getString(Component) 
method&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5746&quot;&gt;WICKET-5746&lt;/a&gt;
 - Fire an event once all JS event listeners are registered&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt;
 - It is impossible to determine the form submitting component's inputName when 
AjaxFormSubmitBehavior is used&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt;
 - (String)ResourceModel's defaultValue could be an 
IModel&amp;lt;String&amp;gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt;
 - It is impossible to determine the form submitting component&#39;s inputName 
when AjaxFormSubmitBehavior is used&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt;
 - (String)ResourceModel&#39;s defaultValue could be an 
IModel&amp;lt;String&amp;gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5756&quot;&gt;WICKET-5756&lt;/a&gt;
 - Allow to use custom ciphers when using SunJceCrypt class&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5758&quot;&gt;WICKET-5758&lt;/a&gt;
 - Portuguese translation&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5760&quot;&gt;WICKET-5760&lt;/a&gt;
 - Add constructor (String, Serializable, String) to 
AttributeAppender&lt;/li&gt;
@@ -561,7 +561,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5806&quot;&gt;WICKET-5806&lt;/a&gt;
 - Wicket.Log should log (at least errors) in the browser console even when 
Wicket Ajax Debug window is disabled&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5808&quot;&gt;WICKET-5808&lt;/a&gt;
 - SpringBean, support generic beans&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5818&quot;&gt;WICKET-5818&lt;/a&gt;
 - Add support for httpOnly cookies to CookieDefaults&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5820&quot;&gt;WICKET-5820&lt;/a&gt;
 - improve StringResourceModel's resource key interpolation for null&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5820&quot;&gt;WICKET-5820&lt;/a&gt;
 - improve StringResourceModel&#39;s resource key interpolation for 
null&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h4 id=&quot;new-features&quot;&gt;New Features&lt;/h4&gt;
@@ -671,15 +671,15 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5747&quot;&gt;WICKET-5747&lt;/a&gt;
 - Wicket Ajax Click handling gets requeued in OnDomReady so fire out of 
order&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5752&quot;&gt;WICKET-5752&lt;/a&gt;
 - ReplacementResourceBundleReference should return the dependencies for the 
replacing resource ref&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5755&quot;&gt;WICKET-5755&lt;/a&gt;
 - Restoring focus after Ajax replace no longer works in IE8&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt;
 - AjaxRequestAttributes extra parameters aren't properly handled in 
getCallbackFunction()&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5759&quot;&gt;WICKET-5759&lt;/a&gt;
 - AjaxRequestAttributes extra parameters aren&#39;t properly handled in 
getCallbackFunction()&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5770&quot;&gt;WICKET-5770&lt;/a&gt;
 - PageParametersEncoder should not decode parameters with no name&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5782&quot;&gt;WICKET-5782&lt;/a&gt;
 - Missing escaping in MultiFileUploadField.js - sort of XSS&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt;
 - Multiple events in AjaxEventBehavior with prefix 'on'&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5783&quot;&gt;WICKET-5783&lt;/a&gt;
 - Multiple events in AjaxEventBehavior with prefix &#39;on&#39;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5784&quot;&gt;WICKET-5784&lt;/a&gt;
 - arraycopy with bad length in AbstractRequestLogger:172&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5793&quot;&gt;WICKET-5793&lt;/a&gt;
 - Request for static resource creating a session in 6.13.0+&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5809&quot;&gt;WICKET-5809&lt;/a&gt;
 - URL IPv6 parsing&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5811&quot;&gt;WICKET-5811&lt;/a&gt;
 - Infinite loop issue in 
PropertyValidator#createUnresolvablePropertyMessage(FormComponent&amp;lt;&amp;gt;)&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt;
 - AtmosphereBehavior wrongly sets Ajax base url to '.'&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5812&quot;&gt;WICKET-5812&lt;/a&gt;
 - AtmosphereBehavior wrongly sets Ajax base url to &#39;.&#39;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h4 id=&quot;improvement&quot;&gt;Improvement&lt;/h4&gt;
@@ -687,8 +687,8 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 &lt;ul&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-4703&quot;&gt;WICKET-4703&lt;/a&gt;
 - StringResourceModel should provide an overridable getString(Component) 
method&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5746&quot;&gt;WICKET-5746&lt;/a&gt;
 - Fire an event once all JS event listeners are registered&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt;
 - It is impossible to determine the form submitting component's inputName when 
AjaxFormSubmitBehavior is used&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt;
 - (String)ResourceModel's defaultValue could be an 
IModel&amp;lt;String&amp;gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5753&quot;&gt;WICKET-5753&lt;/a&gt;
 - It is impossible to determine the form submitting component&#39;s inputName 
when AjaxFormSubmitBehavior is used&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5754&quot;&gt;WICKET-5754&lt;/a&gt;
 - (String)ResourceModel&#39;s defaultValue could be an 
IModel&amp;lt;String&amp;gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5756&quot;&gt;WICKET-5756&lt;/a&gt;
 - Allow to use custom ciphers when using SunJceCrypt class&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5758&quot;&gt;WICKET-5758&lt;/a&gt;
 - Portuguese translation&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5760&quot;&gt;WICKET-5760&lt;/a&gt;
 - Add constructor (String, Serializable, String) to 
AttributeAppender&lt;/li&gt;
@@ -830,7 +830,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5326&quot;&gt;WICKET-5326&lt;/a&gt;
 - Wicket doesn’t encrypt links and Ajax URLs for mounted pages when 
CryptoMapper is used&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5689&quot;&gt;WICKET-5689&lt;/a&gt;
 - Nested Redirects and REDIRECT_TO_BUFFER&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5698&quot;&gt;WICKET-5698&lt;/a&gt;
 - WebApplication#unmount() unmounts the whole compound mapper if some of its 
inner ones matches&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt;
 - WebSocketRequestHandler is not set as a scheduled and thus 
RequestCycle#find(AjaxRequestTarget.class) doesn’t work &lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt;
 - WebSocketRequestHandler is not set as a scheduled and thus 
RequestCycle#find(AjaxRequestTarget.class) doesn’t work&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5704&quot;&gt;WICKET-5704&lt;/a&gt;
 - IllegalArgument exception with wicket:child in ajaxrequest&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5706&quot;&gt;WICKET-5706&lt;/a&gt;
 - ResourceUtils.getLocaleFromFilename cannot handle filenames with 
classifiers&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5711&quot;&gt;WICKET-5711&lt;/a&gt;
 - OnChangeAjaxBehavior should listen for both ‘inputchange’ and 
‘change’ events for TextField and TextArea&lt;/li&gt;
@@ -857,7 +857,7 @@ uDEAn2eZhOrh8//AIYnkRYFLtWJnyx0F
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5350&quot;&gt;WICKET-5350&lt;/a&gt;
 - Enhancement for AbstractChoice and WildcardListModel API&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5691&quot;&gt;WICKET-5691&lt;/a&gt;
 - Wicket FileUploadField.getFileUploads() should never return null.&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5692&quot;&gt;WICKET-5692&lt;/a&gt;
 - Misleading message in PropertyValidator&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt;
 - Add WicketTester assertion methods for component’s markup style, variation 
and locale &lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt;
 - Add WicketTester assertion methods for component’s markup style, variation 
and locale&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5695&quot;&gt;WICKET-5695&lt;/a&gt;
 - Use Log4j 2.x for the archetype&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5697&quot;&gt;WICKET-5697&lt;/a&gt;
 - Rework Spring application to use annotations based configuration&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5708&quot;&gt;WICKET-5708&lt;/a&gt;
 - Making FormComponent.convertInput() public&lt;/li&gt;
@@ -987,7 +987,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5689&quot;&gt;WICKET-5689&lt;/a&gt;
 - Nested Redirects and REDIRECT_TO_BUFFER&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5698&quot;&gt;WICKET-5698&lt;/a&gt;
 - WebApplication#unmount() unmounts the whole compound mapper if some of its 
inner ones matches&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5699&quot;&gt;WICKET-5699&lt;/a&gt;
 - wicket-atmosphere 0.20 should use wicket-webjars 0.4.3&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt;
 - WebSocketRequestHandler is not set as a scheduled and thus 
RequestCycle#find(AjaxRequestTarget.class) doesn’t work &lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5701&quot;&gt;WICKET-5701&lt;/a&gt;
 - WebSocketRequestHandler is not set as a scheduled and thus 
RequestCycle#find(AjaxRequestTarget.class) doesn’t work&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5704&quot;&gt;WICKET-5704&lt;/a&gt;
 - IllegalArgument exception with wicket:child in ajaxrequest&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5706&quot;&gt;WICKET-5706&lt;/a&gt;
 - ResourceUtils.getLocaleFromFilename cannot handle filenames with 
classifiers&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5711&quot;&gt;WICKET-5711&lt;/a&gt;
 - OnChangeAjaxBehavior should listen for both ‘inputchange’ and 
‘change’ events for TextField and TextArea&lt;/li&gt;
@@ -1007,7 +1007,7 @@ i6UAn25gHcC0w8QWiNJXV7u99iTHssaP
 &lt;ul&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5691&quot;&gt;WICKET-5691&lt;/a&gt;
 - Wicket FileUploadField.getFileUploads() should never return null.&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5692&quot;&gt;WICKET-5692&lt;/a&gt;
 - Misleading message in PropertyValidator&lt;/li&gt;
-  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt;
 - Add WicketTester assertion methods for component’s markup style, variation 
and locale &lt;/li&gt;
+  &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5694&quot;&gt;WICKET-5694&lt;/a&gt;
 - Add WicketTester assertion methods for component’s markup style, variation 
and locale&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5710&quot;&gt;WICKET-5710&lt;/a&gt;
 - StringValidator should set ‘minlength’ attribute to input and 
textarea&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5715&quot;&gt;WICKET-5715&lt;/a&gt;
 - Allow setting ‘async’ attribute on reference &lt;script&gt; 
elements&lt;/script&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href=&quot;https://issues.apache.org/jira/browse/WICKET-5718&quot;&gt;WICKET-5718&lt;/a&gt;
 - Upgrade Atmosphere to 2.2.2&lt;/li&gt;

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/index.html
----------------------------------------------------------------------
diff --git a/content/contribute/index.html b/content/contribute/index.html
index bb91c1b..80b1a7c 100644
--- a/content/contribute/index.html
+++ b/content/contribute/index.html
@@ -87,7 +87,9 @@ organisation at Github:</p>
 </ul>
 <p>On this page you will find a button with the caption “Fork”. Click it
 or use the button below.</p>
-<p><a class="button" rel="nofollow" 
href="https://github.com/apache/wicket/fork";>Fork us on Github</a></p>
+<p><a class="button" rel="nofollow" 
href="https://github.com/apache/wicket/fork";>
+       <i class="fa fa-github"></i> Fork us on github
+</a></p>
 <p>Now you have your own copy of Wicket to hack on. You can edit directly
 in the Github web interface–good for minor fixes like documentation
 errors–or clone the project to your workstation.</p>
@@ -108,22 +110,55 @@ shows the corresponding branch for each Wicket 
version.</p>
         <tr>
             <th>Wicket version</th>
             <th>Branch name</th>
+                       <th>Status</th>
         </tr>
     </thead>
     <tbody>
         <tr>
+            <td>7.x</td>
+            <td>master</td>
+                       <td>active</td>
+        </tr>
+        <tr>
             <td>6.x</td>
             <td>wicket-6.x</td>
+                       <td>supported</td>
         </tr>
         <tr>
-            <td>7.x</td>
-            <td>master</td>
+            <td>1.5.x</td>
+            <td>wicket-1.5.x</td>
+                       <td>security fixes only</td>
+        </tr>
+        <tr>
+            <td><s>1.4.x</s></td>
+            <td><s>wicket-1.4.x</s></td>
+                       <td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.3.x</s></td>
+            <td><s>wicket-1.3.x</s></td>
+                       <td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.2.x</s></td>
+            <td><s>wicket-1.2.x</s></td>
+                       <td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.1.x</s></td>
+            <td><s>wicket-1.1.x</s></td>
+                       <td><s>discontinued</s></td>
+        </tr>
+        <tr>
+            <td><s>1.0.x</s></td>
+            <td><s>wicket-1.0.x</s></td>
+                       <td><s>discontinued</s></td>
         </tr>
     </tbody>
 </table>
-<p>If you want to work on an issue for Wicket 6, you need to check out the
-<em>wicket-6.x</em> branch.</p>
-<p>If you want to work on Wicket 7, then you need to check out 
<em>master</em>.</p>
+<p>If you want to work on Wicket 7, you need to check out <em>master</em>.</p>
+<p>If you want to work on an issue for Wicket 6, you’ll need to check out
+the <em>wicket-6.x</em> branch.</p>
 <p>When you are ready with your change you can ask us to review your
 changes and to integrate it into Wicket by creating a Pull Request.</p>
 <h3 id="pullrequest">Create a Pull Request</h3>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/release.html
----------------------------------------------------------------------
diff --git a/content/contribute/release.html b/content/contribute/release.html
index 19e96b0..592c7e9 100644
--- a/content/contribute/release.html
+++ b/content/contribute/release.html
@@ -86,11 +86,11 @@
 <div class="highlight"><pre><code class="language-console" 
data-lang="console"><span class="go">gpg --armor --detach-sign --use-agent 
--sign pom.xml</span>
 <span class="go">rm pom.xml.asc</span></code></pre></div>
 <ul>
-  <li>Create release branch: </li>
+  <li>Create release branch:</li>
 </ul>
 <div class="highlight"><pre><code class="language-console" 
data-lang="console"><span class="go">mvn release:branch 
-DbranchName=build/wicket-$NEWVERSION</span></code></pre></div>
 <ul>
-  <li>Checkout the release branch: </li>
+  <li>Checkout the release branch:</li>
 </ul>
 <div class="highlight"><pre><code class="language-console" 
data-lang="console"><span class="go">git checkout 
build/wicket-$NEWVERSION</span></code></pre></div>
 <ul>
@@ -132,7 +132,7 @@
 <h4 id="staging-the-build">Staging the build</h4>
 <div class="highlight"><pre><code class="language-console" 
data-lang="console"><span class="go">ssh [email protected] mkdir 
public_html/wicket-$NEWVERSION</span>
 <span class="go">scp apache-wicket-* 
[email protected]:public_html/wicket-$NEWVERSION</span></code></pre></div>
-<p><strong>TODO</strong> figure out how to let <code>release:perform</code> 
work from a local checkout, such that we can actually <em>stage</em> the build 
instead of having to push the tag to our git repo. </p>
+<p><strong>TODO</strong> figure out how to let <code>release:perform</code> 
work from a local checkout, such that we can actually <em>stage</em> the build 
instead of having to push the tag to our git repo.</p>
 <p>The following steps are ONLY necessary as long as the above TODO has not 
been resolved.</p>
 <div class="highlight"><pre><code class="language-console" 
data-lang="console"><span class="go">git push origin 
build/wicket-$NEWVERSION:refs/heads/build/wicket-$NEWVERSION</span>
 <span class="go">git push -tags origin</span></code></pre></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/contribute/write.html
----------------------------------------------------------------------
diff --git a/content/contribute/write.html b/content/contribute/write.html
index c5b982c..7931285 100644
--- a/content/contribute/write.html
+++ b/content/contribute/write.html
@@ -87,7 +87,7 @@ any modified files.</p>
 <p>You can check out the website running at <a 
href="http://localhost:4000";>localhost, port 4000</a>.</p>
 <h2 id="write">Write some documentation</h2>
 <p>Jekyll can render HTML from markdown syntax and textile syntax. <strong>For 
our site
-we use markdown</strong>. </p>
+we use markdown</strong>.</p>
 <h3 id="page-template">Page template</h3>
 <p>Each page needs to have a YAML preamble that specifies the rendered template
 and other variables. If it doesn’t include the YAML preamble, it won’t be

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/css/style.css
----------------------------------------------------------------------
diff --git a/content/css/style.css b/content/css/style.css
index 1e8a48f..86a6501 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -934,3 +934,13 @@ article + article {
       margin-left: 0.5rem; }
     .button-bar .button i {
       font-size: 3rem; }
+
+th {
+  text-align: left; }
+
+.media-bar {
+  clear: both; }
+  .media-bar a {
+    border: none; }
+    .media-bar a > img {
+      width: 100%; }

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/doap.rdf
----------------------------------------------------------------------
diff --git a/content/doap.rdf b/content/doap.rdf
index 2377f83..7d87120 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -25,8 +25,8 @@
                <release>
                        <Version>
                                <name>Latest Stable Release</name>
-                               <created>2015-06-14</created>
-                               <revision>6.20.0</revision>
+                               <created>2015-07-10</created>
+                               <revision>7.0.0</revision>
                        </Version>
                </release>
                <repository>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/index.html
----------------------------------------------------------------------
diff --git a/content/help/index.html b/content/help/index.html
index a5fa083..bfac963 100644
--- a/content/help/index.html
+++ b/content/help/index.html
@@ -88,7 +88,7 @@ way</a>.</p>
 <p>The Apache Software Foundation takes a very active stance in
 eliminating security problems against the Apache Wicket web framework.</p>
 <p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately. </p>
+Wicket PMC privately.</p>
 <p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER 
**</strong></p>
 <p>The issue tracker for Wicket is not the appropriate venue for reporting
 security issues as the issue tracker is publicly accessible. Instead,
@@ -113,7 +113,7 @@ for normal, non-security bugs.</p>
 problem via the <a href="https://issues.apache.org/jira/browse/WICKET";>Issue
 Tracker</a>. You may also
 find it useful to discuss your issues with the community on one of the
-Mailing Lists. </p>
+Mailing Lists.</p>
 <p>Before asking for help with your issue, it’s a very good idea to search
 for your issue in the mailing list archives and the FAQ. The majority
 of issues can be solved in this manner without having to send an email
@@ -145,12 +145,12 @@ bug has been solved in a recent version. So if for 
instance you
 discover a bug in Wicket 6.2.0, it might be fixed in a newer version
 (the current version of Wicket 6.x is 6.20.0).</p>
 <p>So we ask you to try the latest version of the branch of Wicket you are
-working on. If the bug still remains,  </p>
+working on. If the bug still remains,</p>
 <p>Check if your version is no longer maintained on our download page. If
 your version is no longer maintained we kindly ask you to upgrade your
 project to a newer, maintained version of Wicket. For example if you
 have a project that depends on Wicket 1.3.7, please consider upgrading
-to Wicket 6.20.0. </p>
+to Wicket 7.0.0.</p>
 <h3 id="compatible">Using Compatible Versions of Supporting Libraries</h3>
 <p>If you are using a supporting library from either the Wicket project,
 Wicket Stuff or another project, please ensure that the version you use

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/reportabug.html
----------------------------------------------------------------------
diff --git a/content/help/reportabug.html b/content/help/reportabug.html
index daef430..0be3849 100644
--- a/content/help/reportabug.html
+++ b/content/help/reportabug.html
@@ -64,7 +64,7 @@ functionality is pretty good, so do have go.</li>
   <li><strong>Be clear and concise in your language.</strong> Wording a short 
but useful 
 summary, with a description that contains all the steps leading up to the
 error plus any extra circumstantial evidence, is not always easy, but its
-vital to getting the issue resolved, and really valuable. </li>
+vital to getting the issue resolved, and really valuable.</li>
   <li><strong>Watch the bug.</strong> The developers may ask you for more 
information via the
 issue comments, so its good practices to check in on the issue whilst its
 still open.</li>
@@ -146,7 +146,7 @@ Wicket code base.</p>
   <li>The plugin should automagically resolve the quickstart’s Wicket 
dependency from the project rather than a .jar</li>
   <li>Find WicketApplication.java</li>
   <li>Click through to WebApplication class from the extends section of the 
class definition.</li>
-  <li>If all is well, you should be taken to the Wicket project .java version 
of WebApplication rather than a .class file from a .jar  </li>
+  <li>If all is well, you should be taken to the Wicket project .java version 
of WebApplication rather than a .class file from a .jar</li>
 </ul>
 <h3 id="proving-a-bug-exists">Proving a bug exists</h3>
 <ul>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/help/security.html
----------------------------------------------------------------------
diff --git a/content/help/security.html b/content/help/security.html
index bcd121e..50b45ff 100644
--- a/content/help/security.html
+++ b/content/help/security.html
@@ -53,7 +53,7 @@
 <p>The Apache Software Foundation takes a very active stance in
 eliminating security problems against the Apache Wicket web framework.</p>
 <p>For reporting and discussing a security issue you should contact the
-Wicket PMC privately. </p>
+Wicket PMC privately.</p>
 <p><strong>** PLEASE DO NOT CREATE A SECURITY REPORT IN OUR ISSUE TRACKER 
**</strong></p>
 <p>The issue tracker for Wicket is not the appropriate venue for reporting
 security issues as the issue tracker is publicly accessible. Instead,

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/blogs.html
----------------------------------------------------------------------
diff --git a/content/learn/blogs.html b/content/learn/blogs.html
index aff19ef..b70c6ee 100644
--- a/content/learn/blogs.html
+++ b/content/learn/blogs.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/blogs.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/blogs.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/blogs.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/blogs.html -->
@@ -46,14 +46,13 @@
             <h1>Wicket related blogs</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#get-your-blog-listed"><span class="toc-number">1</span> <span 
class="toc-text">Get your blog listed!</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#wicket-blogs"><span class="toc-number">1</span> <span 
class="toc-text">Wicket blogs</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#get-your-blog-listed"><span 
class="toc-number">2</span> <span class="toc-text">Get your blog 
listed!</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <p>Any (open source) project exists solely because a community 
wants to support
-it. The Wicket community consists of the users and developers. There are many
-who want to share their experiences with Wicket and do so on the mailing
-lists , on several online media portals (for example The ServerSide and
-JavaLobby ), and on their blogs.</p>
+            <p>Any (open source) project exists solely because a community 
wants to support it.
+The Wicket community consists of the users and developers. 
+There are many who want to share their experiences with Wicket and do so on 
the mailing lists, on several online media portals (for example The ServerSide 
and JavaLobby), and on their blogs.</p>
+<h2 id="wicket-blogs">Wicket blogs</h2>
 <p>Here is a list of regular Wicket bloggers, consisting of core contributers 
and enthusiastic users.</p>
 <ul>
   <li><a href="http://wicketinaction.com/";>Wicket in Action</a> - Igor 
Vaynberg, Martijn Dashorst</li>
@@ -67,10 +66,8 @@ JavaLobby ), and on their blogs.</p>
   <li><a href="http://mysticcoders.com/blog";>Mystic Coders</a> - Andrew 
Lombardi</li>
 </ul>
 <h2 id="get-your-blog-listed">Get your blog listed!</h2>
-<p>If you think your blog is missing, then please send a message to one of the
-core contributors or the mailinglist. In the mean time you can add your blog
-to our wiki’s <a 
href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs";>special 
blog
-page</a>.</p>
+<p>If you think your blog is missing, then please send a message to one of the 
core contributors or the mailinglist.
+In the mean time you can add your blog to our wiki’s <a 
href="https://cwiki.apache.org/confluence/display/WICKET/Wicket+Blogs";>special 
blog page</a>.</p>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/awc.html
----------------------------------------------------------------------
diff --git a/content/learn/books/awc.html b/content/learn/books/awc.html
index 7b6129e..493e61e 100644
--- a/content/learn/books/awc.html
+++ b/content/learn/books/awc.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/awc.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/awc.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/awc.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/awc.html -->
@@ -50,10 +50,17 @@
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Apache Wicket is one of the most famous Java web application frameworks. 
Wicket simplifies web development and makes it fun. Are you bored of going 
through countless pages of theory to find out how to get your web development 
done? With this book in hand, you don’t need to go through hundreds of pages 
to figure out how you will actually build a web application. You will get 
practical solutions to your common everyday development tasks to pace up your 
development activities.</p>
-<p>Apache Wicket Cookbook provides you with information that gets your 
problems solved quickly without beating around the bush. This book is perfect 
for you if you are ready to take the next step from tutorials and step into the 
practical world. It will take you beyond the basics of using Apache Wicket and 
show you how to leverage Wicket’s advanced features to create simpler and 
more maintainable solutions to what at first may seem complex problems.</p>
-<p>You will learn how to integrate with client-side technologies such as 
JavaScript libraries or Flash components, which will help you to build your 
application faster. You will discover how to use Wicket paradigms to factor out 
commonly used code into custom Components, which will reduce the maintenance 
cost of your application, and how to leverage the existing Wicket Components to 
make your own code simpler.</p>
-<p>A straightforward Cookbook with highly focused practical recipes to make 
your web application development easier with the Wicket web framework</p>
+<p>Apache Wicket is one of the most famous Java web application frameworks.
+Wicket simplifies web development and makes it fun.
+Are you bored of going through countless pages of theory to find out how to 
get your web development done?
+With this book in hand, you don’t need to go through hundreds of pages to 
figure out how you will actually build a web application.
+You will get practical solutions to your common everyday development tasks to 
pace up your development activities.</p>
+<p>Apache Wicket Cookbook provides you with information that gets your 
problems solved quickly without beating around the bush.
+This book is perfect for you if you are ready to take the next step from 
tutorials and step into the practical world.
+It will take you beyond the basics of using Apache Wicket and show you how to 
leverage Wicket’s advanced features to create simpler and more maintainable 
solutions to what at first may seem complex problems.</p>
+<p>You will learn how to integrate with client-side technologies such as 
JavaScript libraries or Flash components, which will help you to build your 
application faster.
+You will discover how to use Wicket paradigms to factor out commonly used code 
into custom Components, which will reduce the maintenance cost of your 
application, and how to leverage the existing Wicket Components to make your 
own code simpler.</p>
+<p>A straightforward Cookbook with highly focused practical recipes to make 
your web application development easier with the Wicket web framework.</p>
 <h2 id="what-you-will-learn-from-this-book">What you will learn from this 
book</h2>
 <ul>
   <li>Leverage Wicket to implement a wide variety of both simple and advanced 
use cases in a narrative that gets straight to the point</li>
@@ -68,11 +75,22 @@
   <li>An application cannot be built with Wicket alone; see how to make it 
play nice with other frameworks</li>
 </ul>
 <h2 id="approach">Approach</h2>
-<p>This is a hands-on practical guide to a large variety of topics and use 
cases. This book tries to use real-world examples when possible, but is not 
afraid to come up with a contrived pretext if it makes explaining the problem 
simpler. Unlike a lot of other books, this one does not try to maintain a 
continuous theme from chapter to chapter, such as demonstrating solutions on 
the same fictional application; doing so would be almost impossible given the 
wide variety of recipes presented here. Instead, this book concentrates on 
focused problems users are likely to encounter and shows clear solutions in a 
step-by-step manner. This book tries to teach by example and is not afraid to 
show a lot of code because, after all, it is for coders.</p>
+<p>This is a hands-on practical guide to a large variety of topics and use 
cases.
+This book tries to use real-world examples when possible, but is not afraid to 
come up with a contrived pretext if it makes explaining the problem simpler.
+Unlike a lot of other books, this one does not try to maintain a continuous 
theme from chapter to chapter, such as demonstrating solutions on the same 
fictional application; doing so would be almost impossible given the wide 
variety of recipes presented here.
+Instead, this book concentrates on focused problems users are likely to 
encounter and shows clear solutions in a step-by-step manner.
+This book tries to teach by example and is not afraid to show a lot of code 
because, after all, it is for coders.</p>
 <h2 id="who-this-book-is-written-for">Who this book is written for</h2>
-<p>This book is for current users of the Apache Wicket framework; it is not an 
introduction to Wicket that will bore you with tons of theory. You are expected 
to have built or maintained a simple Wicket application in the past and to be 
looking to learn new and better ways of using Wicket. If you are ready to take 
your Wicket skills to the next level this book is for you.</p>
+<p>This book is for current users of the Apache Wicket framework; it is not an 
introduction to Wicket that will bore you with tons of theory.
+You are expected to have built or maintained a simple Wicket application in 
the past and to be looking to learn new and better ways of using Wicket. 
+If you are ready to take your Wicket skills to the next level this book is for 
you.</p>
 <h2 id="about-the-author">About the author</h2>
-<p>Igor Vaynberg is a software architect with more than ten years of 
experience in the software field. His liking for computers was sparked when his 
parents got him a Sinclair Z80 when he was but ten years old. Since then he has 
worked with companies both large and small building modular and scalable web 
applications. Igor’s main interest is finding ways to simplify the 
development of complex user interfaces required by modern web applications. 
Igor is a committer for the Apache Wicket framework, the aim of which is to 
simplify the programming model as well as reintroduce OOP to the web UI tier. 
In his AFK time he enjoys snowboarding with his beautiful wife and playing with 
his amazing children.</p>
+<p>Igor Vaynberg is a software architect with more than ten years of 
experience in the software field.
+His liking for computers was sparked when his parents got him a Sinclair Z80 
when he was but ten years old.
+Since then he has worked with companies both large and small building modular 
and scalable web applications.
+Igor’s main interest is finding ways to simplify the development of complex 
user interfaces required by modern web applications.
+Igor is a committer for the Apache Wicket framework, the aim of which is to 
simplify the programming model as well as reintroduce OOP to the web UI tier.
+In his AFK time he enjoys snowboarding with his beautiful wife and playing 
with his amazing children.</p>
 <h2 id="book-details">Book details</h2>
 <table>
        <tr>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/ewdww.html
----------------------------------------------------------------------
diff --git a/content/learn/books/ewdww.html b/content/learn/books/ewdww.html
index ff84468..279c8bb 100644
--- a/content/learn/books/ewdww.html
+++ b/content/learn/books/ewdww.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books — Enjoying Web Development with Wicket | Apache 
Wicket</title>
+        <title>Books — Enjoying Web Development with Wicket | Apache 
Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/ewdww.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/ewdww.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/ewdww.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/ewdww.html -->
@@ -43,7 +43,7 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books — Enjoying Web Development with Wicket</h1>
+            <h1>Books — Enjoying Web Development with Wicket</h1>
         </header>
         <section class="l-one-third right">
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> 
<span class="toc-text">About the author</span></a></li><li class="toc--level-1 
toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span 
class="toc-text">Book details</span></a></li></ul></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/iaw6.html
----------------------------------------------------------------------
diff --git a/content/learn/books/iaw6.html b/content/learn/books/iaw6.html
index 17ecb46..8a026ed 100644
--- a/content/learn/books/iaw6.html
+++ b/content/learn/books/iaw6.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/iaw6.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/iaw6.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/iaw6.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/iaw6.html -->
@@ -46,13 +46,20 @@
             <h1>Books — Instant Apache Wicket 6</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#what-you-will-learn-from-this-book"><span 
class="toc-number">2</span> <span class="toc-text">What you will learn from 
this book</span></a></li><li class="toc--level-1 toc--section-3"><a 
href="#approach"><span class="toc-number">3</span> <span 
class="toc-text">Approach</span></a></li><li class="toc--level-1 
toc--section-4"><a href="#who-this-book-is-written-for"><span 
class="toc-number">4</span> <span class="toc-text">Who this book is written 
for</span></a></li><li class="toc--level-1 toc--section-5"><a 
href="#about-the-authors"><span class="toc-number">5</span> <span 
class="toc-text">About the authors</span></a></li><li class="toc--level-1 
toc--section-6"><a href="#book-details"><span class="toc-n
 umber">6</span> <span class="toc-text">Book details</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#what-you-will-learn-from-this-book"><span 
class="toc-number">2</span> <span class="toc-text">What you will learn from 
this book</span></a></li><li class="toc--level-1 toc--section-3"><a 
href="#approach"><span class="toc-number">3</span> <span 
class="toc-text">Approach</span></a></li><li class="toc--level-1 
toc--section-4"><a href="#who-this-book-is-written-for"><span 
class="toc-number">4</span> <span class="toc-text">Who this book is written 
for</span></a></li><li class="toc--level-1 toc--section-5"><a 
href="#about-the-authors"><span class="toc-number">5</span> <span 
class="toc-text">About the authors</span></a><ul><li class="toc--level-2 
toc--section-6"><a href="#joo-svio-ceregatti-longo"><span c
 lass="toc-number">5.1</span> <span class="toc-text">João Sávio Ceregatti 
Longo</span></a></li><li class="toc--level-2 toc--section-7"><a 
href="#felipe-fedel-pinto"><span class="toc-number">5.2</span> <span 
class="toc-text">Felipe Fedel Pinto</span></a></li></ul></li><li 
class="toc--level-1 toc--section-8"><a href="#book-details"><span 
class="toc-number">6</span> <span class="toc-text">Book 
details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Wicket is a component-based Java web framework. In Wicket, the server side 
state is automatically managed as it is associated with components. With proper 
mark-up/logic separation, a POJO data model, and a refreshing lack of XML, 
Apache Wicket makes developing web-apps simple and enjoyable. There are no 
configuration files to learn in Wicket as it has powerful and reusable 
components written with plain Java and HTML. Instant Apache Wicket 6 will take 
you through the entire process of building web application using the Wicket 
frame work.</p>
-<p>Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an 
amazing Java framework. After you finish this book, you will be capable of 
developing Wicket applications, using the knowledge acquired in the book to 
explore more of the technology, and even contribute to Wicket’s community.</p>
-<p>Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its 
advantages, and then goes on to show how to set up the Wicket environment and 
how to build a “hello world” and a sign-in/sign-out application. After you 
learn the Wicket core concepts and apply them to the sign-in/sign-out app, you 
will use Maven in Eclipse to build Wicket applications. You will learn 
important concepts like lifecycle (objects and requests), models (Model, 
PropertyModel, and CompoundPropertyModel), markup (wicket:id, wicket:panel, 
wicket:extend, and wicket:child), and behaviors.</p>
+<p>Wicket is a component-based Java web framework.
+In Wicket, the server side state is automatically managed as it is associated 
with components.
+With proper mark-up/logic separation, a POJO data model, and a refreshing lack 
of XML, Apache Wicket makes developing web-apps simple and enjoyable.
+There are no configuration files to learn in Wicket as it has powerful and 
reusable components written with plain Java and HTML.
+Instant Apache Wicket 6 will take you through the entire process of building 
web application using the Wicket frame work.</p>
+<p>Instant Apache Wicket 6 aims to introduce the reader to Apache Wicket, an 
amazing Java framework.
+After you finish this book, you will be capable of developing Wicket 
applications, using the knowledge acquired in the book to explore more of the 
technology, and even contribute to Wicket’s community.</p>
+<p>Instant Apache Wicket 6 starts by explaining what Apache Wicket is and its 
advantages, and then goes on to show how to set up the Wicket environment and 
how to build a “hello world” and a sign-in/sign-out application.
+After you learn the Wicket core concepts and apply them to the 
sign-in/sign-out app, you will use Maven in Eclipse to build Wicket 
applications.
+You will learn important concepts like lifecycle (objects and requests), 
models (Model, PropertyModel, and CompoundPropertyModel), markup (wicket:id, 
wicket:panel, wicket:extend, and wicket:child), and behaviors.</p>
 <h2 id="what-you-will-learn-from-this-book">What you will learn from this 
book</h2>
 <ul>
   <li>Learn something new in an Instant! A short, fast, focused guide 
delivering immediate results</li>
@@ -61,15 +68,20 @@
   <li>Understand the lifecycle of Wicket</li>
 </ul>
 <h2 id="approach">Approach</h2>
-<p>Get to grips with a new technology, understand what it is and what it can 
do for you, and then get to work with the most important features and tasks. 
This Starter style guide takes the reader through the basic workflow of Apache 
Wicket in a practical and friendly style.</p>
+<p>Get to grips with a new technology, understand what it is and what it can 
do for you, and then get to work with the most important features and tasks.
+This Starter style guide takes the reader through the basic workflow of Apache 
Wicket in a practical and friendly style.</p>
 <h2 id="who-this-book-is-written-for">Who this book is written for</h2>
-<p>Instant Apache Wicket 6 is for people who want to learn the basics of 
Apache Wicket 6 and who already have some experience with Java and 
object-oriented programming. Basic knowledge of web concepts like HTTP and Ajax 
will be an added advantage.</p>
+<p>Instant Apache Wicket 6 is for people who want to learn the basics of 
Apache Wicket 6 and who already have some experience with Java and 
object-oriented programming.
+Basic knowledge of web concepts like HTTP and Ajax will be an added 
advantage.</p>
 <h2 id="about-the-authors">About the authors</h2>
 <p>About the Authors</p>
-<p>João Sávio Ceregatti Longo</p>
-<p>João Sávio Ceregatti Longo has a Bachelor’s and Master’s degree in 
Computer Science. He also has a strong background in the Java programming 
language (consultant, developer, evangelist, SCJP 6 certified) and is a Wicket 
enthusiast. He is currently working at Daitan Group - 
http://www.daitangroup.com.</p>
-<p>Felipe Fedel Pinto</p>
-<p>Felipe Fedel Pinto holds a Bachelor’s degree in Computer Science and has 
been developing and managing projects using Wicket since 2010. He also 
collaborates on open source Wicket projects. He is partner and Software 
Architect at Ampliato - http://www.ampliato.com.br.</p>
+<h3 id="joo-svio-ceregatti-longo">João Sávio Ceregatti Longo</h3>
+<p>João Sávio Ceregatti Longo has a Bachelor’s and Master’s degree in 
Computer Science.
+He also has a strong background in the Java programming language (consultant, 
developer, evangelist, SCJP 6 certified) and is a Wicket enthusiast.
+He is currently working at Daitan Group - http://www.daitangroup.com.</p>
+<h3 id="felipe-fedel-pinto">Felipe Fedel Pinto</h3>
+<p>Felipe Fedel Pinto holds a Bachelor’s degree in Computer Science and has 
been developing and managing projects using Wicket since 2010.
+He also collaborates on open source Wicket projects. He is partner and 
Software Architect at Ampliato - http://www.ampliato.com.br.</p>
 <h2 id="book-details">Book details</h2>
 <table>
        <tr>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/index.html
----------------------------------------------------------------------
diff --git a/content/learn/books/index.html b/content/learn/books/index.html
index a0c0999..176e84c 100644
--- a/content/learn/books/index.html
+++ b/content/learn/books/index.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books -->
@@ -50,15 +50,21 @@
         <section class="l-two-third left">
             <p>Several books have been written about Apache Wicket, 5 in 
English, 3 in German
 and 1 in Japanese. Click on a cover to learn more about each book.</p>
-<p><a href="iaw6.html"><img src="iaw6.png" alt="Instant Apache Wicket 6" 
title="Instant Apache Wicket 6" /></a>
-<a href="awc.html"><img src="awc.png" alt="Apache Wicket Cookbook cover" 
title="Apache Wicket Cookbook" /></a>
-<a href="wia.html"><img src="wia.png" alt="Wicket in Action cover" 
title="Wicket in Action" /></a>
-<a href="koda.html"><img src="koda.png" alt=" Komponentenbasiert und 
objektorientiert - das alternative Java-Webframework cover" title=" 
Komponentenbasiert und objektorientiert- das alternative Java-Webframework" 
/></a>
-<a href="ewdww.html"><img src="ewdww.png" alt="Enjoying Web Development with 
Wicket cover" title="Enjoying Web Development with Wicket" /></a>
-<a href="prowicket.html"><img src="prowicket.png" alt="Pro Wicket cover" 
title="Pro Wicket" /></a>
-<a href="praxisbuchwicket.html"><img src="praxisbuchwicket.png" 
alt="Praxisbuch Wicket cover" title="Praxisbuch Wicket" /></a>
-<a href="kwij.html"><img src="kwij.png" alt="Wicket: Komponentenbasierte 
Webanwendungen in Java cover" title="Wicket: Komponentenbasierte Webanwendungen 
in Java" /></a>
-<a href="wicket-jp.html"><img src="wicket-jp.png" alt="Wicket Japanese cover" 
title="Wicket Japanese" /></a></p>
+<div class="media-bar">
+<a class="l-one-quarter" href="iaw6.html"><img src="iaw6.png" alt="Instant 
Apache Wicket 6" title="Instant Apache Wicket 6" /></a>
+<a class="l-one-quarter" href="awc.html"><img src="awc.png" alt="Apache Wicket 
Cookbook cover" title="Apache Wicket Cookbook" /></a>
+<a class="l-one-quarter" href="wia.html"><img src="wia.png" alt="Wicket in 
Action cover" title="Wicket in Action" /></a>
+<a class="l-one-quarter" href="koda.html"><img src="koda.png" alt=" 
Komponentenbasiert und objektorientiert - das alternative Java-Webframework 
cover" title=" Komponentenbasiert und objektorientiert- das alternative 
Java-Webframework" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="ewdww.html"><img src="ewdww.png" alt="Enjoying 
Web Development with Wicket cover" title="Enjoying Web Development with Wicket" 
/></a>
+<a class="l-one-quarter" href="prowicket.html"><img src="prowicket.png" 
alt="Pro Wicket cover" title="Pro Wicket" /></a>
+<a class="l-one-quarter" href="praxisbuchwicket.html"><img 
src="praxisbuchwicket.png" alt="Praxisbuch Wicket cover" title="Praxisbuch 
Wicket" /></a>
+<a class="l-one-quarter" href="kwij.html"><img src="kwij.png" alt="Wicket: 
Komponentenbasierte Webanwendungen in Java cover" title="Wicket: 
Komponentenbasierte Webanwendungen in Java" /></a>
+</div>
+<div class="media-bar">
+<a class="l-one-quarter" href="wicket-jp.html"><img src="wicket-jp.png" 
alt="Wicket Japanese cover" title="Wicket Japanese" /></a>
+</div>
         </section>
     </div>
 </main>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/koda.html
----------------------------------------------------------------------
diff --git a/content/learn/books/koda.html b/content/learn/books/koda.html
index b89971e..a38afe8 100644
--- a/content/learn/books/koda.html
+++ b/content/learn/books/koda.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books —  Komponentenbasiert und objektorientiert - das 
alternative Java-Webframework | Apache Wicket</title>
+        <title>Books — Komponentenbasiert und objektorientiert - das 
alternative Java-Webframework | Apache Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -43,42 +43,28 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books —  Komponentenbasiert und objektorientiert - das 
alternative Java-Webframework</h1>
+            <h1>Books — Komponentenbasiert und objektorientiert - das 
alternative Java-Webframework</h1>
         </header>
         <section class="l-one-third right">
-            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> 
<span class="toc-text">About the author</span></a></li><li class="toc--level-1 
toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span 
class="toc-text">Book details</span></a></li></ul></div>
+            <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a><ul><li class="toc--level-2 
toc--section-2"><a href="#zielgruppe"><span class="toc-number">1.1</span> <span 
class="toc-text">Zielgruppe</span></a></li></ul></li><li class="toc--level-1 
toc--section-3"><a href="#about-the-author"><span class="toc-number">2</span> 
<span class="toc-text">About the author</span></a></li><li class="toc--level-1 
toc--section-4"><a href="#book-details"><span class="toc-number">3</span> <span 
class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
             <h2 id="description">Description</h2>
-<p>Apache Wicket ist ein komponentbasiertes Webframework, das sich in den
-letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung
-gemausert hat. Man könnte diese Beliebtheit mit der einfachen
-Integration von Ajax oder der rigorosen Trennung von Markup und Logik
-erklären. Aber was Wicket wirklich über die Masse konkurrierender
-Frameworks erhebt, sind der Verzicht auf eine eigene Markup-Sprache
-und das objektorientierte Programmiermodell. Dadurch rücken Java und
-seine Sprachmittel stark in den Vordergrund. Das ermöglicht es
-erfahrenen Entwicklern, sehr schnell in die Kernkonzepte von Wicket
-einzusteigen und auch komplexeste Anwendungen umzusetzen.</p>
-<p>Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu
-vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte
-einzugehen. Hierzu wird eine Beispielanwendung entwickelt und Schritt
-für Schritt erweitert. Anhand detaillierte Codebeispiele werden
-Sachverhalte wie der Wicket Request Cycle, Models, Validierung und
-JUnit Testing erklärt. Des Weiteren werden Themen wie
-Deplyoment-Szenarien (JEE6, Spring, …) , jQuery-Integration und
-Performance-Tuning in separaten Kapiteln behandelt. Durch Studium
-dieses Buchs soll ein Entwickler befähigt werden, skalierbare,
-wartbare Webanwendungen in Wicket zu bauen, und er soll lernen,
-eigene, wiederverwendbare Komponenten zu entwickeln und fremde
-Komponenten zu erweitern.
-Zielgruppe
-Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der
-wichtigen Webtechnologien wie HTML und CSS</p>
+<p>Apache Wicket ist ein komponentbasiertes Webframework, das sich in den 
letzten Jahren zu einem der beliebtesten Vertreter seiner Gattung gemausert hat.
+Man könnte diese Beliebtheit mit der einfachen Integration von Ajax oder der 
rigorosen Trennung von Markup und Logik erklären.
+Aber was Wicket wirklich über die Masse konkurrierender Frameworks erhebt, 
sind der Verzicht auf eine eigene Markup-Sprache und das objektorientierte 
Programmiermodell.
+Dadurch rücken Java und seine Sprachmittel stark in den Vordergrund.
+Das ermöglicht es erfahrenen Entwicklern, sehr schnell in die Kernkonzepte 
von Wicket einzusteigen und auch komplexeste Anwendungen umzusetzen.</p>
+<p>Ziel dieses Buchs ist es, die grundlegenden Konzepte von Wicket zu 
vermitteln und im weiteren Verlauf auf fortgeschrittene Aspekte einzugehen.
+Hierzu wird eine Beispielanwendung entwickelt und Schritt für Schritt 
erweitert.
+Anhand detaillierte Codebeispiele werden Sachverhalte wie der Wicket Request 
Cycle, Models, Validierung und JUnit Testing erklärt.
+Des Weiteren werden Themen wie Deplyoment-Szenarien (JEE6, Spring, …), 
jQuery-Integration und Performance-Tuning in separaten Kapiteln behandelt.
+Durch Studium dieses Buchs soll ein Entwickler befähigt werden, skalierbare, 
wartbare Webanwendungen in Wicket zu bauen, und er soll lernen, eigene, 
wiederverwendbare Komponenten zu entwickeln und fremde Komponenten zu 
erweitern.</p>
+<h3 id="zielgruppe">Zielgruppe</h3>
+<p>Entwickler mit soliden Java-Kenntnissen und einem Grundverständnis der 
wichtigen Webtechnologien wie HTML und CSS.</p>
 <h2 id="about-the-author">About the author</h2>
-<p>Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und
-Entwicklung. Derzeit ist er bei der Senacor Technologies AG für
-verschiedene Wicket-Projekte als Technical Lead verantwortlich.</p>
+<p>Jochen Mader hat über zehn Jahre Erfahrung im Bereich Architektur und 
Entwicklung.
+Derzeit ist er bei der Senacor Technologies AG für verschiedene 
Wicket-Projekte als Technical Lead verantwortlich.</p>
 <h2 id="book-details">Book details</h2>
 <p>Titel   Wicket: Komponentenbasiert und objektorientiert- das alternative 
Java-Webframework
 Autor   Jochen Mader

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/kwij.html
----------------------------------------------------------------------
diff --git a/content/learn/books/kwij.html b/content/learn/books/kwij.html
index a8ef2d9..a5f360c 100644
--- a/content/learn/books/kwij.html
+++ b/content/learn/books/kwij.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/kwij.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/kwij.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/kwij.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/kwij.html -->
@@ -49,27 +49,16 @@
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> 
<span class="toc-text">About the author</span></a></li><li class="toc--level-1 
toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span 
class="toc-text">Book details</span></a></li></ul></div>
         </section>
         <section class="l-two-third left">
-            <p>The book was written by Roland Förther, Carl-Eric Menzel and 
Olaf Siefart. It
-was published by dpunkt.verlag in December 2009.</p>
+            <p>The book was written by Roland Förther, Carl-Eric Menzel and 
Olaf Siefart.
+It was published by dpunkt.verlag in December 2009.</p>
 <h2 id="description">Description</h2>
-<p>Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache
-rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer,
-XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
-Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und
-kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare
-Komponenten radikal vereinfacht. Dieses Buch bietet Java-Entwicklern eine
-praxisorientierte Einführung in Wicket und zeigt, wie die Entwicklung von
-Webanwendungen in Java beschleunigt werden kann und wieder Spaß macht. Dazu
-werden die zugrunde liegenden Konzepte umfassend erklärt und anhand einer
-konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel Schritt
-für Schritt entwickelt wird. Nach der Lektüre des Buches sind Sie in der 
Lage,
-professionelle Webanwendungen mit Wicket zu schreiben, Komponenten für die
-eigenen Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
-Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket
-architektonisch sauber aufgebaut werden können. Umsteiger von anderen
-Webframeworks wie JSF und Struts lernen die wichtigsten Unterschiede zu Wicket
-kennen und werden in die Lage versetzt, bestehende Java-Webanwendungen
-schrittweise nach Wicket zu migrieren.</p>
+<p>Wicket ist ein neuer Typ Webframework für die Java-Welt: Java als Sprache 
rückt hier wieder in den Mittelpunkt und an die Stelle von deklarativer, 
XML-lastiger Programmierung tritt natürliche objektorientierte Entwicklung.
+Typische Probleme wie Codeduplizierung, aufwendige Ajax-Integration und 
kompliziertes Testen werden durch leicht zu erstellende und wiederverwendbare 
Komponenten radikal vereinfacht.</p>
+<p>Dieses Buch bietet Java-Entwicklern eine praxisorientierte Einführung in 
Wicket und zeigt, wie die Entwicklung von Webanwendungen in Java beschleunigt 
werden kann und wieder Spaß macht.
+Dazu werden die zugrunde liegenden Konzepte umfassend erklärt und anhand 
einer konkreten Beispielanwendung veranschaulicht, die im Laufe der Kapitel 
Schritt für Schritt entwickelt wird.
+Nach der Lektüre des Buches sind Sie in der Lage, professionelle 
Webanwendungen mit Wicket zu schreiben, Komponenten für die eigenen 
Bedürfnisse anzupassen oder sie in neue Komponenten zusammenzufassen.
+Sie erfahren zudem, wie Webanwendungen unter Einsatz von Wicket 
architektonisch sauber aufgebaut werden können.
+Umsteiger von anderen Webframeworks wie JSF und Struts lernen die wichtigsten 
Unterschiede zu Wicket kennen und werden in die Lage versetzt, bestehende 
Java-Webanwendungen schrittweise nach Wicket zu migrieren.</p>
 <p>Aus dem Inhalt:</p>
 <ul>
   <li>Aufbau einer Wicket-Anwendung</li>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/praxisbuchwicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/praxisbuchwicket.html 
b/content/learn/books/praxisbuchwicket.html
index 4180dd2..020af2c 100644
--- a/content/learn/books/praxisbuchwicket.html
+++ b/content/learn/books/praxisbuchwicket.html
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Books — Praxisbuch Wicket | Apache Wicket</title>
+        <title>Books — Praxisbuch Wicket | Apache Wicket</title>
         <meta charset="utf8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/praxisbuchwicket.html 
-->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/praxisbuchwicket.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/praxisbuchwicket.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/praxisbuchwicket.html -->
@@ -43,7 +43,7 @@
 <main>
     <div class="l-container">
         <header class="l-full preamble">
-            <h1>Books — Praxisbuch Wicket</h1>
+            <h1>Books — Praxisbuch Wicket</h1>
         </header>
         <section class="l-one-third right">
             <div id="toc" class="toc"><div id="toc-title"><h2>Table of 
Contents</h2></div><ul><li class="toc--level-1 toc--section-1"><a 
href="#description"><span class="toc-number">1</span> <span 
class="toc-text">Description</span></a></li><li class="toc--level-1 
toc--section-2"><a href="#about-the-author"><span class="toc-number">2</span> 
<span class="toc-text">About the author</span></a></li><li class="toc--level-1 
toc--section-3"><a href="#book-details"><span class="toc-number">3</span> <span 
class="toc-text">Book details</span></a></li></ul></div>

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/prowicket.html
----------------------------------------------------------------------
diff --git a/content/learn/books/prowicket.html 
b/content/learn/books/prowicket.html
index 5718e19..e514148 100644
--- a/content/learn/books/prowicket.html
+++ b/content/learn/books/prowicket.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/prowicket.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/prowicket.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/prowicket.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/prowicket.html -->

http://git-wip-us.apache.org/repos/asf/wicket-site/blob/8ec6434b/content/learn/books/wia.html
----------------------------------------------------------------------
diff --git a/content/learn/books/wia.html b/content/learn/books/wia.html
index 359b1a1..f1dd3c4 100644
--- a/content/learn/books/wia.html
+++ b/content/learn/books/wia.html
@@ -26,7 +26,7 @@
                <!-- /start/download.html || /learn/books/wia.html -->
        <li class=""><a href="/start/download.html">Download</a></li>
                <!-- /learn || /learn/books/wia.html -->
-       <li class=""><a href="/learn">Documentation</a></li>
+       <li class="active"><a href="/learn">Documentation</a></li>
                <!-- /help || /learn/books/wia.html -->
        <li class=""><a href="/help">Support</a></li>
                <!-- /contribute || /learn/books/wia.html -->
@@ -49,9 +49,7 @@
         </section>
         <section class="l-two-third left">
             <p>Wicket in Action is written by Martijn Dashorst and Eelco 
Hillenius and is
-published by Manning. The book is currently in the final stages of production
-and will soon be available as a hard copy. Early access to the manuscript is
-available from the publishers site.</p>
+published by Manning.</p>
 <h3 id="description">Description</h3>
 <p>There are dozens of Java frameworks out there, but most of them require you 
to
 learn special coding techniques and new, often rigid, patterns of development.

Reply via email to