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 2021/07/27 09:10:42 UTC

[wicket] branch master updated: Fix javadoc errors

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new 90bbe8f  Fix javadoc errors
90bbe8f is described below

commit 90bbe8f00f0c3273a70fa756575b294ec1a008dc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Jul 27 11:55:39 2021 +0300

    Fix javadoc errors
    
    Enable failOnError=true for javadoc.
    Enable all javadoc lints but 'html'.
    
    (cherry picked from commit 5256d3c1d7549658666994792e831cf68e0c3341)
---
 pom.xml                                            |  4 +--
 .../src/main/java/org/apache/wicket/Component.java |  1 +
 .../java/org/apache/wicket/IGenericComponent.java  |  2 +-
 .../java/org/apache/wicket/MarkupContainer.java    |  5 +--
 .../src/main/java/org/apache/wicket/Session.java   | 38 ++++++++++++----------
 .../wicket/ajax/attributes/AjaxAttributeName.java  | 10 +++---
 .../wicket/core/request/mapper/CryptoMapper.java   |  3 +-
 .../wicket/core/request/mapper/ResourceMapper.java |  7 ++--
 .../wicket/core/util/crypt/AbstractJceCrypt.java   |  1 -
 .../org/apache/wicket/markup/ComponentTag.java     |  2 +-
 .../java/org/apache/wicket/markup/MarkupCache.java |  4 +--
 .../head/filter/SubresourceHeaderResponse.java     |  2 +-
 .../wicket/markup/head/http2/PushHeaderItem.java   |  3 +-
 .../apache/wicket/markup/head/http2/PushItem.java  |  6 ++--
 .../org/apache/wicket/markup/html/CrossOrigin.java |  8 +++--
 .../markup/html/SecurePackageResourceGuard.java    |  1 +
 .../wicket/markup/html/image/ExternalImage.java    |  4 +--
 .../org/apache/wicket/markup/html/image/Image.java |  2 +-
 .../org/apache/wicket/markup/html/link/Link.java   |  4 +--
 .../wicket/markup/html/media/MediaComponent.java   | 16 ++++-----
 .../apache/wicket/markup/html/media/Source.java    |  4 +--
 .../org/apache/wicket/markup/html/media/Track.java |  2 +-
 .../apache/wicket/markup/parser/XmlPullParser.java |  2 +-
 .../apache/wicket/pageStore/CryptingPageStore.java |  2 +-
 .../wicket/protocol/http/ClientProperties.java     |  2 +-
 .../protocol/http/ReloadingWicketFilter.java       | 12 +++----
 .../apache/wicket/protocol/http/WicketServlet.java |  6 ++--
 .../SecuredRemoteAddressRequestWrapperFactory.java |  1 +
 .../protocol/http/servlet/WicketSessionFilter.java |  2 --
 .../servlet/XForwardedRequestWrapperFactory.java   |  5 +++
 .../resource/caching/IStaticCacheableResource.java |  2 +-
 .../caching/version/CachingResourceVersion.java    |  2 +-
 .../version/MessageDigestResourceVersion.java      |  1 -
 .../resource/TextTemplateResourceReference.java    |  2 +-
 .../apache/wicket/settings/ResourceSettings.java   | 12 +++----
 .../apache/wicket/util/tester/WicketTester.java    |  3 +-
 .../html/autocomplete/AutoCompleteSettings.java    |  1 +
 .../ajax/markup/html/modal/ModalDialog.java        |  2 +-
 .../markup/html/form/select/SelectOptions.java     |  4 +--
 .../apache/wicket/request/http/WebResponse.java    |  1 -
 ...nnotationConfigSpringWebApplicationFactory.java |  2 +-
 .../java/org/apache/wicket/util/diff/AddDelta.java | 15 ---------
 .../org/apache/wicket/util/diff/ChangeDelta.java   | 15 ---------
 .../org/apache/wicket/util/diff/DeleteDelta.java   | 15 ---------
 .../java/org/apache/wicket/util/diff/Delta.java    |  2 --
 .../apache/wicket/util/diff/myers/MyersDiff.java   |  2 --
 46 files changed, 100 insertions(+), 142 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d57f2d..e89678f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1060,8 +1060,8 @@
 							<link>${javadoc.jdk.apidocs.link}</link>
 						</links>
 						<linksource>true</linksource>
-						<failOnError>false</failOnError>
-						<doclint>none</doclint>
+						<failOnError>true</failOnError>
+						<doclint>all,-html</doclint>
 						<additionalJOption>${javadoc.additionalJOption}</additionalJOption>
 						<source>8</source>
 					</configuration>
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 10d33b9..cb6cf99 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -206,6 +206,7 @@ import org.slf4j.LoggerFactory;
  * <li><b>Security </b>- All components are subject to an {@link IAuthorizationStrategy} which
  * controls instantiation, visibility and enabling. See {@link SimplePageAuthorizationStrategy} for
  * a simple implementation.</li>
+ * </ul>
  * 
  * @author Jonathan Locke
  * @author Chris Turner
diff --git a/wicket-core/src/main/java/org/apache/wicket/IGenericComponent.java b/wicket-core/src/main/java/org/apache/wicket/IGenericComponent.java
index d208e4d..59dd460 100644
--- a/wicket-core/src/main/java/org/apache/wicket/IGenericComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/IGenericComponent.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
  * for the model and its object.
  *
  * <p>
