Add SUPPORT section and re-order some of the sections to match the order

we use in OpenBSD.

diff --git a/sudo.pod b/sudo.pod
index e5796b9eb5ee4dcd9bc09cad54c33dd49700d860..3996564410ce8e13b1942e93eccfc5289fe8ee60 100644 (file)
--- a/sudo.pod
+++ b/sudo.pod
@@ -373,33 +373,6 @@ of this, care must be taken when giving users access to commands
 via B<sudo> to verify that the command does not inadvertently give
 the user an effective root shell.
 
-=head1 EXAMPLES
-
-Note: the following examples assume suitable L<sudoers(@mansectform@)> entries.
-
-To get a file listing of an unreadable directory:
-
- $ sudo ls /usr/local/protected
-
-To list the home directory of user yazza on a machine where the
-file system holding ~yazza is not exported as root:
-
- $ sudo -u yazza ls ~yazza
-
-To edit the F<index.html> file as user www:
-
- $ sudo -u www vi ~www/htdocs/index.html
-
-To shutdown a machine:
-
- $ sudo shutdown -r +15 "quick reboot"
-
-To make a usage listing of the directories in the /home
-partition.  Note that this runs the commands in a sub-shell
-to make the C<cd> and file redirection work.
-
- $ sudo sh -c "cd /home ; du -s * | sort -rn > USAGE"
-
 =head1 ENVIRONMENT
 
 B<sudo> utilizes the following environment variables:
@@ -438,6 +411,38 @@ B<sudo> utilizes the following environment variables:
  @sysconfdir@/sudoers          List of who can run what
  @timedir@             Directory containing timestamps
 
+=head1 EXAMPLES
+
+Note: the following examples assume suitable L<sudoers(@mansectform@)> entries.
+
+To get a file listing of an unreadable directory:
+
+ $ sudo ls /usr/local/protected
+
+To list the home directory of user yazza on a machine where the
+file system holding ~yazza is not exported as root:
+
+ $ sudo -u yazza ls ~yazza
+
+To edit the F<index.html> file as user www:
+
+ $ sudo -u www vi ~www/htdocs/index.html
+
+To shutdown a machine:
+
+ $ sudo shutdown -r +15 "quick reboot"
+
+To make a usage listing of the directories in the /home
+partition.  Note that this runs the commands in a sub-shell
+to make the C<cd> and file redirection work.
+
+ $ sudo sh -c "cd /home ; du -s * | sort -rn > USAGE"
+
+=head1 SEE ALSO
+
+L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<sudoers(@mansectform@)>,
+L<passwd(@mansectform@)>, L<visudo(@mansectsu@)>
+
 =head1 AUTHORS
 
 Many people have worked on B<sudo> over the years; this
@@ -450,18 +455,6 @@ See the HISTORY file in the B<sudo> distribution or visit
 http://www.sudo.ws/sudo/history.html for a short history
 of B<sudo>.
 
-=head1 BUGS
-
-If you feel you have found a bug in sudo, please submit a bug report
-at http://www.sudo.ws/sudo/bugs/
-
-=head1 DISCLAIMER
-
-B<Sudo> is provided ``AS IS'' and any express or implied warranties,
-including, but not limited to, the implied warranties of merchantability
-and fitness for a particular purpose are disclaimed.
-See the LICENSE file distributed with B<sudo> for complete details.
-
 =head1 CAVEATS
 
 There is no easy way to prevent a user from gaining a root shell
@@ -487,7 +480,24 @@ Running shell scripts via B<sudo> can expose the same kernel bugs that
 make setuid shell scripts unsafe on some operating systems (if your OS
 has a /dev/fd/ directory, setuid shell scripts are generally safe).
 
-=head1 SEE ALSO
+=head1 BUGS
 
-L<grep(1)>, L<su(1)>, L<stat(2)>, L<login_cap(3)>, L<sudoers(@mansectform@)>,
-L<passwd(@mansectform@)>, L<visudo(@mansectsu@)>
+If you feel you have found a bug in B<sudo>, please submit a bug report
+at http://www.sudo.ws/sudo/bugs/
+
+=head1 SUPPORT
+
+Commercial support is available for B<sudo>, see
+http://www.sudo.ws/sudo/support.html for details.
+
+Limited free support is available via the sudo-users mailing list,
+see http://www.sudo.ws/mailman/listinfo/sudo-users to subscribe or
+search the archives.
+
+=head1 DISCLAIMER
+
+B<Sudo> is provided ``AS IS'' and any express or implied warranties,
+including, but not limited to, the implied warranties of merchantability
+and fitness for a particular purpose are disclaimed.  See the LICENSE
+file distributed with B<sudo> or http://www.sudo.ws/sudo/license.html
+for complete details.

