man: Unify command-line options into a single OPTIONS section

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

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.

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.