dbus: make more cgroup attributes runtime settable

[elogind.git] / man / journald.conf.xml

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 26f47f89757f37af713077b0c2d080539df21071..6e43914f23e32893f4a5abe591a2f2319a0e3720 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -237,7 +237,17 @@
                                 while the former apply if persistent
                                 logging is enabled and the system is
                                 fully booted
                                 while the former apply if persistent
                                 logging is enabled and the system is
                                 fully booted

-                                up. <varname>SystemMaxUse=</varname>
+                                up. <command>journalctl</command> and
+                                <command>systemd-journald</command>
+                                ignore all files with names not ending
+                                with <literal>.journal</literal> or
+                                <literal>.journal~</literal>, so only
+                                such files, located in the appropriate
+                                directories, are taken into account
+                                when calculating current disk usage.
+                                </para>
+
+                                <para><varname>SystemMaxUse=</varname>

                                 and <varname>RuntimeMaxUse=</varname>
                                 control how much disk space the
                                 journal may use up at
                                 and <varname>RuntimeMaxUse=</varname>
                                 control how much disk space the
                                 journal may use up at


@@ -271,11 +281,11 @@
                                 values in bytes or use K, M, G, T, P,
                                 E as units for the specified sizes
                                 (equal to 1024, 1024²,... bytes).
                                 values in bytes or use K, M, G, T, P,
                                 E as units for the specified sizes
                                 (equal to 1024, 1024²,... bytes).

-                                Note that size limits are
-                                enforced synchronously to journal
-                                files as they are extended, and need
-                                no explicit rotation step triggered by
-                                time.</para></listitem>
+                                Note that size limits are enforced
+                                synchronously when journal files
+                                are extended, and no explicit
+                                rotation step triggered by
+                                time is needed.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>