sinh.3, sockatmark.3, stdarg.3, stpcpy.3, syslog.3, system.3, tanh.3, termios.3, wctrans.3, wctype.3, wcwidth.3, wordexp.3, cciss.4, fuse.4, initrd.4, loop.4, acct.5, hosts.5, nss.5, operator.7, unix.7: ffix

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
author: Michael Kerrisk <mtk.manpages@gmail.com> 2017-08-19 10:28:45 +0200
committer: Michael Kerrisk <mtk.manpages@gmail.com> 2017-08-19 13:47:27 +0200
commit: a2b7a14421e08d0ae5b3ee11b291646fb060fb88 (patch)
tree: a3dada9a6e42c8897bb0c7232798e39b41d1f479
parent: 207050fa9e2db87546724663e7b364c24a2d99e0 (diff)
download: man-pages-a2b7a14421e08d0ae5b3ee11b291646fb060fb88.tar.gz
21 files changed, 119 insertions, 100 deletions
diff --git a/man3/sinh.3 b/man3/sinh.3
index e571b3c017..7caee11666 100644
--- a/man3/sinh.3
+++ b/man3/sinh.3
@@ -68,8 +68,8 @@ These functions return the hyperbolic sine of
 .IR x ,
 which
 is defined mathematically as:
+.PP
 .nf
-
     sinh(x) = (exp(x) \- exp(\-x)) / 2
 .fi
 .SH RETURN VALUE
diff --git a/man3/sockatmark.3 b/man3/sockatmark.3
index 4eabefc096..ff6792963e 100644
--- a/man3/sockatmark.3
+++ b/man3/sockatmark.3
@@ -113,8 +113,8 @@ The following code can be used after receipt of a
 .B SIGURG
 signal to read (and discard) all data up to the mark,
 and then read the byte of data at the mark:
-.nf
-
+.PP
+.EX
     char buf[BUF_LEN];
     char oobdata;
     int atmark, s;
@@ -142,7 +142,7 @@ and then read the byte of data at the mark:
             ...
         }
     }
-.fi
+.EE
 .SH SEE ALSO
 .BR fcntl (2),
 .BR recv (2),
diff --git a/man3/stdarg.3 b/man3/stdarg.3
index f95621e63f..615a559762 100644
--- a/man3/stdarg.3
+++ b/man3/stdarg.3
@@ -310,8 +310,8 @@ The function
 .I foo
 takes a string of format characters and prints out the argument associated
 with each format character based on the type.
-.nf
-
+.PP
+.EX
 #include <stdio.h>
 #include <stdarg.h>
 
@@ -342,4 +342,4 @@ foo(char *fmt, ...)
         }
     va_end(ap);
 }
-.fi
+.EE
diff --git a/man3/stpcpy.3 b/man3/stpcpy.3
index 0bde185dfa..e611a84fd5 100644
--- a/man3/stpcpy.3
+++ b/man3/stpcpy.3
@@ -102,8 +102,8 @@ and
 to produce
 .BR foobar ,
 which it then prints.
-.nf
-
+.PP
+.EX
 #define _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>
@@ -118,7 +118,7 @@ main(void)
     to = stpcpy(to, "bar");
     printf("%s\\n", buffer);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR bcopy (3),
 .BR memccpy (3),
diff --git a/man3/syslog.3 b/man3/syslog.3
index 82a0b1f8d7..8138d648fe 100644
--- a/man3/syslog.3
+++ b/man3/syslog.3
@@ -350,10 +350,12 @@ Most portable is to use a string constant.
 .PP
 Never pass a string with user-supplied data as a format,
 use the following instead:
-.nf
-
-    syslog(priority, "%s", string);
-.fi
+.PP
+.in +4n
+.EX
+syslog(priority, "%s", string);
+.EE
+.in
 .SH SEE ALSO
 .BR logger (1),
 .BR journalctl (1),
diff --git a/man3/system.3 b/man3/system.3
index 36d0f99be7..bc3c27688b 100644
--- a/man3/system.3
+++ b/man3/system.3
@@ -161,17 +161,18 @@ This may make programs that call it
 from a loop uninterruptible, unless they take care themselves
 to check the exit status of the child.
 For example:
