diff --git a/man/journalctl.xml b/man/journalctl.xml index 0e779b952c..027f22d259 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -233,53 +233,125 @@ Controls the formatting of the journal entries that - are shown. Takes one of - short, - short-monotonic, - verbose, - export, - json, - json-pretty, - json-sse, - cat. short - is the default and generates an output - that is mostly identical to the - formatting of classic syslog - files, showing one line per journal - entry. short-monotonic - is very similar but shows monotonic - timestamps instead of wallclock - timestamps. verbose - shows the full structured entry items - with all - fields. export - serializes the journal into a binary - (but mostly text-based) stream - suitable for backups and network - transfer (see Journal - Export Format for more - information). json - formats entries as JSON data - structures, one per - line (see Journal - JSON Format for more - information). json-pretty - also formats entries as JSON data - structures, but formats them in - multiple lines in order to make them - more readable for - humans. json-sse - also formats entries as JSON data - structures, but wraps them in a format - suitable for Server-Sent - Events. cat - generates a very terse output only - showing the actual message of each - journal entry with no meta data, not - even a timestamp. + are shown. Takes one of the following options: + + + + + + + + is the default + and generates an output + that is mostly identical + to the formatting of + classic syslog files, + showing one line per + journal entry. + + + + + + + + + is very similar + but shows monotonic + timestamps instead of + wallclock timestamps. + + + + + + + + + + shows the + full-structured entry + items with all fields. + + + + + + + + + + serializes the + journal into a binary + (but mostly text-based) + stream suitable for + backups and network + transfer (see Journal + Export Format + for more + information). + + + + + + + + + formats entries + as JSON data structures, + one per line (see Journal + JSON Format for + more information). + + + + + + + + + formats entries as + JSON data structures, + but formats them in + multiple lines in order + to make them more + readable for humans. + + + + + + + + + formats entries as + JSON data structures, + but wraps them in a + format suitable for Server-Sent + Events. + + + + + + + + + generates a very + terse output only + showing the actual + message of each journal + entry with no meta data, + not even a timestamp. + + + + + diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index 6cd8c8845a..126440a15f 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -59,7 +59,7 @@ along with systemd; If not, see . by systemd to encapsulate processes not launched by systemd itself. This management is performed by creating a node in the control group tree. Processes are moved into the scope by means - of the DBus API. + of the D-Bus API. systemd-run can be used to easily launch a command in a new scope unit.