Return-Path: 
 <dev-return-119990-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EF59574EA
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Thu, 22 Sep 2011 20:09:06 +0000 (UTC)
Received: (qmail 45695 invoked by uid 500); 22 Sep 2011 20:09:06 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 45610 invoked by uid 500); 22 Sep 2011 20:09:06 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 45598 invoked by uid 99); 22 Sep 2011 20:09:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Sep 2011 20:09:06 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Sep 2011 20:09:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5515523888FE
	for <dev@tomcat.apache.org>; Thu, 22 Sep 2011 20:08:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1174362 - in /tomcat/site/trunk: docs/security-7.html
 xdocs/security-7.xml
Date: Thu, 22 Sep 2011 20:08:42 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110922200842.5515523888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kkolinko
Date: Thu Sep 22 20:08:41 2011
New Revision: 1174362

URL: http://svn.apache.org/viewvc?rev=1174362&view=rev
Log:
Rephrase, like I already did for 5.5 and 6.0.

Modified:
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/xdocs/security-7.xml

Modified: tomcat/site/trunk/docs/security-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1174362&r1=1174361&r2=1174362&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Thu Sep 22 20:08:41 2011
@@ -359,12 +359,20 @@
       <li>Upgrade to Tomcat 7.0.21</li>
       <li>Apply the appropriate <a href="http://svn.apache.org/viewvc?view=rev&amp;rev=1162958">patch</a>
 </li>
-      <li>Configure both Tomcat and the reverse proxy to use a shared secret
-       ("requiredSecret" attribute in
-       <a href="/tomcat-7.0-doc/config/ajp.html">&lt;Connector&gt;</a>;
-       "worker.<i>workername</i>.secret" directive for
-       <a href="/connectors-doc/reference/workers.html">mod_jk</a>;
-       mod_proxy_ajp currently does not support shared secrets)</li>
+      <li>Configure both Tomcat and the reverse proxy to use a shared secret.<br/>
+       (It is "<code>requiredSecret</code>" attribute in AJP &lt;Connector&gt;,
+       "<code>worker.<i>workername</i>.secret</code>" directive for mod_jk.
+       The mod_proxy_ajp module currently does not support shared secrets).</li>
+    </ul>
+
+    <p>References:</p>
+    <ul>
+      <li>
+<a href="/tomcat-7.0-doc/config/ajp.html">AJP Connector documentation (Tomcat 7.0)</a>
+</li>
+      <li>
+<a href="/connectors-doc/reference/workers.html">workers.properties configuration (mod_jk)</a>
+</li>
     </ul>
   </blockquote>
 </p>

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1174362&r1=1174361&r2=1174362&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Thu Sep 22 20:08:41 2011
@@ -59,12 +59,16 @@
     <ul>
       <li>Upgrade to Tomcat 7.0.21</li>
       <li>Apply the appropriate <revlink rev="1162958">patch</revlink></li>
-      <li>Configure both Tomcat and the reverse proxy to use a shared secret
-       ("requiredSecret" attribute in
-       <a href="/tomcat-7.0-doc/config/ajp.html">&lt;Connector&gt;</a>;
-       "worker.<i>workername</i>.secret" directive for
-       <a href="/connectors-doc/reference/workers.html">mod_jk</a>;
-       mod_proxy_ajp currently does not support shared secrets)</li>
+      <li>Configure both Tomcat and the reverse proxy to use a shared secret.<br />
+       (It is "<code>requiredSecret</code>" attribute in AJP &lt;Connector&gt;,
+       "<code>worker.<i>workername</i>.secret</code>" directive for mod_jk.
+       The mod_proxy_ajp module currently does not support shared secrets).</li>
+    </ul>
+
+    <p>References:</p>
+    <ul>
+      <li><a href="/tomcat-7.0-doc/config/ajp.html">AJP Connector documentation (Tomcat 7.0)</a></li>
+      <li><a href="/connectors-doc/reference/workers.html">workers.properties configuration (mod_jk)</a></li>
     </ul>
   </section>
 



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