X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-journal-remote.xml;h=972c3227e4804a15e43d5ddd920d3c463ea4631f;hp=40bef05a13747812157a605ad5f656288c0a6639;hb=f27e2d8c0c0c18d5a1be62c87ea89fcd4894fffa;hpb=8a8d55f2c104cf99efe5f244fc4857a15e9f60de diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index 40bef05a1..972c3227e 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -79,14 +79,14 @@ along with systemd; If not, see . (systemd-journal-remote requests and pulls the data), or "passive" (systemd-journal-remote waits for a - connection and than receives events pushed by the other side). + connection and then receives events pushed by the other side). systemd-journal-remote can read more than one event stream at a time. They will be interleaved in the output file. In case of "active" connections, each "source" is one - stream, and in case of "passive" connections each connection can + stream, and in case of "passive" connections, each connection can result in a separate stream. Sockets can be configured in "accept" mode (i.e. only one connection), or "listen" mode (i.e. multiple connections, each resulting in a stream). @@ -131,7 +131,7 @@ along with systemd; If not, see . ADDRESS must be an - address suitable for (c.f. + address suitable for (cf. systemd.socket5). systemd-journal-remote will listen on this socket for connections. Each connection is expected to be a @@ -153,7 +153,7 @@ along with systemd; If not, see . $LISTEN_FDS/$LISTEN_PID. In the second case, an HTTP or HTTPS server will be spawned on this port, respectively for and - . Currenntly Only POST requests + . Currenntly, only POST requests to /upload with Content-Type: application/vnd.fdo.journal are supported. @@ -171,7 +171,7 @@ along with systemd; If not, see . or - above. In this later case, an HTTP or HTTPS server will be + above. In the latter case, an HTTP or HTTPS server will be spawned using this descriptor and connections must be made over the HTTP protocol. @@ -193,25 +193,25 @@ along with systemd; If not, see . Will write to this journal. The filename must end with .journal. The file will be - created if it does not exist. When necessary (journal file - full, or corrupted) the file will be renamed following normal - journald rules and a new journal file will be created in it's - stead. + created if it does not exist. If necessary (journal file + full, or corrupted), the file will be renamed following normal + journald rules and a new journal file will be created in its + stead. Will create journal files underneath directory - DIR. The directory must exist. When - necessary (journal files over size, or corrupted) journal + DIR. The directory must exist. If + necessary (journal files over size, or corrupted), journal files will be rotated following normal journald rules. Names of files underneath DIR will be generated using the rules described below. - If is not used, output directory + If is not used, the output directory /var/log/journal/machine-id/ will be used, where machine-id is the identifier of the current system (see @@ -223,7 +223,7 @@ along with systemd; If not, see . based on what passive and active sources are specified. It is recommended to give a full output filename. - In case of "active" sources, if the hostname is known it + In case of "active" sources, if the hostname is known, it will be used in the variable part. Otherwise, local address and port number will be used, or stdin for events passed over standard @@ -272,7 +272,7 @@ along with systemd; If not, see . - Program to invoke to retrieve data. Journal + Program to invoke to retrieve data. The journal event stream must be generated on standard output. Examples: