X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=man%2Fsystemd-tmpfiles.xml;h=4dd5b3da6c314cd99341af5eed20232f5b854e2b;hb=572eb058cfecdd3b97f4fe8ffddf5bff8e21e4cf;hp=f12f997f93582405884e6f3ece2ae6eb7c8c7851;hpb=681eb9cf2b831293a4f3d4c48a748d2e4a25d69e;p=thirdparty%2Fsystemd.git

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index f12f997f935..4dd5b3da6c3 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -78,11 +77,11 @@
     <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
 
-    <para>If invoked with no arguments, it applies all directives from
-    all configuration files. If one or more filenames are passed on
-    the command line, only the directives in these files are applied.
-    If only the basename of a configuration file is specified, all
-    configuration directories as specified in
+    <para>If invoked with no arguments, it applies all directives from all configuration
+    files. If one or more absolute filenames are passed on the command line, only the
+    directives in these files are applied.  If <literal>-</literal> is specified instead
+    of a filename, directives are read from standard input.  If only the basename of a
+    configuration file is specified, all configuration directories as specified in
     <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     are searched for a matching file.</para>
   </refsect1>
@@ -151,12 +150,16 @@
         specified prefix. This option can be specified multiple
         times.</para></listitem>
       </varlistentry>
+
       <varlistentry>
         <term><option>--root=<replaceable>root</replaceable></option></term>
-        <listitem><para>Takes a directory path as an argument. All
-        paths will be prefixed with the given alternate
-        <replaceable>root</replaceable> path, including config search
-        paths. </para></listitem>
+        <listitem><para>Takes a directory path as an argument. All paths will be prefixed with the given alternate
+        <replaceable>root</replaceable> path, including config search paths.</para>
+
+        <para>Note that this option does not alter how the users and groups specified in the configuration files are
+        resolved. With or without this option, users and groups are always resolved according to the host's user and
+        group databases, any such databases stored under the specified root directories are not
+        consulted.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />