From 255d42333e34f684356b1fd16afc7a90ebefc8fe Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Mon, 4 Jan 2021 15:23:05 +0100
Subject: [PATCH] chroot.2, rename.2, getgrent.3, nextafter.3, ttyslot.3,
 wprintf.3: ffix

Bring a bit more consistency to the layout of FTMs.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
---
 man2/chroot.2    | 21 +++++++--------------
 man2/rename.2    | 23 +++++++----------------
 man3/getgrent.3  |  3 +--
 man3/nextafter.3 |  4 ++--
 man3/ttyslot.3   |  6 ++----
 man3/wprintf.3   | 11 ++++-------
 6 files changed, 23 insertions(+), 45 deletions(-)

diff --git a/man2/chroot.2 b/man2/chroot.2
index ea7deffdf..5a831f350 100644
--- a/man2/chroot.2
+++ b/man2/chroot.2
@@ -46,21 +46,14 @@ Feature Test Macro Requirements for glibc (see
 .RE
 .PP
 .BR chroot ():
-.ad l
-.RS 4
-.PD 0
-.TP 4
-Since glibc 2.2.2:
 .nf
-_XOPEN_SOURCE && ! (_POSIX_C_SOURCE\ >=\ 200112L)
-    || /* Since glibc 2.20: */ _DEFAULT_SOURCE
-    || /* Glibc <= 2.19: */ _BSD_SOURCE
-.fi
-.TP 4
-Before glibc 2.2.2: none
-.PD
-.RE
-.ad b
+    Since glibc 2.2.2:
+        _XOPEN_SOURCE && ! (_POSIX_C_SOURCE\ >=\ 200112L)
+            || /* Since glibc 2.20: */ _DEFAULT_SOURCE
+            || /* Glibc <= 2.19: */ _BSD_SOURCE
+    Before glibc 2.2.2:
+        none
+.nf
 .SH DESCRIPTION
 .BR chroot ()
 changes the root directory of the calling process to that specified in
diff --git a/man2/rename.2 b/man2/rename.2
index a577e35e5..3a5c9b79f 100644
--- a/man2/rename.2
+++ b/man2/rename.2
@@ -54,25 +54,16 @@ Feature Test Macro Requirements for glibc (see
 .BR feature_test_macros (7)):
 .RE
 .PP
+.nf
 .BR renameat ():
-.PD 0
-.ad l
-.RS 4
-.TP 4
-Since glibc 2.10:
-_POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.10:
-_ATFILE_SOURCE
-.RE
-.PD
+    Since glibc 2.10:
+        _POSIX_C_SOURCE\ >=\ 200809L
+    Before glibc 2.10:
+        _ATFILE_SOURCE
 .PP
 .BR renameat2 ():
-.RS 4
-.TP
-_GNU_SOURCE
-.RE
-.ad
+    _GNU_SOURCE
+.fi
 .SH DESCRIPTION
 .BR rename ()
 renames a file, moving it between directories if required.
diff --git a/man3/getgrent.3 b/man3/getgrent.3
index 81f98a218..c36baf20b 100644
--- a/man3/getgrent.3
+++ b/man3/getgrent.3
@@ -59,9 +59,8 @@ _XOPEN_SOURCE\ >=\ 500
 .BR endgrent ():
 .RS 4
 Since glibc 2.22:
-    _XOPEN_SOURCE\ >=\ 500 ||
+    _XOPEN_SOURCE\ >=\ 500 || _DEFAULT_SOURCE
 .\"        || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-        _DEFAULT_SOURCE
 .br
 Glibc 2.21 and earlier
     _XOPEN_SOURCE\ >=\ 500
diff --git a/man3/nextafter.3 b/man3/nextafter.3
index a1143a359..f7cbb32d0 100644
--- a/man3/nextafter.3
+++ b/man3/nextafter.3
@@ -54,8 +54,8 @@ _ISOC99_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L
 .BR nexttowardf (),
 .BR nexttowardl ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE ||
-_POSIX_C_SOURCE\ >=\ 200112L
+_XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE
+    || _POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad b
 .SH DESCRIPTION
diff --git a/man3/ttyslot.3 b/man3/ttyslot.3
index 933634669..de2ba59e7 100644
--- a/man3/ttyslot.3
+++ b/man3/ttyslot.3
@@ -47,12 +47,10 @@ Since glibc 2.24:
     _DEFAULT_SOURCE
 .br
 From glibc 2.20 to 2.23:
-    _DEFAULT_SOURCE ||
-    _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE\ <\ 500
+    _DEFAULT_SOURCE || (_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE\ <\ 500)
 .br
 Glibc 2.19 and earlier:
-    _BSD_SOURCE ||
-    _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE\ <\ 500
+    _BSD_SOURCE || (_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE\ <\ 500)
 .RE
 .ad b
 .SH DESCRIPTION
diff --git a/man3/wprintf.3 b/man3/wprintf.3
index b57657bc2..a98e17ed1 100644
--- a/man3/wprintf.3
+++ b/man3/wprintf.3
@@ -38,20 +38,17 @@ Feature Test Macro Requirements for glibc (see
 .BR feature_test_macros (7)):
 .RE
 .PP
-.ad l
 All functions shown above:
-.RS 4
 .\" .BR wprintf (),
 .\" .BR fwprintf (),
 .\" .BR swprintf (),
 .\" .BR vwprintf (),
 .\" .BR vfwprintf (),
 .\" .BR vswprintf ():
-_XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE ||
-.br
-_POSIX_C_SOURCE\ >=\ 200112L
-.RE
-.ad
+.nf
+    _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE ||
+        _POSIX_C_SOURCE\ >=\ 200112L
+.fi
 .SH DESCRIPTION
 The
 .BR wprintf ()