Re: [patch] A few updates to man for 2.4 (git next)

2012-02-24 Thread Arno Töll
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Jean-Michel,

On 20.02.2012 21:30, Jean-Michel Vourgère wrote:
 Attached is a patch about a2(en|dis)(mod|site|conf) man pages

Thanks, I just committed your patch (I didn't push yet, though). Much
appreciated. However, as I told you in IRC please send us git
format-patches in future, that makes it much easier to merge it and
retain you as author.


- -- 
with kind regards,
Arno Töll
IRC: daemonkeeper on Freenode/OFTC
GnuPG Key-ID: 0x9D80F36D
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPR7JMAAoJEMcrUe6dgPNtW1MQAIf23QFsI9DLeP7JyauWrBHO
u/QGxxp8PuXzC/p8b+N1tlOwNGalNdDOZXIuC2eYQMdXrthtmOeuDrat6iEvquEc
2Aq5wUfEh4AeBKRRWWrFrvnAq7UcBYzQIQOO5EGAXLvU2Jc7ZL5ffRiBStKBbi0n
UyFNfoqc+9i/E1oNoHAv2PXXFgoF2yuLjXAFyfPmvbC7l8HsklvrmLJ0NGPxSO9V
Rt75OE6jAK2U5u/t3DxIIAwd+KqvSpSjYducaTBBPkzkKPrcxV0keJkyC2t5fhKa
2kzDe8VSliqiUf6BlCeH0Sw3HjyDMS60tnPqSB6mFGe52cdaWGdf67vB8iObr+Y8
hAcfJb6JYyaBzEkQHCLUVgRxaUXDChOAZLcOoIkuu3xU0Eo5pbp+MBJfeMhtz3XV
WjrhDd3aQxfj+WicGXGrHGjSDaJrj0Wqt6LIEhyKbgNSfPYz8/1NfwmxLyD+rlur
oRw0oZU0V4V4oCkRr1QRwE0fOrshekvxkZ5evBMtQ6od5/mBMMWnCBueiFIedIp8
T/ELmWzXJ/BMFHwYK8fOxalrzfK0taeuZv9HvSJmEohDPGduOx6WKNcK2QSdirvL
i7hy+MuEg8iEDH4x0JM6ih7vtHXOIhmQecMxN2ofptEqxIlrXplvV5viEtPJQAl8
+4JfKzf7V+VCOEjBT5VU
=ifME
-END PGP SIGNATURE-


-- 
To UNSUBSCRIBE, email to debian-apache-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/4f47b24c.20...@toell.net



[patch] A few updates to man for 2.4 (git next)

2012-02-20 Thread Jean-Michel Vourgère
Attached is a patch about a2(en|dis)(mod|site|conf) man pages

* 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
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:
-.\ .nhdisable hyphenation
-.\ .hyenable hyphenation
-.\ .ad l  left justify
-.\ .ad b  justify to both left and right margins
-.\ .nfdisable filling
-.\ .fienable filling
-.\ .brinsert line break
-.\ .sp ninsert 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 deb...@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 ninsert 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