19 files changed, 23 insertions, 20 deletions
diff --git a/man2/getgroups.2 b/man2/getgroups.2
index 9fdc0a0a89..e2644a68a2 100644
--- a/man2/getgroups.2
+++ b/man2/getgroups.2
@@ -174,9 +174,9 @@ The maximum number of supplementary group IDs can be found at run time using
 .EX
 long ngroups_max;
 ngroups_max = sysconf(_SC_NGROUPS_MAX);
-..EE
-.in
 .EE
+.in
+.PP
 The maximum return value of
 .BR getgroups ()
 cannot be larger than one more than this value.
diff --git a/man2/getrlimit.2 b/man2/getrlimit.2
index 61c7b7b552..df175003b9 100644
--- a/man2/getrlimit.2
+++ b/man2/getrlimit.2
@@ -815,7 +815,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.EX
+.EE
 .SH SEE ALSO
 .BR prlimit (1),
 .BR dup (2),
diff --git a/man2/ioctl_ficlonerange.2 b/man2/ioctl_ficlonerange.2
index 64f6adcd57..0e5edc4308 100644
--- a/man2/ioctl_ficlonerange.2
+++ b/man2/ioctl_ficlonerange.2
@@ -73,7 +73,7 @@ struct file_clone_range {
     __u64 src_length;
     __u64 dest_offset;
 };
-.EX
+.EE
 .in
 .PP
 Clones are atomic with regards to concurrent writes, so no locks need to be
diff --git a/man2/ioctl_fideduperange.2 b/man2/ioctl_fideduperange.2
index 6d69dffc0e..f86b6a242f 100644
--- a/man2/ioctl_fideduperange.2
+++ b/man2/ioctl_fideduperange.2
@@ -66,7 +66,7 @@ struct file_dedupe_range {
     __u32 reserved2;
     struct file_dedupe_range_info info[0];
 };
-.EX
+.EE
 .in
 .PP
 Deduplication is atomic with regards to concurrent writes, so no locks need to
diff --git a/man2/semop.2 b/man2/semop.2
index 95940782fd..7879c23afa 100644
--- a/man2/semop.2
+++ b/man2/semop.2
@@ -64,8 +64,8 @@ unsigned short  semval;   /* semaphore value */
 unsigned short  semzcnt;  /* # waiting for zero */
 unsigned short  semncnt;  /* # waiting for increase */
 pid_t           sempid;   /* PID of process that last
-.in -4n
-.fi
+.in
+.EE
 .PP
 .BR semop ()
 performs operations on selected semaphores in the set indicated by
diff --git a/man3/difftime.3 b/man3/difftime.3
index f53d3b8698..d6b5bf1be0 100644
--- a/man3/difftime.3
+++ b/man3/difftime.3
@@ -68,7 +68,7 @@ define
 .in +4n
 .EX
 #define difftime(t1,t0) (double)(t1 \- t0)
-.EX
+.EE
 .in
 .PP
 when the possible overflow in the subtraction is not a concern.
diff --git a/man3/getpw.3 b/man3/getpw.3
index e4a41c616b..fc2db195a0 100644
--- a/man3/getpw.3
+++ b/man3/getpw.3
@@ -48,7 +48,7 @@ the given user ID \fIuid\fP in the buffer \fIbuf\fP.
 The returned buffer contains a line of format
 .PP
 .in +4n
-.EE
+.EX
 .B name:passwd:uid:gid:gecos:dir:shell
 .EE
 .in
diff --git a/man3/malloc_hook.3 b/man3/malloc_hook.3
index 5df2d49d21..cdd72b3ce1 100644
--- a/man3/malloc_hook.3
+++ b/man3/malloc_hook.3
@@ -138,7 +138,7 @@ my_malloc_hook(size_t size, const void *caller)
 
     return result;
 }
-.EX
+.EE
 .SH SEE ALSO
 .BR mallinfo (3),
 .BR malloc (3),
diff --git a/man3/mbrtowc.3 b/man3/mbrtowc.3
index 5b2f32c9ec..5526b2da35 100644
--- a/man3/mbrtowc.3
+++ b/man3/mbrtowc.3
@@ -145,7 +145,7 @@ can be initialized to the initial state
 by zeroing it, for example using
 .PP
 .in +4n
-.EE
+.EX
 memset(&a, 0, sizeof(a));
 .EE
 .in
diff --git a/man3/newlocale.3 b/man3/newlocale.3
index 4b7b0b9591..c7eb6f1459 100644
--- a/man3/newlocale.3
+++ b/man3/newlocale.3
@@ -296,7 +296,8 @@ New Zealand Māori):
 $ LC_ALL=mi_NZ ./a.out fr_FR ""
 123456,789
 Te Paraire, te 07 o Poutū-te-rangi, 2014 00:38:44 CET
-.fi
+.EE
+.in
 .SS Program source
 .EX
 #define _XOPEN_SOURCE 700
diff --git a/man3/offsetof.3 b/man3/offsetof.3
index b9a6ffd018..a9cd0a04b6 100644
--- a/man3/offsetof.3
+++ b/man3/offsetof.3
@@ -72,7 +72,8 @@ options, the program below produces the following output:
 .RB "$" " ./a.out"
 offsets: i=0; c=4; d=8 a=16
 sizeof(struct s)=16
-.fi
+.EE
+.in
 .SS Program source
 \&
 .EX
diff --git a/man3/pthread_tryjoin_np.3 b/man3/pthread_tryjoin_np.3
index 640c3715c9..50c467476e 100644
--- a/man3/pthread_tryjoin_np.3
+++ b/man3/pthread_tryjoin_np.3
@@ -155,7 +155,7 @@ s = pthread_timedjoin_np(thread, NULL, &ts);
 if (s != 0) {
     /* Handle error */
 }