-.br
-.nf
-
-    while (something) {
-        int ret = system("foo");
+.PP
+.in +4n
+.EX
+while (something) {
+    int ret = system("foo");
 
-        if (WIFSIGNALED(ret) &&
-            (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT))
-                break;
-    }
-.fi
+    if (WIFSIGNALED(ret) &&
+        (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT))
+            break;
+}
+.EE
+.in
 .PP
 Do not use
 .BR system ()
diff --git a/man3/tanh.3 b/man3/tanh.3
index 49ccabf132..1eb4e4892c 100644
--- a/man3/tanh.3
+++ b/man3/tanh.3
@@ -67,8 +67,8 @@ These functions return the hyperbolic tangent of
 .IR x ,
 which
 is defined mathematically as:
+.PP
 .nf
-
     tanh(x) = sinh(x) / cosh(x)
 .fi
 .SH RETURN VALUE
diff --git a/man3/termios.3 b/man3/termios.3
index 0917cb10e0..203cd9e6ab 100644
--- a/man3/termios.3
+++ b/man3/termios.3
@@ -842,15 +842,18 @@ input is available character by character,
 echoing is disabled, and all special processing of
 terminal input and output characters is disabled.
 The terminal attributes are set as follows:
-.nf
-
-    termios_p\->c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP
-                    | INLCR | IGNCR | ICRNL | IXON);
-    termios_p\->c_oflag &= ~OPOST;
-    termios_p\->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
-    termios_p\->c_cflag &= ~(CSIZE | PARENB);
-    termios_p\->c_cflag |= CS8;
-.fi
+.PP
+.in +4n
+.EX
+termios_p\->c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP
+                | INLCR | IGNCR | ICRNL | IXON);
+termios_p\->c_oflag &= ~OPOST;
+termios_p\->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+termios_p\->c_cflag &= ~(CSIZE | PARENB);
+termios_p\->c_cflag |= CS8;
+.EE
+.in
+.\"
 .SS Line control
 .PP
 .BR tcsendbreak ()
@@ -926,8 +929,8 @@ pointed to by
 .BR cfsetospeed ()
 sets the output baud rate stored in the \fItermios\fP structure pointed
 to by \fItermios_p\fP to \fIspeed\fP, which must be one of these constants:
+.PP
 .nf
-
 .ft B
 	B0
 	B50
@@ -949,8 +952,8 @@ to by \fItermios_p\fP to \fIspeed\fP, which must be one of these constants:
 	B115200
 	B230400
 .ft P
-
 .fi
+.PP
 The zero baud rate, \fBB0\fP,
 is used to terminate the connection.
 If B0 is specified, the modem control lines shall no longer be asserted.
diff --git a/man3/wctrans.3 b/man3/wctrans.3
index 8b7b946145..8ffe4f4e6f 100644
--- a/man3/wctrans.3
+++ b/man3/wctrans.3
@@ -47,9 +47,10 @@ valid names depends on the
 .B LC_CTYPE
 category of the current locale, but the
 following names are valid in all locales.
+.PP
 .nf
-  "tolower" \- realizes the \fBtolower\fP(3) mapping
-  "toupper" \- realizes the \fBtoupper\fP(3) mapping
+    "tolower" \- realizes the \fBtolower\fP(3) mapping
+    "toupper" \- realizes the \fBtoupper\fP(3) mapping
 .fi
 .SH RETURN VALUE
 The
diff --git a/man3/wctype.3 b/man3/wctype.3
index f22972d110..d51c3e0afe 100644
--- a/man3/wctype.3
+++ b/man3/wctype.3
@@ -48,19 +48,20 @@ valid names depends on the
 .B LC_CTYPE
 category of the current locale, but the
 following names are valid in all locales.
+.PP
 .nf
