14c3102
From e02e2cd119d731cdd830c9b4f5312ed35d2ad6ba Mon Sep 17 00:00:00 2001
14c3102
From: Lennart Poettering <lennart@poettering.net>
14c3102
Date: Mon, 12 Mar 2012 21:51:39 +0100
14c3102
Subject: [PATCH] man: reword tmpfiles selinux bits (cherry picked from commit
14c3102
 669e49fe2c841e53f7f2196bbe5d614013429ecd)
14c3102
14c3102
---
14c3102
 man/tmpfiles.d.xml |   29 +++++++++++++++++------------
14c3102
 1 files changed, 17 insertions(+), 12 deletions(-)
14c3102
14c3102
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
14c3102
index 4a8e831..74fcc75 100644
14c3102
--- a/man/tmpfiles.d.xml
14c3102
+++ b/man/tmpfiles.d.xml
14c3102
@@ -158,23 +158,28 @@ d    /run/user 0755 root root 10d</programlisting>
14c3102
 
14c3102
                                 <varlistentry>
14c3102
                                         <term><varname>z</varname></term>
14c3102
-                                        <listitem><para>Set ownership, access
14c3102
-                                        mode and relabel security context of
14c3102
-                                        a file or directory if it exists.
14c3102
-                                        Lines of this type accept shell-style
14c3102
-                                        globs in place of normal path names.
14c3102
+                                        <listitem><para>Restore
14c3102
+                                        SELinux security context label
14c3102
+                                        and set ownership and access
14c3102
+                                        mode of a file or directory if
14c3102
+                                        it exists.  Lines of this type
14c3102
+                                        accept shell-style globs in
14c3102
+                                        place of normal path names.
14c3102
                                         </para></listitem>
14c3102
                                 </varlistentry>
14c3102
 
14c3102
                                 <varlistentry>
14c3102
                                         <term><varname>Z</varname></term>
14c3102
-                                        <listitem><para>Recursively set
14c3102
-                                        ownership, access mode and relabel
14c3102
-                                        security context of a path and
14c3102
-                                        all its subdirectories (if it is a
14c3102
-                                        directory). Lines of this type accept
14c3102
-                                        shell-style globs in place of normal
14c3102
-                                        path names.</para></listitem>
14c3102
+                                        <listitem><para>Recursively
14c3102
+                                        restore SELinux security
14c3102
+                                        context label and set
14c3102
+                                        ownership and access mode of a
14c3102
+                                        path and all its
14c3102
+                                        subdirectories (if it is a
14c3102
+                                        directory). Lines of this type
14c3102
+                                        accept shell-style globs in
14c3102
+                                        place of normal path
14c3102
+                                        names.</para></listitem>
14c3102
                                 </varlistentry>
14c3102
                         </variablelist>
14c3102
                 </refsect2>