Updates from review

jetty · Jul 7, 2024 · 3f81758 · 3f81758
1 parent 1d75a49
commit 3f81758
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/documentation/jetty-asciidoctor-extensions/pom.xml b/documentation/jetty-asciidoctor-extensions/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.eclipse.jetty.documentation</groupId>
     <artifactId>documentation</artifactId>
-    <version>12.0.10-SNAPSHOT</version>
+    <version>12.0.12-SNAPSHOT</version>
   </parent>
   <artifactId>jetty-asciidoctor-extensions</artifactId>
   <packaging>jar</packaging>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -14,6 +14,7 @@
 
   <modules>
     <module>jetty</module>
+    <module>jetty-asciidoctor-extensions</module>
     <module>jetty-documentation</module>
   </modules>
 </project>
diff --git a/...ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java b/...ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ResourceServlet.java
@@ -72,8 +72,9 @@
  *   </dd>
  *   <dt>baseResource</dt>
  *   <dd>
- *     Defaults to the context's baseResource.
- *     The root directory to look for static resources.
+ *     The root directory to look for static resources. Defaults to the context's baseResource. Relative URI
+ *     are {@link Resource#resolve(String) resolved} against the context's {@link ServletContextHandler#getBaseResource()}
+ *     base resource, all other values are resolved using {@link ServletContextHandler#newResource(String)}.
  *   </dd>
  *   <dt>cacheControl</dt>
  *   <dd>
@@ -126,7 +127,8 @@
  *   </dd>
  *   <dt>pathInfoOnly</dt>
  *   <dd>
- *     Use {@code true} to use only the pathInfo portion of a PATH (aka prefix) match.
+ *     Use {@code true} to use only the pathInfo portion of a PATH (aka prefix) match
+ *     as obtained from {@link HttpServletRequest#getPathInfo()}.
  *     Defaults to {@code true}.
  *   </dd>
  *   <dt>precompressed</dt>