diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | man/sd_bus_message_append_string_memfd.xml | 4 | ||||
| -rw-r--r-- | man/sd_bus_message_append_strv.xml | 4 | ||||
| -rw-r--r-- | man/sd_bus_open_user.xml | 4 | ||||
| -rw-r--r-- | man/sd_bus_path_encode.xml | 4 | ||||
| -rw-r--r-- | man/sd_event_new.xml | 2 | ||||
| -rw-r--r-- | man/systemctl.xml | 2 | ||||
| -rw-r--r-- | man/systemd-gpt-auto-generator.xml | 4 | ||||
| -rw-r--r-- | man/systemd-journal-remote.xml | 8 | ||||
| -rw-r--r-- | man/systemd-nspawn.xml | 2 | ||||
| -rw-r--r-- | man/systemd-run.xml | 2 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 6 | ||||
| -rw-r--r-- | man/systemd.link.xml | 2 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 2 | ||||
| -rw-r--r-- | src/core/unit-printf.c | 2 |
15 files changed, 25 insertions, 25 deletions
@@ -2348,7 +2348,7 @@ CHANGES WITH 190: dir: %_presetdir. * journald will now warn if it ca not forward a message to the - syslog daemon because it's socket is full. + syslog daemon because its socket is full. * timedated will no longer write or process /etc/timezone, except on Debian. As we do not support late mounted /usr diff --git a/man/sd_bus_message_append_string_memfd.xml b/man/sd_bus_message_append_string_memfd.xml index a9b8924805..bf185ef6d4 100644 --- a/man/sd_bus_message_append_string_memfd.xml +++ b/man/sd_bus_message_append_string_memfd.xml @@ -115,8 +115,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. space for a string to message <parameter>m</parameter>. If behaves similarly to <function>sd_bus_message_append_basic</function> with type <literal>s</literal>, but instead of copying a string into - the the message, it returns a pointer to the destination area to - the caller in pointer <parameter>p</parameter>. Space for string + the message, it returns a pointer to the destination area to + the caller in pointer <parameter>p</parameter>. Space for the string of length <parameter>size</parameter> plus the terminating <constant>NUL</constant> is allocated.</para> </refsect1> diff --git a/man/sd_bus_message_append_strv.xml b/man/sd_bus_message_append_strv.xml index 048bbcac08..4fb1390df4 100644 --- a/man/sd_bus_message_append_strv.xml +++ b/man/sd_bus_message_append_strv.xml @@ -77,8 +77,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para>The memory pointed at by <parameter>p</parameter> and the contents of the strings themselves are copied into the memory area containing the message and may be changed after this call. Note - that the signature of <parameter>l</parameter> parameter is be - treated as <type>const char* const*</type>, and the the contents + that the signature of <parameter>l</parameter> parameter is to be + treated as <type>const char *const *</type>, and the contents will not be modified.</para> </refsect1> diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml index 7fa1be61ed..740977e1cf 100644 --- a/man/sd_bus_open_user.xml +++ b/man/sd_bus_open_user.xml @@ -96,13 +96,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <title>Description</title> <para><function>sd_bus_open_user()</function> creates a new bus - object and opens a connection to the the user bus. + object and opens a connection to the user bus. <function>sd_bus_open_system()</function> does the same, but connects to the system bus.</para> <para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment variable is set - (c.f. <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>), + (cf. <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>), it will be used as the address of the user bus. This variable can contain multiple addresses separated by <literal>;</literal>. If this variable is not set, a suitable default for the default user diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml index 7cb8e77bc0..7e11906872 100644 --- a/man/sd_bus_path_encode.xml +++ b/man/sd_bus_path_encode.xml @@ -101,11 +101,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. takes a bus path and a prefix string, plus a place to store the returned external identifier string. If the bus path does not start with the specified prefix, 0 is returned and the returned - string is set to <constant>NULL</constant>. Otherwise the the + string is set to <constant>NULL</constant>. Otherwise the string following the prefix is unescaped and returned in the external identifier string.</para> - <para>The escaping used will will replace all characters which are + <para>The escaping used will replace all characters which are invalid in a bus object path by <literal>_</literal> followed by a hexadecimal value. As a special case, the empty string will be replaced by a lone <literal>_</literal>.</para> diff --git a/man/sd_event_new.xml b/man/sd_event_new.xml index 6545cde7ca..f25631f9ca 100644 --- a/man/sd_event_new.xml +++ b/man/sd_event_new.xml @@ -109,7 +109,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para><function>sd_event_unref()</function> decreases the reference counter of the specified event loop object by one. If the counter hits zero the event loop object is freed. Note that it - is freed regardless if it is the default event loop object of a + is freed regardless of whether it is the default event loop object for a thread or not. This means that allocating an event loop with <function>sd_event_default()</function>, then releasing it and then acquiring a new one with diff --git a/man/systemctl.xml b/man/systemctl.xml index 94f238041a..28a7cca0ed 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -724,7 +724,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <para>Show terse runtime status information about one or more units, followed by most recent log data from the journal. If no units are specified, show system status. If - combined with <option>--all</option> also shows status of + combined with <option>--all</option> also show the status of all units (subject to limitations specified with <option>-t</option>). If a PID is passed, show information about the unit the process belongs to.</para> diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 32e1183336..41b83dd383 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -60,7 +60,7 @@ is a unit generator that automatically discovers root, <filename>/home</filename>, <filename>/srv</filename> and swap partitions and creates mount and swap units - for them, based on the the partition type GUIDs of + for them, based on the partition type GUIDs of GUID partition tables (GPT). It implements the <ulink url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>. Note that this @@ -75,7 +75,7 @@ Partition (ESP) is located on. It will only look for the other partitions on the same physical disk the root file system is located on. These partitions will - not be search on systems where the root file system is + not be searched on systems where the root file system is distributed on multiple disks, for example via btrfs RAID.</para> diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index 40bef05a13..1f0d93e2f3 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -79,7 +79,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. (<command>systemd-journal-remote</command> requests and pulls the data), or "passive" (<command>systemd-journal-remote</command> waits for a - connection and than receives events pushed by the other side). + connection and then receives events pushed by the other side). </para> <para> @@ -131,7 +131,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <term><option>--listen-raw=<replaceable>ADDRESS</replaceable></option></term> <listitem><para><replaceable>ADDRESS</replaceable> must be an - address suitable for <option>ListenStream=</option> (c.f. + address suitable for <option>ListenStream=</option> (cf. <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>). <command>systemd-journal-remote</command> will listen on this socket for connections. Each connection is expected to be a @@ -195,8 +195,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. end with <filename>.journal</filename>. 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. </para></listitem> + journald rules and a new journal file will be created in its + stead.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 18946167c5..1ad8e6ec05 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -340,7 +340,7 @@ container's name (as specified with <option>--machine=</option>), prefixed with <literal>ve-</literal>. The - container side of the the Ethernet + container side of the Ethernet link will be named <literal>host0</literal>. Note that <option>--network-veth</option> diff --git a/man/systemd-run.xml b/man/systemd-run.xml index 8bb587cf7f..9ca17df55a 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -121,7 +121,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <varlistentry> <term><option>--description=</option></term> - <listitem><para>Provide description for the service or scope + <listitem><para>Provide a description for the service or scope unit. If not specified, the command itself will be used as a description. See <varname>Description=</varname> in <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index d206d4f645..f794894947 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -341,7 +341,7 @@ <para>The files listed with this directive will be read shortly before the process is executed (more - specifically, this means after all + specifically, after all processes from a previous unit state terminated. This means you can generate these files in one unit @@ -1022,7 +1022,7 @@ <varlistentry> <term><varname>AppArmorProfile=</varname></term> - <listitem><para>Take a profile name as argument. + <listitem><para>Takes a profile name as argument. The process executed by the unit will switch to this profile when started. Profiles must already be loaded in the kernel, or the unit will fail. @@ -1427,7 +1427,7 @@ <varname>systemd.setenv=</varname> (see <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>). Additional variables may also be set through PAM, - c.f. <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> + cf. <citerefentry><refentrytitle>pam_env</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> </refsect1> <refsect1> diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 2f5de23742..1bee07cf1d 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -186,7 +186,7 @@ <listitem> <para>If the hardware has a persistent MAC address, as most hardware should, - and this is used by the kernel, nothing + and if it is used by the kernel, nothing is done. Otherwise, a new MAC address is generated which is guaranteed to be the same on every boot for the given diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index d645de45e1..c0d7906d7e 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -571,7 +571,7 @@ <varlistentry> <term><varname>PipeSize=</varname></term> - <listitem><para>Takes an size in + <listitem><para>Takes a size in bytes. Controls the pipe buffer size of FIFOs configured in this socket unit. See diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 4e18afab8b..d16d856b51 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -369,7 +369,7 @@ int unit_full_printf(Unit *u, const char *format, char **ret) { /* This is similar to unit_name_printf() but also supports * unescaping. Also, adds a couple of additional codes: * - * %f the the instance if set, otherwise the id + * %f the instance if set, otherwise the id * %c cgroup path of unit * %r where units in this slice are placed in the cgroup tree * %R the root of this systemd's instance tree |