diff --git a/man2/getgroups.2 b/man2/getgroups.2
index 4b670d601..a59573064 100644
--- a/man2/getgroups.2
+++ b/man2/getgroups.2
@@ -50,10 +50,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR setgroups ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 .BR getgroups ()
 returns the supplementary group IDs of the calling process in
diff --git a/man2/gettimeofday.2 b/man2/gettimeofday.2
index acdd314b5..929bea05f 100644
--- a/man2/gettimeofday.2
+++ b/man2/gettimeofday.2
@@ -55,10 +55,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR settimeofday ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The functions
 .BR gettimeofday ()
diff --git a/man2/mincore.2 b/man2/mincore.2
index b43f19843..87b94aeab 100644
--- a/man2/mincore.2
+++ b/man2/mincore.2
@@ -48,10 +48,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR mincore ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 .BR mincore ()
 returns a vector that indicates whether pages
diff --git a/man2/readv.2 b/man2/readv.2
index e881a9881..b5a3fe7f4 100644
--- a/man2/readv.2
+++ b/man2/readv.2
@@ -57,10 +57,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR preadv (),
 .BR pwritev ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR readv ()
diff --git a/man2/stime.2 b/man2/stime.2
index 53726f235..68ab8425f 100644
--- a/man2/stime.2
+++ b/man2/stime.2
@@ -43,10 +43,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR stime ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 .BR NOTE :
 This function is deprecated;
diff --git a/man3/addseverity.3 b/man3/addseverity.3
index aca24c003..1dcbf0bb2 100644
--- a/man3/addseverity.3
+++ b/man3/addseverity.3
@@ -23,10 +23,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR addseverity ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 This function allows the introduction of new severity classes
 which can be addressed by the
diff --git a/man3/adjtime.3 b/man3/adjtime.3
index 5ad61a81c..e72122a0a 100644
--- a/man3/adjtime.3
+++ b/man3/adjtime.3
@@ -38,10 +38,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR adjtime ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR adjtime ()
diff --git a/man3/cfree.3 b/man3/cfree.3
index 219ee2ee5..ff4bba318 100644
--- a/man3/cfree.3
+++ b/man3/cfree.3
@@ -48,10 +48,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR cfree ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 This function should never be used.
 Use
diff --git a/man3/clearenv.3 b/man3/clearenv.3
index 2ccb789d8..a95aa487d 100644
--- a/man3/clearenv.3
+++ b/man3/clearenv.3
@@ -39,8 +39,10 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR clearenv ():
+.nf
     /* Glibc since 2.19: */ _DEFAULT_SOURCE
         || /* Glibc <= 2.19: */ _SVID_SOURCE || _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR clearenv ()
diff --git a/man3/confstr.3 b/man3/confstr.3
index 716fff547..91f9db5e4 100644
--- a/man3/confstr.3
+++ b/man3/confstr.3
@@ -46,7 +46,9 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR confstr ():
+.nf
     _POSIX_C_SOURCE >= 2 || _XOPEN_SOURCE
+.fi
 .SH DESCRIPTION
 .BR confstr ()
 gets the value of configuration-dependent string variables.
diff --git a/man3/ctermid.3 b/man3/ctermid.3
index 493751098..314215301 100644
--- a/man3/ctermid.3
+++ b/man3/ctermid.3
@@ -41,7 +41,9 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR ctermid ():
+.nf
     _POSIX_C_SOURCE
+.fi
 .SH DESCRIPTION
 .BR ctermid ()
 returns a string which is the pathname for the current
diff --git a/man3/dysize.3 b/man3/dysize.3
index 4962d32d8..4c19a6f95 100644
--- a/man3/dysize.3
+++ b/man3/dysize.3
@@ -39,10 +39,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR dysize ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The function returns 365 for a normal year and 366 for a leap year.
 The calculation for leap year is based on:
diff --git a/man3/fgetgrent.3 b/man3/fgetgrent.3
index 7f75642c3..24b00c530 100644
--- a/man3/fgetgrent.3
+++ b/man3/fgetgrent.3
@@ -45,10 +45,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR fgetgrent ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR fgetgrent ()
diff --git a/man3/fgetpwent.3 b/man3/fgetpwent.3
index 1ff797464..b7ff0f9b4 100644
--- a/man3/fgetpwent.3
+++ b/man3/fgetpwent.3
@@ -48,10 +48,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR fgetpwent ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR fgetpwent ()
diff --git a/man3/futimes.3 b/man3/futimes.3
index 0df833e60..8968aa76e 100644
--- a/man3/futimes.3
+++ b/man3/futimes.3
@@ -40,10 +40,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR futimes (),
 .BR lutimes ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 .BR futimes ()
 changes the access and modification times of a file in the same way as
diff --git a/man3/getdirentries.3 b/man3/getdirentries.3
index bf571bcc6..c756f8167 100644
--- a/man3/getdirentries.3
+++ b/man3/getdirentries.3
@@ -41,10 +41,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR getdirentries ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 Read directory entries from the directory specified by
 .I fd
diff --git a/man3/getgrouplist.3 b/man3/getgrouplist.3
index 6dd861256..c4bdbea5e 100644
--- a/man3/getgrouplist.3
+++ b/man3/getgrouplist.3
@@ -43,10 +43,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR getgrouplist ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR getgrouplist ()
diff --git a/man3/getmntent.3 b/man3/getmntent.3
index 097391ba9..7f83ed248 100644
--- a/man3/getmntent.3
+++ b/man3/getmntent.3
@@ -61,10 +61,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR getmntent_r ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 These routines are used to access the filesystem description file
 .I /etc/fstab
