The following commit has been merged in the master branch:
commit 20386f50d2009e4b1e3535a0ee7a3a064384d6b3
Author: Guillem Jover <[email protected]>
Date: Thu Mar 28 20:07:42 2013 +0100
man: Unify command-line options into a single OPTIONS section
diff --git a/debian/changelog b/debian/changelog
index 10c5170..bd3a253 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Document since when DEB_*_MULTIARCH variables are supported.
- Move compiler flags subsection from ENVIRONMENT to NOTES.
- Unify WARNING and ERROR sections into DIAGNOSTICS.
+ - Unify command-line options into a single OPTIONS section.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 0d09657..1bcd2ed 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -121,7 +121,8 @@ Show the usage message and exit.
.BR \-\-version
Show the version and exit.
.
-.SH GENERIC BUILD OPTIONS
+.SH OPTIONS
+.SS Generic build options
.TP
.BI \-c control-file
Specifies the main source control file to read information from. The
@@ -232,7 +233,7 @@ documentation.
The default regexp and patterns for both options can be seen
in the output of the \fB\-\-help\fP command.
-.SH GENERIC EXTRACT OPTIONS
+.SS Generic extract options
.TP
.BI \-\-no\-copy
Do not copy original tarballs near the extracted source package.
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 14eea0a..206ebe6 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -100,7 +100,8 @@ Show usage information and exit.
.BR \-V ", " \-\-version
Show the program version and exit.
.
-.SH MATCHING OPTIONS
+.SH OPTIONS
+.SS Matching options
.TP
.BR \-p ", " \-\-pidfile " \fIpid-file\fP"
Check whether a process has created the file \fIpid-file\fP. Note: using this
@@ -126,7 +127,7 @@ Check for processes owned by the user specified by
\fIusername\fP or
\fIuid\fP. Note: using this matching option alone will cause all processes
matching the user to be acted on.
.
-.SH OPTIONS
+.SS Generic options
.TP
.BR \-g ", " \-\-group " \fIgroup\fP|\fIgid\fP"
Change to \fIgroup\fP or \fIgid\fP when starting the process.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
