diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-06-18 22:27:50 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2015-06-18 22:27:50 +0200 |
| commit | 6433d440729d22f5954ea1bf9c828bbad04e0838 (patch) | |
| tree | 2c99d171a99820d08bc2618cf7a17d60e573abc9 /man/systemd-journal-upload.xml | |
| parent | 38489ef8b2998e2015de629d80932ffcb6a2e78c (diff) | |
| parent | 12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (diff) | |
Merge pull request #293 from teg/man-revert
man: revert dynamic paths for split-usr setups
Diffstat (limited to 'man/systemd-journal-upload.xml')
| -rw-r--r-- | man/systemd-journal-upload.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.xml index 5398ff42e2..597f2a2d3e 100644 --- a/man/systemd-journal-upload.xml +++ b/man/systemd-journal-upload.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. @@ -246,8 +243,8 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem <varname>TrustedCertificateFile=</varname>, <varname>ServerCertificateFile=</varname>, <varname>ServerKeyFile=</varname>, in - <filename>&pkgsysconfdir;/journal-remote.conf</filename> and - <filename>&pkgsysconfdir;/journal-upload.conf</filename> + <filename>/etc/systemd/journal-remote.conf</filename> and + <filename>/etc/systemd/journal-upload.conf</filename> respectively. The default locations can be queried by using <command>systemd-journal-remote --help</command> and <command>systemd-journal-upload --help</command>.</para> |