From e29f8ed7098c21c76a992ffa268af59ef40c048f Mon Sep 17 00:00:00 2001
From: Joe Orton
Date: Mon, 1 Jul 2013 09:02:13 +0000
Subject: [PATCH] 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
---
docs/man/suexec.8 | 4 ++--
docs/manual/programs/suexec.html.en | 2 +-
docs/manual/programs/suexec.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/man/suexec.8 b/docs/man/suexec.8
index 107436f955..347802c3f2 100644
--- 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 99219d95e6..53a990e764 100644
--- 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 root
. It should never be
writable for any other person than root
.
- For further information about the concepts and and the security model
+
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).
Synopsis
diff --git a/docs/manual/programs/suexec.xml b/docs/manual/programs/suexec.xml
index 890f873890..7ddf54e545 100644
--- a/docs/manual/programs/suexec.xml
+++ b/docs/manual/programs/suexec.xml
@@ -33,7 +33,7 @@
setuid bit set and must be owned by root
. It should never be
writable for any other person than root
.
- For further information about the concepts and and the security model
+
For further information about the concepts and the security model
of suexec please refer to the suexec documentation (http://httpd.apache.org/docs/&httpd.docs;/suexec.html).
--
2.50.1