-  "alnum" \- realizes the \fBisalnum\fP(3) classification function
-  "alpha" \- realizes the \fBisalpha\fP(3) classification function
-  "blank" \- realizes the \fBisblank\fP(3) classification function
-  "cntrl" \- realizes the \fBiscntrl\fP(3) classification function
-  "digit" \- realizes the \fBisdigit\fP(3) classification function
-  "graph" \- realizes the \fBisgraph\fP(3) classification function
-  "lower" \- realizes the \fBislower\fP(3) classification function
-  "print" \- realizes the \fBisprint\fP(3) classification function
-  "punct" \- realizes the \fBispunct\fP(3) classification function
-  "space" \- realizes the \fBisspace\fP(3) classification function
-  "upper" \- realizes the \fBisupper\fP(3) classification function
-  "xdigit" \- realizes the \fBisxdigit\fP(3) classification function
+    "alnum" \- realizes the \fBisalnum\fP(3) classification function
+    "alpha" \- realizes the \fBisalpha\fP(3) classification function
+    "blank" \- realizes the \fBisblank\fP(3) classification function
+    "cntrl" \- realizes the \fBiscntrl\fP(3) classification function
+    "digit" \- realizes the \fBisdigit\fP(3) classification function
+    "graph" \- realizes the \fBisgraph\fP(3) classification function
+    "lower" \- realizes the \fBislower\fP(3) classification function
+    "print" \- realizes the \fBisprint\fP(3) classification function
+    "punct" \- realizes the \fBispunct\fP(3) classification function
+    "space" \- realizes the \fBisspace\fP(3) classification function
+    "upper" \- realizes the \fBisupper\fP(3) classification function
+    "xdigit" \- realizes the \fBisxdigit\fP(3) classification function
 .fi
 .SH RETURN VALUE
 The
diff --git a/man3/wcwidth.3 b/man3/wcwidth.3
index 8217589407..6c19e91096 100644
--- a/man3/wcwidth.3
+++ b/man3/wcwidth.3
@@ -58,7 +58,7 @@ T}	Thread safety	MT-Safe locale
 POSIX.1-2001, POSIX.1-2008.
 .PP
 Note that glibc before 2.2.5 used the prototype
-.br
+.PP
 .nf
 .BI "int wcwidth(wint_t " c );
 .fi
diff --git a/man3/wordexp.3 b/man3/wordexp.3
index 3df86d8532..d4f811c1a2 100644
--- a/man3/wordexp.3
+++ b/man3/wordexp.3
@@ -224,7 +224,7 @@ POSIX.1-2001, POSIX.1-2008.
 The output of the following example program
 is approximately that of "ls [a-c]*.c".
 .PP
-.nf
+.EX
 #include <stdio.h>
 #include <stdlib.h>
 #include <wordexp.h>
@@ -243,7 +243,7 @@ main(int argc, char **argv)
     wordfree(&p);
     exit(EXIT_SUCCESS);
 }
-.fi
+.EE
 .SH SEE ALSO
 .BR fnmatch (3),
 .BR glob (3)
diff --git a/man4/cciss.4 b/man4/cciss.4
index b2f0729482..983f15923c 100644
--- a/man4/cciss.4
+++ b/man4/cciss.4
@@ -26,8 +26,8 @@ driver from attempting to drive any controllers that the
 driver is capable of controlling, which is to say, the
 .B cciss
 driver is restricted by this option to the following controllers:
+.PP
 .nf
-
     Smart Array 5300
     Smart Array 5i
     Smart Array 532
@@ -50,8 +50,8 @@ driver is restricted by this option to the following controllers:
 The
 .B cciss
 driver supports the following Smart Array boards:
+.PP
 .nf
-
     Smart Array 5300
     Smart Array 5i
     Smart Array 532
@@ -89,10 +89,10 @@ run from the Smart Array's option ROM at boot time.
 .SH FILES
 .SS Device nodes
 The device naming scheme is as follows:
+.PP
 .nf
-
 Major numbers:
-
+.PP
     104     cciss0
     105     cciss1
     106     cciss2
@@ -101,23 +101,23 @@ Major numbers:
     109     cciss5
     110     cciss6
     111     cciss7
-
+.PP
 Minor numbers:
-
+.PP
     b7 b6 b5 b4 b3 b2 b1 b0
     |----+----| |----+----|
          |           |
          |           +-------- Partition ID (0=wholedev, 1-15 partition)
          |
          +-------------------- Logical Volume number
