summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-10-26 01:07:07 +0200
committerLennart Poettering <lennart@poettering.net>2012-10-26 01:18:41 +0200
commitdf688b23daff9382b8fa2609cfcf73315a3b896e (patch)
tree2dc3c8242c82cb9bbdda64104c0f91a44336709a
parent220369cc0c3e167af2eee8bdac95a6157e0e2b62 (diff)
man: minor updates
-rw-r--r--man/systemd.exec.xml5
-rw-r--r--man/systemd.journal-fields.xml18
2 files changed, 14 insertions, 9 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 3491d877d1..7b6514375d 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -567,8 +567,9 @@
argument. If true and
<varname>StandardOutput=</varname> or
<varname>StandardError=</varname> are
- set to <option>syslog</option> or
- <option>kmsg</option> log lines
+ set to <option>syslog</option>,
+ <option>kmsg</option> or
+ <option>journal</option>, log lines
written by the executed process that
are prefixed with a log level will be
passed on to syslog with this log
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index d95cb011d9..76a436d650 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -372,13 +372,17 @@
<refsect1>
<title>Address Fields</title>
- <para>During serialization into external formats the
- addresses of journal entries are serialized into
- fields prefixed with double underscores. Note that
- these aren't proper fields when stored in the journal,
- but addressing meta data of entries. They cannot be
- written as part of structured log entries via calls
- such as
+ <para>During serialization into external formats, such
+ as the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal
+ Export Format</ulink> or the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal
+ JSON Format</ulink>, the addresses of journal entries
+ are serialized into fields prefixed with double
+ underscores. Note that these aren't proper fields when
+ stored in the journal, but addressing meta data of
+ entries. They cannot be written as part of structured
+ log entries via calls such as
<citerefentry><refentrytitle>sd_journal_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>. They
may also not be used as matches for
<citerefentry><refentrytitle>sd_journal_add_match</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>