From: Michael Kerrisk Date: Sun, 8 Aug 2021 03:00:36 +0000 (+0200) Subject: capabilities.7, user_namespaces.7: Minor tweaks (part 2) to Kir Kolyshkin's patch X-Git-Tag: man-pages-5.13~135 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd62f2240be5a2e29bb5fe2512cc863bcfe2766d;p=thirdparty%2Fman-pages.git capabilities.7, user_namespaces.7: Minor tweaks (part 2) to Kir Kolyshkin's patch Signed-off-by: Michael Kerrisk --- diff --git a/man7/capabilities.7 b/man7/capabilities.7 index 4d08545ed1..c817f7cd6b 100644 --- a/man7/capabilities.7 +++ b/man7/capabilities.7 @@ -352,10 +352,10 @@ Set arbitrary capabilities on a file. .IP .\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18 Since Linux 5.12, this capability is -also needed to map uid 0 (as in -.IR "unshare -Ur" , +also needed to map UID 0 (as in +.IR "unshare \-Ur" ; see -.BR unshare (1). +.BR unshare (1)). .TP .B CAP_SETPCAP If file capabilities are supported (i.e., since Linux 2.6.24): diff --git a/man7/user_namespaces.7 b/man7/user_namespaces.7 index 3378b6057e..e35c950ca4 100644 --- a/man7/user_namespaces.7 +++ b/man7/user_namespaces.7 @@ -578,8 +578,8 @@ The mapped user IDs (group IDs) must in turn have a mapping in the parent user namespace. .IP 4. .\" commit db2e718a47984b9d71ed890eb2ea36ecf150de18 -If a writing process is root (i.e. UID 0) trying to map host user ID 0, -it must have +If a writing process is root (i.e., UID 0) trying to map host user ID 0, +it must have the .B CAP_SETFCAP capability (since Linux 5.12). .IP 5.