Skip to content
This repository was archived by the owner on Jun 6, 2018. It is now read-only.

Commit 8ecb128

Browse files
author
Ed Burns
committed
Remove watermark, and add preposition where needed
modified: src/main/java/javax/servlet/http/HttpServletRequest.java - Include "to" after "corresponding" as needed. modified: src/main/javadoc/javax.servlet-api.css - Remove watermark.
1 parent 8c36bee commit 8ecb128

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ nbactions.xml
99
.classpath
1010
.project
1111
.settings/
12+
downloads/

src/main/java/javax/servlet/http/HttpServletRequest.java

+13-14
Original file line numberDiff line numberDiff line change
@@ -264,24 +264,23 @@ public interface HttpServletRequest extends ServletRequest {
264264
* obtain the {@link RequestDispatcher}. If the currently active
265265
* {@code Servlet} invocation was obtained by a call to {@link
266266
* ServletRequest#getRequestDispatcher} followed by a call to {@link
267-
* RequestDispatcher#include}, the returned {@code HttpServletMapping}
268-
* is the one corresponding to the path that caused the first {@code
269-
* Servlet} in the invocation sequence to be invoked. If the
270-
* currently active {@code Servlet} invocation was obtained by a
271-
* call to {@link javax.servlet.AsyncContext#dispatch}, the returned
272-
* {@code HttpServletMapping} is the one corresponding to the path that caused
273-
* the first {@code Servlet} in the invocation sequence to be
267+
* RequestDispatcher#include}, the returned {@code
268+
* HttpServletMapping} is the one corresponding to the path that
269+
* caused the first {@code Servlet} in the invocation sequence to be
270+
* invoked. If the currently active {@code Servlet} invocation was
271+
* obtained by a call to {@link
272+
* javax.servlet.AsyncContext#dispatch}, the returned {@code
273+
* HttpServletMapping} is the one corresponding to the path that
274+
* caused the first {@code Servlet} in the invocation sequence to be
274275
* invoked. See {@link
275276
* javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link
276277
* javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link
277278
* javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request
278-
* attributes related to {@code HttpServletMapping}.</p>
279-
*
280-
* <p>If the {@code Servlet} corresponding to this request was
281-
* obtained using {@link
282-
* javax.servlet.ServletContext#getNamedDispatcher}, the returned
283-
* {@code HttpServletMapping} instance must have properties that
284-
* reflect the mapping last applied to this request.</p>
279+
* attributes related to {@code HttpServletMapping}. If the
280+
* currently active {@code Servlet} invocation was obtained by a
281+
* call to {@link javax.servlet.ServletContext#getNamedDispatcher},
282+
* the returned {@code HttpServletMapping} is the one corresponding
283+
* to the path for the mapping last applied to this request.</p>
285284
*
286285
* <p>The returned object is immutable. Servlet 4.0 compliant
287286
* implementations must override this method.</p>

src/main/javadoc/javax.servlet-api.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ Overall document style
4545

4646
@import url('resources/fonts/dejavu.css');
4747

48+
/* background: url(doc-files/expert-draft-bg.png); */
49+
4850
body {
4951
background-color:#ffffff;
50-
background: url(doc-files/expert-draft-bg.png);
5152
color:#353833;
5253
font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
5354
font-size:14px;

0 commit comments

Comments
 (0)