You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/04/22 18:50:46 UTC
[16/19] wicket git commit: guide changed to comply with WICKET-5410
guide changed to comply with WICKET-5410
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bd18b9b1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bd18b9b1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bd18b9b1
Branch: refs/heads/master
Commit: bd18b9b11260cc06798b1f9dd72a191ddcc04f41
Parents: d9f84bf
Author: Andrea Del Bene <ad...@apache.org>
Authored: Tue Apr 7 16:59:21 2015 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Tue Apr 7 17:13:56 2015 +0200
----------------------------------------------------------------------
wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc | 4 ++--
wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc | 4 ++--
.../src/docs/guide/internals/pagestoring.gdoc | 8 ++++----
.../src/docs/guide/jsintegration/jsintegration_2.gdoc | 6 +++---
wicket-user-guide/src/docs/guide/redirects.gdoc | 6 +++---
.../docs/guide/requestProcessing/requestProcessing_5.gdoc | 10 +++++-----
.../src/docs/guide/resources/resources_13.gdoc | 6 +++---
wicket-user-guide/src/docs/guide/security/security_2.gdoc | 6 +++---
wicket-user-guide/src/docs/guide/security/security_4.gdoc | 4 ++--
wicket-user-guide/src/docs/guide/urls/urls_3.gdoc | 2 +-
.../docs/guide/versioningCaching/versioningCaching_2.gdoc | 8 ++++----
11 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc
index 42ff95d..8b03d1b 100644
--- a/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc
+++ b/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc
@@ -64,7 +64,7 @@ The code that copies the uploaded file to the temporary directory is inside the
Form component can limit the size for uploaded files using its setMaxSize(size) method. In the example we have set this limit to 100 kb to prevent users from uploading files bigger than this size.
{note}
-The maximum size for uploaded files can also be set at application's level using the setDefaultMaximumUploadSize(Bytes maxSize) method of the IApplicationSettings interface:
+The maximum size for uploaded files can also be set at application's level using the setDefaultMaximumUploadSize(Bytes maxSize) method of class ApplicationSettings:
{code}
@Override
@@ -78,4 +78,4 @@ public void init()
h3. Upload multiple files
If we need to upload multiple files at once and our clients support HTML5, we can still use FileUploadField adding attribute "multiple" to its tag. If we can not rely on HTML5, we can use the MultiFileUploadField component which allows the user to upload an arbitrary number of files using a JavaScript-based solution.
-An example showing how to use this component can be found in Wicket module wicket-examples in file MultiUploadPage.java. The live example is hosted at "http://www.wicket-library.com/wicket-examples-6.0.x/upload/multi":http://www.wicket-library.com/wicket-examples-6.0.x/upload/multi .
\ No newline at end of file
+An example showing how to use this component can be found in Wicket module wicket-examples in file MultiUploadPage.java. The live example is hosted at "http://www.wicket-library.com/wicket-examples-6.0.x/upload/multi":http://www.wicket-library.com/wicket-examples-6.0.x/upload/multi .
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc b/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc
index 75e870e..d00a134 100644
--- a/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/i18n/i18n_3.gdoc
@@ -86,14 +86,14 @@ Wicket implements the default lookup algorithm using the strategy pattern1. The
# *ValidatorStringResourceLoader:* searches for resources into validator's bundles. A list of validators is provided by the form component that failed validation.
# *InitializerStringResourceLoader:* this resource allows internationalization to interact with the initialization mechanism of the framework that will be illustrated in paragraph 15.4.
-Developer can customize lookup algorithm removing default resource loaders or adding custom implementations to the list of the resource loaders in use. This task can be accomplished using method getStringResourceLoaders of setting interface @org.apache.wicket.settings.IResourceSettings@:
+Developer can customize lookup algorithm removing default resource loaders or adding custom implementations to the list of the resource loaders in use. This task can be accomplished using method getStringResourceLoaders of setting class @org.apache.wicket.settings.ResourceSettings@:
{code}
@Override
public void init()
{
super.init();
- //retrieve IResourceSettings and then the list of resource loaders
+ //retrieve ResourceSettings and then the list of resource loaders
List<IStringResourceLoader> resourceLoaders = getResourceSettings().
getStringResourceLoaders();
//customize the list...
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/internals/pagestoring.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/internals/pagestoring.gdoc b/wicket-user-guide/src/docs/guide/internals/pagestoring.gdoc
index 2def2fe..784d732 100644
--- a/wicket-user-guide/src/docs/guide/internals/pagestoring.gdoc
+++ b/wicket-user-guide/src/docs/guide/internals/pagestoring.gdoc
@@ -31,17 +31,17 @@ i.e. this is the serialized page instance (data) plus additional information nee
When a @SerializedPage@ has to be stored @DefaultPageStore@ stores it in a application scoped cache ({sessionId, pageId} -> SerializedPage) and additionally gives it to the underlying @IDataStore#storeData(sessionId, pageId, data)@. The application scoped cache is used as second level cache. Getting a page from it is slower than the http session based cache in @PageStoreManager@ because the page has to be deserialized, but is faster than the underlying @IDataStore@ which stores the page bytes in some persistent store.
-The size of the application scoped cache is configurable via @org.apache.wicket.settings.IStoreSettings.setInmemoryCacheSize(int)@.
+The size of the application scoped cache is configurable via @org.apache.wicket.settings.StoreSettings.setInmemoryCacheSize(int)@.
h3. IDataStore
-@org.apache.wicket.pageStore.IDataStore@ is used to persist Wicket pages (as bytes) to a persistent store like e.g. files or databases. The default implementation is @org.apache.wicket.pageStore.DiskDataStore@ which as its name says stores the pages in files. The location of the folder where the files are stored is configurable via @org.apache.wicket.settings.IStoreSettings.setFileStoreFolder(File)@, by default the web container's work folder is used (ServletContext attribute 'javax.servlet.context.tempdir'). In this folder a sub-folder is created named @'applicationName-filestore'@.
-This folder contains a sub-folder for each active http session. This session folder contains a single file named 'data' which contains the bytes for the pages. The size of this 'data' file is configurable via @org.apache.wicket.settings.IStoreSettings.setMaxSizePerSession(Bytes)@. When this size is exceeded the newly stored files overwrite the oldest ones.
+@org.apache.wicket.pageStore.IDataStore@ is used to persist Wicket pages (as bytes) to a persistent store like e.g. files or databases. The default implementation is @org.apache.wicket.pageStore.DiskDataStore@ which as its name says stores the pages in files. The location of the folder where the files are stored is configurable via @org.apache.wicket.settings.StoreSettings.setFileStoreFolder(File)@, by default the web container's work folder is used (ServletContext attribute 'javax.servlet.context.tempdir'). In this folder a sub-folder is created named @'applicationName-filestore'@.
+This folder contains a sub-folder for each active http session. This session folder contains a single file named 'data' which contains the bytes for the pages. The size of this 'data' file is configurable via @org.apache.wicket.settings.StoreSettings.setMaxSizePerSession(Bytes)@. When this size is exceeded the newly stored files overwrite the oldest ones.
h3. AsynchronousDataStore
By default Wicket wraps @DiskDataStore@ with @org.apache.wicket.pageStore.AsynchronousDataStore@. The role of @AsynchronousDataStore@ is to detach the http worker thread from waiting for the write of the page bytes to the disk.
-To disable it use: @org.apache.wicket.settings.IStoreSettings.setAsynchronous(false)@. AsynchronousDataStore can delay the storage of pages' bytes for at most @org.apache.wicket.settings.IStoreSettings.setAsynchronousQueueCapacity(int)@ pages. If this capacity is exceeded then the page's bytes are written synchronously to the backing @IDataStore@.
+To disable it use: @org.apache.wicket.settings.StoreSettings.setAsynchronous(false)@. AsynchronousDataStore can delay the storage of pages' bytes for at most @org.apache.wicket.settings.StoreSettings.setAsynchronousQueueCapacity(int)@ pages. If this capacity is exceeded then the page's bytes are written synchronously to the backing @IDataStore@.
h3. DebugDiskDataStore
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc b/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
index 7b32ede..88c945d 100644
--- a/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
@@ -98,7 +98,7 @@ public void renderHead(IHeaderResponse response) {
if(!isEnabledInHierarchy())
return;
//add bundled JQuery
- IJavaScriptLibrarySettings javaScriptSettings =
+ JavaScriptLibrarySettings javaScriptSettings =
getApplication().getJavaScriptLibrarySettings();
response.render(JavaScriptHeaderItem.
forReference(javaScriptSettings.getJQueryReference()));
@@ -122,7 +122,7 @@ public void renderHead(IHeaderResponse response) {
If component is disabled the calendar icon must be hidden and no datepicker must be displayed. That's why @renderHeader@ is skipped if component is not enabled.
-To get a reference to the bundled JQuery library we used the JavaScript setting interface @IJavaScriptLibrarySettings@ and its method @getJQueryReference@.
+To get a reference to the bundled JQuery library we used the JavaScript setting class @JavaScriptLibrarySettings@ and its method @getJQueryReference@.
In the last part of @renderHeader@ we build the string to invoke function @initJQDatepicker@ using the values obtained inside onInitialize. Unfortunately the date format used by JQuery UI is different from the one adopted in Java so we have to convert it before building the JavaScript code. This init script is rendered into header section using a @OnLoadHeaderItem@ to ensure that it will be executed after all the other scripts have been loaded.
@@ -134,4 +134,4 @@ This does not apply to the init script which is dynamically generated and is ren
{warning}
Our datepicker is not ready yet to be used with AJAX. In chapter 16 we will see how to modify it to make it AJAX-compatible.
-{warning}
\ No newline at end of file
+{warning}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/redirects.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/redirects.gdoc b/wicket-user-guide/src/docs/guide/redirects.gdoc
index 1442f7a..4bc1604 100644
--- a/wicket-user-guide/src/docs/guide/redirects.gdoc
+++ b/wicket-user-guide/src/docs/guide/redirects.gdoc
@@ -1,6 +1,6 @@
Quite a few teams have already got stuck into the following problem when working with wicket forms in a clustered environment while having 2 (or more) tomcat server with enabled session replication running.
-In case of invalid data being submitted with a form instance for example, it seemed like according error messages wouldn’t be presented when the same form page gets displayed again. Sometimes! And sometimes they would! One of those nightmares of rather deterministic programmer’s life. This so called Lost In Redirection problem, even if it looks like a wicket bug at first, is rather a result of a default setting in wicket regarding the processing of form submissions in general. In order to prevent another wide known problem of double form submissions, Wicket uses a so called REDIRECT_TO_BUFFER strategy for dealing with rendering a page after web form’s processing (@see IRequestCycleSettings#RenderStrategy).
+In case of invalid data being submitted with a form instance for example, it seemed like according error messages wouldn’t be presented when the same form page gets displayed again. Sometimes! And sometimes they would! One of those nightmares of rather deterministic programmer’s life. This so called Lost In Redirection problem, even if it looks like a wicket bug at first, is rather a result of a default setting in wicket regarding the processing of form submissions in general. In order to prevent another wide known problem of double form submissions, Wicket uses a so called REDIRECT_TO_BUFFER strategy for dealing with rendering a page after web form’s processing (@see RequestCycleSettings#RenderStrategy).
What does the default RenderStrategy actually do?
@@ -16,7 +16,7 @@ After the buffered response is cached the HTTP status code of 302 get’s provid
{code}
// Are we using REDIRECT_TO_BUFFER?
-if (webApplication.getRequestCycleSettings().getRenderStrategy() == IRequestCycleSettings.REDIRECT_TO_BUFFER)
+if (webApplication.getRequestCycleSettings().getRenderStrategy() == RequestCycleSettings.REDIRECT_TO_BUFFER)
{
// Try to see if there is a redirect stored
// try get an existing session
@@ -61,7 +61,7 @@ Unfortunately, there is currently no ideal solution to the problem described abo
@Override
protected void init() {
getRequestCycleSettings().setRenderStrategy(
- IRequestCycleSettings.ONE_PASS_RENDER);
+ RequestCycleSettings.ONE_PASS_RENDER);
}
{code}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_5.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_5.gdoc b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_5.gdoc
index 42c06cb..329a67d 100644
--- a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_5.gdoc
+++ b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_5.gdoc
@@ -10,11 +10,11 @@ We can also manually set if Wicket should display the exception with @ExceptionE
{code}
//show default developer page
-getExceptionSettings().setUnexpectedExceptionDisplay( IExceptionSettings.SHOW_EXCEPTION_PAGE );
+getExceptionSettings().setUnexpectedExceptionDisplay( ExceptionSettings.SHOW_EXCEPTION_PAGE );
//show internal error page
-getExceptionSettings().setUnexpectedExceptionDisplay( IExceptionSettings.SHOW_INTERNAL_ERROR_PAGE );
+getExceptionSettings().setUnexpectedExceptionDisplay( ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE );
//show no exception page when an unexpected exception is thrown
-getExceptionSettings().setUnexpectedExceptionDisplay( IExceptionSettings.SHOW_NO_EXCEPTION_PAGE );
+getExceptionSettings().setUnexpectedExceptionDisplay( ExceptionSettings.SHOW_NO_EXCEPTION_PAGE );
{code}
Developers can also decide to use a custom exception mapper instead of @DefaultExceptionMapper@. To do this we must override @Application@'s method @getExceptionMapperProvider@:
@@ -31,5 +31,5 @@ The method returns an instance of @org.apache.wicket.util.IProvider@ that should
h3. Ajax requests
-To control the behavior in Ajax requests the application may use @org.apache.wicket.settings.IExceptionSettings# setAjaxErrorHandlingStrategy(IExceptionSettings.AjaxErrorStrategy)@. By default if an error occurs during the
-processing of an Ajax request Wicket will render the configured error page. By configuring @org.apache.wicket.settings.IExceptionSettings. AjaxErrorStrategy#INVOKE_FAILURE_HANDLER@ as the default strategy the application will call the JavaScript @onFailure@ callback(s) instead.
+To control the behavior in Ajax requests the application may use @org.apache.wicket.settings.ExceptionSettings# setAjaxErrorHandlingStrategy(ExceptionSettings.AjaxErrorStrategy)@. By default if an error occurs during the
+processing of an Ajax request Wicket will render the configured error page. By configuring @org.apache.wicket.settings.ExceptionSettings. AjaxErrorStrategy#INVOKE_FAILURE_HANDLER@ as the default strategy the application will call the JavaScript @onFailure@ callback(s) instead.
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/resources/resources_13.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/resources/resources_13.gdoc b/wicket-user-guide/src/docs/guide/resources/resources_13.gdoc
index a1a0890..ee12183 100644
--- a/wicket-user-guide/src/docs/guide/resources/resources_13.gdoc
+++ b/wicket-user-guide/src/docs/guide/resources/resources_13.gdoc
@@ -1,6 +1,6 @@
-Wicket loads application's resources delegating this task to a resource locator represented by interface @org.apache.wicket.core.util.resource.locator.IResourceStreamLocator@. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting interface @IResourceSettings@:
+Wicket loads application's resources delegating this task to a resource locator represented by interface @org.apache.wicket.core.util.resource.locator.IResourceStreamLocator@. To retrieve or modify the current resource locator we can use the getter and setter methods defined by setting class @ResourceSettings@:
{code}
//init application's method
@@ -34,7 +34,7 @@ public void init()
}
{code}
-Method getResourceFinders() defined by setting interface IResourceSettings returns the list of resource finders defined in our application. The constructor of WebApplicationPath takes in input also an instance of standard interface javax.servlet.ServletContext which can be retrieved with WebApplication's method getServletContext().
+Method getResourceFinders() defined by setting class ResourceSettings returns the list of resource finders defined in our application. The constructor of WebApplicationPath takes in input also an instance of standard interface javax.servlet.ServletContext which can be retrieved with WebApplication's method getServletContext().
{note}
By default, if resource files can not be found inside application classpath, Wicket will search for them inside “resources” folder. You may have noted this folder in the previous picture. It is placed next to the folder “java” containing our source files:
@@ -42,4 +42,4 @@ By default, if resource files can not be found inside application classpath, Wic
!package-structure-resource-folder.png!
This folder can be used to store resource files without writing any configuration code.
-{note}
\ No newline at end of file
+{note}
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/security/security_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/security/security_2.gdoc b/wicket-user-guide/src/docs/guide/security/security_2.gdoc
index 99f51f9..1f76d76 100644
--- a/wicket-user-guide/src/docs/guide/security/security_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/security/security_2.gdoc
@@ -33,7 +33,7 @@ This interface defines two methods:
Inside @IAuthorizationStrategy@ we can also find a default implementation of the interface (called ALLOW_ALL) that allows everyone to instantiate every component and perform every possible action on it. This is the default strategy adopted by class @Application@.
-To change the authorization strategy in use we must register the desired implementation into security settings (interface @ISecuritySettings@) during initialization phase with method setAuthorization Strategy:
+To change the authorization strategy in use we must register the desired implementation into security settings (class @SecuritySettings@) during initialization phase with method setAuthorization Strategy:
{code}
//Application class code...
@@ -206,7 +206,7 @@ Now if we run the project and we try to access to @AdminOnlyPage@ from the home
!authorization-access-denied.png!
-The access-denied page can be customized using method @setAccessDeniedPage(Class<? extends Page>)@ of setting interface @IApplicationSettings@:
+The access-denied page can be customized using method @setAccessDeniedPage(Class<? extends Page>)@ of setting class @ApplicationSettings@:
{code}
//Application class code...
@@ -248,7 +248,7 @@ h3. Catching an unauthorized component instantiation
Interface IUnauthorizedComponentInstantiationListener (in package @org.apache.wicket.authorization@) is provided to give the chance to handle the case in which a user tries to instantiate a component without having the permissions to do it. The method defined inside this interface is @onUnauthorizedInstantiation(Component)@ and it is executed whenever a user attempts to execute an unauthorized instantiation.
-This listener must be registered into application's security settings with method setUnauthorized @ComponentInstantiationListener@ defined by setting interface @ISecuritySettings@. In the following code snippet we register a listener that redirect user to a warning page if he tries to do a not-allowed instantiation:
+This listener must be registered into application's security settings with method @setUnauthorizedComponentInstantiationListener@ defined by setting class @SecuritySettings@. In the following code snippet we register a listener that redirect user to a warning page if he tries to do a not-allowed instantiation:
{code}
public class WicketApplication extends AuthenticatedWebApplication{
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/security/security_4.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/security/security_4.gdoc b/wicket-user-guide/src/docs/guide/security/security_4.gdoc
index bf10b48..e4746ca 100644
--- a/wicket-user-guide/src/docs/guide/security/security_4.gdoc
+++ b/wicket-user-guide/src/docs/guide/security/security_4.gdoc
@@ -17,7 +17,7 @@ The default implementation for this interface is class @org.apache.wicket.util.c
For better security it is recommended to install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction [Policy Files|http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html] for your version of JDK/JRE and use stronger algorithms. See this [example|https://github.com/apache/wicket/blob/42ce1faa57d3617ccaa443045537306fabf4d71a/wicket-util/src/test/java/org/apache/wicket/util/crypt/UnlimitedStrengthJurisdictionPolicyTest.java#L67] of a custom @ICrypt@ implementation for inspiration.
{note}
-By using @CryptoMapper(IRequestMapper wrappedMapper, Application application)@ constructor the mapper will use the configured @org.apache.wicket.util.crypt.ICryptFactory@ from @org.apache.wicket.settings.ISecuritySettings#getCryptFactory()@. To use a stronger cryptography mechanism there are the following options:
+By using @CryptoMapper(IRequestMapper wrappedMapper, Application application)@ constructor the mapper will use the configured @org.apache.wicket.util.crypt.ICryptFactory@ from @org.apache.wicket.settings.SecuritySettings#getCryptFactory()@. To use a stronger cryptography mechanism there are the following options:
* The first option is to use constructor @CryptoMapper(IRequestMapper wrappedMapper, IProvider<ICrypt> cryptProvider)@ and give it an implementation of @org.apache.wicket.util.IProvider@ that returns a custom @org.apache.wicket.util.crypt.ICrypt@.
@@ -32,7 +32,7 @@ public interface IProvider<T>
}
{code}
-* The second option is to register a cipher factory at application level with method @setCryptFactory(ICryptFactory cryptFactory)@ of interface @ISecuritySettings@:
+* The second option is to register a cipher factory at application level with method @setCryptFactory(ICryptFactory cryptFactory)@ of class @SecuritySettings@:
{code}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/urls/urls_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/urls/urls_3.gdoc b/wicket-user-guide/src/docs/guide/urls/urls_3.gdoc
index 9f85265..8b35241 100644
--- a/wicket-user-guide/src/docs/guide/urls/urls_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/urls/urls_3.gdoc
@@ -52,7 +52,7 @@ Please note that any link to the current page (aka self link) is disabled. For e
<span><em>HomePage</em></span>
{code}
-The markup used to render disabled links can be customized using the markup settings (interface IMarkupSettings) available in the application class:
+The markup used to render disabled links can be customized using the markup settings (class org.apache.wicket.settings.MarkupSettings) available in the application class:
{code}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/bd18b9b1/wicket-user-guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc b/wicket-user-guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
index c83c220..d8c153e 100644
--- a/wicket-user-guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
@@ -70,9 +70,9 @@ If for any reason we need to switch off versioning for a given page, we can call
h3. Pluggable serialization
-Starting from version 1.5 it is possible to choose which implementation of Java serialization will be used by Wicket to store page versions. Wicket serializes pages using an implementation of interface @org.apache.wicket.serialize.ISerializer@. The default implementation is @org.apache.wicket.serialize.java.JavaSerializer@ and it uses the standard Java serialization mechanism based on classes ObjectOutputStream and ObjectInputStream. However on Internet we can find other interesting serialization libraries like [Kryo|https://github.com/EsotericSoftware/kryo] or [Fast|http://ruedigermoeller.github.io/fast-serialization/] which perform faster then the standard implementation. The serializer in use can be customized with the setSerializer(ISerializer) method defined by setting interface @org.apache.wicket.settings.IFrameworkSettings@.
+Starting from version 1.5 it is possible to choose which implementation of Java serialization will be used by Wicket to store page versions. Wicket serializes pages using an implementation of interface @org.apache.wicket.serialize.ISerializer@. The default implementation is @org.apache.wicket.serialize.java.JavaSerializer@ and it uses the standard Java serialization mechanism based on classes ObjectOutputStream and ObjectInputStream. However on Internet we can find other interesting serialization libraries like [Kryo|https://github.com/EsotericSoftware/kryo] or [Fast|http://ruedigermoeller.github.io/fast-serialization/] which perform faster then the standard implementation. The serializer in use can be customized with the setSerializer(ISerializer) method defined by setting class @org.apache.wicket.settings.FrameworkSettings@.
-We can access this interface inside the method init of the class Application using the getFrameworkSettings() method :
+We can access this class inside the method @init@ of the class Application using the getFrameworkSettings() method :
{code}
@Override
@@ -93,7 +93,7 @@ The following picture is an overview of these two caching levels:
!wicket-cache.png!
-The session-scoped cache is faster then the other memory levels but it contains only the pages used to serve the last request. Wicket allows us to set the maximum amount of memory allowed for the application-scoped cache and for the page store file. Both parameters can be configured via setting interface @org.apache.wicket.settings.IStoreSettings@.
+The session-scoped cache is faster then the other memory levels but it contains only the pages used to serve the last request. Wicket allows us to set the maximum amount of memory allowed for the application-scoped cache and for the page store file. Both parameters can be configured via setting class @org.apache.wicket.settings.StoreSettings@.
This interface provides the setMaxSizePerSession(Bytes bytes) method to set the size for page store file. The Bytes parameter is the maximum size allowed for this file:
@@ -124,7 +124,7 @@ Page instances are not kept in the user session forever. They can be discarded w
!page-expired.png!
-This error page can be customized with the setPageExpiredErrorPage method of the @org.apache.wicket.settings.IApplicationSettings@ interface:
+This error page can be customized with the @setPageExpiredErrorPage@ method of class @org.apache.wicket.settings.ApplicationSettings@:
{code}
@Override