[Pkg-apache-commits] r1182 - in /trunk/apache2: apache2.2-common.links apache2.2-common.manpages apache2ctl.8 apachectl.8 changelog

[sf at alioth.debian.org]

Author: sf
Date: Mon Apr 19 21:06:39 2010
New Revision: 1182

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1182
Log:
Add symlink from apachectl to apache2ctl to be more compatible with
upstream.

Added:
    trunk/apache2/apachectl.8
Modified:
    trunk/apache2/apache2.2-common.links
    trunk/apache2/apache2.2-common.manpages
    trunk/apache2/apache2ctl.8
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.links
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.links?rev=1182&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.links (original)
+++ trunk/apache2/apache2.2-common.links Mon Apr 19 21:06:39 2010
@@ -1,3 +1,4 @@
 usr/sbin/a2enmod usr/sbin/a2dismod
 usr/sbin/a2enmod usr/sbin/a2ensite
 usr/sbin/a2enmod usr/sbin/a2dissite
+usr/sbin/apache2ctl usr/sbin/apachectl

Modified: trunk/apache2/apache2.2-common.manpages
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.manpages?rev=1182&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.manpages (original)
+++ trunk/apache2/apache2.2-common.manpages Mon Apr 19 21:06:39 2010
@@ -1,6 +1,7 @@
 debian/a2enmod.8
 debian/a2dismod.8
 debian/apache2.8
+debian/apachectl.8
 debian/apache2ctl.8
 debian/a2ensite.8
 debian/a2dissite.8

Modified: trunk/apache2/apache2ctl.8
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2ctl.8?rev=1182&op=diff
==============================================================================
--- trunk/apache2/apache2ctl.8 (original)
+++ trunk/apache2/apache2ctl.8 Mon Apr 19 21:06:39 2010
@@ -56,11 +56,17 @@
 When acting in SysV init mode, apache2ctl takes simple, one-word commands,
 defined below.
 .PP
+.B apachectl 
+.I command
+.PP
 .B apache2ctl 
 .I command
 .PP
 When acting in pass-through mode, apache2ctl can take all the arguments available
 for the httpd binary.
+.PP
+.B apachectl 
+.RI [ httpd-argument ]
 .PP
 .B apache2ctl 
 .RI [ httpd-argument ]

Added: trunk/apache2/apachectl.8
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apachectl.8?rev=1182&op=file
==============================================================================
--- trunk/apache2/apachectl.8 (added)
+++ trunk/apache2/apachectl.8 Mon Apr 19 21:06:39 2010
@@ -1,0 +1,1 @@
+.so man8/apache2ctl.8

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1182&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Mon Apr 19 21:06:39 2010
@@ -11,6 +11,8 @@
   * Remove empty directory /usr/lib/debug/usr/sbin in mpm packages.
     Closes: #576089
   * Fix apxs2 to work with perl 5.12rc3. Closes: #577239
+  * Add symlink from apachectl to apache2ctl to be more compatible with
+    upstream. Apache httpd 1.3 hasn't been in Debian for some time.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 03 Apr 2010 15:20:42 +0200