fixing small text bugs

diff --git a/debian/changelog b/debian/changelog
index 542307bb5d8099f92c64df3d6f25cf2db71da186..1a77453f6889d5c215f6384642f066e072834cb7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-sudo (1.7.2p2-1) UNRELEASED; urgency=low
+sudo (1.7.2p5-1) UNRELEASED; urgency=low
 
-  * new upstream release, closes a bug filed upstream regarding missing
-    man page processing scripts in the 1.7.2p1 tarball
+  * new upstream release, closes a bug filed upstream regarding missing man 
+    page processing scripts in the 1.7.2p1 tarball, also includes the fix
+    for CVE-2010-0426 previously the subject of a security team nmu
   * move to source format 3.0 (quilt) and restructure changes as patches
   * fix unprocessed substitution variables in man pages, closes: #557204
   * apply patch from Neil Moore to fix Debian-specific content in the
     visudo man page, closes: #555013
   * update descriptions to better explain sudo-ldap, closes: #573108
+  * eliminate spurious 'and' in man page, closes: #571620
 
- -- Bdale Garbee <bdale@gag.com>  Mon, 07 Dec 2009 16:58:36 +0100
+ -- Bdale Garbee <bdale@gag.com>  Thu, 11 Mar 2010 11:54:23 -0700
 
 sudo (1.7.2p1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 90f5800add85dc432c7bea66c9624b250e8b08a7..2fda4433bee1bab97ff54cd88fa8fa0953c9e16e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -29,5 +29,6 @@ Description: Provide limited super user privileges to specific users
  privileges to users and log root activity.  The basic philosophy is to give
  as few privileges as possible but still allow people to get their work done.
  .
- This version is built with LDAP support, which allows the sudoers database
- to be distributed via LDAP.  Authentication is still performed via pam.
+ This version is built with LDAP support, which allows an equivalent of the
+ sudoers database to be distributed via LDAP.  Authentication is still 
+ performed via pam.

diff --git a/sudoers.man.in b/sudoers.man.in
index b56b1c4ef8d97aff6f51d92231630753e89af033..9d4f010de5dde5896191a132f734e50104e116cc 100644 (file)
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -856,7 +856,7 @@ This flag is \fIoff\fR by default.
 If set, root is allowed to run \fBsudo\fR too.  Disabling this prevents users
 from \*(L"chaining\*(R" \fBsudo\fR commands to get a root shell by doing something
 like \f(CW"sudo sudo /bin/sh"\fR.  Note, however, that turning off \fIroot_sudo\fR
-will also prevent root and from running \fBsudoedit\fR.
+will also prevent root from running \fBsudoedit\fR.
 Disabling \fIroot_sudo\fR provides no real additional security; it
 exists purely for historical reasons.
 This flag is \fI@root_sudo@\fR by default.