From 2685b303e3ab32c0769107706814be697cd7c9e2 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Fri, 8 Dec 2017 10:23:09 +0100
Subject: [PATCH] namespaces.7, network_namespaces.7: Move content from
 namespaces(7) to network_namespaces(7)

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
---
 man7/namespaces.7         | 29 +++--------------------------
 man7/network_namespaces.7 | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/man7/namespaces.7 b/man7/namespaces.7
index 477fc1e47..b4da1aa73 100644
--- a/man7/namespaces.7
+++ b/man7/namespaces.7
@@ -365,31 +365,8 @@ option.
 .\" ==================== Network namespaces ====================
 .\"
 .SS Network namespaces (CLONE_NEWNET)
-Network namespaces provide isolation of the system resources associated
-with networking: network devices, IPv4 and IPv6 protocol stacks,
-IP routing tables, firewalls, the
-.I /proc/net
-directory, the
-.I /sys/class/net
-directory, port numbers (sockets), and so on.
-A physical network device can live in exactly one
-network namespace.
-A virtual network
-.RB ( veth (4))
-device pair provides a pipe-like abstraction
-.\" FIXME . Add pointer to veth(4) page when it is eventually completed
-that can be used to create tunnels between network namespaces,
-and can be used to create a bridge to a physical network device
-in another namespace.
-.PP
-When a network namespace is freed
-(i.e., when the last process in the namespace terminates),
-its physical network devices are moved back to the
-initial network namespace (not to the parent of the process).
-.PP
-Use of network namespaces requires a kernel that is configured with the
-.B CONFIG_NET_NS
-option.
+See
+.BR network_namespaces (7).
 .\"
 .\" ==================== Mount namespaces ====================
 .\"
@@ -445,8 +422,8 @@ and
 .BR cgroup_namespaces (7),
 .BR cgroups (7),
 .BR credentials (7),
+.BR network_namespaces (7),
 .BR pid_namespaces (7),
 .BR user_namespaces (7),
-.BR ip-netns (8),
 .BR lsns (8),
 .BR switch_root (8)
diff --git a/man7/network_namespaces.7 b/man7/network_namespaces.7
index d3489ddaa..8d99ebc8d 100644
--- a/man7/network_namespaces.7
+++ b/man7/network_namespaces.7
@@ -27,13 +27,34 @@
 .SH NAME
 network_namespaces \- overview of Linux network namespaces
 .SH DESCRIPTION
-/sys/class/net -- see sysfs(5)
-
-/proc/net
-
-/var/run/netns
-
-.SH EXAMPLE
+.\" FIXME: /sys/class/net -- see sysfs(5)
+.\" FIXME : /proc/net
+.\" FIXME : /var/run/netns
+Network namespaces provide isolation of the system resources associated
+with networking: network devices, IPv4 and IPv6 protocol stacks,
+IP routing tables, firewalls, the
+.I /proc/net
+directory, the
+.I /sys/class/net
+directory, port numbers (sockets), and so on.
+A physical network device can live in exactly one
+network namespace.
+A virtual network
+.RB ( veth (4))
+device pair provides a pipe-like abstraction
+that can be used to create tunnels between network namespaces,
+and can be used to create a bridge to a physical network device
+in another namespace.
+.PP
+When a network namespace is freed
+(i.e., when the last process in the namespace terminates),
+its physical network devices are moved back to the
+initial network namespace (not to the parent of the process).
+.PP
+Use of network namespaces requires a kernel that is configured with the
+.B CONFIG_NET_NS
+option.
+.\" FIXME .SH EXAMPLE
 .SH SEE ALSO
 .BR nsenter (1),
 .BR unshare (1),