X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=30523c5370c6316cb37de548396b94ce1e738e6e;hp=66189bd92d70285bccaec0ad02ce7d75cfaa2ae7;hb=652d0dd7097984801fca0378b762bf96e8fda029;hpb=fb0951b02ebf51a93acf12721d8857d31ce57ba3

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 66189bd92..30523c537 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -183,8 +183,8 @@
                                 messages is generated. This rate
                                 limiting is applied per-service, so
                                 that two services which log do not
-                                interfere with each other's
-                                limit. Defaults to 200 messages in
+                                interfere with each others'
+                                limits. Defaults to 200 messages in
                                 10s. The time specification for
                                 <varname>RateLimitInterval=</varname>
                                 may be specified in the following
@@ -201,11 +201,9 @@
                                 <term><varname>SystemMaxUse=</varname></term>
                                 <term><varname>SystemKeepFree=</varname></term>
                                 <term><varname>SystemMaxFileSize=</varname></term>
-                                <term><varname>SystemMinFileSize=</varname></term>
                                 <term><varname>RuntimeMaxUse=</varname></term>
                                 <term><varname>RuntimeKeepFree=</varname></term>
                                 <term><varname>RuntimeMaxFileSize=</varname></term>
-                                <term><varname>RuntimeMinFileSize=</varname></term>
 
                                 <listitem><para>Enforce size limits on
                                 the journal files stored. The options
@@ -263,16 +261,11 @@
                                 <varname>SystemMaxUse=</varname> and
                                 <varname>RuntimeMaxUse=</varname>, so
                                 that usually seven rotated journal
-                                files are kept as
-                                history. <varname>SystemMinFileSize=</varname>
-                                and
-                                <varname>RuntimeMinFileSize=</varname>
-                                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.</para></listitem>
@@ -307,7 +300,7 @@
                                 <term><varname>MaxRetentionSec=</varname></term>
 
                                 <listitem><para>The maximum time to
-                                store journal entries for. This
+                                store journal entries. This
                                 controls whether journal files
                                 containing entries older then the
                                 specified time span are
@@ -320,9 +313,9 @@
                                 journal files don't grow without
                                 bounds. However, to enforce data
                                 retention policies it might make sense
-                                to set change this value from the
+                                to change this value from the
                                 default of 0 (which turns off this
-                                feature). This settings also takes
+                                feature). This setting also takes
                                 time values which may be suffixed with
                                 the units year, month, week, day, h, m
                                 to override the default time unit of