You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/08 09:24:14 UTC
[20/20] git commit: Fix minor warnings in the generation of the docs
Updated Branches:
refs/heads/reference-guide 017e45eb5 -> 38b272fab
Fix minor warnings in the generation of the docs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/38b272fa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/38b272fa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/38b272fa
Branch: refs/heads/reference-guide
Commit: 38b272fab09430570ea674386b397a8101c5329d
Parents: 60e2756
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 8 09:23:20 2013 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 8 09:23:20 2013 +0100
----------------------------------------------------------------------
.../src/documentation/source/models.rst | 4 ++--
.../src/documentation/source/websockets.rst | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/38b272fa/wicket-reference-guide/src/documentation/source/models.rst
----------------------------------------------------------------------
diff --git a/wicket-reference-guide/src/documentation/source/models.rst b/wicket-reference-guide/src/documentation/source/models.rst
index c154134..5ed2adc 100644
--- a/wicket-reference-guide/src/documentation/source/models.rst
+++ b/wicket-reference-guide/src/documentation/source/models.rst
@@ -12,7 +12,7 @@ There is a simple model implementation, which can hold any data, which is serial
.. includecode:: ../../../models/src/main/java/org/apache/wicket/reference/models/SerializableModelPage.java#docu
-This examples shows an easy way to create a model instance for a value and how the value can be changed afterwards. The Label component accepts any model value (not only strings, see :doc:`converter`).
+This examples shows an easy way to create a model instance for a value and how the value can be changed afterwards. The Label component accepts any serializable model value (not only strings, see :doc:`converter`).
TODO
-------------------
@@ -23,7 +23,7 @@ TODO
.. _models--detach-label:
Model and detach (TODO)
--------------------
+-----------------------
As any page contains mainly components and models. Most data is stored in models, it is important to know, that models are detached after the page is rendered (see :doc:`requestcycle`). to remove anything from the page which is not needed anymore.
http://git-wip-us.apache.org/repos/asf/wicket/blob/38b272fa/wicket-reference-guide/src/documentation/source/websockets.rst
----------------------------------------------------------------------
diff --git a/wicket-reference-guide/src/documentation/source/websockets.rst b/wicket-reference-guide/src/documentation/source/websockets.rst
index 8fa70cd..5986f0e 100644
--- a/wicket-reference-guide/src/documentation/source/websockets.rst
+++ b/wicket-reference-guide/src/documentation/source/websockets.rst
@@ -51,9 +51,11 @@ See the demo application at [martin-g's GitHub|https://github.com/martin-g/wicke
h5. Client side APIs
-By adding a _WebSocketBehavior_ to your component(s) Wicket will contribute _wicket-websocket-jquery.js_ library which provides some helper functions to write your client side code. There is a default websocket connection per Wicket Page opened for you which you can use like _Wicket.WebSocket.send('\{msg: "my message"\}')_.
+By adding a *WebSocketBehavior* to your component(s) Wicket will contribute *wicket-websocket-jquery.js* library which provides some helper functions to write your client side code. There is a default websocket connection per Wicket Page opened for you which you can use like _Wicket.WebSocket.send('\{msg: "my message"\}')_.
-If you need more WebSocket connections then you can do: _var ws = new Wicket.WebSocket(); ws.send('message');_
+If you need more WebSocket connections then you can do::
+
+ var ws = new Wicket.WebSocket(); ws.send('message');
To close a connection: _Wicket.WebSocket.close()_ or _ws.close()_.