-
+.PP
 The device naming scheme is:
-
+.PP
     /dev/cciss/c0d0         Controller 0, disk 0, whole device
     /dev/cciss/c0d0p1       Controller 0, disk 0, partition 1
     /dev/cciss/c0d0p2       Controller 0, disk 0, partition 2
     /dev/cciss/c0d0p3       Controller 0, disk 0, partition 3
-
+.PP
     /dev/cciss/c1d1         Controller 1, disk 1, whole device
     /dev/cciss/c1d1p1       Controller 1, disk 1, partition 1
     /dev/cciss/c1d1p2       Controller 1, disk 1, partition 2
@@ -244,14 +244,16 @@ This is best done via an initialization script
 .IR /etc/init.d ,
 but could vary depending on distribution).
 For example:
-.nf
-
-    for x in /proc/driver/cciss/cciss[0-9]*
-    do
-        echo "engage scsi" > $x
-    done
-
-.fi
+.PP
+.in +4n
+.EX
+for x in /proc/driver/cciss/cciss[0-9]*
+do
+    echo "engage scsi" > $x
+done
+.EE
+.in
+.PP
 Once the SCSI core is engaged by the driver, it cannot be disengaged
 (except by unloading the driver, if it happens to be linked as a module.)
 .PP
diff --git a/man4/fuse.4 b/man4/fuse.4
index 95126810a4..26474a0bbf 100644
--- a/man4/fuse.4
+++ b/man4/fuse.4
@@ -29,7 +29,7 @@ fuse \- Filesystem in Userspace (FUSE) device
 .SH SYNOPSIS
 .nf
 .B #include <linux/fuse.h>
-.nf
+.fi
 .SH DESCRIPTION
 .PP
 This device is the primary interface between the FUSE filesystem driver
diff --git a/man4/initrd.4 b/man4/initrd.4
index 0b31f8764e..57fa650816 100644
--- a/man4/initrd.4
+++ b/man4/initrd.4
@@ -47,13 +47,13 @@ with mode 0400 (read access by root only).
 If the Linux system does not have
 .I /dev/initrd
 already created, it can be created with the following commands:
