aboutsummaryrefslogtreecommitdiffstats
path: root/man7
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2017-08-19 10:56:06 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2017-08-19 13:47:27 +0200
commit9c40f2b9ba935b423a6c31ec4c252c3afdee696c (patch)
tree34b69daa340b0902f39c0bbbeeee84e53efecdbb /man7
parent010c75a2bbe2768e27998d476da04f0b23084234 (diff)
downloadman-pages-9c40f2b9ba935b423a6c31ec4c252c3afdee696c.tar.gz
random.4, gai.conf.5, slabinfo.5, cgroup_namespaces.7, feature_test_macros.7, keyrings.7, locale.7, man-pages.7, sock_diag.7: ffix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man7')
-rw-r--r--man7/cgroup_namespaces.78
-rw-r--r--man7/feature_test_macros.710
-rw-r--r--man7/keyrings.72
-rw-r--r--man7/locale.76
-rw-r--r--man7/man-pages.724
-rw-r--r--man7/sock_diag.74
6 files changed, 24 insertions, 30 deletions
diff --git a/man7/cgroup_namespaces.7 b/man7/cgroup_namespaces.7
index f2ad7c343b..959ce01690 100644
--- a/man7/cgroup_namespaces.7
+++ b/man7/cgroup_namespaces.7
@@ -88,13 +88,11 @@ Next, we use
.BR unshare (1)
to create a process running a new shell in new cgroup and mount namespaces:
.PP
-.nf
.EX
.in +4n
# \fBunshare \-Cm bash\fP
.in
.EE
-.fi
.PP
We then inspect the
.IR /proc/[pid]/cgroup
@@ -105,7 +103,6 @@ command, a process that is in the original cgroup namespace
with PID 1), and a process in a sibling cgroup
.RI ( sub2 ):
.PP
-.nf
.EX
.in +4n
$ \fBcat /proc/self/cgroup | grep freezer\fP
@@ -116,7 +113,6 @@ $ \fBcat /proc/20124/cgroup | grep freezer\fP
7:freezer:/../sub2
.in
.EE
-.fi
.PP
From the output of the first command,
we see that the freezer cgroup membership of the new shell
@@ -136,14 +132,12 @@ However, when we look in
.IR /proc/self/mountinfo
we see the following anomaly:
.PP
-.nf
.EX
.in +4n
# \fBcat /proc/self/mountinfo | grep freezer\fP
155 145 0:32 /.. /sys/fs/cgroup/freezer ...
.in
.EE
-.fi
.PP
The fourth field of this line
.RI ( /.. )
@@ -159,7 +153,6 @@ filesystem corresponding to our initial shell process's cgroup namespace
We need to remount the freezer cgroup filesystem
inside this cgroup namespace, after which we see the expected results:
.PP
-.nf
.EX
.in +4n
# \fBmount \-\-make\-rslave /\fP # Don't propagate mount events
@@ -170,7 +163,6 @@ inside this cgroup namespace, after which we see the expected results:
155 145 0:32 / /sys/fs/cgroup/freezer rw,relatime ...
.in
.EE
-.fi
.PP
Use of cgroup namespaces requires a kernel that is configured with the
.B CONFIG_CGROUPS
diff --git a/man7/feature_test_macros.7 b/man7/feature_test_macros.7
index 6c98e59871..3a26397986 100644
--- a/man7/feature_test_macros.7
+++ b/man7/feature_test_macros.7
@@ -85,13 +85,13 @@ from
.I either
of the following macro
definitions must be made before including any header files:
-.RS
-.nf
-
+.PP
+.in +4n
+.EX
#define _BSD_SOURCE
#define _XOPEN_SOURCE /* or any value < 500 */
-.fi
-.RE
+.EE
+.in
.PP
Alternatively, equivalent definitions can be included in the
compilation command:
diff --git a/man7/keyrings.7 b/man7/keyrings.7
index a6a99f7ad4..ba980da2e6 100644
--- a/man7/keyrings.7
+++ b/man7/keyrings.7
@@ -540,8 +540,8 @@ An example of the data that one might see in this file
(with the columns numbered for easy reference below)
is the following:
.IP
-.nf
.in 0n
+.EX
(1) (2) (3)(4) (5) (6) (7) (8) (9)
009a2028 I--Q--- 1 perm 3f010000 1000 1000 user krb_ccache:primary: 12
1806c4ba I--Q--- 1 perm 3f010000 1000 1000 keyring _pid: 2
diff --git a/man7/locale.7 b/man7/locale.7
index bce2d1a668..96f8619b97 100644
--- a/man7/locale.7
+++ b/man7/locale.7
@@ -260,9 +260,9 @@ Values about local numeric formatting is made available in a
returned by the
.BR localeconv (3)
function, which has the following declaration:
-.in +2n
-.nf
-
+.PP
+.in +4n
+.EX
struct lconv {
/* Numeric (nonmonetary) information */
diff --git a/man7/man-pages.7 b/man7/man-pages.7
index e4a7ede73c..dbc8f55d9b 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -174,9 +174,9 @@ Most manual pages should include at least the
sections.
Arrange a new manual page so that sections
are placed in the order shown in the list.
-.in +0.5i
+.PP
+.in +4n
.nf
-
\fBNAME\fP
\fBSYNOPSIS\fP
CONFIGURATION [Normally only in Section 4]
@@ -203,7 +203,7 @@ EXAMPLE
.\" AUTHORS sections are discouraged
.\" AUTHORS [Discouraged]
\fBSEE ALSO\fP
-.EE
+.fi
.in
.PP
.IR "Where a traditional heading would apply" ", " "please use it" ;
@@ -519,11 +519,11 @@ For example, in the
man page, references to the subject of the page would be written as:
.BR fcntl ().
The preferred way to write this in the source file is:
-.nf
-
+.PP
+.EX
.BR fcntl ()
-
-.fi
+.EE
+.PP
(Using this format, rather than the use of "\\fB...\\fP()"
makes it easier to write tools that parse man page source files.)
.\"
@@ -588,11 +588,11 @@ formatted in Roman (normal) font, without any
separating spaces (e.g.,
.BR intro (2)).
The preferred way to write this in the source file is:
-.nf
-
+.PP
+.EX
.BR intro (2)
-
-.fi
+.EE
+.PP
(Including the section number in cross references lets tools like
.BR man2html (1)
create properly hyperlinked pages.)
@@ -628,7 +628,9 @@ except where English usage (e.g., proper nouns) or programming
language requirements (e.g., identifier names) dictate otherwise.
For example:
.PP
+.EX
.SS Unicode under Linux
+.EE
.\"
.SS Indentation of structure definitions, shell session logs, and so on
When structure definitions, shell session logs, and so on are included
diff --git a/man7/sock_diag.7 b/man7/sock_diag.7
index 206d01eca0..7cbf6b927f 100644
--- a/man7/sock_diag.7
+++ b/man7/sock_diag.7
@@ -641,7 +641,7 @@ were introduced in Linux 3.6.
The following example program prints inode number, peer's inode number,
and name of all UNIX domain sockets in the current namespace.
.PP
-.nf
+.EX
#include <errno.h>
#include <stdio.h>
#include <string.h>
@@ -834,7 +834,7 @@ main(void)
close(fd);
return ret;
}
-.fi
+.EE
.SH SEE ALSO
.BR netlink (3),
.BR rtnetlink (3),