From 8b6306abcdfb93281391abac70fdad42e346ae00 Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Wed, 16 May 2018 14:11:47 +0000
Subject: [PATCH] Follow-up to 1831695 kkolinko review comments

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1831721 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/jasper/JspC.java                         | 5 +++++
 java/org/apache/jasper/resources/LocalStrings.properties | 2 +-
 webapps/docs/jasper-howto.xml                            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index afa4fde8ccdf..e553a0ec465d 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -328,6 +328,11 @@ public void setArgs(String[] arg) throws JasperException {
                 if (webxmlFile != null) {
                     webxmlLevel = INC_WEBXML;
                 }
+            } else if (tok.equals(SWITCH_WEBAPP_FRG)) {
+                webxmlFile = nextArg();
+                if (webxmlFile != null) {
+                    webxmlLevel = FRG_WEBXML;
+                }
             } else if (tok.equals(SWITCH_WEBAPP_XML)) {
                 webxmlFile = nextArg();
                 if (webxmlFile != null) {
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index fbd2c3f7b2e3..602c3eba3e9d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -257,7 +257,7 @@ where options include:\n\
 \    -uriroot <dir>     Same as -webapp\n\
 \    -compile           Compiles generated servlets\n\
 \    -webinc <file>     Creates a partial servlet mappings in the file\n\
-\    -webfrg <file>     Creates a complete web-fragment.xml the file\n\
+\    -webfrg <file>     Creates a complete web-fragment.xml file\n\
 \    -webxml <file>     Creates a complete web.xml in the file\n\
 \    -webxmlencoding <enc> Set the encoding charset used to read and write the web.xml\n\
 \                       file (default is platform default encoding)\n\
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 1225fe68d0da..3b92f241a4fe 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -278,7 +278,7 @@ download) to precompile a webapp:
     <jasper
              validateXml="false"
              uriroot="${webapp.path}"
-             webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
+             webXmlInclude="${webapp.path}/WEB-INF/generated_web.xml"
              outputDir="${webapp.path}/WEB-INF/src" />
 
   </target>