X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=70b05f600a9cc0a39961e1d12db14ae48b4ff912;hb=5de0409e54580b1e8929d9e09f970dfe339cec7b;hp=b06a23d80e39309f28b86bc3c1bf64ac3164f2c9;hpb=c651162ca83e6389cc167e5b09527dcbe2852799;p=elogind.git
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index b06a23d80..70b05f600 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -201,11 +201,9 @@
SystemMaxUse=
SystemKeepFree=
SystemMaxFileSize=
- SystemMinFileSize=
RuntimeMaxUse=
RuntimeKeepFree=
RuntimeMaxFileSize=
- RuntimeMinFileSize=
Enforce size limits on
the journal files stored. The options
@@ -263,21 +261,67 @@
SystemMaxUse= and
RuntimeMaxUse=, so
that usually seven rotated journal
- files are kept as
- history. SystemMinFileSize=
- and
- RuntimeMinFileSize=
- control how large individual journal
- files grow at minimum. Defaults to
- 64K. Specify values in bytes or use
- K, M, G, T, P, E as units for the
- specified sizes. Note that size limits
- are enforced synchronously to journal
+ files are kept as history. Specify
+ values in bytes or use K, M, G, T, P,
+ E as units for the specified
+ sizes. Note that size limits are
+ enforced synchronously to journal
files as they are extended, and need
no explicit rotation step triggered by
time.
+
+ MaxFileSec=
+
+ The maximum time to
+ store entries in a single journal
+ file, before rotating to the next
+ one. Normally time-based rotation
+ should not be required as size-based
+ rotation with options such as
+ SystemMaxFileSize=
+ should be sufficient to ensure that
+ journal files don't grow without
+ bounds. However, to ensure that not
+ too much data is lost at once when old
+ journal files are deleted it might
+ make sense to change this value from
+ the default of one month. Set to 0 to
+ turn off this feature. This setting
+ takes time values which may be
+ suffixed with the units year, month,
+ week, day, h, m to override the
+ default time unit of
+ seconds.
+
+
+
+ MaxRetentionSec=
+
+ The maximum time to
+ store journal entries for. This
+ controls whether journal files
+ containing entries older then the
+ specified time span are
+ deleted. Normally time-based deletion
+ of old journal files should not be
+ required as size-based deletion with
+ options such as
+ SystemMaxUse=
+ should be sufficient to ensure that
+ journal files don't grow without
+ bounds. However, to enforce data
+ retention policies it might make sense
+ to set change this value from the
+ default of 0 (which turns off this
+ feature). This settings also takes
+ time values which may be suffixed with
+ the units year, month, week, day, h, m
+ to override the default time unit of
+ seconds.
+
+
ForwardToSyslog=
ForwardToKMsg=