chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document that assignemnts of devices to seats are persistent
[elogind.git]
/
man
/
journalctl.xml
diff --git
a/man/journalctl.xml
b/man/journalctl.xml
index 1ea004fc8156b56fe101ab8ba33b484d721e7b50..9800cf30ed260ecfd8b4650f06f6a8a23e7f2d2c 100644
(file)
--- a/
man/journalctl.xml
+++ b/
man/journalctl.xml
@@
-189,6
+189,7
@@
<literal>verbose</literal>,
<literal>export</literal>,
<literal>json</literal>,
<literal>verbose</literal>,
<literal>export</literal>,
<literal>json</literal>,
+ <literal>json-pretty</literal>,
<literal>cat</literal>. <literal>short</literal>
is the default and generates an output
that is mostly identical to the
<literal>cat</literal>. <literal>short</literal>
is the default and generates an output
that is mostly identical to the
@@
-209,7
+210,13
@@
Export Format</ulink> for more
information). <literal>json</literal>
formats entries as JSON data
Export Format</ulink> for more
information). <literal>json</literal>
formats entries as JSON data
- structures. <literal>cat</literal>
+ structures, one per
+ line. <literal>json-pretty</literal>
+ also formats entries as JSON data
+ structures, but formats them in
+ multiple lines in order to make them
+ more readable for
+ humans. <literal>cat</literal>
generates a very terse output only
showing the actual message of each
journal entry with no meta data, not
generates a very terse output only
showing the actual message of each
journal entry with no meta data, not
@@
-227,11
+234,13
@@
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
- <term><option>--
local
</option></term>
- <term><option>-
l
</option></term>
+ <term><option>--
merge
</option></term>
+ <term><option>-
m
</option></term>
- <listitem><para>Show only locally
- generated messages.</para></listitem>
+ <listitem><para>Show entries
+ interleaved from all available
+ journals, including remote
+ ones.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-311,6
+320,14
@@
accessed.</para></listitem>
</varlistentry>
accessed.</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--disk-usage</option></term>
+
+ <listitem><para>Shows the current disk
+ usage of all
+ journal files.</para></listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--setup-keys</option></term>
<varlistentry>
<term><option>--setup-keys</option></term>