DIAGNOSTICS section name missing and .Nm changes

usr.bin/id/groups.1

@@ -43,7 +43,7 @@
 .Op Ar user
 .Sh DESCRIPTION
 The
-.Nm groups
+.Nm
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
@@ -53,12 +53,12 @@ The command
 is suggested for normal interactive use.
 .Pp
 The
-.Nm groups
+.Nm
 utility displays the groups to which you (or the optionally specified user)
 belong.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm groups
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr id 1

usr.bin/id/id.1

@@ -42,7 +42,7 @@
 .Nm id
 .Nd return user identity
 .Sh SYNOPSIS
-.Nm
+.Nm id
 .Op Ar user
 .Nm id
 .Fl G Op Fl n
@@ -74,7 +74,7 @@ is specified, the user and group IDs of that user are displayed.
 In this case, the real and effective IDs are assumed to be the same.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl G
 Display the different group IDs (effective, real and supplementary)
 as white-space separated numbers, in no particular order.
@@ -121,7 +121,7 @@ options instead of the effective ID.
 .It Fl u
 Display the effective user ID as a number.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.

usr.bin/id/whoami.1

@@ -42,7 +42,7 @@
 .Nm whoami
 .Sh DESCRIPTION
 The
-.Nm whoami
+.Nm
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
@@ -52,11 +52,11 @@ The command
 is suggested for normal interactive use.
 .Pp
 The
-.Nm whoami
+.Nm
 utility displays your effective user ID as a name.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm whoami
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr id 1