-
-.nf
-\fB
-        mknod \-m 400 /dev/initrd b 1 250
-        chown root:disk /dev/initrd
-\fP
-.fi
+.PP
+.in +4n
+.EX
+mknod \-m 400 /dev/initrd b 1 250
+chown root:disk /dev/initrd
+.EE
+.in
 .PP
 Also, support for both "RAM disk" and "Initial RAM disk"
 (e.g.,
@@ -281,23 +281,27 @@ and then writing 0xff (e.g., the pseudo-NFS-device number) into file
 For example, the following shell command line would change
 the normal root device to
 .IR /dev/hdb1 :
-.nf
-
-    echo 0x365 >/proc/sys/kernel/real-root-dev
-
-.fi
+.PP
+.in +4n
+.EX
+echo 0x365 >/proc/sys/kernel/real-root-dev
+.EE
+.in
+.PP
 For an NFS example, the following shell command lines would change the
 normal root device to the NFS directory
 .I /var/nfsroot
 on a local networked NFS server with IP number 193.8.232.7 for a system with
 IP number 193.8.232.2 and named "idefix":
-.nf
-
-    echo /var/nfsroot >/proc/sys/kernel/nfs-root-name
-    echo 193.8.232.2:193.8.232.7::255.255.255.0:idefix \\
-        >/proc/sys/kernel/nfs-root-addrs
-    echo 255 >/proc/sys/kernel/real-root-dev
-.fi
+.PP
+.in +4n
+.EX
+echo /var/nfsroot >/proc/sys/kernel/nfs-root-name
+echo 193.8.232.2:193.8.232.7::255.255.255.0:idefix \\
+    >/proc/sys/kernel/nfs-root-addrs
+echo 255 >/proc/sys/kernel/real-root-dev
+.EE
+.in
 .PP
 .BR Note :
 The use of
diff --git a/man4/loop.4 b/man4/loop.4
index 5b7196dd9c..9dbf2509ff 100644
--- a/man4/loop.4
+++ b/man4/loop.4
@@ -38,14 +38,16 @@ image stored in a file, so that it can be mounted with the
 .BR mount (8)
 command.
 You could do
-.nf
-.IP
+.PP
+.in +4n
+.EX
 $ \fBdd if=/dev/zero of=file.img bs=1MiB count=10\fP
 $ \fBsudo losetup /dev/loop4 file.img \fP
 $ \fBsudo mkfs -t ext4 /dev/loop4\fP
 $ \fBsudo mkdir /myloopdev\fP
 $ \fBsudo mount /dev/loop4 /myloopdev\fP
-.fi
+.EE
+.in
 .PP
 See
 .BR losetup (8)
diff --git a/man5/acct.5 b/man5/acct.5
index 55bc877602..c04ac95c27 100644
--- a/man5/acct.5
+++ b/man5/acct.5
@@ -91,8 +91,8 @@ and a 13-bit mantissa.
 A value,
 .IR c ,
 of this type can be converted to a (long) integer as follows:
+.PP
 .nf
-
     v = (c & 0x1fff) << (((c >> 13) & 0x7) * 3);
 .fi
 .PP
diff --git a/man5/hosts.5 b/man5/hosts.5
index 572c94b5d1..dbb0314dce 100644
--- a/man5/hosts.5
+++ b/man5/hosts.5
@@ -105,7 +105,7 @@ historical hosts.txt files on the WWW.
 I just found three, from 92,
 94, and 95.
 .SH EXAMPLE
-.nf
+.EX
 # The following lines are desirable for IPv4 capable hosts
 127.0.0.1       localhost
 
@@ -120,7 +120,7 @@ I just found three, from 92,
 ::1             localhost ip6-localhost ip6-loopback
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
-.fi
+.EE
 .SH SEE ALSO
 .BR hostname (1),
 .BR resolver (3),
diff --git a/man5/nss.5 b/man5/nss.5
index 6c0a2f4fa0..b6ab83fb3b 100644
--- a/man5/nss.5
+++ b/man5/nss.5
@@ -100,10 +100,13 @@ the next entry.
 .SH EXAMPLE
 The default configuration corresponds to the following configuration file:
 .PP
-.nf
+.in +4n
+.EX
 NETID_AUTHORITATIVE=FALSE
 SERVICES_AUTHORITATIVE=FALSE
 SETENT_BATCH_READ=FALSE
+.EE
+.in
 .\" .SH AUTHOR
 .\" Ulrich Drepper <drepper@redhat.com>
 .\"
diff --git a/man7/operator.7 b/man7/operator.7
index 1a8d082ba2..6f5b89dc89 100644
--- a/man7/operator.7
+++ b/man7/operator.7
@@ -42,8 +42,8 @@
 operator \- C operator precedence and order of evaluation
 .SH DESCRIPTION
 This manual page lists C operators and their precedence in evaluation.
+.PP
 .nf
-
 .B "Operator                             Associativity"
 () [] \-> .                           left to right
 ! ~ ++ \-\- + \- (type) * & sizeof      right to left
diff --git a/man7/unix.7 b/man7/unix.7
index 3b5848937b..d4ccc33898 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -659,8 +659,8 @@ and the extra zero byte ensures that there will be
 a null terminator for the string returned in
 .IR sun_path :
 .PP
-.nf
-.in +3
+.in +4n
+.EX
 void *addrp;
 
 addrlen = sizeof(struct sockaddr_un);
author	Michael Kerrisk <mtk.manpages@gmail.com>	2017-08-19 10:28:45 +0200
committer	Michael Kerrisk <mtk.manpages@gmail.com>	2017-08-19 13:47:27 +0200
commit	a2b7a14421e08d0ae5b3ee11b291646fb060fb88 (patch)
tree	a3dada9a6e42c8897bb0c7232798e39b41d1f479
parent	207050fa9e2db87546724663e7b364c24a2d99e0 (diff)
download	man-pages-a2b7a14421e08d0ae5b3ee11b291646fb060fb88.tar.gz