shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-06 12:58:22 +03:00
Code

doc: corrections to words and forms

Browse Source 
This patch exchange words which are inappropriate for a situation,
deletes duplicated words, and adds particles where needed.
This commit is contained in:
Jan Engelhardt 2014-05-08 01:28:44 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 0c9d8f1d4b
commit dca348bcbb
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -2348,7 +2348,7 @@ CHANGES WITH 190:
dir: %_presetdir. dir: %_presetdir.
* journald will now warn if it ca not forward a message to the * 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, * timedated will no longer write or process /etc/timezone,
except on Debian. As we do not support late mounted /usr except on Debian. As we do not support late mounted /usr

4
man/sd_bus_message_append_string_memfd.xml
View File

@ -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 space for a string to message <parameter>m</parameter>. If behaves
similarly to <function>sd_bus_message_append_basic</function> with similarly to <function>sd_bus_message_append_basic</function> with
type <literal>s</literal>, but instead of copying a string into type <literal>s</literal>, but instead of copying a string into
the the message, it returns a pointer to the destination area to the message, it returns a pointer to the destination area to
the caller in pointer <parameter>p</parameter>. Space for string the caller in pointer <parameter>p</parameter>. Space for the string
of length <parameter>size</parameter> plus the terminating of length <parameter>size</parameter> plus the terminating
<constant>NUL</constant> is allocated.</para> <constant>NUL</constant> is allocated.</para>
</refsect1> </refsect1>

4
man/sd_bus_message_append_strv.xml
View File

@ -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 <para>The memory pointed at by <parameter>p</parameter> and the
contents of the strings themselves are copied into the memory area contents of the strings themselves are copied into the memory area
containing the message and may be changed after this call. Note containing the message and may be changed after this call. Note
that the signature of <parameter>l</parameter> parameter is be that the signature of <parameter>l</parameter> parameter is to be
treated as <type>const char* const*</type>, and the the contents treated as <type>const char *const *</type>, and the contents
will not be modified.</para> will not be modified.</para>
</refsect1> </refsect1>

4
man/sd_bus_open_user.xml
View File

@ -96,13 +96,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<title>Description</title> <title>Description</title>
<para><function>sd_bus_open_user()</function> creates a new bus <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 <function>sd_bus_open_system()</function> does the same, but
connects to the system bus.</para> connects to the system bus.</para>
<para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment <para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
variable is set 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 it will be used as the address of the user bus. This variable can
contain multiple addresses separated by <literal>;</literal>. If contain multiple addresses separated by <literal>;</literal>. If
this variable is not set, a suitable default for the default user this variable is not set, a suitable default for the default user

4
man/sd_bus_path_encode.xml
View File

@ -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 takes a bus path and a prefix string, plus a place to store the
returned external identifier string. If the bus path does not returned external identifier string. If the bus path does not
start with the specified prefix, 0 is returned and the returned 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 string following the prefix is unescaped and returned in the
external identifier string.</para> 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 invalid in a bus object path by <literal>_</literal> followed by a
hexadecimal value. As a special case, the empty string will be hexadecimal value. As a special case, the empty string will be
replaced by a lone <literal>_</literal>.</para> replaced by a lone <literal>_</literal>.</para>

2
man/sd_event_new.xml
View File

@ -109,7 +109,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para><function>sd_event_unref()</function> decreases the <para><function>sd_event_unref()</function> decreases the
reference counter of the specified event loop object by one. If reference counter of the specified event loop object by one. If
the counter hits zero the event loop object is freed. Note that it 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 thread or not. This means that allocating an event loop with
<function>sd_event_default()</function>, then releasing it and <function>sd_event_default()</function>, then releasing it and
then acquiring a new one with then acquiring a new one with

2
man/systemctl.xml
View File

@ -724,7 +724,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<para>Show terse runtime status information about one or <para>Show terse runtime status information about one or
more units, followed by most recent log data from the more units, followed by most recent log data from the
journal. If no units are specified, show system status. If 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 all units (subject to limitations specified with
<option>-t</option>). If a PID is passed, show information <option>-t</option>). If a PID is passed, show information
about the unit the process belongs to.</para> about the unit the process belongs to.</para>

4
man/systemd-gpt-auto-generator.xml
View File