-.EX
+.EE
 .in
 .SH SEE ALSO
 .BR clock_gettime (2),
diff --git a/man3/rand.3 b/man3/rand.3
index c7984d44c9..6a1bee31a6 100644
--- a/man3/rand.3
+++ b/man3/rand.3
@@ -232,7 +232,7 @@ main(int argc, char *argv[])
 
     exit(EXIT_SUCCESS);
 }
-.EX
+.EE
 .in
 .SH SEE ALSO
 .BR drand48 (3),
diff --git a/man3/rtnetlink.3 b/man3/rtnetlink.3
index eb6f0f74a0..b738530cf4 100644
--- a/man3/rtnetlink.3
+++ b/man3/rtnetlink.3
@@ -119,7 +119,7 @@ req.nh.nlmsg_len = NLMSG_ALIGN(req.nh.nlmsg_len) +
                               RTA_LENGTH(sizeof(mtu));
 memcpy(RTA_DATA(rta), &mtu, sizeof(mtu));
 send(rtnetlink_sk, &req, req.nh.nlmsg_len, 0);
-.EX
+.EE
 .in
 .SH SEE ALSO
 .BR netlink (3),
diff --git a/man3/setbuf.3 b/man3/setbuf.3
index 7637c4fa05..cb6bc4c852 100644
--- a/man3/setbuf.3
+++ b/man3/setbuf.3
@@ -213,7 +213,7 @@ main(void)
     printf("Hello, world!\\n");
     return 0;
 }
-.PP
+.EE
 .SH SEE ALSO
 .BR stdbuf (1),
 .BR fclose (3),
diff --git a/man3/strtol.3 b/man3/strtol.3
index e7e3496ba9..cc5196dee4 100644
--- a/man3/strtol.3
+++ b/man3/strtol.3
@@ -204,9 +204,9 @@ BSD also has
 .in +4n
 .EX
 .BI "quad_t strtoq(const char *" nptr ", char **" endptr ", int " base );
-.EX
 .EE
 .in
+.PP
 with completely analogous definition.
 Depending on the wordsize of the current architecture, this
 may be equivalent to
diff --git a/man4/fuse.4 b/man4/fuse.4
index 26474a0bbf..05a68f899e 100644
--- a/man4/fuse.4
+++ b/man4/fuse.4
@@ -521,7 +521,7 @@ The FUSE filesystem is Linux-specific.
 The following messages are not yet documented in this manual page:
 .\" FIXME: Document the following.
 .in +8n
-.nf
+.EX
 .BR FUSE_BATCH_FORGET
 .BR FUSE_BMAP
 .BR FUSE_CREATE
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index d4f4e4c209..c7516fc573 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -65,7 +65,7 @@ manual page):
 .PP
 .BI "int acct(const char *" filename );
 .PP
-.nf
+.EX
 .in -4n
 Feature Test Macro Requirements for glibc (see
 .BR feature_test_macros (7)):
diff --git a/man7/pkeys.7 b/man7/pkeys.7
index c442c4d7d3..7cacef1b5a 100644
--- a/man7/pkeys.7
+++ b/man7/pkeys.7
@@ -288,6 +288,7 @@ main(void)
 
     exit(EXIT_SUCCESS);
 }
+.EE
 .SH SEE ALSO
 .BR pkey_alloc (2),
 .BR pkey_free (2),