21 files changed, 56 insertions, 58 deletions
diff --git a/man3/cmsg.3 b/man3/cmsg.3
index ccf8c54856..9c18887687 100644
--- a/man3/cmsg.3
+++ b/man3/cmsg.3
@@ -160,7 +160,7 @@ This code looks for the
 .B IP_TTL
 option in a received ancillary buffer:
 .PP
-.RS 4
+.in +4n
 .nf
 struct msghdr msgh;
 struct cmsghdr *cmsg;
@@ -185,12 +185,12 @@ if (cmsg == NULL) {
      */
 }
 .fi
-.RE
+.in
 .PP
 The code below passes an array of file descriptors over a Unix socket using
 .BR SCM_RIGHTS :
 .PP
-.RS 4
+.in +4n
 .nf
 struct msghdr msg = {0};
 struct cmsghdr *cmsg;
@@ -210,7 +210,7 @@ memcpy(fdptr, myfds, NUM_FD * sizeof(int));
 /* Sum of the length of all control messages in the buffer: */
 msg.msg_controllen = cmsg\->cmsg_len;
 .fi
-.RE
+.in
 .SH "SEE ALSO"
 .BR recvmsg (2),
 .BR sendmsg (2)
diff --git a/man3/ctime.3 b/man3/ctime.3
index 58edf4680c..19d8c768c9 100644
--- a/man3/ctime.3
+++ b/man3/ctime.3
@@ -91,7 +91,7 @@ separated into year, month, day, etc.
 Broken-down time is stored
 in the structure \fItm\fP which is defined in \fI<time.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct tm {
     int tm_sec;         /* seconds */
@@ -105,7 +105,7 @@ struct tm {
     int tm_isdst;       /* daylight saving time */
 };
 .fi
-.RE
+.in
 .PP
 The members of the \fItm\fP structure are:
 .TP
diff --git a/man3/encrypt.3 b/man3/encrypt.3
index e6e0602e51..26f7a0762f 100644
--- a/man3/encrypt.3
+++ b/man3/encrypt.3
@@ -79,7 +79,7 @@ and
 are the reentrant versions.
 They use the following
 structure to hold the key data:
-.RS 4
+.in +4n
 .nf
 
 struct crypt_data {
@@ -95,7 +95,7 @@ struct crypt_data {
     int      initialized;
 };
 .fi
-.RE
+.in
 .PP
 Before calling
 .BR setkey_r ()
diff --git a/man3/fgetgrent.3 b/man3/fgetgrent.3
index 622d57cb23..77e1de6e2b 100644
--- a/man3/fgetgrent.3
+++ b/man3/fgetgrent.3
@@ -55,7 +55,7 @@ The file \fIstream\fP must have the same format as \fI/etc/group\fP.
 .PP
 The \fIgroup\fP structure is defined in \fI<grp.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct group {
     char   *gr_name;        /* group name */
@@ -64,7 +64,7 @@ struct group {
     char  **gr_mem;         /* group members */
 };
 .fi
-.RE
+.in
 .SH "RETURN VALUE"
 The
 .BR fgetgrent ()
diff --git a/man3/getgrent_r.3 b/man3/getgrent_r.3
index 99efd40b9e..3de34e3291 100644
--- a/man3/getgrent_r.3
+++ b/man3/getgrent_r.3
@@ -66,7 +66,7 @@ The \fIgroup\fP structure is defined in
 .I <grp.h>
 as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct group {
     char    *gr_name;     /* group name */
@@ -76,7 +76,7 @@ struct group {
 };
 .ta
 .fi
-.RE
+.in
 .sp
 The non-reentrant functions return a pointer to static storage,
 where this static storage contains further pointers to group
diff --git a/man3/getgrnam.3 b/man3/getgrnam.3
index 0911264a89..6429b63789 100644
--- a/man3/getgrnam.3
+++ b/man3/getgrnam.3
@@ -88,7 +88,7 @@ was found or an error occurred) is stored in
 .PP
 The \fIgroup\fP structure is defined in \fI<grp.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct group {
     char   *gr_name;       /* group name */
@@ -97,7 +97,7 @@ struct group {
     char  **gr_mem;        /* group members */
 };
 .fi
-.RE
+.in
 .PP
 The maximum needed size for
 .I buf
diff --git a/man3/getpw.3 b/man3/getpw.3
index 22ab31428e..aedcdd465b 100644
--- a/man3/getpw.3
+++ b/man3/getpw.3
@@ -51,7 +51,7 @@ The returned buffer contains a line of format
 .PP
 The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct passwd {
     char   *pw_name;       /* user name */
@@ -63,7 +63,7 @@ struct passwd {
     char   *pw_shell;      /* shell program */
 };
 .fi
-.RE
+.in
 .SH "RETURN VALUE"
 The
 .BR getpw ()
diff --git a/man3/getpwent.3 b/man3/getpwent.3
index dcacdc8d4b..cdfdcc0a11 100644
--- a/man3/getpwent.3
+++ b/man3/getpwent.3
@@ -78,7 +78,7 @@ after all processing has been performed.
 .PP
 The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct passwd {
     char   *pw_name;       /* user name */
@@ -90,7 +90,7 @@ struct passwd {
     char   *pw_shell;      /* shell program */
 };
 .fi
-.RE
+.in
 .SH "RETURN VALUE"
 The
 .BR getpwent ()
diff --git a/man3/getpwent_r.3 b/man3/getpwent_r.3
index 90c156a743..862b7c5180 100644
--- a/man3/getpwent_r.3
+++ b/man3/getpwent_r.3
@@ -65,7 +65,7 @@ The \fIpasswd\fP structure is defined in
 .I <pwd.h>
 as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct passwd {
     char    *pw_name;      /* user name */
@@ -77,7 +77,7 @@ struct passwd {
     char    *pw_shell;     /* shell program */
 };
 .fi
-.RE
+.in
 .sp
 The non-reentrant functions return a pointer to static storage,
 where this static storage contains further pointers to user
diff --git a/man3/getpwnam.3 b/man3/getpwnam.3
index 14f657bde6..d2e0cf1e70 100644
--- a/man3/getpwnam.3
+++ b/man3/getpwnam.3
@@ -99,7 +99,7 @@ was found or an error occurred) is stored in
 .PP
 The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct passwd {
     char   *pw_name;       /* user name */
@@ -111,7 +111,7 @@ struct passwd {
     char   *pw_shell;      /* shell program */
 };
 .fi
-.RE
+.in
 .PP
 The maximum needed size for
 .I buf
diff --git a/man3/getrpcent.3 b/man3/getrpcent.3
index eec0cd3268..ab2a2f80e0 100644
--- a/man3/getrpcent.3
+++ b/man3/getrpcent.3
@@ -39,7 +39,7 @@ following structure
 containing the broken-out
 fields of a line in the rpc program number data base,
 .IR /etc/rpc .
-.RS 4
+.in +4n
 .LP
 .nf
 struct rpcent {
@@ -48,7 +48,7 @@ struct rpcent {
     long   r_number;   /* rpc program number */
 };
 .fi
-.RE
+.in
 .LP
 The members of this structure are:
 .TP 10
diff --git a/man3/getservent.3 b/man3/getservent.3
index b13dcd1cf6..b4dab2f221 100644
--- a/man3/getservent.3
+++ b/man3/getservent.3
@@ -86,7 +86,7 @@ function closes \fI/etc/services\fP.
 .PP
 The \fIservent\fP structure is defined in \fI<netdb.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct servent {
     char  *s_name;       /* official service name */
@@ -95,7 +95,7 @@ struct servent {
     char  *s_proto;      /* protocol to use */
 }
 .fi
-.RE
+.in
 .PP
 The members of the \fIservent\fP structure are:
 .TP
diff --git a/man3/getspnam.3 b/man3/getspnam.3
index 0cfb147476..4587753007 100644
--- a/man3/getspnam.3
+++ b/man3/getspnam.3
@@ -188,7 +188,7 @@ often with different prototypes.
 .SS Structure
 The shadow password structure is defined in \fI<shadow.h>\fP as follows:
 .sp
-.RS 4
+.in +4n
 .nf
 struct spwd {
     char *sp_namp;         /* Login name */
@@ -205,7 +205,7 @@ struct spwd {
     unsigned long sp_flag; /* Reserved */
 };
 .fi
-.RE
+.in
 .SH "RETURN VALUE"
 The functions that return a pointer return NULL if no more entries
 are available or if an error occurs during processing.
diff --git a/man3/hsearch.3 b/man3/hsearch.3
index abc8fe4deb..aaec52c02b 100644
--- a/man3/hsearch.3
+++ b/man3/hsearch.3
@@ -77,14 +77,14 @@ the hash table so that a new table can be constructed.
 .PP
 The argument \fIitem\fP is of type \fBENTRY\fP, which is a typedef defined in
 \fI<search.h>\fP and includes these elements:
-.RS 4
+.in +4n
 .sp
 .nf
 typedef struct entry {
     char *key;
     void *data;
 } ENTRY;
-.RE
+.in
 .fi
 .sp
 The field \fIkey\fP points to the null-terminated string which is the
diff --git a/man3/inet.3 b/man3/inet.3
index 74a48efd67..63643c047a 100644
--- a/man3/inet.3
+++ b/man3/inet.3
@@ -137,7 +137,7 @@ is defined in
 .I <netinet/in.h>
 as:
 .sp
-.RS 4
+.in +4n
 .nf
 typedef uint32_t in_addr_t;
 
@@ -145,7 +145,7 @@ struct in_addr {
     in_addr_t s_addr;
 };
 .fi
-.RE
+.in
 .PP
 Note that on the i80x86 the host byte order is Least Significant Byte
 first (little endian), whereas the network byte order, as used on the
diff --git a/man3/insque.3 b/man3/insque.3
index d5d8ab21a1..484a31eff1 100644
--- a/man3/insque.3
+++ b/man3/insque.3
@@ -72,7 +72,7 @@ Traditionally (e.g., SunOS, Linux libc 4,5) the parameters of these
 functions were of type \fIstruct qelem *\fP, where the struct
 is defined as
 
-.RS 4
+.in +4n
 .nf
 struct qelem {
     struct qelem *q_forw;
@@ -80,7 +80,7 @@ struct qelem {
     char          q_data[1];
 };
 .fi
-.RE
+.in
 
 This is still what you will get if
 .B _GNU_SOURCE
diff --git a/man3/mq_receive.3 b/man3/mq_receive.3
index 41b0a08dee..946cc0e095 100644
--- a/man3/mq_receive.3
+++ b/man3/mq_receive.3
@@ -83,7 +83,7 @@ This ceiling is an absolute timeout in seconds and nanoseconds
 since the Epoch (midnight on the morning of 1 January 1970),
 specified in the following structure:
 .sp
-.RS 4
+.in +4n
 .nf
 struct timespec {
     time_t tv_sec;        /* seconds */
@@ -91,7 +91,7 @@ struct timespec {
 };
 
 .fi
-.RE
+.in
 If no message is available,
 and the timeout has already expired by the time of the call,
 .BR mq_timedreceive ()
diff --git a/man3/mq_send.3 b/man3/mq_send.3
index 4c66c83e2d..655bafc4ef 100644
--- a/man3/mq_send.3
+++ b/man3/mq_send.3
@@ -89,7 +89,7 @@ This ceiling is an absolute timeout in seconds and nanoseconds
 since the Epoch (midnight on the morning of 1 January 1970),
 specified in the following structure:
 .sp
-.RS 4
+.in +4n
 .nf
 struct timespec {
     time_t tv_sec;        /* seconds */
@@ -97,7 +97,7 @@ struct timespec {
 };
 
 .fi
-.RE
+.in
 If the message queue is full,
 and the timeout has already expired by the time of the call,
 .BR mq_timedsend ()
diff --git a/man3/printf.3 b/man3/printf.3
index ade6e6018a..6d6f38d0c4 100644
--- a/man3/printf.3
+++ b/man3/printf.3
@@ -187,21 +187,21 @@ of `%' and `*m$' instead of `*', where the decimal integer m denotes
 the position in the argument list of the desired argument, indexed starting
 from 1.
 Thus,
-.RS
+.in +4n
 .nf
 
-    printf("%*d", width, num);
+printf("%*d", width, num);
 
 .fi
-.RE
+.in
 and
-.RS
+.in +4n
 .nf
 
-    printf("%2$*1$d", width, num);
+printf("%2$*1$d", width, num);
 
 .fi
-.RE
+.in
 are equivalent.
 The second style allows repeated references to the
 same argument.
@@ -927,14 +927,14 @@ call to write to memory and creating a security hole.
 .br
 .if \w'\*(Pi'=0 .ds Pi pi
 To print \*(Pi to five decimal places:
-.RS
+.in +4n
 .nf
 
 #include <math.h>
 #include <stdio.h>
 fprintf(stdout, "pi = %.5f\en", 4 * atan(1.0));
 .fi
-.RE
+.in
 .PP
 To print a date and time in the form `Sunday, July 3, 10:02',
 where
@@ -942,19 +942,19 @@ where
 and
 .I month
 are pointers to strings:
-.RS
+.in +4n
 .nf
 
 #include <stdio.h>
 fprintf(stdout, "%s, %s %d, %.2d:%.2d\en",
         weekday, month, day, hour, min);
 .fi
-.RE
+.in
 .PP
 Many countries use the day-month-year order.
 Hence, an internationalized version must be able to print
 the arguments in an order specified by the format:
-.RS
+.in +4n
 .nf
 
 #include <stdio.h>
@@ -962,21 +962,20 @@ fprintf(stdout, format,
         weekday, month, day, hour, min);
 
 .fi
-.RE
+.in
 where
 .I format
 depends on locale, and may permute the arguments.
 With the value
-.RS
+.in +4n
 .nf
 "%1$s, %3$d. %2$s, %4$d:%5$.2d\en"
 .fi
-.RE
+.in
 one might obtain `Sonntag, 3. Juli, 10:02'.
 .PP
 To allocate a sufficiently large string and print into it
 (code correct for both glibc 2.0 and glibc 2.1):
-.RS 4
 .nf
 
 #include <stdio.h>
@@ -1016,7 +1015,6 @@ make_message(const char *fmt, ...)
     }
 }
 .fi
-.RE
 .SH "SEE ALSO"
 .BR printf (1),
 .BR asprintf (3),
diff --git a/man3/readdir.3 b/man3/readdir.3
index 9c5b483d35..0b6b878223 100644
--- a/man3/readdir.3
+++ b/man3/readdir.3
@@ -54,7 +54,7 @@ On Linux, the
 .I dirent
 structure is defined as follows:
 .PP
-.RS 4
+.in +4n
 .nf
 struct dirent {
     ino_t          d_ino;       /* inode number */
@@ -64,7 +64,7 @@ struct dirent {
     char           d_name[256]; /* filename */
 };
 .fi
-.RE
+.in
 .PP
 According to POSIX, the
 .I dirent
diff --git a/man3/regex.3 b/man3/regex.3
index 3f720faa9a..0aa2fb0225 100644
--- a/man3/regex.3
+++ b/man3/regex.3
@@ -182,14 +182,14 @@ structure which is the type of
 is defined in
 .IR <regex.h> .
 
-.RS 4
+.in +4n
 .nf
 typedef struct {
     regoff_t rm_so;
     regoff_t rm_eo;
 } regmatch_t;
 .fi
-.RE
+.in
 
 Each
 .I rm_so