Merge r1498310 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1498321 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/man/suexec.8 b/docs/man/suexec.8
index 107436f9554cc6db1fd5509445de166cc27fc236..347802c3f291ce8d9b59e7cc37aa39105800b857 100644 (file)
--- a/docs/man/suexec.8
+++ b/docs/man/suexec.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "SUEXEC" 8 "2011-12-15" "Apache HTTP Server" "suexec"
+.TH "SUEXEC" 8 "2013-07-01" "Apache HTTP Server" "suexec"
 
 .SH NAME
 suexec \- Switch user before executing external programs
@@ -36,7 +36,7 @@ suexec \- Switch user before executing external programs
 suexec is used by the Apache HTTP Server to switch to another user before executing CGI programs\&. In order to achieve this, it must run as root\&. Since the HTTP daemon normally doesn't run as root, the suexec executable needs the setuid bit set and must be owned by root\&. It should never be writable for any other person than root\&.
  
 .PP
-For further information about the concepts and and the security model of suexec please refer to the suexec documentation (http://httpd\&.apache\&.org/docs/2\&.4/suexec\&.html)\&.
+For further information about the concepts and the security model of suexec please refer to the suexec documentation (http://httpd\&.apache\&.org/docs/2\&.4/suexec\&.html)\&.
  
 
 .SH "OPTIONS"

diff --git a/docs/manual/programs/suexec.html.en b/docs/manual/programs/suexec.html.en
index 99219d95e6da44c52c0cb744b327455eb258ede2..53a990e764ea2a9abd92515c2af83a4ec3448e82 100644 (file)
--- a/docs/manual/programs/suexec.html.en
+++ b/docs/manual/programs/suexec.html.en
@@ -33,7 +33,7 @@
      setuid bit set and must be owned by <code>root</code>. It should never be
      writable for any other person than <code>root</code>.</p>
 
-     <p>For further information about the concepts and and the security model
+     <p>For further information about the concepts and the security model
      of suexec please refer to the suexec documentation (<a href="http://httpd.apache.org/docs/2.4/suexec.html">http://httpd.apache.org/docs/2.4/suexec.html</a>).</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li>

diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index 890f873890e39f2045327a8039aa0c6726a77a9d..7ddf54e5458def7b818dd5d7614bd152a7929c26 100644 (file)
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -33,7 +33,7 @@
      setuid bit set and must be owned by <code>root</code>. It should never be
      writable for any other person than <code>root</code>.</p>
 
-     <p>For further information about the concepts and and the security model
+     <p>For further information about the concepts and the security model
      of suexec please refer to the suexec documentation (<a
      href="http://httpd.apache.org/docs/&httpd.docs;/suexec.html"
      >http://httpd.apache.org/docs/&httpd.docs;/suexec.html</a>).</p>