Fix broken documentation links for non-English locales in the HTML Manager application.

Patch provided by Eiji Takahashi.

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

diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties b/java/org/apache/catalina/manager/LocalStrings_de.properties
index f9082e8..cbce55b 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -27,9 +27,9 @@ htmlManagerServlet.appsTitle=Anwendungen
 htmlManagerServlet.expire.explain=mit Inaktivit\u00e4t ≥
 htmlManagerServlet.expire.unit=Minuten
 htmlManagerServlet.helpHtmlManager=Hilfeseite HTML Manager (englisch)
-htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
 htmlManagerServlet.helpManager=Hilfeseite Manager (englisch)
-htmlManagerServlet.helpManagerFile=manager-howto.html
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 htmlManagerServlet.deployButton=Installieren
 htmlManagerServlet.deployConfig=XML Konfigurationsdatei URL:
 htmlManagerServlet.deployPath=Kontext Pfad (optional):

diff --git a/java/org/apache/catalina/manager/LocalStrings_es.properties b/java/org/apache/catalina/manager/LocalStrings_es.properties
index cb783f8..6534daf 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_es.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_es.properties
@@ -26,9 +26,9 @@ htmlManagerServlet.appsTitle = Aplicaciones
 htmlManagerServlet.expire.explain = sin trabajar ≥
 htmlManagerServlet.expire.unit = minutos
 htmlManagerServlet.helpHtmlManager = Ayuda HTML de Gestor
-htmlManagerServlet.helpHtmlManagerFile = html-manager-howto.html
+htmlManagerServlet.helpHtmlManagerFile = ../docs/html-manager-howto.html
 htmlManagerServlet.helpManager = Ayuda de Gestor
-htmlManagerServlet.helpManagerFile = manager-howto.html
+htmlManagerServlet.helpManagerFile = ../docs/manager-howto.html
 htmlManagerServlet.deployButton = Desplegar
 htmlManagerServlet.deployConfig = URL de archivo de Configuraci\u00F3n XML\:
 htmlManagerServlet.deployPath = Trayectoria de Contexto (opcional)\:

diff --git a/java/org/apache/catalina/manager/LocalStrings_ja.properties b/java/org/apache/catalina/manager/LocalStrings_ja.properties
index 11dca74..5a56368 100644 (file)
--- a/java/org/apache/catalina/manager/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_ja.properties
@@ -24,9 +24,9 @@ htmlManagerServlet.appsStop=\u505c\u6b62
 htmlManagerServlet.appsTasks=\u30b3\u30de\u30f3\u30c9
 htmlManagerServlet.appsTitle=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
 htmlManagerServlet.helpHtmlManager=HTML\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
-htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html
+htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
 htmlManagerServlet.helpManager=\u30de\u30cd\u30fc\u30b8\u30e3\u30d8\u30eb\u30d7
-htmlManagerServlet.helpManagerFile=manager-howto.html
+htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 htmlManagerServlet.deployButton=\u914d\u5099
 htmlManagerServlet.deployConfig=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306eURL:
 htmlManagerServlet.deployPath=\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 (\u7701\u7565\u53ef):

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 576629b..5495471 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -64,6 +64,11 @@
         Add documentation for AJP-NIO connector. (markt/rjung)
       </add>
       <fix>
+        <bug>51225</bug>: Fix broken documentation links for non-English locales
+        in the HTML Manager application. Patch provided by Eiji Takahashi.
+        (markt)
+      </fix>
+      <fix>
         <bug>51229</bug>: Fix bugs in the Servlet 3.0 asynchronous examples.
         Patch provided by Eiji Takahashi. (markt)
       </fix>