documentation for proxy connector rules screen

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

diff --git a/archiva-docs/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 7a4438a1cab3f638f16135da47e3b2ffb28d315d..65a20b76d523d711ae81edd64bdef358fba42e47 100644 (file)
--- a/archiva-docs/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
@@ -34,6 +34,8 @@ Runtime Configuration of Apache Archiva
 
     * {{{./network-proxies.html} Configuring network proxies}}
 
+    * {{{./proxy-connector-rules.html} Configuring proxy connectors rules}}
+
     * {{{./network-configuration.html} Network Configuration}}
 
     * {{{./legacy.html} Configuring legacy (maven 1) support}}

diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index a874925ff5b8d26c53938232a95594af1c5c8650..96a12e62f30aca3d9c2daa2aa4f84081be715af9 100644 (file)
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -101,6 +101,7 @@
       <item name="Runtime Configuration"      href="/adminguide/configuration.html" collapse="true">
         <item name="Repositories"             href="/adminguide/repositories.html" />
         <item name="Proxy Connectors"         href="/adminguide/proxy-connectors.html" />
+        <item name="Proxy Connectors Rules"   href="/adminguide/proxy-connector-rules.html"/>
         <item name="Network Proxies"          href="/adminguide/network-proxies.html" />
         <item name="Network Configuration"    href="/adminguide/network-configuration.html" />
         <item name="Legacy (Maven 1) Support" href="/adminguide/legacy.html" />

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index 6278fa5f162774ef69ab4baf778308a3a3f8228b..86dbd36881c192e3fc60a0a5a2e0310b18691ac1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -1331,7 +1331,7 @@
         <blockquote>
           ${proxyConnectorRule.pattern()}
           <br/>
-          ${proxyConnectorRule.proxyConnectorRuleType()}
+          ${proxyConnectorRule.ruleType.label}
         </blockquote>
       </div>
     {{else}}