From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Fri, 23 Nov 2018 13:42:23 +0000 (-0700)
Subject: Update fixmdoc.sh to match the BSD -> .Bx changes in the manuals.
X-Git-Tag: SUDO_1_8_27^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0679f4529c87e2752db1d36adc71dad26eee06c7;p=sudo

Update fixmdoc.sh to match the BSD -> .Bx changes in the manuals.
Bug #861
---

diff --git a/doc/fixmdoc.sh b/doc/fixmdoc.sh
index 53bf64296..a5c9b3399 100755
--- a/doc/fixmdoc.sh
+++ b/doc/fixmdoc.sh
@@ -35,7 +35,7 @@ case "$OUTFILE" in
 	if [ X"$BAMAN" != X"1" ]; then
 		BA_FLAG='/^.*\n\.Op Fl a Ar type/{;N;/^.*\n\.Ek$/d;};'
 		cat >>"$OUTFILE" <<-'EOF'
-			/^\.It Fl a Ar type/,/BSD authentication\.$/d
+			/^\.It Fl a Ar type/,/\.Bx authentication \.$/d
 		EOF
 	fi
 
@@ -44,11 +44,11 @@ case "$OUTFILE" in
 	if [ X"$LCMAN" != X"1" ]; then
 		LC_FLAG='/^.*\n\.Op Fl c Ar class/{;N;/^.*\n\.Ek$/d;};'
 		cat >>"$OUTFILE" <<-'EOF'
-			/^\.It Fl c Ar class/,/BSD login classes\.$/d
+			/^\.It Fl c Ar class/,/\.Bx login classes \.$/d
 			/^\.Xr login_cap 3 ,$/d
-			/^BSD login class$/ {
+			/^\.Bx login class$/ {
 				N
-				/^BSD login class\n\.It$/d
+				/^\.Bx login class\n\.It$/d
 			}
 		EOF
 	fi
@@ -110,7 +110,7 @@ case "$OUTFILE" in
 	# BSD login class
 	if [ X"$LCMAN" != X"1" ]; then
 		cat >>"$OUTFILE" <<-'EOF'
-			/^On BSD systems/,/\.$/d
+			/^\.No On Bx systems/,/\.$/d
 			/^\.It use_loginclass$/,/^by default\./d
 		EOF
 	fi
diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index 0de854e6f..e54959ad0 100644
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd October 27, 2018
+.Dd November 23, 2018
 .Dt SUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -173,8 +173,7 @@ If no askpass program is available,
 will exit with an error.
 .It Fl a Ar type , Fl -auth-type Ns = Ns Ar type
 Use the specified
-.Bx
-authentication
+.Bx authentication
 .Ar type
 when validating the user, if allowed by
 .Pa /etc/login.conf .
@@ -184,8 +183,7 @@ authentication methods by adding an
 entry in
 .Pa /etc/login.conf .
 This option is only available on systems that support
-.Bx
-authentication.
+.Bx authentication .
 .It Fl b , -background
 Run the given command in the background.
 Note that it is not possible to use shell job control to manipulate
@@ -234,8 +232,7 @@ If the command is being run as a login shell, additional
 settings, such as the umask and environment variables, will
 be applied, if present.
 This option is only available on systems with
-.Bx
-login classes.
+.Bx login classes .
 .It Fl E , -preserve-env
 Indicates to the security policy that the user wishes to
 preserve their existing environment variables.
@@ -658,7 +655,7 @@ Solaris project
 .It
 Solaris privileges
 .It
-.Bx No login class
+.Bx login class
 .It
 scheduling priority (aka nice value)
 .El
diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 9414c68cb..3256193e3 100644
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd October 27, 2018
+.Dd November 23, 2018
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -282,9 +282,7 @@ systems without PAM), the environment is initialized with the
 contents of the
 .Pa /etc/environment
 file.
-On
-.Bx
-systems, if the
+.No On Bx systems , if the
 .Em use_loginclass
 option is enabled, the environment is initialized
 based on the
@@ -472,9 +470,7 @@ systems without PAM), the contents of
 .Pa /etc/environment
 are also
 included.
-On
-.Bx
-systems, if the
+.No On Bx systems , if the
 .Em use_loginclass
 flag is
 enabled, the