From 12444d3dd03cae0d6a78aff4a3f3b765399ca0c4 Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Wed, 3 May 2017 21:57:39 +0200
Subject: [PATCH] Changes.old: Fixes to 4.11 changelog

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
---
 Changes.old | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/Changes.old b/Changes.old
index 48a19cdb6..8e7195996 100644
--- a/Changes.old
+++ b/Changes.old
@@ -44925,7 +44925,7 @@ inode.7
     Michael Kerrisk
         New page with information about inodes
             David Howells provided a statx(2) page that duplicated much of
-            the information from form stat(2). Avoid such duplication
+            the information from stat(2). Avoid such duplication
             by moving the common information in stat(2) and statx(2)
             to a new page.
 
@@ -44965,6 +44965,14 @@ proc.5
     Michael Kerrisk
         Document /proc/sys/kernel/sched_child_runs_first
 
+namespaces.7
+    Michael Kerrisk
+        Document the /proc/sys/user/* files added in Linux 4.9
+
+socket.7
+    Francois Saint-Jacques, Michael Kerrisk
+        Document SO_INCOMING_CPU
+
 
 New and changed links
 ---------------------
@@ -45286,7 +45294,6 @@ ttyname.3
     Christian Brauner
         NOTES: warn about a confusing case that may occur with mount namespaces
 
-
 wcsdup.3
     Jan Heberer
         RETURN VALUE: fix error in return value description
@@ -45336,26 +45343,23 @@ man-pages.7
     Michael Kerrisk
         Note preferred approach for 'duplicate' errors
 
-namespaces.7
-    Michael Kerrisk
-        Document the /proc/sys/user/* files added in Linux 4.9
-
 pid_namespaces.7
     Michael Kerrisk
         The maximum nesting depth for PID namespaces is 32
 
-user_namespaces.7: Fixes to example
+user_namespaces.7
     Stephan Bergmann
-        While toying around with the userns_child_exec example program on the
-        user_namespaces(7) man page, I noticed two things:
+        Fixes to example
+            While toying around with the userns_child_exec example program on the
+            user_namespaces(7) man page, I noticed two things:
 
-        * In the EXAMPLE section, we need to mount the new /proc before
-          looking at /proc/$$/status, otherwise the latter will print
-          information about the outer namespace's PID 1 (i.e., the real
-          init).  So the two paragraphs need to be swapped.
+            * In the EXAMPLE section, we need to mount the new /proc before
+              looking at /proc/$$/status, otherwise the latter will print
+              information about the outer namespace's PID 1 (i.e., the real
+              init).  So the two paragraphs need to be swapped.
 
-        * In the program source, make sure to close pipe_fd[0] in the
-          child before exec'ing.
+            * In the program source, make sure to close pipe_fd[0] in the
+              child before exec'ing.
 
 pthreads.7
     Michael Kerrisk
@@ -45373,12 +45377,6 @@ signal.7
     Michael Kerrisk
         SEE ALSO: add sigreturn(2)
 
-socket.7
-    Michael Kerrisk
-        Enhance the description of SO_INCOMING_CPU
-    Francois Saint-Jacques
-        Document SO_INCOMING_CPU
-
 tcp.7
     Michael Kerrisk
         Note indications for OOB data given by select(2) and poll(2)