wicket git commit: Fix the versions in the user guide

[mgrigorov]

Repository: wicket
Updated Branches:
  refs/heads/master 88f3ac702 -> f765fad4b


Fix the versions in the user guide


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

Branch: refs/heads/master
Commit: f765fad4b29ce67710814bd92a3cbd77fe28c975
Parents: 88f3ac7
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
Authored: Sat Oct 3 17:22:44 2015 +0200
Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
Committed: Sat Oct 3 17:22:44 2015 +0200

----------------------------------------------------------------------
 wicket-user-guide/grails-app/conf/BuildConfig.groovy   |  2 +-
 wicket-user-guide/grails-app/conf/Config.groovy        |  6 +++---
 wicket-user-guide/src/docs/guide/contributing.gdoc     |  2 +-
 .../guide/nativewebsockets/nativewebsockets_2.gdoc     | 13 ++-----------
 4 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f765fad4/wicket-user-guide/grails-app/conf/BuildConfig.groovy
----------------------------------------------------------------------
diff --git a/wicket-user-guide/grails-app/conf/BuildConfig.groovy 
b/wicket-user-guide/grails-app/conf/BuildConfig.groovy
index 5d62788..567b993 100644
--- a/wicket-user-guide/grails-app/conf/BuildConfig.groovy
+++ b/wicket-user-guide/grails-app/conf/BuildConfig.groovy
@@ -64,4 +64,4 @@ grails.project.dependency.resolution = {
     }
 }
 
-grails.project.docs.output.dir = 'target/guide/7.x'
+grails.project.docs.output.dir = 'target/guide/8.x'

http://git-wip-us.apache.org/repos/asf/wicket/blob/f765fad4/wicket-user-guide/grails-app/conf/Config.groovy
----------------------------------------------------------------------
diff --git a/wicket-user-guide/grails-app/conf/Config.groovy 
b/wicket-user-guide/grails-app/conf/Config.groovy
index cd3273d..5ef476b 100644
--- a/wicket-user-guide/grails-app/conf/Config.groovy
+++ b/wicket-user-guide/grails-app/conf/Config.groovy
@@ -94,13 +94,13 @@ log4j = {
 def basePath = System.properties['base.dir']
 
 grails.doc.title = "Apache Wicket User Guide"
-grails.doc.version = "7.x"
+grails.doc.version = "8.x"
 grails.doc.subtitle = "Free Online Guide for Apache Wicket framework"
 grails.doc.authors = "Andrea Del Bene, Martin Grigorov, Carsten Hufe, 
Christian Kroemer, Daniel Bartl, Paul Borș, Tobias Soloschenko, Igor Vaynberg 
, Joachim Rohde"
 grails.doc.images = new File("${basePath}/src/docs/img")
 grails.doc.css = new File("${basePath}/src/docs/css")
-grails.doc.logo = """<a href="http://ci.apache.org/projects/wicket/guide/7.x/"; 
target="_self"><img height="80px" 
src="http://ci.apache.org/projects/wicket/guide/7.x/img/apache-wicket.png"/></a>"""
-grails.doc.sponsorLogo = """<a href="http://www.apache.org/"; 
target="_blank"><img height="60px" 
src="http://ci.apache.org/projects/wicket/guide/7.x/img/asf_logo.gif"/></a>"""
+grails.doc.logo = """<a href="http://ci.apache.org/projects/wicket/guide/8.x/"; 
target="_self"><img height="80px" 
src="http://ci.apache.org/projects/wicket/guide/7.x/img/apache-wicket.png"/></a>"""
+grails.doc.sponsorLogo = """<a href="http://www.apache.org/"; 
target="_blank"><img height="60px" 
src="http://ci.apache.org/projects/wicket/guide/8.x/img/asf_logo.gif"/></a>"""
 grails.doc.copyright="""
 Copyright &copy; 2013-2015 — <a href="http://www.apache.org/"; 
target="_blank">The Apache Software Foundation</a> 
                       — <b style="color:#E8590A !important;">(Generated on: 
""" + (new Date()).format('yyyy-MM-dd - HH:mm:ss Z') + """)</b>

http://git-wip-us.apache.org/repos/asf/wicket/blob/f765fad4/wicket-user-guide/src/docs/guide/contributing.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/contributing.gdoc 
b/wicket-user-guide/src/docs/guide/contributing.gdoc
index 5a8225b..24391d2 100644
--- a/wicket-user-guide/src/docs/guide/contributing.gdoc
+++ b/wicket-user-guide/src/docs/guide/contributing.gdoc
@@ -11,7 +11,7 @@ git clone https://github.com/apache/wicket.git
 
 * To preview your changes run "mvn clean package -P guide" in the 
_wicket/wicket-user-guide_ folder (in eclipse use a run configuration)
 
-* Navigate to _wicket/wicket-user-guide/target/guide/7.x_ and open one of the 
following files a browser / pdf viewer:
+* Navigate to _wicket/wicket-user-guide/target/guide/8.x_ and open one of the 
following files a browser / pdf viewer:
 ** _index.html_ (multi page version)
 ** _guide/single.html_ (single page version)
 ** _guide/single.pdf_ (single page pdf version)

http://git-wip-us.apache.org/repos/asf/wicket/blob/f765fad4/wicket-user-guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc
----------------------------------------------------------------------
diff --git 
a/wicket-user-guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc 
b/wicket-user-guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc
index 5af9914..98bbb7d 100644
--- a/wicket-user-guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/nativewebsockets/nativewebsockets_2.gdoc
@@ -11,15 +11,6 @@ Depending on the web container that is used the application 
has to add a depende
 </dependency>
 {code}
 
-- for Jetty 7.x and 8.x
-{code}
-<dependency>
-  <groupId>org.apache.wicket</groupId>
-  <artifactId>wicket-native-websocket-jetty</artifactId>
-  <version>...</version>
-</dependency>
-{code}
-
 - for Tomcat 7.0.27+ (the old, non-JSR356 implementation)
 {code}
 <dependency>
@@ -39,7 +30,7 @@ Depending on the web container that is used the application 
has to add a depende
 {code}
 
 {note}
-All web containers providing JSR356 implementation are built with Java 7. This 
is the reason why @wicket-native-websocket-javax@ module is available only with 
Wicket 7.x. If your application runs with JRE 7.x then you can
+All web containers providing JSR356 implementation are built with Java 7. This 
is the reason why @wicket-native-websocket-javax@ module is available only with 
Wicket 7.x+. If your application runs with JRE 7.x then you can
 use @wicket-native-websocket-javax@ together with the latest version of Wicket 
6.x. Beware that the API/implementation of @wicket-native-websocket-javax@ may 
change before Wicket 7.0.0 is released!
 {note}
 
@@ -122,4 +113,4 @@ Application application = Application.get(applicationName);
 WebSocketSettings webSocketSettings = 
WebSocketSettings.Holder.get(application);
 IWebSocketConnectionRegistry webSocketConnectionRegistry = 
webSocketSettings.getConnectionRegistry();
 IWebSocketConnection connection = 
webSocketConnectionRegistry.getConnection(application, sessionId, key);
-{code}
\ No newline at end of file
+{code}