diff --git a/man3/getpwent_r.3 b/man3/getpwent_r.3
index 1fc1d6a97..3414b31a8 100644
--- a/man3/getpwent_r.3
+++ b/man3/getpwent_r.3
@@ -40,16 +40,20 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR getpwent_r (),
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .PP
 .BR fgetpwent_r ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The functions
 .BR getpwent_r ()
diff --git a/man3/gsignal.3 b/man3/gsignal.3
index 00071bb8e..659e1a7c2 100644
--- a/man3/gsignal.3
+++ b/man3/gsignal.3
@@ -45,10 +45,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR gsignal (),
 .BR ssignal ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 Don't use these functions under Linux.
 Due to a historical mistake, under Linux these functions are
diff --git a/man3/initgroups.3 b/man3/initgroups.3
index 546e5a10f..114eff6a8 100644
--- a/man3/initgroups.3
+++ b/man3/initgroups.3
@@ -46,10 +46,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR initgroups ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR initgroups ()
diff --git a/man3/on_exit.3 b/man3/on_exit.3
index 7371c6c04..2cb03de3d 100644
--- a/man3/on_exit.3
+++ b/man3/on_exit.3
@@ -44,10 +44,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR on_exit ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR on_exit ()
diff --git a/man3/perror.3 b/man3/perror.3
index 24192358d..661dd6b0d 100644
--- a/man3/perror.3
+++ b/man3/perror.3
@@ -51,10 +51,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .IR sys_errlist ,
 .IR sys_nerr :
+.nf
     From glibc 2.19 to 2.31:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR perror ()
diff --git a/man3/putpwent.3 b/man3/putpwent.3
index 35ec67ab8..fcbce54d3 100644
--- a/man3/putpwent.3
+++ b/man3/putpwent.3
@@ -45,10 +45,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR putpwent ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR putpwent ()
diff --git a/man3/rpmatch.3 b/man3/rpmatch.3
index 80742972b..4ae2c95c9 100644
--- a/man3/rpmatch.3
+++ b/man3/rpmatch.3
@@ -42,10 +42,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR rpmatch ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 .BR rpmatch ()
 handles a user response to yes or no questions, with
diff --git a/man3/seekdir.3 b/man3/seekdir.3
index 1375099ef..0bc5460bf 100644
--- a/man3/seekdir.3
+++ b/man3/seekdir.3
@@ -45,9 +45,11 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR seekdir ():
+.nf
     _XOPEN_SOURCE
         || /* Glibc since 2.19: */ _DEFAULT_SOURCE
         || /* Glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR seekdir ()
diff --git a/man3/setbuf.3 b/man3/setbuf.3
index b009cfebf..2cd778285 100644
--- a/man3/setbuf.3
+++ b/man3/setbuf.3
@@ -67,10 +67,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR setbuffer (),
 .BR setlinebuf ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The three types of buffering available are unbuffered, block buffered, and
 line buffered.
diff --git a/man3/sigvec.3 b/man3/sigvec.3
index d29ce6497..920265be8 100644
--- a/man3/sigvec.3
+++ b/man3/sigvec.3
@@ -44,10 +44,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 All functions shown above:
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 These functions are provided in glibc as a compatibility interface
 for programs that make use of the historical BSD signal API.
diff --git a/man3/strsep.3 b/man3/strsep.3
index 06a9aa1f7..9d40e208b 100644
--- a/man3/strsep.3
+++ b/man3/strsep.3
@@ -46,10 +46,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR strsep ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 If
 .I *stringp
diff --git a/man3/syslog.3 b/man3/syslog.3
index 8f355450b..50566f2ae 100644
--- a/man3/syslog.3
+++ b/man3/syslog.3
@@ -54,10 +54,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR vsyslog ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 .SS openlog()
 .BR openlog ()
diff --git a/man3/telldir.3 b/man3/telldir.3
index 0f8a90f52..3fac0ebbc 100644
--- a/man3/telldir.3
+++ b/man3/telldir.3
@@ -43,9 +43,11 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR telldir ():
- _XOPEN_SOURCE
-    || /* Glibc since 2.19: */ _DEFAULT_SOURCE
-    || /* Glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
+.nf
+    _XOPEN_SOURCE
+       || /* Glibc since 2.19: */ _DEFAULT_SOURCE
+       || /* Glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The
 .BR telldir ()
diff --git a/man3/tempnam.3 b/man3/tempnam.3
index 349226b72..cb66c953a 100644
--- a/man3/tempnam.3
+++ b/man3/tempnam.3
@@ -38,10 +38,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR tempnam ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 .I "Never use this function."
 Use
diff --git a/man3/termios.3 b/man3/termios.3
index 525ecdd42..73dae3efb 100644
--- a/man3/termios.3
+++ b/man3/termios.3
@@ -73,10 +73,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR cfsetspeed (),
 .BR cfmakeraw ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The termios functions describe a general terminal interface that is
 provided to control asynchronous communications ports.
diff --git a/man3/timegm.3 b/man3/timegm.3
index 6a411c1bc..de0fdc634 100644
--- a/man3/timegm.3
+++ b/man3/timegm.3
@@ -40,10 +40,12 @@ Feature Test Macro Requirements for glibc (see
 .PP
 .BR timelocal (),
 .BR timegm ():
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE || _SVID_SOURCE
+.fi
 .SH DESCRIPTION
 The functions
 .BR timelocal ()
diff --git a/man3/timeradd.3 b/man3/timeradd.3
index d5779a492..a8d50df3a 100644
--- a/man3/timeradd.3
+++ b/man3/timeradd.3
@@ -48,10 +48,12 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 All functions shown above:
+.nf
     Since glibc 2.19:
         _DEFAULT_SOURCE
     Glibc 2.19 and earlier:
         _BSD_SOURCE
+.fi
 .SH DESCRIPTION
 The macros are provided to operate on
 .I timeval