Fix bug 43800. Make clearer relationship between APR and native in docs, error messag...

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

diff --git a/java/org/apache/catalina/core/LocalStrings.properties b/java/org/apache/catalina/core/LocalStrings.properties
index 99a0695..532a796 100644 (file)
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -31,12 +31,12 @@ applicationRequest.badParent=Cannot locate parent Request implementation
 applicationRequest.badRequest=Request is not a javax.servlet.ServletRequestWrapper
 applicationResponse.badParent=Cannot locate parent Response implementation
 applicationResponse.badResponse=Response is not a javax.servlet.ServletResponseWrapper
-aprListener.aprInit=The Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0}
-aprListener.tcnInvalid=An incompatible version {0} of the Apache Tomcat Native library is installed, while Tomcat requires version {1} 
-aprListener.tcnVersion=An older version {0} of the Apache Tomcat Native library is installed, while Tomcat recommends version greater then {1}
-aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime
+aprListener.aprInit=The APR based Apache Tomcat Native library which allows optimal performance in production environments was not found on the java.library.path: {0}
+aprListener.tcnInvalid=An incompatible version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat requires version {1} 
+aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat Native library is installed, while Tomcat recommends version greater then {1}
+aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native library
 aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnValid=Loaded Apache Tomcat Native library {0}.
+aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}.
 aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters [{2}], random [{3}].
 containerBase.addDefaultMapper=Exception configuring default mapper of class {0}
 containerBase.alreadyStarted=Container {0} has already been started

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index c3fbfd0..42c1b9e 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -95,7 +95,7 @@ ${StrRep}
     LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
     LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container core."
     LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
-    LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs Tomcat native .dll for better performance and scalability in production environments."
+    LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs APR based Tomcat native .dll for better performance and scalability in production environments."
 ;    LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code."
     LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."
     LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This include documentation on the servlet container and its configuration options, on the Jasper JSP page compiler, as well as on the native webserver connectors."

diff --git a/webapps/docs/apr.xml b/webapps/docs/apr.xml
index 675149c..bced0cf 100644 (file)
--- a/webapps/docs/apr.xml
+++ b/webapps/docs/apr.xml
@@ -23,7 +23,7 @@
     &project;
 
   <properties>
-    <title>Apache Portable Runtime and Tomcat</title>
+    <title>Apache Portable Runtime (APR) based Native library for Tomcat</title>
     <author>Remy Maucherat</author>
   </properties>
 

diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 0f17a38..377d259 100644 (file)
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -59,7 +59,7 @@
         <item name="21) Monitoring and Management"         
               href="monitoring.html"/>
         <item name="22) Logging"            href="logging.html"/>
-        <item name="23) APR"                href="apr.html"/>
+        <item name="23) APR/Native"         href="apr.html"/>
         <item name="24) Virtual Hosting"    href="virtual-hosting-howto.html"/>
         <item name="25) Advanced IO"        href="aio.html"/>
         <item name="26) Additional Components" href="extras.html"/>