- *     Usage:<br/>
+ *     Usage:<br>
  *     <code>
  *         public class MyComponent&lt;T&gt; extends AnotherComponent implements IGenericComponent&lt;T, MyComponent&lt;T&gt;&gt; { ... }
  *     </code>
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index e095319..3011999 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -71,13 +71,14 @@ import org.slf4j.LoggerFactory;
  * nested container "b" which held a nested component "c", then a.get("b:c") would return the
  * Component with id "c". The number of children in a MarkupContainer can be determined by calling
  * size(), and the whole hierarchy of children held by a MarkupContainer can be traversed by calling
- * visitChildren(), passing in an implementation of IVisitor.
+ * visitChildren(), passing in an implementation of IVisitor.</li>
  * 
  * <li><b>Markup Rendering </b>- A MarkupContainer also holds/references associated markup which is
  * used to render the container. As the markup stream for a container is rendered, component
  * references in the markup are resolved by using the container to look up Components in the
  * container's component map by id. Each component referenced by the markup stream is given an
- * opportunity to render itself using the markup stream.
+ * opportunity to render itself using the markup stream.</li>
+ * </ul>
  * <p>
  * Components may alter their referring tag, replace the tag's body or insert markup after the tag.
  * But components cannot remove tags from the markup stream. This is an important guarantee because
diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java b/wicket-core/src/main/java/org/apache/wicket/Session.java
index 9906da1..c4152c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -56,30 +56,31 @@ import org.slf4j.LoggerFactory;
  * <li><b>Access</b> - the Session can be retrieved either by {@link Component#getSession()}
  * or by directly calling the static method Session.get(). All classes which extend directly or indirectly
  * {@link org.apache.wicket.markup.html.WebMarkupContainer} can also use its convenience method
- * {@link org.apache.wicket.markup.html.WebMarkupContainer#getWebSession()}
+ * {@link org.apache.wicket.markup.html.WebMarkupContainer#getWebSession()}</li>
  * 
  * <li><b>Locale</b> - A session has a Locale property to support localization. The Locale for a
  * session can be set by calling {@link Session#setLocale(Locale)}. The Locale for a Session
- * determines how localized resources are found and loaded.
+ * determines how localized resources are found and loaded.</li>
  * 
  * <li><b>Style</b> - Besides having an appearance based on locale, resources can also have
  * different looks in the same locale (a.k.a. "skins"). The style for a session determines the look
  * which is used within the appropriate locale. The session style ("skin") can be set with the
- * setStyle() method.
+ * setStyle() method.</li>
  * 
  * <li><b>Resource Loading</b> - Based on the Session locale and style, searching for resources
  * occurs in the following order (where sourcePath is set via the ApplicationSettings object for the
  * current Application, and style and locale are Session properties):
- * <ul>
- * 1. [sourcePath]/name[style][locale].[extension] <br>
- * 2. [sourcePath]/name[locale].[extension] <br>
- * 3. [sourcePath]/name[style].[extension] <br>
- * 4. [sourcePath]/name.[extension] <br>
- * 5. [classPath]/name[style][locale].[extension] <br>
- * 6. [classPath]/name[locale].[extension] <br>
- * 7. [classPath]/name[style].[extension] <br>
- * 8. [classPath]/name.[extension] <br>
- * </ul>
+ * <ol>
+ * <li> [sourcePath]/name[style][locale].[extension]</li>
+ * <li> [sourcePath]/name[locale].[extension]</li>
+ * <li> [sourcePath]/name[style].[extension]</li>
+ * <li> [sourcePath]/name.[extension]</li>
+ * <li> [classPath]/name[style][locale].[extension]</li>
+ * <li> [classPath]/name[locale].[extension]</li>
+ * <li> [classPath]/name[style].[extension]</li>
+ * <li> [classPath]/name.[extension]</li>
+ * </ol>
+ * </li>
  * 
  * <li><b>Session Properties</b> - Arbitrary objects can be attached to a Session by installing a
  * session factory on your Application class which creates custom Session subclasses that have
@@ -87,20 +88,21 @@ import org.slf4j.LoggerFactory;
  * discourage non-typesafe access to Session properties, no setProperty() or getProperty() method is
  * provided. In a clustered environment, you should take care to call the dirty() method when you
  * change a property on your own. This way the session will be reset again in the http session so
- * that the http session knows the session is changed.
+ * that the http session knows the session is changed.</li>
  * 
  * <li><b>Class Resolver</b> - Sessions have a class resolver ( {@link IClassResolver})
- * implementation that is used to locate classes for components such as pages.
+ * implementation that is used to locate classes for components such as pages.</li>
  * 
  * <li><b>Page Factory</b> - A pluggable implementation of {@link IPageFactory} is used to
- * instantiate pages for the session.
+ * instantiate pages for the session.</li>
  * 
  * <li><b>Removal</b> - Pages can be removed from the Session forcibly by calling clear(),
- * although such an action should rarely be necessary.
+ * although such an action should rarely be necessary.</li>
  * 
  * <li><b>Flash Messages</b> - Flash messages are messages that are stored in session and are removed
  * after they are displayed to the user. Session acts as a store for these messages because they can
- * last across requests.
+ * last across requests.</li>
+ * </ul>
  * 
  * @author Jonathan Locke
  * @author Eelco Hillenius
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java
index 45b0b73..26d8f2a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/attributes/AjaxAttributeName.java
@@ -190,7 +190,7 @@ public enum AjaxAttributeName {
 	/**
 	 * the indicator id, if any found (i)
 	 * 
-	 * @see AbstractDefaultAjaxBehavior#findIndicatorId()
+	 * See AbstractDefaultAjaxBehavior#findIndicatorId()
 	 */
 	INDICATOR_ID("i"),
 
@@ -218,7 +218,7 @@ public enum AjaxAttributeName {
 	/**
 	 * markup id of behavior attached component (c)
 	 * 
-	 * @see AbstractDefaultAjaxBehavior#renderAjaxAttributes(org.apache.wicket.Component)
+	 * See AbstractDefaultAjaxBehavior#renderAjaxAttributes(Component)
 	 */
 	MARKUP_ID("c"),
 
@@ -230,17 +230,17 @@ public enum AjaxAttributeName {
 	METHOD("m"),
 
 	/**
-	 * @see AbstractDefaultAjaxBehavior#getCallbackUrl();
+	 * @see AbstractDefaultAjaxBehavior#getCallbackUrl()
 	 */
 	URL("u"),
 
 	/**
-	 * @see AjaxRequestAttributes#childSelector
+	 * @see AjaxRequestAttributes#setChildSelector(CharSequence)
 	 */
 	CHILD_SELECTOR("sel"),
 
 	/**
-	 * @see AjaxRequestAttributes#serializeRecursively
+	 * @see AjaxRequestAttributes#setSerializeRecursively(boolean)
 	 */
 	SERIALIZE_RECURSIVELY("sr");
 
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java
index 6e0f943..333250e 100755
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java
@@ -112,8 +112,7 @@ public class CryptoMapper implements IRequestMapperDelegate
 	/**
 	 * Encrypt with {@link org.apache.wicket.settings.SecuritySettings#getCryptFactory()}.
 	 * <p>
-	 * <strong>Important</strong>: Encryption is done with {@link org.apache.wicket.settings.SecuritySettings#DEFAULT_ENCRYPTION_KEY} if you haven't
-	 * configured an alternative {@link ICryptFactory}. For better security it is recommended to use
+	 * <strong>Important</strong>: For better security it is recommended to use
 	 * {@link CryptoMapper#CryptoMapper(IRequestMapper, Supplier)} with a specific {@link ICrypt} implementation
 	 * that generates a separate key for each user.
 	 * {@link org.apache.wicket.core.util.crypt.KeyInSessionSunJceCryptFactory} provides such an implementation that stores the
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
index 0370532..4928cc2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/ResourceMapper.java
@@ -47,14 +47,15 @@ import org.apache.wicket.util.string.Strings;
  * <li>maps named parameters to query string arguments or placeholder path segments</li>
  * </ul>
  *
- * <strong>sample structure of url</strong>
- *
+ * <strong>Sample structure of url</strong>
+ * <p/>
  * <pre>
  *    /myresources/${category}/images/[indexed-param-0]/[indexed-param-1]?[named-param-1=value]&amp;[named-param-2=value2]
  * </pre>
  *
- * <h4>sample usage</h4>
+ * <strong>Sample usage</strong>
  *
+ * <p/>
  * in your wicket application's init() method use a statement like this
  * <p/>
  *
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
index 495cea4..4f5d7b6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/crypt/AbstractJceCrypt.java
@@ -88,7 +88,6 @@ public abstract class AbstractJceCrypt implements ICrypt
 	 * @param plainBytes
 	 *            text to encrypt
 	 * @return the string encrypted
-	 * @throws GeneralSecurityException
 	 */
 	abstract protected byte[] encrypt(final byte[] plainBytes);
 }
\ No newline at end of file
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
index b2f50ef..4bd9708 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
@@ -225,8 +225,8 @@ public class ComponentTag extends MarkupElement
 
 	/**
 	 * @return read only iterator over added behaviors
-	 * @TODO change to return unmodifiable list which will never be null. See Component.getBehavior
 	 */
+	// TODO change to return unmodifiable list which will never be null. See Component.getBehavior
 	public final Iterator<? extends Behavior> getBehaviors()
 	{
 		if (behaviors == null)
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
index d73ba86..3caa46f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
@@ -75,8 +75,8 @@ public class MarkupCache implements IMarkupCache
 	/**
 	 * A convenient helper to get the markup cache registered with the application.
 	 * 
-	 * @see {@link Application#getMarkupSettings()}
-	 * @see {@link MarkupFactory#getMarkupCache()}
+	 * @see Application#getMarkupSettings()
+	 * @see MarkupFactory#getMarkupCache()
 	 * 
 	 * @return The markup cache registered with the {@link Application}
 	 */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/SubresourceHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/SubresourceHeaderResponse.java
index 02887d1..d9c56e8 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/SubresourceHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/SubresourceHeaderResponse.java
@@ -31,7 +31,7 @@ import org.apache.wicket.markup.html.DecoratingHeaderResponse;
  * on how to configure the item.
  * <p>
  * Note: please don't forget to wrap with {@link ResourceAggregator} when setting it up with
- * {@link Application#setHeaderResponseDecorator}, otherwise dependencies will not be rendered.
+ * {@link Application#getHeaderResponseDecorators()}, otherwise dependencies will not be rendered.
  * 
  * @see ISubresourceHeaderItem
  */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushHeaderItem.java
index acdb2f3..377d1f7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushHeaderItem.java
@@ -434,8 +434,7 @@ public class PushHeaderItem extends HeaderItem
 	 *            the request to get the container request from. The container request is checked if
 	 *            it is instance of {@link HttpServletRequest}
 	 * @return the container request get from the given request casted to {@link HttpServletRequest}
-	 * @throw {@link WicketRuntimeException} if the container request is not a
-	 *        {@link HttpServletRequest}
+	 * @throws WicketRuntimeException - if the container request is not a {@link HttpServletRequest}
 	 */
 	public HttpServletRequest checkHttpServletRequest(Request request)
 	{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java
index 54a6e4e..f2a75c5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/http2/PushItem.java
@@ -122,7 +122,7 @@ public class PushItem implements Serializable
 	 * 
 	 * @param object
 	 *            the object to extract the push URL information from
-	 * @see {@link org.apache.wicket.request.cycle.RequestCycle} (urlFor methods)
+	 * @see org.apache.wicket.request.cycle.RequestCycle (urlFor methods)
 	 * @return the push item
 	 */
 	public PushItem setObject(Serializable object)
@@ -157,7 +157,7 @@ public class PushItem implements Serializable
 	/**
 	 * Gets the URL composed within the push header item
 	 *
-	 * @see {@link PushHeaderItem#push(List)}
+	 * @see PushHeaderItem#push(List)
 	 * @return the URL to be pushed
 	 */
 	public String getUrl()
@@ -168,7 +168,7 @@ public class PushItem implements Serializable
 	/**
 	 * Sets the URL composed within the push header item
 	 *
-	 * @see {@link PushHeaderItem#push(List)}
+	 * @see PushHeaderItem#push(List)
 	 * @param url
 	 *            the URL used to push the resource
 	 * @return the push item
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/CrossOrigin.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/CrossOrigin.java
index 9151eee..940ca4d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/CrossOrigin.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/CrossOrigin.java
@@ -16,10 +16,12 @@
  */
 package org.apache.wicket.markup.html;
 
+import org.apache.wicket.markup.head.ISubresourceHeaderItem;
+
 /**
  * To be used for the crossOrigin attribute
  *
- * @see {@link #setCrossOrigin(CrossOrigin)}
+ * @see ISubresourceHeaderItem#setCrossOrigin(org.apache.wicket.markup.html.CrossOrigin)
  */
 public enum CrossOrigin {
 	/**
@@ -37,7 +39,7 @@ public enum CrossOrigin {
 
 	private final String realName;
 
-	private CrossOrigin(String realName)
+	CrossOrigin(String realName)
 	{
 		this.realName = realName;
 	}
@@ -51,4 +53,4 @@ public enum CrossOrigin {
 	{
 		return realName;
 	}
-}
\ No newline at end of file
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
index 957ba80..7b6a65b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/SecurePackageResourceGuard.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
  * <p/>
  * Examples:
  * <table border="0">
+ * <caption>Examples</caption>
  * <tr>
  * <td>+*.gif</td>
  * <td>All gif files in all directories</td>
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
index ed650a5..bcde8ce 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
@@ -282,7 +282,7 @@ public class ExternalImage extends WebComponent
 	/**
 	 * Gets the cross origin settings
 	 * 
-	 * @see {@link org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)}
+	 * @see org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)
 	 *
 	 * @return the cross origins settings
 	 */
@@ -294,7 +294,7 @@ public class ExternalImage extends WebComponent
 	/**
 	 * Sets the cross origin settings
 	 * 
-	 * @see {@link org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)}
+	 * @see org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)
 	 * @param crossOrigin
 	 *            the cross origins settings to set
 	 */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index e2ee919..c6e625b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -564,7 +564,7 @@ public class Image extends WebComponent implements IRequestListener
 	/**
 	 * Gets the cross origin settings
 	 *
-	 * @see {@link #setCrossOrigin(CrossOrigin)}
+	 * @see #setCrossOrigin(CrossOrigin)
 	 *
 	 * @return the cross origins settings
 	 */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index 305f1ed..a374db1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -57,7 +57,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
  *  &lt;td wicket:id=&quot;myLink&quot;&gt;my clickable column&lt;/td&gt;
  * </pre>
  * 
- * </p>
+ * <p>
  * The following snippet shows how to pass a parameter from the Page creating the Page to the Page
  * responded by the Link.
  * 
@@ -441,4 +441,4 @@ public abstract class Link<T> extends AbstractLink implements IRequestListener,
 	{
 		return true;
 	}
-}
\ No newline at end of file
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
index cb1b4cf..069af58 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
@@ -39,7 +39,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * To be used for the <em>crossorigin</em> attribute
 	 *
-	 * @see {@link #setCrossOrigin(Cors)}
+	 * @see #setCrossOrigin(Cors)
 	 */
 	public enum Cors {
 		/**
@@ -76,7 +76,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * To be used for the <em>preload</em> attribute
 	 *
-	 * @see {@link #setPreload(Preload)}
+	 * @see #setPreload(Preload)
 	 */
 	public enum Preload {
 		/**
@@ -94,7 +94,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 
 		private final String realName;
 
-		private Preload(String realname)
+		Preload(String realname)
 		{
 			realName = realname;
 		}
@@ -455,7 +455,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * The type of preload
 	 *
-	 * @see {@link #setPreload(Preload)}
+	 * @see #setPreload(Preload)
 	 *
 	 * @return the preload
 	 */
@@ -491,7 +491,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * Gets the position at which the media component starts the playback
 	 *
-	 * @see {@link #setStartTime(String)}
+	 * @see #setStartTime(String)
 	 *
 	 * @return the time at which position the media component starts the playback
 	 */
@@ -528,7 +528,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * Gets the position at which the media component stops the playback
 	 *
-	 * @see {@link #setEndTime(String)}
+	 * @see #setEndTime(String)
 	 *
 	 * @return the time at which position the media component stops the playback
 	 */
@@ -586,7 +586,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * Gets the cross origin settings
 	 *
-	 * @see {@link #setCrossOrigin(Cors)}
+	 * @see #setCrossOrigin(Cors)
 	 *
 	 * @return the cross origins settings
 	 */
@@ -620,7 +620,7 @@ public abstract class MediaComponent extends WebMarkupContainer
 	/**
 	 * Gets the type
 	 *
-	 * @see {@link #setType(String)}
+	 * @see #setType(String)
 	 *
 	 * @return the type of this media element
 	 */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
index bf960c5..b117042 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java
@@ -239,7 +239,7 @@ public class Source extends WebMarkupContainer
 	/**
 	 * Gets the type
 	 *
-	 * @see {@link #setType(String)}
+	 * @see #setType(String)
 	 *
 	 * @return the type of this media element
 	 */
@@ -299,7 +299,7 @@ public class Source extends WebMarkupContainer
 	/**
 	 * The media for which the content of this source should be shown
 	 *
-	 * @See {@link #setMedia(String)}
+	 * @see #setMedia(String)
 	 * @return The media for which the content of this source should be shown
 	 */
 	public String getMedia()
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
index da16738..6b848ac 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Track.java
@@ -264,7 +264,7 @@ public class Track extends WebMarkupContainer
 	/**
 	 * Gets the kind of the track belongs to the media component
 	 *
-	 * @see {@link #setKind(Kind)}
+	 * @see #setKind(Kind)
 	 *
 	 * @return the kind
 	 */
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
index 46dc2b0..a4383e0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
@@ -576,7 +576,7 @@ public final class XmlPullParser implements IXmlPullParser
 	 *            The input stream to read and parse
 	 * @throws IOException
 	 * 
-	 * @see {@link #parse(InputStream, String)}
+	 * @see #parse(InputStream, String)
 	 */
 	@Override
 	public void parse(final InputStream in) throws IOException
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
index 5b697b6..b8e26ac 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/CryptingPageStore.java
@@ -36,7 +36,7 @@ import org.apache.wicket.util.lang.Args;
  * achieve this with
  * <ul>
  * <li>a {@link SerializingPageStore} delegating to this store and</li>
- * <li>delegating to a store that does not deserialize its pages, e.g. a {@link DiskPageStore}.</li>.
+ * <li>delegating to a store that does not deserialize its pages, e.g. a {@link DiskPageStore}.</li>
  * </ul>
  */
 public class CryptingPageStore extends DelegatingPageStore
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
index 88d645f..025ffc2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ClientProperties.java
@@ -43,7 +43,7 @@ import org.apache.wicket.util.string.AppendingStringBuffer;
  * getRequestCycleSettings().setGatherExtendedBrowserInfo(true);
  * </pre>
  *
- * </p>
+ * <p>
  *
  * WARNING: Be sure you think about the dangers of depending on information you pull from the client
  * too much. They may be easily spoofed or inaccurate in other ways, and properties like window and
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
index d308b33..4d9dce4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/ReloadingWicketFilter.java
@@ -58,8 +58,8 @@ import org.apache.wicket.util.listener.IChangeListener;
  * </pre>
  * 
  * <p>
- * <b>NOTE. </b> If you wish to reload <tt>com.company.search.Form</tt>, you have to make sure to
- * include all classes that <b>reference</b> <tt>com.company.search.Form</tt>. In particular, if it
+ * <b>NOTE</b> If you wish to reload <em>com.company.search.Form</em>, you have to make sure to
+ * include all classes that <b>reference</b> <em>com.company.search.Form</em>. In particular, if it
  * is referenced in com.company.Application, you will also have to include the latter. And this is
  * viral, as for every class you include, you must check that all classes that reference it are also
  * included.
@@ -67,7 +67,7 @@ import org.apache.wicket.util.listener.IChangeListener;
  * 
  * <p>
  * It is also possible to add an extra URL to watch for changes using
- * <tt>ReloadingClassLoader.addLocation()</tt> . By default, all the URLs returned by the parent
+ * <em>ReloadingClassLoader.addLocation()</em> . By default, all the URLs returned by the parent
  * class loader (ie all {@link URL} returned by {@link ClassLoader#getResources(String)} with empty
  * {@link String}) are registered.
  * </p>
@@ -82,7 +82,7 @@ import org.apache.wicket.util.listener.IChangeListener;
  * <li>Don't forget that inner classes are named after YourClass$1, so take that into account when
  * setting up the patterns, eg include <tt>YourClass*</tt>, not just <tt>YourClass</tt></li>
  * <li>To enable back-button support for the reloading mechanism, be sure to put
- * <tt>Objects.setObjectStreamFactory(new WicketObjectStreamFactory());</tt> in your application's
+ * <em>Objects.setObjectStreamFactory(new WicketObjectStreamFactory());</em> in your application's
  * {@link WebApplication#init()} method. <b>Native JDK object serialization will break the reloading
  * mechanism when navigating in the browser's history.</b></li>
  * <li>It is advisable to <b>exclude</b> subclasses of {@link Session} from the the reloading
@@ -103,14 +103,14 @@ import org.apache.wicket.util.listener.IChangeListener;
  * 
  * <p>
  * <b>WARNING. </b> Be careful that when using Spring or other component managers, you will get
- * <tt>ClassCastException</tt> if a given class is loaded two times, one time by the normal
+ * <em>ClassCastException</em> if a given class is loaded two times, one time by the normal
  * classloader, and another time by the reloading classloader. You need to ensure that your Spring
  * beans are properly excluded from the reloading class loader and that only the Wicket components
  * are included. When getting a cryptic error with regard to class loading, class instantiation or
  * class comparison, first <b>disable the reloading class loader</b> to rule out the possibility of
  * a classloader conflict. Please keep in mind that two classes are equal if and only if they have
  * the same name <b>and are loaded in the same classloader</b>. Same goes for errors like
- * <tt>LinkageError: Class FooBar violates loader constraints</tt>, better be safe and disable the
+ * <em>LinkageError: Class FooBar violates loader constraints</em>, better be safe and disable the
  * reloading feature.
  * </p>
  * 
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
index 3b706a5..f42214c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
  * Note that the applicationClassName parameter you specify must be the fully qualified name of a
  * class that extends WebApplication. If your class cannot be found, does not extend WebApplication
  * or cannot be instantiated, a runtime exception of type WicketRuntimeException will be thrown.
- * </p>
+ * <p>
  * As an alternative, you can configure an application factory instead. This looks like:
  * 
  * <pre>
@@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * If you want to use servlet specific configuration, e.g. using init parameters from the
  * {@link jakarta.servlet.ServletConfig}object, you should override the init() method of
- * {@link javax.servlet.GenericServlet}. For example:
+ * {@link jakarta.servlet.GenericServlet}. For example:
  * 
  * <pre>
  * public void init() throws ServletException
@@ -97,7 +97,7 @@ import org.slf4j.LoggerFactory;
  *     ...
  * </pre>
  * 
- * </p>
+ * <p>
  * In order to support frameworks like Spring, the class is non-final and the variable
  * webApplication is protected instead of private. Thus subclasses may provide their own means of
  * providing the application object.
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java
index c919793..69c40b0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/SecuredRemoteAddressRequestWrapperFactory.java
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * <strong>Configuration parameters:</strong>
  * <table border="1">
+ * <caption>Configuration parameters</caption>
  * <tr>
  * <th>XForwardedFilter property</th>
  * <th>Description</th>
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
index 1a97746..5f5ac97 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
@@ -104,8 +104,6 @@ import org.slf4j.LoggerFactory;
  * }
  * </pre>
  * 
- * </p>
- * 
  * @author Eelco Hillenius
  */
 public class WicketSessionFilter implements Filter
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.java
index 768a348..edfd784 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperFactory.java
@@ -64,6 +64,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * <strong>Configuration parameters:</strong>
  * <table border="1">
+ * <caption>Configuration parameters</caption>
  * <tr>
  * <th>XForwardedFilter property</th>
  * <th>Description</th>
@@ -184,6 +185,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Request values:
  * <table border="1">
+ * <caption>Request values</caption>
  * <tr>
  * <th>property</th>
  * <th>Value Before XForwardedFilter</th>
@@ -262,6 +264,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Request values:
  * <table border="1">
+ * <caption>Request values</caption>
  * <tr>
  * <th>property</th>
  * <th>Value Before XForwardedFilter</th>
@@ -320,6 +323,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Request values:
  * <table border="1">
+ * <caption>Request values</caption>
  * <tr>
  * <th>property</th>
  * <th>Value Before XForwardedFilter</th>
@@ -380,6 +384,7 @@ import org.slf4j.LoggerFactory;
  * <p>
  * Request values:
  * <table border="1">
+ * <caption>Request values</caption>
  * <tr>
  * <th>property</th>
  * <th>Value Before XForwardedFilter</th>
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java
index 09c888e..0529370 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java
@@ -33,7 +33,7 @@ public interface IStaticCacheableResource extends IResource
 	/**
 	 * controls whether caching of the resource is enabled or disabled
 	 * 
-	 * @return @{code true} if caching is enabled
+	 * @return {@code true} if caching is enabled
 	 */
 	boolean isCachingEnabled();
 	
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
index c94ad0c..4ee03bd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
@@ -31,7 +31,7 @@ import org.apache.wicket.util.lang.Args;
  * this instance. It will expire the oldest entries if the maximum number 
  * of entries is exceeded.
  * 
- * @autor Peter Ertl
+ * @author Peter Ertl
  * 
  * @since 1.5
  */
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
index 96a22c0..6c37149 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
@@ -190,7 +190,6 @@ public class MessageDigestResourceVersion implements IResourceVersion
 	 * 
 	 * @return binary message digest
 	 * 
-	 * @throws ResourceStreamNotFoundException
 	 * @throws IOException
 	 */
 	protected byte[] computeDigest(InputStream inputStream) throws IOException
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java
index 1a9089a..21ddf93 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java
@@ -35,7 +35,7 @@ import org.apache.wicket.util.template.TextTemplate;
 /**
  * A class which adapts a {@link PackageTextTemplate} to a {@link ResourceReference}.
  * 
- * @see {@link "https://cwiki.apache.org/WICKET/dynamically-generate-a-css-stylesheet.html"}
+ * See <a href="https://cwiki.apache.org/confluence/display/WICKET/Dynamically+Generate+a+CSS+Stylesheet">Dynamically generate a CSS stylesheet</a>
  * 
  * @author James Carman
  */
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
index 8639402..def2d11 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
@@ -512,9 +512,9 @@ public class ResourceSettings implements IPropertiesFactoryContext
 	 * Get the the default cache duration for resources.
 	 * <p/>
 	 *
-	 * @return cache duration (Duration.NONE will be returned if caching is disabled)
+	 * @return cache duration ({@link Duration#ZERO} will be returned if caching is disabled)
 	 *
-	 * @see org.apache.wicket.util.time.Duration#NONE
+	 * @see Duration#ZERO
 	 */
 	public final Duration getDefaultCacheDuration()
 	{
@@ -522,15 +522,15 @@ public class ResourceSettings implements IPropertiesFactoryContext
 	}
 
 	/**
-	 * Set the the default cache duration for resources.
+	 * Set the default cache duration for resources.
 	 * <p/>
-	 * Based on RFC-2616 this should not exceed one year. If you set Duration.NONE caching will be
+	 * Based on RFC-2616 this should not exceed one year. If you set {@link Duration#ZERO} caching will be
 	 * disabled.
 	 *
 	 * @param duration
 	 *            default cache duration in seconds
 	 *
-	 * @see org.apache.wicket.util.time.Duration#NONE
+	 * @see Duration#ZERO
 	 * @see org.apache.wicket.request.http.WebResponse#MAX_CACHE_DURATION
 	 * @return {@code this} object for chaining
 	 */
@@ -770,4 +770,4 @@ public class ResourceSettings implements IPropertiesFactoryContext
 		this.encodeJSessionId = encodeJSessionId;
 		return this;
 	}
-}
\ No newline at end of file
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
index e44e77f..ad29970 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java
@@ -146,7 +146,7 @@ import org.slf4j.LoggerFactory;
  * separating each ID with a ':'.
  *
  * <h2>Cookie handling</h2>
- * <p>
+ *
  * There are some expectations about wicket tester cookie handling which should match as best as
  * it can be with a real client server request response cycle:
  * <ul>
@@ -159,7 +159,6 @@ import org.slf4j.LoggerFactory;
  *  <li> all valid cookies (maxAge!=0) from the last response should be added to
  *   the next request cookies (tester.getRequest().getCookies())</li>
  * </ul>
- * </p>
  *
  * @author Ingram Chen
  * @author Juergen Donnerstag
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
index 339c14e..c9c43ce 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteSettings.java
@@ -24,6 +24,7 @@ import org.apache.wicket.util.io.IClusterable;
  * <p>
  * Default settings:
  * <table>
+ * <caption>Default settings</caption>
  * <tr>
  * <th>setting</th>
  * <th>default value</th>
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
index c450a0a..3b99248 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
@@ -256,7 +256,7 @@ public class ModalDialog extends Panel
 	/**
 	 * Convenience method to trap focus inside the overlay.
 	 * 
-	 * @see {@link TrapFocusBehavior}
+	 * @see TrapFocusBehavior
 	 * 
 	 * @return this
 	 */
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
index 5f1d7a4..7e82312 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOptions.java
@@ -79,9 +79,9 @@ public class SelectOptions<T> extends RepeatingView
 	/**
 	 * Controls whether {@link SelectOption}s are recreated on each render.
 	 * <p>
-	 * Note: When recreating on each render, {@link #newOption(String, IModel)} should return
+	 * Note: When recreating on each render, {@link #newOption(String, String, IModel)} should return
 	 * {@link SelectOption}s with stable values, i.e. {@link SelectOption#getValue()} should return
-	 * a value based on its model object instead of the default auto index. Otherwise the current
+	 * a value based on its model object instead of the default auto index, otherwise the current
 	 * selection will be lost on form errors.
 	 * 
 	 * @param refresh
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java b/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
index 58f12a0..3e87c15 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java
@@ -199,7 +199,6 @@ public abstract class WebResponse extends Response
 	 * 
 	 * @param sc
 	 * @param msg
-	 * @throws IOException
 	 */
 	public abstract void sendError(int sc, String msg);
 
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/AnnotationConfigSpringWebApplicationFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/AnnotationConfigSpringWebApplicationFactory.java
index 4d17d39..d293664 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/AnnotationConfigSpringWebApplicationFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/AnnotationConfigSpringWebApplicationFactory.java
@@ -28,7 +28,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
  * <pre>
  * &lt;filter&gt;
  *   &lt;filter-name&gt;MyApplication&lt;/filter-name&gt;
- *   &lt;filter-class>org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
+ *   &lt;filter-class&gt;org.apache.wicket.protocol.http.WicketFilter&lt;/filter-class&gt;
  *   &lt;init-param&gt;
  *     &lt;param-name&gt;applicationFactoryClassName&lt;/param-name&gt;
  *     &lt;param-value&gt;org.apache.wicket.spring.AnnotationConfigSpringWebApplicationFactory&lt;/param-value&gt;
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
index 0350112..41bc1f3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/AddDelta.java
@@ -81,9 +81,6 @@ public class AddDelta extends Delta
 		init(new Chunk(origpos, 0), rev);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
-	 */
 	@Override
 	public void verify(final List<Object> target) throws PatchFailedException
 	{
@@ -93,18 +90,12 @@ public class AddDelta extends Delta
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
-	 */
 	@Override
 	public void applyTo(final List<Object> target)
 	{
 		revised.applyAdd(original.first(), target);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toString(StringBuilder)
-	 */
 	@Override
 	public void toString(final StringBuilder s)
 	{
@@ -115,9 +106,6 @@ public class AddDelta extends Delta
 		revised.toString(s, "> ", Diff.NL);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toRCSString(StringBuilder, String)
-	 */
 	@Override
 	public void toRCSString(final StringBuilder s, final String EOL)
 	{
@@ -129,9 +117,6 @@ public class AddDelta extends Delta
 		revised.toString(s, "", EOL);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
-	 */
 	@Override
 	public void accept(final RevisionVisitor visitor)
 	{
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
index 19cbcd5..390cd61 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/ChangeDelta.java
@@ -87,9 +87,6 @@ public class ChangeDelta extends Delta
 		init(orig, rev);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
-	 */
 	@Override
 	public void verify(final List<Object> target) throws PatchFailedException
 	{
@@ -103,9 +100,6 @@ public class ChangeDelta extends Delta
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
-	 */
 	@Override
 	public void applyTo(final List<Object> target)
 	{
@@ -113,9 +107,6 @@ public class ChangeDelta extends Delta
 		revised.applyAdd(original.first(), target);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toString(StringBuilder)
-	 */
 	@Override
 	public void toString(final StringBuilder s)
 	{
@@ -129,9 +120,6 @@ public class ChangeDelta extends Delta
 		revised.toString(s, "> ", "\n");
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuilder, java.lang.String)
-	 */
 	@Override
 	public void toRCSString(final StringBuilder s, final String EOL)
 	{
@@ -148,9 +136,6 @@ public class ChangeDelta extends Delta
 		revised.toString(s, "", EOL);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
-	 */
 	@Override
 	public void accept(final RevisionVisitor visitor)
 	{
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
index 30b8e37..da94583 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/DeleteDelta.java
@@ -80,9 +80,6 @@ public class DeleteDelta extends Delta
 		init(orig, null);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#verify(java.util.List)
-	 */
 	@Override
 	public void verify(final List<Object> target) throws PatchFailedException
 	{
@@ -92,18 +89,12 @@ public class DeleteDelta extends Delta
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#applyTo(java.util.List)
-	 */
 	@Override
 	public void applyTo(final List<Object> target)
 	{
 		original.applyDelete(target);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toString(java.lang.StringBuilder)
-	 */
 	@Override
 	public void toString(final StringBuilder s)
 	{
@@ -114,9 +105,6 @@ public class DeleteDelta extends Delta
 		original.toString(s, "< ", Diff.NL);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#toRCSString(java.lang.StringBuilder, java.lang.String)
-	 */
 	@Override
 	public void toRCSString(final StringBuilder s, final String EOL)
 	{
@@ -127,9 +115,6 @@ public class DeleteDelta extends Delta
 		s.append(EOL);
 	}
 
-	/**
-	 * @see org.apache.wicket.util.diff.Delta#accept(org.apache.wicket.util.diff.RevisionVisitor)
-	 */
 	@Override
 	public void accept(final RevisionVisitor visitor)
 	{
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
index a48ff3d..c06a583 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
@@ -191,8 +191,6 @@ public abstract class Delta extends ToString
 	 * 
 	 * @param target
 	 *            the text to patch.
-	 * @throws PatchFailedException
-	 *             if the patch cannot be applied.
 	 */
 	public abstract void applyTo(List<Object> target);
 
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
index a07928c..5570621 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/MyersDiff.java
@@ -196,8 +196,6 @@ public class MyersDiff implements DiffAlgorithm
 	 * @param rev
 	 *            The revised sequence.
 	 * @return A {@link Revision} script corresponding to the path.
-	 * @throws DifferentiationFailedException
-	 *             if a {@link Revision} could not be built from the given path.
 	 */
 	public static Revision buildRevision(PathNode path, final Object[] orig, final Object[] rev)
 	{