Tweaked structure of API docs
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/39accefb Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/39accefb Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/39accefb Branch: refs/heads/master Commit: 39accefbdeded3f9b36a26415e34493d13d053f4 Parents: ce19988 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Sun May 25 18:25:17 2014 +0200 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Sun May 25 18:25:17 2014 +0200 ---------------------------------------------------------------------- .../aether/util/repository/DefaultProxySelector.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/39accefb/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java ---------------------------------------------------------------------- diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java index 0fed710..0a3cb71 100644 --- a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java +++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java @@ -35,13 +35,12 @@ public final class DefaultProxySelector /** * Adds the specified proxy definition to the selector. Proxy definitions are ordered, the first matching proxy for * a given repository will be used. - * <p> - * The syntax of the non-proxy host list matches that of the property "http.nonProxyHosts" from the JRE, i.e. the - * asterisk character ('*') serves as a wildcard for pattern matching. Multiple non-proxy hosts are separated by the - * pipe character ('|') but note that surrounding whitespace is not trimmed from the entries. * * @param proxy The proxy definition to add, must not be {@code null}. - * @param nonProxyHosts The list of (case-insensitive) host names to exclude from proxying, may be {@code null}. + * @param nonProxyHosts The list of (case-insensitive) host names to exclude from proxying, may be {@code null}. The + * syntax of this list matches that of the property "http.nonProxyHosts" from the JRE, i.e. the asterisk + * character ('*') serves as a wildcard for pattern matching. Multiple non-proxy hosts are separated by + * the pipe character ('|') but note that surrounding whitespace is not trimmed from the entries. * @return This proxy selector for chaining, never {@code null}. */ public DefaultProxySelector add( Proxy proxy, String nonProxyHosts ) @@ -52,12 +51,11 @@ public final class DefaultProxySelector /** * Adds the specified proxy definition to the selector. Proxy definitions are ordered, the first matching proxy for * a given repository will be used. - * <p> - * The asterisk character ('*') may be used as wildcard in a host name. * * @param proxy The proxy definition to add, must not be {@code null}. * @param nonProxyHosts The list of (case-insensitive) host names to exclude from proxying, may be {@code null} but - * must not contain {@code null} elements. + * must not contain {@code null} elements. The asterisk character ('*') may be used as wildcard in a host + * name. * @return This proxy selector for chaining, never {@code null}. * @since 1.1.0 */
