X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.journal-fields.xml;h=6a9fd9d85cdaf80efefd08fbf732fc0c14db6dec;hb=7212a8a99ee863698f5feaa00abb4b99f3996a1a;hp=e638893b63f9e330b07630ba4c1f2652e1b4a41a;hpb=6df831f25ebc9f55cd939f04392dad9237706e45;p=elogind.git
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index e638893b6..6a9fd9d85 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -53,11 +53,12 @@
Entries in the journal resemble an environment
block in their syntax, however with fields that can
include binary data. Primarily, fields are formatted
- ASCII strings, and binary formatting is used only
- where formatting as ASCII makes little sense. New
- fields may be freely defined by applications, but a
- few fields have special meaning. All fields with
- special meaning are optional.
+ UTF-8 text strings, and binary formatting is used only
+ where formatting as UTF-8 text strings makes little
+ sense. New fields may freely be defined by
+ applications, but a few fields have special
+ meaning. All fields with special meanings are
+ optional.
@@ -74,9 +75,11 @@
message string for this
entry. This is supposed to be
the primary text shown to the
- user. It is not translated,
- and is not supposed to be
- parsed for meta data.
+ user. It is usually not
+ translated (but might be in
+ some cases), and is not
+ supposed to be parsed for meta
+ data.
@@ -281,8 +284,8 @@
journal protocol, for the
those read from a services'
standard output or error
- output, resp. for those read
- from the kernel.
+ output, and for those read
+ from the kernel, resp.
@@ -296,7 +299,12 @@
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.
+ but addressing meta data of entries. They cannot be
+ written as part of structured log entries via calls
+ such as
+ sd_journal_send3. They
+ may also not be used as matches for
+ sd_journal_add_match3
@@ -353,7 +361,8 @@
systemd1,
journalctl1,
- journald.conf5
+ journald.conf5,
+ sd-journal3