summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-05-08 10:39:18 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-05-08 10:39:18 +0200
commit0b063391d8c63e96f2bc8d43ddd07208b9d99577 (patch)
tree2f9a42cae1b8b62b35cb2a624c2f0e5a3c283569
parent3dd22749ae735e39971d87860edc1ea7b29dc7ec (diff)
downloadsystemd-0b063391d8c63e96f2bc8d43ddd07208b9d99577.tar.gz
man: add a bit more text about systemd-journal-upload.service
-rw-r--r--man/journal-upload.conf.xml3
-rw-r--r--man/systemd-journal-upload.service.xml6
2 files changed, 8 insertions, 1 deletions
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 9d486d9801..cd3335452a 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -68,7 +68,8 @@
<listitem><para>The URL to upload the journal entries to. See the description
of <varname>--url=</varname> option in
<citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- for the description of possible values.</para></listitem>
+ for the description of possible values. There is no default value, so either this
+ option or the command-line option must be always present to make an upload.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml
index 141e595400..f923e53d29 100644
--- a/man/systemd-journal-upload.service.xml
+++ b/man/systemd-journal-upload.service.xml
@@ -61,6 +61,12 @@
Unless limited by one of the options specified below, all journal entries accessible to the user
the program is running as will be uploaded, and then the program will wait and send new entries
as they become available.</para>
+
+ <para><filename>systemd-journal-upload.service</filename> is a system service that uses
+ <command>systemd-journal-upload</command> to upload journal entries to a server. It uses the
+ configuration in
+ <citerefentry><refentrytitle>journal-upload.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ At least the <varname>URL=</varname> option must be specified.</para>
</refsect1>
<refsect1>