[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fdb6503c66bbafea8e92a86c26fa2653ee503253

Sat Feb 25 02:16:56 UTC 2012

The following commit has been merged in the next branch:
commit 8ded4c3d2c12fc08b429a6b742697af31409f130
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Fri Feb 24 16:46:36 2012 +0100

    Update manpages, replace a2disconf.8 by a link pointing to a2enconf.8
    
    * make a2disconf.8 a link to a2enconf.8, just like a2dismod.8 and a2dissite.8
    * documented -q option
    * documented exit codes
    * added "see also" between a2(en|dis)mod.8 and a2(en|dis)conf.8
    * fixed a few typos
    
    Signed-off-by: Arno Töll <debian at toell.net>

diff --git a/debian/manpages/a2disconf.8 b/debian/manpages/a2disconf.8
index a349380..0423e86 100644
--- a/debian/manpages/a2disconf.8
+++ b/debian/manpages/a2disconf.8
@@ -1,74 +1 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH A2ENCONF 8 "14 February 2012"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-a2enconf, a2disconf \- enable or disable an apache2 module
-.SH SYNOPSIS
-.B a2enmod
-.RI [ configuration ]
-.PP
-.B a2dismod
-.RI [ configuration ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B a2enconf
-and
-.B a2disconf
-commands.
-.PP
-.B a2enmod
-is a script that enables the specified configuration file within the
-.B apache2
-configuration.  It does this by creating symlinks within
-.BR /etc/apache2/conf-enabled .
-Likewise,
-.B a2disconf
-disables a specific configuration part by removing those symlinks.  It is not an
-error to enable a module which is already enabled, or to disable one which is
-already disabled.
-.PP
-Note that many configuration file may have a dependency to specific modules.
-Unlike module dependencies, these are not resolved automatically. Configuration
-fragments stored in the conf-available directory are considered non-essential or
-being installed and manged by reverse dependencies (e.g. web scripts).
-.B apache2
-.SH EXAMPLES
-.RS
-.B "a2enmod security"
-.br
-.B "a2dismod charset"
-.RE
-.PP
-Enables Apache security directives stored in the
-.B security
-configuration files, and disables the
-.B charset
-configuration.
-.SH FILES
-.TP
-.B /etc/apache2/conf-available
-Directory with files giving information on available configuration files.
-.TP
-.B /etc/apache2/conf-enabled
-Directory with links to the files in
-.B conf-available
-for enabled modules.
-.SH "SEE ALSO"
-.BR apache2ctl (8).
-.SH AUTHOR
-This manual page was written by Arno Toell <debian at toell.net> for the Debian
-GNU/Linux distribution, as it is a Debian-specific script with the package.
+.so man8/a2enconf.8
diff --git a/debian/manpages/a2enconf.8 b/debian/manpages/a2enconf.8
index a349380..d3ff413 100644
--- a/debian/manpages/a2enconf.8
+++ b/debian/manpages/a2enconf.8
@@ -16,13 +16,15 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-a2enconf, a2disconf \- enable or disable an apache2 module
+a2enconf, a2disconf \- enable or disable an apache2 configuration file
 .SH SYNOPSIS
-.B a2enmod
-.RI [ configuration ]
+.B a2enconf
+[ [\-q|\-\-quiet]
+.IR configuration ]
 .PP
-.B a2dismod
-.RI [ configuration ]
+.B a2disconf
+[ [\-q|\-\-quiet]
+.IR configuration ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B a2enconf
@@ -30,7 +32,7 @@ and
 .B a2disconf
 commands.
 .PP
-.B a2enmod
+.B a2enconf
 is a script that enables the specified configuration file within the
 .B apache2
 configuration.  It does this by creating symlinks within
@@ -38,19 +40,29 @@ configuration.  It does this by creating symlinks within
 Likewise,
 .B a2disconf
 disables a specific configuration part by removing those symlinks.  It is not an
-error to enable a module which is already enabled, or to disable one which is
+error to enable a configuration which is already enabled, or to disable one which is
 already disabled.
 .PP
 Note that many configuration file may have a dependency to specific modules.
 Unlike module dependencies, these are not resolved automatically. Configuration
 fragments stored in the conf-available directory are considered non-essential or
 being installed and manged by reverse dependencies (e.g. web scripts).
-.B apache2
+.SH OPTIONS
+.TP
+.B \-q, \-\-quiet
+Don't show informative messages.
+.SH "EXIT STATUS"
+.B a2enconf
+and
+.B a2disconf
+exit with status 0 if all
+.IR configuration s
+are processed successfully, 1 if errors occur, 2 if an invalid option was used.
 .SH EXAMPLES
 .RS
-.B "a2enmod security"
+.B "a2enconf security"
 .br
-.B "a2dismod charset"
+.B "a2disconf charset"
 .RE
 .PP
 Enables Apache security directives stored in the
@@ -66,9 +78,11 @@ Directory with files giving information on available configuration files.
 .B /etc/apache2/conf-enabled
 Directory with links to the files in
 .B conf-available
-for enabled modules.
+for enabled configuration files.
 .SH "SEE ALSO"
-.BR apache2ctl (8).
+.BR apache2ctl (8),
+.BR a2enmod (8),
+.BR a2dismod (8).
 .SH AUTHOR
 This manual page was written by Arno Toell <debian at toell.net> for the Debian
 GNU/Linux distribution, as it is a Debian-specific script with the package.
diff --git a/debian/manpages/a2enmod.8 b/debian/manpages/a2enmod.8
index 2ad11dd..18148ca 100644
--- a/debian/manpages/a2enmod.8
+++ b/debian/manpages/a2enmod.8
@@ -19,10 +19,12 @@
 a2enmod, a2dismod \- enable or disable an apache2 module
 .SH SYNOPSIS
 .B a2enmod
-.RI [ module ]
+[ [\-q|\-\-quiet]
+.IR module ]
 .PP
 .B a2dismod
-.RI [ module ]
+[ [\-q|\-\-quiet]
+.IR module ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B a2enmod
@@ -44,7 +46,18 @@ already disabled.
 Note that many modules have, in addition to a .load file, an
 associated .conf file.  Enabling the module puts the configuration
 directives in the .conf file as directives into the main server context of
-.B apache2
+.B apache2.
+.SH OPTIONS
+.TP
+.B \-q, \-\-quiet
+Don't show informative messages.
+.SH "EXIT STATUS"
+.B a2enmod
+and
+.B a2dismod
+exit with status 0 if all
+.IR module s
+are processed successfully, 1 if errors occur, 2 if an invalid option was used.
 .SH EXAMPLES
 .RS
 .B "a2enmod imagemap"
@@ -67,7 +80,9 @@ Directory with links to the files in
 .B mods-available
 for enabled modules.
 .SH "SEE ALSO"
-.BR apache2ctl (8).
+.BR apache2ctl (8),
+.BR a2enconf (8),
+.BR a2disconf (8).
 .SH AUTHOR
 This manual page was written by Daniel Stone <daniel at sfarc.net> for the Debian
 GNU/Linux distribution, as it is a Debian-specific script with the package.
diff --git a/debian/manpages/a2ensite.8 b/debian/manpages/a2ensite.8
index 2c2c63b..916323f 100644
--- a/debian/manpages/a2ensite.8
+++ b/debian/manpages/a2ensite.8
@@ -19,10 +19,12 @@
 a2ensite, a2dissite \- enable or disable an apache2 site / virtual host
 .SH SYNOPSIS
 .B a2ensite
-.RI [ site ]
+[ [\-q|\-\-quiet]
+.IR site ]
 .PP
 .B a2dissite
-.RI [ site ]
+[ [\-q|\-\-quiet]
+.IR site ]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B a2ensite
@@ -46,6 +48,17 @@ The
 site is handled specially: The resulting symlink will be called
 .B 000-default
 in order to be loaded first.
+.SH OPTIONS
+.TP
+.B \-q, \-\-quiet
+Don't show informative messages.
+.SH "EXIT STATUS"
+.B a2ensite
+and
+.B a2dissite
+exit with status 0 if all
+.IR site s
+are processed successfully, 1 if errors occur, 2 if an invalid option was used.
 .SH EXAMPLES
 .RS
 .B "a2dissite default"

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)

