diff --git a/.gitignore b/.gitignore index 026d13be..5dcac45f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ nbactions.xml .classpath .project .settings/ +downloads/ diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index d2f21dab..ad0d3937 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -264,24 +264,23 @@ public interface HttpServletRequest extends ServletRequest { * obtain the {@link RequestDispatcher}. If the currently active * {@code Servlet} invocation was obtained by a call to {@link * ServletRequest#getRequestDispatcher} followed by a call to {@link - * RequestDispatcher#include}, the returned {@code HttpServletMapping} - * is the one corresponding to the path that caused the first {@code - * Servlet} in the invocation sequence to be invoked. If the - * currently active {@code Servlet} invocation was obtained by a - * call to {@link javax.servlet.AsyncContext#dispatch}, the returned - * {@code HttpServletMapping} is the one corresponding to the path that caused - * the first {@code Servlet} in the invocation sequence to be + * RequestDispatcher#include}, the returned {@code + * HttpServletMapping} is the one corresponding to the path that + * caused the first {@code Servlet} in the invocation sequence to be + * invoked. If the currently active {@code Servlet} invocation was + * obtained by a call to {@link + * javax.servlet.AsyncContext#dispatch}, the returned {@code + * HttpServletMapping} is the one corresponding to the path that + * caused the first {@code Servlet} in the invocation sequence to be * invoked. See {@link * javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link * javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link * javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request - * attributes related to {@code HttpServletMapping}.
- * - *If the {@code Servlet} corresponding to this request was - * obtained using {@link - * javax.servlet.ServletContext#getNamedDispatcher}, the returned - * {@code HttpServletMapping} instance must have properties that - * reflect the mapping last applied to this request.
+ * attributes related to {@code HttpServletMapping}. If the + * currently active {@code Servlet} invocation was obtained by a + * call to {@link javax.servlet.ServletContext#getNamedDispatcher}, + * the returned {@code HttpServletMapping} is the one corresponding + * to the path for the mapping last applied to this request. * *The returned object is immutable. Servlet 4.0 compliant * implementations must override this method.
diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css index 532eb485..4062a9fc 100644 --- a/src/main/javadoc/javax.servlet-api.css +++ b/src/main/javadoc/javax.servlet-api.css @@ -45,9 +45,10 @@ Overall document style @import url('resources/fonts/dejavu.css'); +/* background: url(doc-files/expert-draft-bg.png); */ + body { background-color:#ffffff; - background: url(doc-files/expert-draft-bg.png); color:#353833; font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; font-size:14px;