diff --git a/sudoers.pod b/sudoers.pod
index 88eeeba83dff154b7e31bb27a47abbafae9343d4..592b35c41279b1cfe56b052ff9ed8788beca703d 100644 (file)
--- a/sudoers.pod
+++ b/sudoers.pod
@@ -982,6 +982,12 @@ The following characters must be escaped with a backslash ('\') when
 used as part of a word (e.g. a username or hostname):
 '@', '!', '=', ':', ',', '(', ')', '\'.
 
+=head1 FILES
+
+ @sysconfdir@/sudoers          List of who can run what
+ /etc/group            Local groups file
+ /etc/netgroup         List of network groups
+
 =head1 EXAMPLES
 
 Since the I<sudoers> file is parsed in a single pass, order is
@@ -1226,6 +1232,10 @@ as root are still capable of many potentially hazardous operations
 privilege escalation.  In the specific case of an editor, a safer
 approach is to give the user permission to run B<sudoedit>.
 
+=head1 SEE ALSO
+
+L<rsh(1)>, L<su(1)>, L<fnmatch(3)>, L<sudo(@mansectsu@)>, L<visudo(@mansectsu@)>
+
 =head1 CAVEATS
 
 The I<sudoers> file should B<always> be edited by the B<visudo>
@@ -1239,12 +1249,24 @@ case), you either need to have the machine's hostname be fully qualified
 as returned by the C<hostname> command or use the I<fqdn> option in
 I<sudoers>.
 
-=head1 FILES
+=head1 BUGS
 
- @sysconfdir@/sudoers          List of who can run what
- /etc/group            Local groups file
- /etc/netgroup         List of network groups
+If you feel you have found a bug in B<sudo>, please submit a bug report
+at http://www.sudo.ws/sudo/bugs/
 
-=head1 SEE ALSO
+=head1 SUPPORT
 
-L<rsh(1)>, L<su(1)>, L<fnmatch(3)>, L<sudo(@mansectsu@)>, L<visudo(@mansectsu@)>
+Commercial support is available for B<sudo>, see
+http://www.sudo.ws/sudo/support.html for details.
+
+Limited free support is available via the sudo-users mailing list,
+see http://www.sudo.ws/mailman/listinfo/sudo-users to subscribe or
+search the archives.
+
+=head1 DISCLAIMER
+
+B<Sudo> is provided ``AS IS'' and any express or implied warranties,
+including, but not limited to, the implied warranties of merchantability
+and fitness for a particular purpose are disclaimed.  See the LICENSE
+file distributed with B<sudo> or http://www.sudo.ws/sudo/license.html
+for complete details.

diff --git a/visudo.pod b/visudo.pod
index 045ea2c4b069fe71ac6d9c42dc48d3989e892880..7437923632b2145753de6f3f1d91ce384f40b9d6 100644 (file)
--- a/visudo.pod
+++ b/visudo.pod
@@ -106,7 +106,20 @@ and exit.
 
 =back
 
-=head1 ERRORS
+=head1 ENVIRONMENT
+
+The following environment variables are used only if B<visudo>
+was configured with the I<--with-env-editor> option:
+
+ VISUAL                        Invoked by visudo as the editor to use
+ EDITOR                        Used by visudo if VISUAL is not set
+
+=head1 FILES
+
+ @sysconfdir@/sudoers          List of who can run what
+ @sysconfdir@/sudoers.tmp      Lock file for visudo
+
+=head1 DIAGNOSTICS
 
 =over 4
 
@@ -145,18 +158,9 @@ not a warning.
 
 =back
 
-=head1 ENVIRONMENT
-
-The following environment variables are used only if B<visudo>
-was configured with the I<--with-env-editor> option:
-
- VISUAL                        Invoked by visudo as the editor to use
- EDITOR                        Used by visudo if VISUAL is not set
-
-=head1 FILES
+=head1 SEE ALSO
 
- @sysconfdir@/sudoers          List of who can run what
- @sysconfdir@/sudoers.tmp      Lock file for visudo
+L<vi(1)>, L<sudoers(@mansectform@)>, L<sudo(@mansectsu@)>, L<vipw(@mansectsu@)>
 
 =head1 AUTHOR
 
@@ -168,23 +172,29 @@ B<visudo> was written by:
 See the HISTORY file in the sudo distribution or visit
 http://www.sudo.ws/sudo/history.html for more details.
 
+=head1 CAVEATS
+
+There is no easy way to prevent a user from gaining a root shell if 
+the editor used by B<visudo> allows shell escapes.
+
 =head1 BUGS
 
-If you feel you have found a bug in sudo, please submit a bug report
+If you feel you have found a bug in B<visudo>, please submit a bug report
 at http://www.sudo.ws/sudo/bugs/
 
-=head1 DISCLAIMER
+=head1 SUPPORT
 
-B<Visudo> is provided ``AS IS'' and any express or implied warranties,
-including, but not limited to, the implied warranties of merchantability
-and fitness for a particular purpose are disclaimed.
-See the LICENSE file distributed with B<sudo> for complete details.
-
-=head1 CAVEATS
+Commercial support is available for B<sudo>, see
+http://www.sudo.ws/sudo/support.html for details.
 
-There is no easy way to prevent a user from gaining a root shell if 
-the editor used by B<visudo> allows shell escapes.
+Limited free support is available via the sudo-users mailing list,
+see http://www.sudo.ws/mailman/listinfo/sudo-users to subscribe or
+search the archives.
 
-=head1 SEE ALSO
+=head1 DISCLAIMER
 
-L<vi(1)>, L<sudoers(@mansectform@)>, L<sudo(@mansectsu@)>, L<vipw(@mansectsu@)>
+B<Visudo> is provided ``AS IS'' and any express or implied warranties,
+including, but not limited to, the implied warranties of merchantability
+and fitness for a particular purpose are disclaimed.  See the LICENSE
+file distributed with B<sudo> or http://www.sudo.ws/sudo/license.html
+for complete details.