From 67c3cf4f9ea35c1f789526b24a4d052d071902c0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 18:28:08 +0200 Subject: man: document sd_journal_next() --- man/sd_journal_next.xml | 194 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 man/sd_journal_next.xml (limited to 'man/sd_journal_next.xml') diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml new file mode 100644 index 0000000000..f55ee15744 --- /dev/null +++ b/man/sd_journal_next.xml @@ -0,0 +1,194 @@ + + + + + + + + + sd_journal_next + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + sd_journal_next + 3 + + + + sd_journal_next + sd_journal_previous + sd_journal_next_skip + sd_journal_previous_skip + Advance or set back the read pointer in the journal + + + + + #include <systemd/sd-journal.h> + + + int sd_journal_next + sd_journal* j + + + + int sd_journal_previous + sd_journal* j + + + + int sd_journal_next_skip + sd_journal* j + uint64_t skip + + + + int sd_journal_previous_skip + sd_journal* j + uint64_t skip + + + + + + + Description + + sd_journal_next() advances + the read pointer into the journal by one entry. The + only argument taken is a journal context object as + allocated via + sd_journal_open3. After + successful invocation the entry may be read with + functions such as + sd_journal_get_data3. + + Similar, sd_journal_previous() sets + the read pointer back one entry. + + sd_journal_next_skip() and + sd_journal_previous_skip() + advance/set back the read pointer by multiple entries + at once, as specified in the skip + parameter. + + The journal is strictly ordered by reception + time, and hence advancing to the next entry guarantees + that the entry then pointing to is later in time than + then previous one, or has the same timestamp. + + Note that the + SD_JOURNAL_FOREACH() macro may be used + as a wrapper around + sd_journal_seek_head3 + and sd_journal_next() in order to + make iteratring through the journal easier. See below + for an example. Similar, + SD_JOURNAL_FOREACH_BACKWARDS() + may be used for iterating the journal in reverse + order. + + + + Return Value + + The four calls return the number of entries + advanced/set back on success or a negative errno-style + error code. When the end (resp. beginning) of the journal + is reached a number smaller than requested is + returned. More specifically, if + sd_journal_next() or + sd_journal_previous() reach the + end/beginning of the journal they will return 0, + instead of 1 when they are successful. This should be + considered an EOF marker. + + + + Notes + + The sd_journal_next(), sd_journal_previous(), + sd_journal_next_skip() and + sd_journal_previous_skip() interfaces are + available as shared library, which can be compiled and + linked to with the + libsystemd-journal + pkg-config1 + file. + + + + Examples + + Iterating through the journal: + + #include <stdio.h> +#include <string.h> +#include <systemd/sd-journal.h> + +int main(int argc, char *argv[]) { + int r; + sd_journal *j; + r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY); + if (r < 0) { + fprintf(stderr, "Failed to open journal: %s\n", strerror(-r)); + return 1; + } + SD_JOURNAL_FOREACH(j) { + const char *d; + size_t l; + + r = sd_journal_get_data(j, "MESSAGE", &d, &l); + if (r < 0) { + fprintf(stderr, "Failed to read message field: %s\n", strerror(-r)); + continue; + } + + printf("%.*s\n", (int) l, d); + } + sd_journal_close(j); + return 0; +} + + + + + See Also + + + systemd1, + sd-journal3, + sd_journal_open3, + sd_journal_get_data3 + + + + -- cgit v1.2.3-54-g00ecf From 4171a6676c74846c9c189f3a92b97bbcd4a11a13 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 19:00:48 +0200 Subject: man: document sd_journal_get_data() and friends --- Makefile.am | 15 +++- man/sd_journal_get_data.xml | 199 ++++++++++++++++++++++++++++++++++++++++++++ man/sd_journal_next.xml | 18 ++++ src/systemd/sd-journal.h | 1 + 4 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 man/sd_journal_get_data.xml (limited to 'man/sd_journal_next.xml') diff --git a/Makefile.am b/Makefile.am index 119d968889..b54c21b374 100644 --- a/Makefile.am +++ b/Makefile.am @@ -502,7 +502,8 @@ MANPAGES = \ man/sd_journal_print.3 \ man/sd_journal_stream_fd.3 \ man/sd_journal_open.3 \ - man/sd_journal_next.3 + man/sd_journal_next.3 \ + man/sd_journal_get_data.3 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -547,7 +548,12 @@ MANPAGES_ALIAS = \ man/sd_journal_close.3 \ man/sd_journal_previous.3 \ man/sd_journal_next_skip.3 \ - man/sd_journal_previous_skip.3 + man/sd_journal_previous_skip.3 \ + man/SD_JOURNAL_FOREACH.3 \ + man/SD_JOURNAL_FOREACH_BACKWARDS.3 \ + man/sd_journal_enumerate_data.3 \ + man/sd_journal_restart_data.3 \ + man/SD_JOURNAL_FOREACH_DATA.3 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 @@ -592,6 +598,11 @@ man/sd_journal_close.3: man/sd_journal_open.3 man/sd_journal_previous.3: man/sd_journal_next.3 man/sd_journal_next_skip.3: man/sd_journal_next.3 man/sd_journal_previous_skip.3: man/sd_journal_next.3 +man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3 +man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3 +man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3 +man/sd_journal_restart_data.3: man/sd_journal_get_data.3 +man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml new file mode 100644 index 0000000000..9d8a4a2221 --- /dev/null +++ b/man/sd_journal_get_data.xml @@ -0,0 +1,199 @@ + + + + + + + + + sd_journal_get_data + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + sd_journal_get_data + 3 + + + + sd_journal_get_data + sd_journal_enumerate_data + sd_journal_restart_data + SD_JOURNAL_FOREACH_DATA + Read data fields from the current journal entry + + + + + #include <systemd/sd-journal.h> + + + int sd_journal_get_data + sd_journal* j + const char* field + const void** data + size_t* length + + + + int sd_journal_enumerate_data + sd_journal* j + const void** data + size_t* length + + + + int sd_journal_restart_data + sd_journal* j + + + + SD_JOURNAL_FOREACH_DATA + sd_journal* j + const void* data + size_t length + + + + + + + Description + + sd_journal_get_data() gets + the data object associated with a specific field from + the current journal entry. It takes four arguments: + the journal context object, a string with the field + name to request, plus a pair of pointers to + pointer/size variables where the data object and its + size shall be stored in. The field name should be an + entry field name. Well-known field names are listed in + systemd.journal-fields7. The + returned data is in a read-only memory map and is only + valid until the next invocation of + sd_journal_get_data() or + sd_journal_enumerate_data(), or + the read pointer is altered. Note that the data + returned will be prefixed with the field name and + '='. + + sd_journal_enumerate_data() + may be used to iterate through all fields of the + current entry. On each invocation the data for the + next field is returned. The order of these fields is + not defined. The data returned is in the same format + as with sd_journal_get_data() and + also follows the same life-time semantics. + + sd_journal_restart_data() + resets the data enumeration index to the beginning of + the entry. The next invocation of + sd_journal_enumerate_data() will return the first + field of the entry again. + + Note that the + SD_JOURNAL_FOREACH_DATA() macro + may be used as a wrapper around + sd_journal_restart_data() and + sd_journal_enumerate_data(). + + Note that these functions will not work before + sd_journal_next3 + (or related call) has not been called at least + once. + + + + Return Value + + sd_journal_get_data() + returns 0 on success or a negative errno-style error + code. If the current entry does not include the + specified field -ENOENT is returned. If + sd_journal_next3 + has not been called at least once -EADDRNOTAVAIL is + returned. sd_journal_enumerate_data() + returns a positive integer if the next field has been + read, 0 when no more fields are known, or a negative + errno-style error + code. sd_journal_restart_data() + returns nothing. + + + + Notes + + The sd_journal_get_data(), + sd_journal_enumerate_data() and + sd_journal_restart_data() + interfaces are available as shared library, which can + be compiled and linked to with the + libsystemd-journal + pkg-config1 + file. + + + + Examples + + See + sd_journal_next3 + for a complete example how to use + sd_journal_get_data(). + + Use the + SD_JOURNAL_FOREACH_DATA macro to + iterate through all fields of the current journal + entry: + + ... +int print_fields(sd_journal *j) { + const void *data; + size_t l; + SD_JOURNAL_FOREACH_DATA(j, data, length) + printf("%.*s\n", (int) length, data); +} +... + + + + + See Also + + + systemd1, + systemd.journal-fields7, + sd-journal3, + sd_journal_open3, + sd_journal_next3 + + + + diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index f55ee15744..90fcecb107 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -47,6 +47,8 @@ sd_journal_previous sd_journal_next_skip sd_journal_previous_skip + SD_JOURNAL_FOREACH + SD_JOURNAL_FOREACH_BACKWARDS Advance or set back the read pointer in the journal @@ -76,6 +78,15 @@ uint64_t skip + + SD_JOURNAL_FOREACH + sd_journal* j + + + + SD_JOURNAL_FOREACH_BACKWARDS + sd_journal* j + @@ -105,6 +116,13 @@ that the entry then pointing to is later in time than then previous one, or has the same timestamp. + Note that + sd_journal_get_data3 + and related calls will fail unless + sd_journal_next() has been + invoked at least once in order to position the read + pointer on a journal entry. + Note that the SD_JOURNAL_FOREACH() macro may be used as a wrapper around diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index 935b0452b3..e70f575ce9 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -85,6 +85,7 @@ int sd_journal_next_skip(sd_journal *j, uint64_t skip); int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret); int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id); + int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l); int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l); void sd_journal_restart_data(sd_journal *j); -- cgit v1.2.3-54-g00ecf From 4a010f4e6e95964d7acaa33be768dbdb5e46d72a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 20:39:05 +0200 Subject: man: document sd_journal_get_cursor() --- Makefile.am | 3 +- man/sd_journal_get_cursor.xml | 122 ++++++++++++++++++++++++++++ man/sd_journal_get_cutoff_realtime_usec.xml | 2 +- man/sd_journal_get_data.xml | 2 +- man/sd_journal_get_realtime_usec.xml | 2 +- man/sd_journal_next.xml | 4 +- man/sd_journal_open.xml | 19 +++++ 7 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 man/sd_journal_get_cursor.xml (limited to 'man/sd_journal_next.xml') diff --git a/Makefile.am b/Makefile.am index f6301f1283..50b2a9f363 100644 --- a/Makefile.am +++ b/Makefile.am @@ -505,7 +505,8 @@ MANPAGES = \ man/sd_journal_next.3 \ man/sd_journal_get_data.3 \ man/sd_journal_get_realtime_usec.3 \ - man/sd_journal_get_cutoff_realtime_usec.3 + man/sd_journal_get_cutoff_realtime_usec.3 \ + man/sd_journal_get_cursor.3 MANPAGES_ALIAS = \ man/reboot.8 \ diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml new file mode 100644 index 0000000000..9e00ef7c82 --- /dev/null +++ b/man/sd_journal_get_cursor.xml @@ -0,0 +1,122 @@ + + + + + + + + + sd_journal_get_cursor + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + sd_journal_get_cursor + 3 + + + + sd_journal_get_cursor + Get cursor string for the current journal entry + + + + + #include <systemd/sd-journal.h> + + + int sd_journal_get_cursor + sd_journal* j + char ** cursor + + + + + + + Description + + sd_journal_get_cursor() + returns a cursor string for the current journal + entry. A cursor is a serialization of the current + journal position in text form. The string only + contains printable characters and can be passed around + in text form. The cursor identifies a journal entry + globally and in a stable way and may be used to later + seek to it via + sd_journal_seek_cursor3. The + cursor string should be considered opaque and not be + parsed by clients. Seeking to a cursor position + without the specific entry being available locally + will seek to the next closest (in terms of time) + available entry. The call takes two arguments: a + journal context object and a pointer to a + string pointer where the cursor string will be + placed. The string is allocated via libc malloc3 and should + be freed after use with + free3. + + Note that this function will not work before + sd_journal_next3 + (or related call) has been called at least + once, in order to position the read pointer at a valid entry. + + + + Return Value + + sd_journal_get_cursor() + returns 0 on success or a negative errno-style error + code. + + + + Notes + + The sd_journal_get_cursor() + interface is available as shared library, which can be + compiled and linked to with the + libsystemd-journal + pkg-config1 + file. + + + + See Also + + + systemd1, + sd-journal3, + sd_journal_open3, + sd_journal_seek_cursor3 + + + + diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml index c60e8f43ad..ed014cb509 100644 --- a/man/sd_journal_get_cutoff_realtime_usec.xml +++ b/man/sd_journal_get_cutoff_realtime_usec.xml @@ -45,7 +45,7 @@ sd_journal_get_cutoff_realtime_usec sd_journal_get_cutoff_monotonic_usec - Read timestamps from the current journal entry + Read cut-off timestamps from the current journal entry diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml index 6f20c62012..a7754129f0 100644 --- a/man/sd_journal_get_data.xml +++ b/man/sd_journal_get_data.xml @@ -127,7 +127,7 @@ Note that these functions will not work before sd_journal_next3 (or related call) has been called at least - once. + once, in order to position the read pointer at a valid entry. diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml index a8aa3a4772..515932c6d8 100644 --- a/man/sd_journal_get_realtime_usec.xml +++ b/man/sd_journal_get_realtime_usec.xml @@ -99,7 +99,7 @@ Note that these functions will not work before sd_journal_next3 (or related call) has been called at least - once. + once, in order to position the read pointer at a valid entry. diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 90fcecb107..95429fa6ff 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -205,7 +205,9 @@ int main(int argc, char *argv[]) { systemd1, sd-journal3, sd_journal_open3, - sd_journal_get_data3 + sd_journal_get_data3, + sd_journal_get_realtime_usec3, + sd_journal_get_cursor3 diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index 12b80551a2..ff089a88e0 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -118,6 +118,25 @@ for an example how to iterate through the journal after opening it it with sd_journal_open(). + + A journal context object returned by + sd_journal_open() references a + specific journal entry as current entry, + similar to a file seek index in a classic file system + file, but without absolute positions. It may be + altered with + sd_journal_next3 + and + sd_journal_seek_head3 + and related calls. The current entry position may be + exported in cursor strings, as accessible + via + sd_journal_get_cursor3. Cursor + strings may be used to globally identify a specific + journal entry in a stable way and then later to seek + to it (or if the specific entry is not available + locally, to its closest entry in time) + sd_journal_seek_cursor3. -- cgit v1.2.3-54-g00ecf From 16dad32e437fdf2ffca03cc60a083d84bd31886f Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Mon, 15 Oct 2012 13:59:12 -0500 Subject: Reword sentences that contain psuedo-English "resp." As you likely know, Arch Linux is in the process of moving to systemd. So I was reading through the various systemd docs and quickly became baffled by this new abbreviation "resp.", which I've never seen before in my English-mother-tongue life. Some quick Googling turned up a reference: I guess it's a literal translation of the German "Beziehungsweise", but English doesn't work the same way. The word "respectively" is used exclusively to provide an ordering connection between two lists. E.g. "the prefixes k, M, and G refer to kilo-, mega-, and giga-, respectively." It is also never abbreviated to "resp." So the sentence "Sets the default output resp. error output for all services and sockets" makes no sense to a natural English speaker. This patch removes all instances of "resp." in the man pages and replaces them with sentences which are much more clear and, hopefully, grammatically valid. In almost all instances, it was simply replacing "resp." with "or," which the original author (Lennart?) could probably just do in the future. The only other instances of "resp." are in the src/ subtree, which I don't feel privileged to correct. Signed-off-by: Andrew Eikum --- man/daemon.xml | 2 +- man/journalctl.xml | 14 +++---- man/os-release.xml | 4 +- man/sd-daemon.xml | 2 +- man/sd-readahead.xml | 2 +- man/sd_booted.xml | 2 +- man/sd_is_fifo.xml | 2 +- man/sd_journal_next.xml | 4 +- man/sd_listen_fds.xml | 2 +- man/sd_notify.xml | 2 +- man/sd_readahead.xml | 2 +- man/systemd-ask-password-console.service.xml | 4 +- man/systemd-cat.xml | 2 +- man/systemd-cgtop.xml | 12 +++--- man/systemd-inhibit.xml | 5 ++- man/systemd.exec.xml | 18 ++++----- man/systemd.journal-fields.xml | 4 +- man/systemd.kill.xml | 2 +- man/systemd.service.xml | 4 +- man/systemd.socket.xml | 22 +++++----- man/systemd.swap.xml | 6 +-- man/systemd.unit.xml | 20 +++++----- man/systemd.xml | 60 ++++++++++++++-------------- 23 files changed, 100 insertions(+), 97 deletions(-) (limited to 'man/sd_journal_next.xml') diff --git a/man/daemon.xml b/man/daemon.xml index e3c038e46a..197138e51d 100644 --- a/man/daemon.xml +++ b/man/daemon.xml @@ -740,7 +740,7 @@ directory returned by pkg-config systemd --variable=systemdsystemunitdir (for - system services), resp. pkg-config + system services) or pkg-config systemd --variable=systemduserunitdir (for user services). This will make the diff --git a/man/journalctl.xml b/man/journalctl.xml index 3786fdf514..0bbcee33ab 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -275,9 +275,9 @@ Start showing entries - newer or of the specified date, - resp. older or of the specified - date. Date specifications should be of + on or newer than the specified date, + or on or older than the specified + date, respectively. Date specifications should be of the format "2012-10-30 18:17:16". If the time part is omitted, 00:00:00 is assumed. If only the seconds component @@ -290,14 +290,14 @@ tomorrow are understood, which refer to 00:00:00 of the day before the current day, the - current day, resp the day after the - current day. now + current day, or the day after the + current day, respectively. now refers to the current time. Finally, relative times may be specified, prefixed with - or +, referring to - times before resp. after the current - time. + times before or after the current + time, respectively. diff --git a/man/os-release.xml b/man/os-release.xml index 5e34a884bb..98320efe31 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -279,8 +279,8 @@ URLs are intended to be exposed in "About this system" UIs behind links with captions such as "About this - Operating System", "Obtain Support" - resp. "Report a Bug". The values should + Operating System", "Obtain Support", + and "Report a Bug". The values should be in RFC3986 format, and should be diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml index 1e1734adf6..a3bf662fe9 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -139,7 +139,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's sd-daemon.c and diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml index 484e1273b2..cebaa5da2b 100644 --- a/man/sd-readahead.xml +++ b/man/sd-readahead.xml @@ -87,7 +87,7 @@ check the liberally licensed reference implementation sources: - resp. + and These APIs are implemented in the reference implementation's drop-in diff --git a/man/sd_booted.xml b/man/sd_booted.xml index 3567d585ae..34f2cbfbc8 100644 --- a/man/sd_booted.xml +++ b/man/sd_booted.xml @@ -94,7 +94,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_booted() is implemented diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index a98122b1b0..27e9a0de8f 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -181,7 +181,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_is_fifo() and the diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 95429fa6ff..58e7cec6f3 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -140,8 +140,8 @@ The four calls return the number of entries advanced/set back on success or a negative errno-style - error code. When the end (resp. beginning) of the journal - is reached a number smaller than requested is + error code. When the end or beginning of the journal + is reached, a number smaller than requested is returned. More specifically, if sd_journal_next() or sd_journal_previous() reach the diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 649b1995a1..b891b6b039 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -142,7 +142,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_listen_fds() is diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 346ec8f90b..5f86e86fec 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -228,7 +228,7 @@ For details about the algorithms check the liberally licensed reference implementation sources: - resp. sd_notify() and diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml index ff7b355741..a1fc6f178f 100644 --- a/man/sd_readahead.xml +++ b/man/sd_readahead.xml @@ -130,7 +130,7 @@ For details about the algorithm check the liberally licensed reference implementation sources: - resp. sd_readahead() is diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 6ca94360ac..6c87feb179 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -79,8 +79,8 @@ Note that these services invoke systemd-tty-ask-password-agent1 - with the --watch --console - resp. --watch --wall command line + with either the --watch --console + or --watch --wall command line parameters. diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml index 54e28726cb..cac275b453 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -120,7 +120,7 @@ warning, notice, info, - debug, resp. a + debug, or a value between 0 and 7 (corresponding to the same named levels). These priority values are the same as diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index 112e5fff87..7a34512b21 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -238,19 +238,19 @@ m i - Change ordering of control groups + Sort the control groups by path, number of tasks, CPU load, - memory usage resp. IO - load. + memory usage, or IO + load, respectively. + - - Increase, - resp. decrease refresh - delay. + Increase + or decrease refresh + delay, respectively. diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 1218836cb2..5f26c96546 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -114,9 +114,10 @@ for inhibiting reboot/power-off/halt/kexec, suspending/hibernating, the automatic - idle detection, resp. the low-level + idle detection, or the low-level handling of the power/sleep key and - the lid switch. If omitted defaults to + the lid switch, respectively. If omitted, + defaults to idle:sleep:shutdown. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 7ab9b5c1ed..3491d877d1 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -75,7 +75,7 @@ for more information on the specific unit configuration files. The execution specific configuration options are configured in the [Service], - [Socket], [Mount] resp. [Swap] section, depending on the unit + [Socket], [Mount], or [Swap] sections, depending on the unit type. @@ -117,10 +117,10 @@ Group= Sets the Unix user - resp. group the processes are executed - as. Takes a single user resp. group + or group that the processes are executed + as, respectively. Takes a single user or group name or ID as argument. If no group is - set the default group of the user is + set, the default group of the user is chosen. @@ -868,8 +868,8 @@ the value is suffixed with K, M, G or T the specified memory size is parsed as Kilobytes, Megabytes, Gigabytes, - resp. Terabytes (to the base - 1024). This controls the + or Terabytes (to the base + 1024), respectively. This controls the memory.limit_in_bytes and memory.soft_limit_in_bytes @@ -889,9 +889,9 @@ path (such as /dev/null) followed by a combination of r, w, m - to control reading, writing resp. + to control reading, writing, or creating of the specific device node - by the unit. This controls the + by the unit, respectively. This controls the devices.allow and devices.deny @@ -948,7 +948,7 @@ If the bandwidth is suffixed with K, M, G, or T the specified bandwidth is parsed as Kilobytes, Megabytes, - Gigabytes, resp. Terabytes (Example: + Gigabytes, or Terabytes, respectively (Example: "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0 5M"). This controls the blkio.read_bps_device diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index d1cb40bb12..e212c811fd 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -298,8 +298,8 @@ journal protocol, for the those read from a services' standard output or error - output, and for those read - from the kernel, resp. + output, or for those read + from the kernel, respectively. diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 3300534040..3fff2f57e6 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -75,7 +75,7 @@ for more information on the specific unit configuration files. The execution specific configuration options are configured in the [Service], - [Socket], [Mount] resp. [Swap] section, depending on the unit + [Socket], [Mount], or [Swap] section, depending on the unit type. diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 339dea9aa5..11f6006636 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -372,9 +372,9 @@ ExecStartPre= ExecStartPost= Additional commands - that are executed before (resp. after) + that are executed before or after the command in - ExecStart=. Multiple + ExecStart=, respectively. Multiple command lines may be concatenated in a single directive, by separating them by semicolons (these semicolons must diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 7885b0748a..9db39b1de9 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -150,9 +150,9 @@ ListenSequentialPacket= Specifies an address to listen on for a stream - (SOCK_STREAM), datagram (SOCK_DGRAM) - resp. sequential packet - (SOCK_SEQPACKET) socket. The address + (SOCK_STREAM), datagram (SOCK_DGRAM), + or sequential packet + (SOCK_SEQPACKET) socket, respectively. The address can be written in various formats: If the address starts with a @@ -434,9 +434,9 @@ SendBuffer= Takes an integer argument controlling the receive - resp. send buffer sizes of this - socket. This controls the SO_RCVBUF - resp. SO_SNDBUF socket options (see + or send buffer sizes of this + socket, respectively. This controls the SO_RCVBUF + and SO_SNDBUF socket options (see socket7 for details.). @@ -499,7 +499,7 @@ MessageQueueMessageSize= These two settings take integer values and control the - mq_maxmsg resp. mq_msgsize field when + mq_maxmsg field or the mq_msgsize field, respectively, when creating the message queue. Note that either none or both of these variables need to be set. See @@ -581,9 +581,9 @@ ExecStartPost= Takes one or more command lines, which are executed - before (resp. after) the listening + before or after the listening sockets/FIFOs are created and - bound. The first token of the command + bound, respectively. The first token of the command line must be an absolute file name, then followed by arguments for the process. Multiple command lines may be @@ -597,9 +597,9 @@ ExecStopPre= ExecStopPost= Additional commands - that are executed before (resp. after) + that are executed before or after the listening sockets/FIFOs are closed - and removed. Multiple command lines + and removed, respectively. Multiple command lines may be specified following the same scheme as used for ExecStartPre= of diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 5eb008dfcf..a932143d43 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -78,7 +78,7 @@ terminated. Swap units must be named after the devices - (resp. files) they control. Example: the swap device + or files they control. Example: the swap device /dev/sda5 must be configured in a unit file dev-sda5.swap. For details about the escaping logic used to convert a @@ -86,8 +86,8 @@ systemd.unit5. All swap units automatically get the appropriate - dependencies on the devices (resp. on the mount points - of the files) they are activated from. + dependencies on the devices or on the mount points + of the files they are activated from. Swap units with DefaultDependencies= enabled diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 55569681cf..afad56c5b2 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -77,8 +77,8 @@ This man pages lists the common configuration options of all the unit types. These options need to - be configured in the [Unit] resp. [Install] - section of the unit files. + be configured in the [Unit] or [Install] + sections of the unit files. In addition to the generic [Unit] and [Install] sections described here, each unit should have a @@ -418,7 +418,7 @@ Similar to Requires= - resp. RequiresOverridable=. However, + and RequiresOverridable=, respectively. However, if a unit listed here is not started already it will not be started and the transaction fails @@ -566,7 +566,7 @@ Before=. If two units have no ordering dependencies between them they are shut down - resp. started up simultaneously, and + or started up simultaneously, and no ordering takes place. @@ -672,13 +672,13 @@ Takes a boolean argument. If this unit can only be activated - (resp. deactivated) indirectly. In + or deactivated indirectly. In this case explicit start-up - (resp. termination) requested by the + or termination requested by the user is denied, however if it is - started (resp. stopped) as a + started or stopped as a dependency of another unit, start-up - (resp. termination) will succeed. This + or termination will succeed. This is mostly a safety feature to ensure that the user does not accidentally activate units that are not intended @@ -1023,8 +1023,8 @@ Installs a symlink in the .wants/ - resp. .requires/ - subdirectory for a unit. This has the + or .requires/ + subdirectory for a unit, respectively. This has the effect that when the listed unit name is activated the unit listing it is activated diff --git a/man/systemd.xml b/man/systemd.xml index 01833f66f2..f14e3eb9ae 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -144,11 +144,13 @@ - Tell systemd to run a - system instance (resp. user - instance), even if the process ID is - not 1 (resp. is 1), i.e. systemd is - not (resp. is) run as init process. + For , + tell systemd to run a + system instance, even if the process ID is + not 1, i.e. systemd is not run as init process. + does the opposite, + running a user instance even if the process + ID is 1. Normally it should not be necessary to pass these options, as systemd automatically detects the mode it is @@ -251,11 +253,11 @@ Sets the default - output resp. error output for all - services and sockets, i.e. controls + output or error output for all + services and sockets, respectively. That is, controls the default for - resp. + and (see systemd.exec5 for details). Takes one of @@ -495,12 +497,12 @@ Specification. Systems which invoke systemd in a container - resp. initrd environment should implement the + or initrd environment should implement the Container - Interface resp. or initrd - Interface specifications. + Interface specifications, respectively. @@ -825,11 +827,11 @@ Sets the log level to debug - (resp. info on + (or info on SIGRTMIN+23), as controlled via systemd.log_level=debug - (resp. systemd.log_level=info + (or systemd.log_level=info on SIGRTMIN+23) on the kernel command line. @@ -843,19 +845,19 @@ Sets the log level to journal-or-kmsg - (resp. console on - SIGRTMIN+27; - resp. kmsg on - SIGRTMIN+28; - resp. syslog-or-kmsg + (or console on + SIGRTMIN+27, + kmsg on + SIGRTMIN+28, + or syslog-or-kmsg on SIGRTMIN+29), as controlled via systemd.log_target=journal-or-kmsg - (resp. systemd.log_target=console - on SIGRTMIN+27; - resp. systemd.log_target=kmsg - on SIGRTMIN+28; - resp + (or systemd.log_target=console + on SIGRTMIN+27, + systemd.log_target=kmsg + on SIGRTMIN+28, + or systemd.log_target=syslog-or-kmsg on SIGRTMIN+29) on the kernel command @@ -1073,12 +1075,12 @@ systemd.default_standard_output= systemd.default_standard_error= Controls default - standard output/error output for + standard output and error output for services, with the same effect as the - resp. + and command line arguments described - above. + above, respectively. @@ -1143,12 +1145,12 @@ 5 Boot into the - specified legacy SysV runlevel. This - is equivalent to + specified legacy SysV runlevel. These + are equivalent to systemd.unit=runlevel2.target, systemd.unit=runlevel3.target, systemd.unit=runlevel4.target, - resp. systemd.unit=runlevel5.target + and systemd.unit=runlevel5.target, respectively, and provided for compatibility reasons and to be easier to type. -- cgit v1.2.3-54-g00ecf From bb31a4ac1997c189a344caf554f34c6aabc71aa7 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 26 Oct 2012 00:16:47 +0200 Subject: man: typo fixes https://bugs.freedesktop.org/show_bug.cgi?id=55890 Fixed typos, serial comma, and removed "either" as there were more than two options. Also did an extra rename of "system-shutdown" to "systemd-shutdown" that was forgotten in commit 8bd3b8620c80d0f2383f2fb04315411fc8077ca1 --- man/loginctl.xml | 2 +- man/sd_id128_to_string.xml | 4 ++-- man/sd_is_fifo.xml | 4 ++-- man/sd_journal_add_match.xml | 2 +- man/sd_journal_get_fd.xml | 2 +- man/sd_journal_next.xml | 2 +- man/sd_journal_open.xml | 4 ++-- man/sd_journal_print.xml | 2 +- man/sd_journal_seek_head.xml | 2 +- man/sd_journal_stream_fd.xml | 2 +- man/sd_login_monitor_new.xml | 6 +++--- man/sd_notify.xml | 4 ++-- man/sd_pid_get_session.xml | 2 +- man/sd_seat_get_active.xml | 4 ++-- man/sd_uid_get_state.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd-ask-password.xml | 2 +- man/systemd-cgls.xml | 4 ++-- man/systemd-cryptsetup-generator.xml | 12 ++++++------ man/systemd-delta.xml | 2 +- man/systemd-detect-virt.xml | 2 +- man/systemd-fstab-generator.xml | 6 +++--- man/systemd-halt.service.xml | 2 +- man/systemd-inhibit.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd-nspawn.xml | 2 +- man/systemd-suspend.service.xml | 2 +- man/systemd-udevd.service.xml | 4 ++-- man/systemd-vconsole-setup.service.xml | 2 +- man/systemd.automount.xml | 2 +- man/systemd.conf.xml | 6 +++--- man/systemd.journal-fields.xml | 2 +- man/systemd.service.xml | 12 ++++++------ man/systemd.unit.xml | 2 +- man/systemd.xml | 4 ++-- man/tmpfiles.d.xml | 2 +- man/udev.xml | 4 ++-- man/vconsole.conf.xml | 4 ++-- 38 files changed, 66 insertions(+), 66 deletions(-) (limited to 'man/sd_journal_next.xml') diff --git a/man/loginctl.xml b/man/loginctl.xml index 7d9d8a1e2c..5dbc1f6967 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -403,7 +403,7 @@ paths in the /sys file system. To create a new seat attach at least one graphics card to a - previously unused seat name. seat + previously unused seat name. Seat names may consist only of a-z, A-Z, 0-9, "-" and "_" and must be prefixed with "seat". To drop assignment of a diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml index eda35b08b1..ec8b263e0d 100644 --- a/man/sd_id128_to_string.xml +++ b/man/sd_id128_to_string.xml @@ -77,7 +77,7 @@ sd_id128_from_string() implements the reverse operation: it takes a 33 - character array with 32 hexadecimial digits + character array with 32 hexadecimal digits (terminated by NUL) and parses them back into an 128 bit ID returned in ret. @@ -89,7 +89,7 @@ When formatting a 128 bit ID into a string it is often easier to use a format string for printf3. This - is easly done using the + is easily done using the SD_ID128_FORMAT_STR and SD_ID128_FORMAT_VAL() macros. For more information see diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 27e9a0de8f..595c8f112d 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -107,7 +107,7 @@ sd_is_socket() may be called to check whether the specified file descriptor - refers to a socket. It the + refers to a socket. If the family parameter is not AF_UNSPEC it is checked whether the socket is of the specified family (AF_UNIX, AF_INET, ...). If the @@ -129,7 +129,7 @@ optionally checks the IPv4 or IPv6 port number the socket is bound to, unless port is zero. For this call family - must be passed as either AF_UNSPEC, AF_INET or + must be passed as either AF_UNSPEC, AF_INET, or AF_INET6. sd_is_socket_unix() is diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml index 4aadf6cf00..f9ffc91326 100644 --- a/man/sd_journal_add_match.xml +++ b/man/sd_journal_add_match.xml @@ -122,7 +122,7 @@ again. Note that filtering via matches only applies to - way the journal is read, it has no effect on storage + the way the journal is read, it has no effect on storage on disk. diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml index 7fb151edd6..e3b5eaa13d 100644 --- a/man/sd_journal_get_fd.xml +++ b/man/sd_journal_get_fd.xml @@ -81,7 +81,7 @@ sd_journal_get_fd() returns a file descriptor that may be asynchronously polled in - an external event loop and is signalled readable as + an external event loop and is signaled readable as soon as the journal changes, for example because new entries were added. The file descriptor is suitable for usage in diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 58e7cec6f3..9b1cb1fc46 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -128,7 +128,7 @@ as a wrapper around sd_journal_seek_head3 and sd_journal_next() in order to - make iteratring through the journal easier. See below + make iterating through the journal easier. See below for an example. Similar, SD_JOURNAL_FOREACH_BACKWARDS() may be used for iterating the journal in reverse diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index b99c67da46..06d0ccfd12 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -80,7 +80,7 @@ Description - sd_journal_open() opens the + sd_journal_open() opens the log journal for reading. It will find all journal files automatically and interleave them automatically when reading. As first argument it takes a pointer to @@ -120,7 +120,7 @@ See sd_journal_next3 for an example how to iterate through the journal - after opening it it with + after opening it with sd_journal_open(). A journal context object returned by diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 41414bbc09..7742268f5d 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -194,7 +194,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( sd-journal.h. syslog3 - and and sd_journal_print() may + and sd_journal_print() may largely be used interchangeably functionality-wise. However, note that log messages logged via the former take a different path to the diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml index b10f069e83..3716c5d367 100644 --- a/man/sd_journal_seek_head.xml +++ b/man/sd_journal_seek_head.xml @@ -108,7 +108,7 @@ sd_journal_seek_realtime_usec() seeks to the entry with the specified realtime (wallclock) timestamp, i.e. CLOCK_REALTIME. Note that - the realtime clock is not necessary monotonic. If a + the realtime clock is not necessarily monotonic. If a realtime timestamp is ambiguous it is not defined which position is sought to. diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml index 662c7bbbb9..4407296b40 100644 --- a/man/sd_journal_stream_fd.xml +++ b/man/sd_journal_stream_fd.xml @@ -96,7 +96,7 @@ for more information. It is recommended that applications log UTF-8 - mesages only with this API, but this is not + messages only with this API, but this is not enforced. diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index ce17159541..35cb6b368b 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.xml @@ -83,20 +83,20 @@ Description sd_login_monitor_new() may - be used to monitor login session, users and seats. Via + be used to monitor login sessions, users and seats. Via a monitor object a file descriptor can be integrated into an application defined event loop which is woken up each time a user logs in, logs out or a seat is added or removed, or a session, user, or seat changes state otherwise. The first parameter takes a string - which can be either seat (to get + which can be seat (to get only notifications about seats being added, removed or changed), session (to get only notifications about sessions being created or removed or changed) or uid (to get only notifications when a user changes state in respect to logins). If notifications shall be generated in all - these conditions, NULL may be passed. Note that in + these conditions, NULL may be passed. Note that in the future additional categories may be defined. The second parameter returns a monitor object and needs to be freed with the diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 5f86e86fec..75edeeadf3 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -87,7 +87,7 @@ processes. The state parameter - should contain an newline-separated list of variable + should contain a newline-separated list of variable assignments, similar in style to an environment block. A trailing newline is implied if none is specified. The string may contain any kind of variable @@ -104,7 +104,7 @@ definition file has Type=notify set. The passed argument is a boolean "1" or "0". Since there is little - value in signalling non-readiness, the + value in signaling non-readiness, the only value daemons should send is "READY=1". diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml index 7897a2cd3e..9517795f78 100644 --- a/man/sd_pid_get_session.xml +++ b/man/sd_pid_get_session.xml @@ -114,7 +114,7 @@ and not being a shared process of a user this function will fail. - If the pid paramater of any + If the pid parameter of any of these functions is passed as 0 the operation is executed for the calling process. diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 778f9aeaf9..b1d6d20edf 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -140,8 +140,8 @@ Return Value On success - sd_seat_get_active() return - return 0 or a positive integer. On success + sd_seat_get_active() + returns 0 or a positive integer. On success sd_seat_get_sessions() returns the number of entries in the session identifier array. If the test succeeds diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml index 183e8a600a..b7bc944b14 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.xml @@ -120,7 +120,7 @@ sd_uid_get_sessions() may be used to determine the current sessions of the - specified user. Acceptes a Unix user identifier as + specified user. Accepts a Unix user identifier as parameter. The require_active parameter controls whether the returned list shall consist of only those sessions where the user is diff --git a/man/systemctl.xml b/man/systemctl.xml index c452dfc43f..d547410696 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -178,7 +178,7 @@ execute it immediately. If passed no required units of the unit passed will be pulled in, and no ordering - dependencies will be honoured. This is + dependencies will be honored. This is mostly a debugging and rescue tool for the administrator and should not be used by @@ -766,7 +766,7 @@ configuration after completing the disabling of the units. Note that this command does not implicitly stop the - units that is being disabled. If this + units that are being disabled. If this is desired an additional stop command should be executed afterwards. @@ -789,7 +789,7 @@ is-enabled [NAME...] Checks whether any of - the specified unit files is enabled + the specified unit files are enabled (as with enable). Returns an exit code of 0 if at least one is diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index e46241b67f..7b0b9ab809 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -90,7 +90,7 @@ url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd Password Agent Specification. - If a password is queried on a tty the user may + If a password is queried on a TTY the user may press TAB to hide the asterisks normally shown for each character typed. Pressing Backspace as first key achieves the same effect. diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml index 0666937c16..4b6ee93b4e 100644 --- a/man/systemd-cgls.xml +++ b/man/systemd-cgls.xml @@ -70,7 +70,7 @@ to. Otherwise the full systemd control group hierarchy is shown. - By default empty control cgroups are not + By default empty control groups are not shown. @@ -107,7 +107,7 @@ Don't hide empty control groups in the - outpout. + output. diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index ec2b5e4e32..49d4d5545b 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -83,9 +83,9 @@ no disables the generator entirely. rd.luks= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while - luks= is honoured + luks= is honored by both the main system and the initrd. @@ -104,10 +104,10 @@ (luks.uuid= will still work however). rd.luks.crypttab= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.crypttab= is - honoured by both the main system and + honored by both the main system and the initrd. @@ -124,10 +124,10 @@ option may be specified more than once in order to set up multiple devices. rd.luks.uuid= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.uuid= is - honoured by both the main system and + honored by both the main system and the initrd. diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 4e57d18fcc..c66d7e8875 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -109,7 +109,7 @@ comma-separated list of desired difference types. - Recognised types are: + Recognized types are: diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index 75cc714f52..762b6ab992 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -58,7 +58,7 @@ systemd-detect-virt detects execution in a virtualized environment. It identifies - the virtualization technology and can distuingish full + the virtualization technology and can distinguish full VM virtualization from container virtualization. diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index 87cc35b7d1..2decec6c40 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -59,7 +59,7 @@ for details) into native systemd units early at boot and when configuration of the system manager is reloaded. This will instantiate mount and swap units - units as necessary. + as necessary. See systemd.mount5 @@ -94,10 +94,10 @@ generator to ignore any mounts or swaps configured in /etc/fstab. rd.fstab= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.fstab= is - honoured by both the main system and + honored by both the main system and the initrd. diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml index e15361ae48..6a6bfdc7d7 100644 --- a/man/systemd-halt.service.xml +++ b/man/systemd-halt.service.xml @@ -85,7 +85,7 @@ Immediately before executing the actual system halt/poweroff/reboot/kexec - system-shutdown will run all + systemd-shutdown will run all executables in /usr/lib/systemd/system-shutdown/ and pass one arguments to them: either diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 5f26c96546..6f63c8c73e 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -160,7 +160,7 @@ may be specified in systemd-logind.conf5. Note that delay is only - available or sleep + available for sleep and shutdown. diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 90f9290276..abc03df5db 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -134,7 +134,7 @@ Kernel Command Line A few configuration parameters from - journald.conf may be overriden on + journald.conf may be overridden on the kernel command line: diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 71ce0aca43..fef5c2c83a 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -220,7 +220,7 @@ list of capability names, see capabilities7 for more information. Note that the - the following capabilities will be + following capabilities will be granted in any way: CAP_CHOWN, CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH, CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER, diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index d3e08a8f1d..604aab6f6b 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -64,7 +64,7 @@ for the actual system suspend. Similar, systemd-hibernate.service is pulled in by hibernate.target to - executed the actual hibernation. + execute the actual hibernation. Immediately before entering system suspend and hibernation diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index 0dd5d10089..92fb38f067 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -83,7 +83,7 @@ - Delay the execution of RUN intruction by the given + Delay the execution of RUN instruction by the given number of seconds. This option might be useful when debugging system crashes during coldplug caused by loading non-working kernel modules. @@ -148,7 +148,7 @@ udev.exec-delay= rd.udev.exec-delay= - Delay the execution of RUN intruction by the given + Delay the execution of RUN instruction by the given number of seconds. This option might be useful when debugging system crashes during coldplug caused by loading non-working kernel modules. diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml index b31177e58b..c1ef80dae4 100644 --- a/man/systemd-vconsole-setup.service.xml +++ b/man/systemd-vconsole-setup.service.xml @@ -73,7 +73,7 @@ Kernel Command Line A few configuration parameters from - vconsole.conf may be overriden on + vconsole.conf may be overridden on the kernel command line: diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index 43006d4dc9..fe559e1dcb 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -130,7 +130,7 @@ Takes an absolute path of a directory of the automount point. If the automount point is not - existing at time of the automount + existing at time that the automount point is installed it is created. This string must be reflected in the unit file name. (See above.) This option is diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 7776c8f4f7..a6be932c73 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -201,7 +201,7 @@ capabilities will be included, the effect of the assignment inverted. Note that this option also - effects the respective capabilities in + affects the respective capabilities in the effective, permitted and inheritable capability sets. The capability bounding set may also be @@ -220,7 +220,7 @@ Sets the timer slack in nanoseconds for PID 1 which is then inherited to all executed processes, - unless overriden individually, for + unless overridden individually, for example with the TimerSlackNSec= setting in service units (for details @@ -264,7 +264,7 @@ infinity to configure no limit on a specific resource. These settings may be - overriden in individual units + overridden in individual units using the corresponding LimitXXX= directives. Note that these resource limits are only defaults for units, diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index e212c811fd..d95cb011d9 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -215,7 +215,7 @@ _SYSTEMD_OWNER_UID= - The contol group path in + The control group path in the systemd hierarchy, the systemd session ID (if any), the systemd unit name (if any) diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 59ecf810fb..00a6398a1e 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -100,7 +100,7 @@ script. This is useful for compatibility with SysV. Note that this compatibility is quite comprehensive but not 100%. For details about the - incomptibilities see the Incompatibilities with SysV document. @@ -219,7 +219,7 @@ Behavior of is very similar to , however - actual execution of a the service + actual execution of the service binary is delayed until all jobs are dispatched. This may be used to avoid interleaving of output of shell @@ -245,7 +245,7 @@ Takes a boolean value that specifies whether systemd should try to guess the main PID of a service - should if it cannot be determined + if it cannot be determined reliably. This option is ignored unless is set and @@ -283,7 +283,7 @@ BusName= Takes a D-Bus bus - name, where this service is reachable + name, that this service is reachable as. This option is mandatory for services where Type= is set to @@ -341,7 +341,7 @@ variable substitution is supported. Use ${FOO} as part of a - word, or as word of its own on the + word, or as a word of its own on the command line, in which case it will be replaced by the value of the environment variable including all @@ -578,7 +578,7 @@ 0. If set to it will be restarted only when it exited with an - exit code not equalling 0, when + exit code not equaling 0, when terminated by a signal (including on core dump), when an operation (such as service reload) times out or when the diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index afad56c5b2..f23aad9fa0 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -75,7 +75,7 @@ inspired by Microsoft Windows .ini files. - This man pages lists the common configuration + This man page lists the common configuration options of all the unit types. These options need to be configured in the [Unit] or [Install] sections of the unit files. diff --git a/man/systemd.xml b/man/systemd.xml index 77585248a9..7b3d265b8d 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1002,7 +1002,7 @@ systemd.special7 for details about these units. The option prefixed with - rd. is honoured + rd. is honored only in the initial RAM disk (initrd), while the one that isn't prefixed only in the main system. @@ -1101,7 +1101,7 @@ process and all its children at boot time. May be used more than once to set multiple variables. If the equal - sign and variable are missing unsets + sign and variable are missing it unsets an environment variable which might be passed in from the initial ram disk. diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 91bc8e5571..785264e3cf 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -161,7 +161,7 @@ L /tmp/foobar - - - - /dev/null effect of r or R lines. Lines of this type accept shell-style globs in place of - of normal path + normal path names. diff --git a/man/udev.xml b/man/udev.xml index 0746618d00..7ec7a3fed0 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -94,7 +94,7 @@ extensions are ignored. Every line in the rules file contains at least one key-value pair. - There are two kind of keys: match and assignment. + There are two kinds of keys: match and assignment. If all match keys are matching against its value, the rule gets applied and the assignment keys get the specified value assigned. @@ -327,7 +327,7 @@ The name to use for a network interface. The name of a device node - can not be changed by udev, only additional symlinks can be created. + cannot be changed by udev, only additional symlinks can be created. diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index 258c82bc62..45156b7447 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -61,7 +61,7 @@ The basic file format of the vconsole.conf is a - newline-separated list environment-like + newline-separated list of environment-like shell-compatible variable assignments. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell @@ -100,7 +100,7 @@ defaults to us if not set. The KEYMAP_TOGGLE= can - be used to configured a second toggle + be used to configure a second toggle keymap and is by default unset. -- cgit v1.2.3-54-g00ecf