@ -60,7 +60,7 @@
is a unit generator that automatically discovers root, is a unit generator that automatically discovers root,
<filename>/home</filename>, <filename>/srv</filename> <filename>/home</filename>, <filename>/srv</filename>
and swap partitions and creates mount and swap units 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 GUID partition tables (GPT). It implements the <ulink
url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable
Partitions Specification</ulink>. Note that this Partitions Specification</ulink>. Note that this
@ -75,7 +75,7 @@
Partition (ESP) is located on. It will only look for Partition (ESP) is located on. It will only look for
the other partitions on the same physical disk the the other partitions on the same physical disk the
root file system is located on. These partitions will 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 distributed on multiple disks, for example via btrfs
RAID.</para> RAID.</para>

8
man/systemd-journal-remote.xml
View File

@ -79,7 +79,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
(<command>systemd-journal-remote</command> requests and pulls (<command>systemd-journal-remote</command> requests and pulls
the data), or "passive" the data), or "passive"
(<command>systemd-journal-remote</command> waits for a (<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>
<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> <term><option>--listen-raw=<replaceable>ADDRESS</replaceable></option></term>
<listitem><para><replaceable>ADDRESS</replaceable> must be an <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>). <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
<command>systemd-journal-remote</command> will listen on this <command>systemd-journal-remote</command> will listen on this
socket for connections. Each connection is expected to be a 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 end with <filename>.journal</filename>. The file will be
created if it does not exist. When necessary (journal file created if it does not exist. When necessary (journal file
full, or corrupted) the file will be renamed following normal full, or corrupted) the file will be renamed following normal
journald rules and a new journal file will be created in it's journald rules and a new journal file will be created in its
stead. </para></listitem> stead.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

2
man/systemd-nspawn.xml
View File

@ -340,7 +340,7 @@
container's name (as specified with container's name (as specified with
<option>--machine=</option>), prefixed <option>--machine=</option>), prefixed
with <literal>ve-</literal>. The with <literal>ve-</literal>. The
container side of the the Ethernet container side of the Ethernet
link will be named link will be named
<literal>host0</literal>. Note that <literal>host0</literal>. Note that
<option>--network-veth</option> <option>--network-veth</option>

2
man/systemd-run.xml
View File

@ -121,7 +121,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<varlistentry> <varlistentry>
<term><option>--description=</option></term> <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 unit. If not specified, the command itself will be used as a
description. See <varname>Description=</varname> in description. See <varname>Description=</varname> in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.

6
man/systemd.exec.xml
View File

@ -341,7 +341,7 @@
<para>The files listed with this <para>The files listed with this
directive will be read shortly before directive will be read shortly before
the process is executed (more the process is executed (more
specifically, this means after all specifically, after all
processes from a previous unit state processes from a previous unit state
terminated. This means you can terminated. This means you can
generate these files in one unit generate these files in one unit
@ -1022,7 +1022,7 @@
<varlistentry> <varlistentry>
<term><varname>AppArmorProfile=</varname></term> <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 The process executed by the unit will switch to
this profile when started. Profiles must already this profile when started. Profiles must already
be loaded in the kernel, or the unit will fail. be loaded in the kernel, or the unit will fail.
@ -1427,7 +1427,7 @@
<varname>systemd.setenv=</varname> (see <varname>systemd.setenv=</varname> (see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>). Additional <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>). Additional
variables may also be set through PAM, 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>
<refsect1> <refsect1>

2
man/systemd.link.xml
View File

@ -186,7 +186,7 @@
<listitem> <listitem>
<para>If the hardware has a persistent <para>If the hardware has a persistent
MAC address, as most hardware should, 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 done. Otherwise, a new MAC address
is generated which is guaranteed to be is generated which is guaranteed to be
the same on every boot for the given the same on every boot for the given

2
man/systemd.socket.xml
View File

@ -571,7 +571,7 @@
<varlistentry> <varlistentry>
<term><varname>PipeSize=</varname></term> <term><varname>PipeSize=</varname></term>
<listitem><para>Takes an size in <listitem><para>Takes a size in
bytes. Controls the pipe buffer size bytes. Controls the pipe buffer size
of FIFOs configured in this socket of FIFOs configured in this socket
unit. See unit. See

2
src/core/unit-printf.c
View File

@ -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 /* This is similar to unit_name_printf() but also supports
* unescaping. Also, adds a couple of additional codes: * 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 * %c cgroup path of unit
* %r where units in this slice are placed in the cgroup tree * %r where units in this slice are placed in the cgroup tree
* %R the root of this systemd's instance tree * %R the root of this systemd's instance tree