tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1164489 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/tomcat.nsi webapps/docs/changelog.xml
Date Fri, 02 Sep 2011 11:45:40 GMT
Author: markt
Date: Fri Sep  2 11:45:40 2011
New Revision: 1164489

URL: http://svn.apache.org/viewvc?rev=1164489&view=rev
Log:
Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)
(kkolinko)

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/res/tomcat.nsi
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1164489&r1=1164488&r2=1164489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep  2 11:45:40 2011
@@ -90,12 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt, kkolinko
   -1:
 
-* Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)
-  Already fixed in 5.5, 7.0, trunk.
-  http://svn.apache.org/viewvc?rev=1161310&view=rev
-  +1: kkolinko, markt, kfujino
-  -1:
-
 * Detect incomplete AJP messages and reject the associated request if one is
   found
   http://people.apache.org/~markt/patches/2011-08-25-ajp-incomplete-msg-tc6.patch

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1164489&r1=1164488&r2=1164489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri Sep  2 11:45:40 2011
@@ -1091,7 +1091,7 @@ Section Uninstall
     MessageBox MB_ICONSTOP|MB_OK \
         "No service name specified to uninstall. This will be provided automatically if you
uninstall via \
          Add/Remove Programs or the shortcut on the Start menu. Alternatively, call the installer
from \
-         the command line with -serviceName=$\"<name of service>$\"."
+         the command line with -ServiceName=$\"<name of service>$\"."
     Quit
   ${EndIf}
   
@@ -1166,7 +1166,7 @@ SectionEnd
 ; =================
 Function un.onInit
   ${GetParameters} $R0
-  ${GetOPtions} $R0 "-ServiceName=" $R1
+  ${GetOptions} $R0 "-ServiceName=" $R1
   StrCpy $TomcatServiceName $R1
   StrCpy $TomcatServiceFileName $R1.exe
   StrCpy $TomcatServiceManagerFileName $R1w.exe

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1164489&r1=1164488&r2=1164489&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep  2 11:45:40 2011
@@ -102,6 +102,9 @@
       <update>
         Update the Eclipse compiler (used for JSPs) to 3.7. (markt)
       </update>
+      <fix>
+        Correct two typos in the Windows installer. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message