Merge pull request #16793 from poettering/path-join-more

path-lookup: path_join() all the things!

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 4510fb120a74e0200f530d2598b2f0a67a37b9d3..ec7d12b9ca00537de102fb4ba41bdfb492ca3c4d 100644 (file)
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -75,7 +75,7 @@
     <filename>systemd-tmpfiles-clean.service</filename>) also invoke <command>systemd-tmpfiles</command>, but
     it reads a separate set of files, which includes user-controlled files under
     <filename>~/.config/user-tmpfiles.d/</filename> and <filename>~/.local/share/user-tmpfiles.d/</filename>,
-    and administrator-controller files under <filename>/usr/share/user-tmpfiles.d/</filename>. Users may use
+    and administrator-controlled files under <filename>/usr/share/user-tmpfiles.d/</filename>. Users may use
     this to create and clean up files under their control, but the system instance performs global cleanup
     and is not influenced by user configuration. Note that this means a time-based cleanup configured in the
     system instance, such as the one typically configured for <filename>/tmp</filename>, will thus also