Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49130

Better describe the core package
Patch provided by sebb.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964211 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 47246d9..3c141db 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -93,7 +93,7 @@ ${StrRep}
   ;Component-selection page
     ;Descriptions
     LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
-    LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core."
+    LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core and create the Windows service."
     LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the computer is started."
     LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat native .dll for better performance and scalability in production environments."
     LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1ea0b33..7b6723b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -239,6 +239,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>49130</bug>: Better describe the core package in the Windows
+        installer, making it clear that the service will be installed. Patch
+        provided by sebb. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.0 (markt)" rtext="beta, 2010-06-29">
   <subsection name="Catalina">