summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/httpd/conf/httpd.conf4
-rw-r--r--usr.sbin/httpd/conf/httpd.conf-dist2
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf
index e20f8d765cd..f8c5eb62910 100644
--- a/usr.sbin/httpd/conf/httpd.conf
+++ b/usr.sbin/httpd/conf/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.24 2008/06/07 01:59:36 jdixon Exp $
+# $OpenBSD: httpd.conf,v 1.25 2009/04/01 06:47:34 jmc Exp $
#
# Based upon the NCSA server configuration files originally by Rob McCool.
#
@@ -169,7 +169,7 @@ MaxRequestsPerChild 0
#
# MaxFOOPerChild: these directives set the current and hard rlimits for
-# the child processes. Attempts to exceed them will cause the the OS to
+# the child processes. Attempts to exceed them will cause the OS to
# take appropriate action. See the setrlimit(2) and signal(3).
#
MaxCPUPerChild 0
diff --git a/usr.sbin/httpd/conf/httpd.conf-dist b/usr.sbin/httpd/conf/httpd.conf-dist
index e6af0ece430..cf409f5b73f 100644
--- a/usr.sbin/httpd/conf/httpd.conf-dist
+++ b/usr.sbin/httpd/conf/httpd.conf-dist
@@ -168,7 +168,7 @@ MaxRequestsPerChild 0
#
# MaxFOOPerChild: these directives set the current and hard rlimits for
-# the child processes. Attempts to exceed them will cause the the OS to
+# the child processes. Attempts to exceed them will cause the OS to
# take appropriate action. See the setrlimit(2) and signal(3).
#
MaxCPUPerChild 0