Remove OPTIONS section; options now go inside DESCRIPTION

doc/sudo.cat

@@ -49,8 +49,7 @@ DDEESSCCRRIIPPTTIIOONN
      an I/O plugin is configured, the running command's input and output may
      be logged as well.
 
-OOPPTTIIOONNSS
-     ssuuddoo accepts the following command line options:
+     The options are as follows:
 
      --AA          Normally, if ssuuddoo requires a password, it will read it from
                  the user's terminal.  If the --AA (_a_s_k_p_a_s_s) option is

doc/sudo.man.in

@@ -150,9 +150,8 @@ Security policies may log successful and failed attempts to use
 \fBsudo\fR.
 If an I/O plugin is configured, the running command's input and
 output may be logged as well.
-.SH "OPTIONS"
-\fBsudo\fR
-accepts the following command line options:
+.PP
+The options are as follows:
 .TP 12n
 \fB\-A\fR
 Normally, if

doc/sudo.mdoc.in

@@ -190,9 +190,8 @@ Security policies may log successful and failed attempts to use
 .Nm sudo .
 If an I/O plugin is configured, the running command's input and
 output may be logged as well.
-.Sh OPTIONS
-.Nm sudo
-accepts the following command line options:
+.Pp
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl A
 Normally, if

doc/sudoreplay.cat

@@ -33,8 +33,7 @@ DDEESSCCRRIIPPTTIIOONN
 
      `>'           Double the playback speed.
 
-OOPPTTIIOONNSS
-     ssuuddoorreeppllaayy accepts the following command line options:
+     The options are as follows:
 
      --dd _d_i_r_e_c_t_o_r_y  Use _d_i_r_e_c_t_o_r_y to for the session logs instead of the
                    default, _/_v_a_r_/_l_o_g_/_s_u_d_o_-_i_o.

doc/sudoreplay.man.in

@@ -90,9 +90,8 @@ Reduce the playback speed by one half.
 .TP 14n
 `>'
 Double the playback speed.
-.SH "OPTIONS"
-\fBsudoreplay\fR
-accepts the following command line options:
+.PP
+The options are as follows:
 .TP 14n
 \fB\-d\fR \fIdirectory\fR
 .br

doc/sudoreplay.mdoc.in

@@ -96,9 +96,8 @@ Reduce the playback speed by one half.
 .It Ql >
 Double the playback speed.
 .El
-.Sh OPTIONS
-.Nm sudoreplay
-accepts the following command line options:
+.Pp
+The options are as follows:
 .Bl -tag -width 12n
 .It Fl d Ar directory
 Use

doc/visudo.cat

@@ -35,9 +35,7 @@ DDEESSCCRRIIPPTTIIOONN
      been detected, the cursor will be placed on the line where the error
      occurred (if the editor supports this feature).
 
-OOPPTTIIOONNSS
-     vviissuuddoo accepts the following command line options: accepts the following
-     command line options:
+     The options are as follows:
 
      --cc          Enable _c_h_e_c_k_-_o_n_l_y mode.  The existing _s_u_d_o_e_r_s file will be
                  checked for syntax errors, owner and mode.  A message will be

doc/visudo.man.in

@@ -120,10 +120,8 @@ is typed to edit the
 \fIsudoers\fR
 file after a parse error has been detected, the cursor will be placed on
 the line where the error occurred (if the editor supports this feature).
-.SH "OPTIONS"
-\fBvisudo\fR
-accepts the following command line options:
-accepts the following command line options:
+.PP
+The options are as follows:
 .TP 12n
 \fB\-c\fR
 Enable

doc/visudo.mdoc.in

@@ -119,10 +119,8 @@ is typed to edit the
 .Em sudoers
 file after a parse error has been detected, the cursor will be placed on
 the line where the error occurred (if the editor supports this feature).
-.Sh OPTIONS
-.Nm visudo
-accepts the following command line options:
-accepts the following command line options:
+.Pp
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl c
 Enable