On Fri, 20.12.13 03:03, Jan Engelhardt (jeng...@inai.de) wrote: > This is a recurring submission and includes corrections to various > issue spotted: comma setting, missing words/preposition choice. > Of note is the change of /lib to /usr/lib, because that is what most > distros are using as the system-wide location for systemd/udev files.
This is still unmerged if I am right? Unfortunately it doesn't apply anymore. Can you please rebase if this indeed is still unmerged? > --- > man/journalctl.xml | 6 +++--- > man/sd-login.xml | 2 +- > man/sd_bus_request_name.xml | 28 ++++++++++++++-------------- > man/sd_get_seats.xml | 6 +++--- > man/sd_is_fifo.xml | 2 +- > man/sd_journal_next.xml | 4 ++-- > man/sd_journal_seek_head.xml | 2 +- > man/sd_uid_get_state.xml | 2 +- > man/systemctl.xml | 16 ++++++++-------- > man/systemd-halt.service.xml | 2 +- > man/systemd-machine-id-setup.xml | 2 +- > man/systemd-networkd.service.xml | 8 ++++---- > man/systemd.device.xml | 4 ++-- > man/systemd.exec.xml | 4 ++-- > man/systemd.service.xml | 4 ++-- > man/systemd.timer.xml | 20 ++++++++++---------- > man/systemd.unit.xml | 30 +++++++++++++++--------------- > man/udev.xml | 12 ++++++------ > 18 files changed, 77 insertions(+), 77 deletions(-) > > diff --git a/man/journalctl.xml b/man/journalctl.xml > index 2de7252..55474c5 100644 > --- a/man/journalctl.xml > +++ b/man/journalctl.xml > @@ -119,7 +119,7 @@ > <para>When outputing to a tty, lines are colored > according to priority: lines of level ERROR and higher > are colored red; lines of level NOTICE and higher are > - highlighted; and other lines are displayed normally. > + highlighted; other lines are displayed normally. > </para> > </refsect1> > > @@ -232,7 +232,7 @@ > <term><option>-r</option></term> > <term><option>--reverse</option></term> > > - <listitem><para>Reverse output so the newest > + <listitem><para>Reverse output so that the > newest > entries are displayed > first.</para></listitem> > </varlistentry> > > @@ -691,7 +691,7 @@ > matching <replaceable>GLOB</replaceable> > instead of the default runtime and > system journal paths. May be specified > - multiple times, in which case, files will > + multiple times, in which case files will > be suitably interleaved.</para></listitem> > </varlistentry> > > diff --git a/man/sd-login.xml b/man/sd-login.xml > index 251b35b..2ac773a 100644 > --- a/man/sd-login.xml > +++ b/man/sd-login.xml > @@ -99,7 +99,7 @@ > caller with the libc > > <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry> > call after use, including the strings referenced > - therein. Similar, individual strings returned need to > + therein. Similarly, individual strings returned need to > be freed, as well.</para> > > <para>As a special exception, instead of an empty > diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml > index 23d49fb..6966a91 100644 > --- a/man/sd_bus_request_name.xml > +++ b/man/sd_bus_request_name.xml > @@ -81,13 +81,13 @@ > > <term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term> > > <listitem><para>After acquiring the > - name successuflly, permit other peers > + name successfully, permit other peers > to take over the name when they try to > acquire it with the > > <varname>SD_BUS_NAME_REPLACE_EXISTING</varname> > flag set. If > > <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname> > - is not set on the original request > + is not set on the original request, > such a request by other peers will be > denied.</para></listitem> > </varlistentry> > @@ -95,10 +95,10 @@ > <varlistentry> > > <term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term> > > - <listitem><para>Take over a the name > - if it is already acquired by a another > - peer, and that other peer permitted > - taking it over by setting > + <listitem><para>Take over the name > + if it is already acquired by another > + peer, and that other peer has permitted > + takeover by setting > > <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname> > while acquiring it.</para></listitem> > </varlistentry> > @@ -106,8 +106,8 @@ > <varlistentry> > > <term><varname>SD_BUS_NAME_QUEUE</varname></term> > > - <listitem><para>Queue name > - acquisition when the name is already > + <listitem><para>Queue the acquisition > + of the name when the name is already > taken.</para></listitem> > </varlistentry> > </variablelist> > @@ -125,10 +125,10 @@ > errno-style error code.</para> > > <para>If <varname>SD_BUS_NAME_QUEUE</varname> is > - specified <function>sd_bus_request_name()</function> > + specified, <function>sd_bus_request_name()</function> > will return 0 when the name is already taken by > another peer and the client has been added to the > - queue for the name. In that case the caller can > + queue for the name. In that case, the caller can > subscribe to <literal>NameOwnerChanged</literal> > signals to be notified when the name is successfully > acquired. <function>sd_bus_request_name()</function> > @@ -165,7 +165,7 @@ > <varlistentry> > <term><varname>-ESRCH</varname></term> > > - <listitem><para>It was attemted to > + <listitem><para>It was attempted to > release a name that is currently not > registered on the > bus.</para></listitem> > @@ -174,7 +174,7 @@ > <varlistentry> > <term><varname>-EADDRINUSE</varname></term> > > - <listitem><para>It was attemted to > + <listitem><para>It was attempted to > release a name that is owned by a > different peer on the > bus.</para></listitem> > @@ -199,7 +199,7 @@ > > <listitem><para>The bus connection has > been created in a different process > - than the current.</para></listitem> > + than the current one.</para></listitem> > </varlistentry> > </variablelist> > </refsect1> > @@ -209,7 +209,7 @@ > > <para>The <function>sd_bus_acquire_name()</function> > and <function>sd_bus_release_bame()</function> > - interfaces are available as shared library, which can > + interfaces are available as a shared library, which can > be compiled and linked to with the > <constant>libsystemd-bus</constant> > <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry> > file.</para> > diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml > index 8254b7c..fdb6891 100644 > --- a/man/sd_get_seats.xml > +++ b/man/sd_get_seats.xml > @@ -90,13 +90,13 @@ > <constant>NULL</constant> may be returned and should be > considered > equivalent to an empty array.</para> > > - <para>Similar, <function>sd_get_sessions()</function> may > + <para>Similarly, <function>sd_get_sessions()</function> may > be used to determine all current login sessions.</para> > > - <para>Similar, <function>sd_get_uids()</function> may > + <para>Similarly, <function>sd_get_uids()</function> may > be used to determine all Unix users who currently have login > sessions.</para> > > - <para>Similar, > + <para>Similarly, > <function>sd_get_machine_names()</function> may be > used to determine all current virtual machines and > containers on the system.</para> > diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml > index 4d9cd79..ec109a9 100644 > --- a/man/sd_is_fifo.xml > +++ b/man/sd_is_fifo.xml > @@ -165,7 +165,7 @@ > called to check whether the specified file descriptor > refers to a special file. If the > <parameter>path</parameter> parameter is not > - <constant>NULL</constant>, it is checked whether file > + <constant>NULL</constant>, it is checked whether the file > descriptor is bound to the specified file > name. Special files in this context are character > device nodes and files in <filename>/proc</filename> > diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml > index 6e437d1..5526190 100644 > --- a/man/sd_journal_next.xml > +++ b/man/sd_journal_next.xml > @@ -102,7 +102,7 @@ > functions such as > > <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para> > > - <para>Similar, <function>sd_journal_previous()</function> > sets > + <para>Similarly, <function>sd_journal_previous()</function> > sets > the read pointer back one entry.</para> > > <para><function>sd_journal_next_skip()</function> and > @@ -129,7 +129,7 @@ > > <citerefentry><refentrytitle>sd_journal_seek_head</refentrytitle><manvolnum>3</manvolnum></citerefentry> > and <function>sd_journal_next()</function> in order to > make iterating through the journal easier. See below > - for an example. Similar, > + for an example. Similarly, > <function>SD_JOURNAL_FOREACH_BACKWARDS()</function> > may be used for iterating the journal in reverse > order.</para> > diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml > index 03de30a..a07f8b4 100644 > --- a/man/sd_journal_seek_head.xml > +++ b/man/sd_journal_seek_head.xml > @@ -94,7 +94,7 @@ > seeks to the beginning of the journal, i.e. the oldest > available entry.</para> > > - <para>Similar, > + <para>Similarly, > <function>sd_journal_seek_tail()</function> may be > used to seek to the end of the journal, i.e. the most > recent available entry.</para> > diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml > index d4d23f4..4ad8280 100644 > --- a/man/sd_uid_get_state.xml > +++ b/man/sd_uid_get_state.xml > @@ -139,7 +139,7 @@ > be returned and should be considered equivalent to an > empty array.</para> > > - <para>Similar, <function>sd_uid_get_seats()</function> > + <para>Similarly, <function>sd_uid_get_seats()</function> > may be used to determine the list of seats on which > the user currently has sessions. Similar semantics > apply, however note that the user may have > diff --git a/man/systemctl.xml b/man/systemctl.xml > index 5e55f29..80517e5 100644 > --- a/man/systemctl.xml > +++ b/man/systemctl.xml > @@ -193,8 +193,8 @@ along with systemd; If not, see > <http://www.gnu.org/licenses/>. > <term><option>--job-mode=</option></term> > > <listitem> > - <para>When queuing a new job, control how to deal with already > - queued jobs. Takes one of <literal>fail</literal>, > + <para>When queuing a new job, this option controls how to deal with > + already queued jobs. It takes one of <literal>fail</literal>, > <literal>replace</literal>, > <literal>replace-irreversibly</literal>, > <literal>isolate</literal>, > @@ -237,7 +237,7 @@ along with systemd; If not, see > <http://www.gnu.org/licenses/>. > applications.</para> > > <para><literal>ignore-requirements</literal> is similar to > - <literal>ignore-dependencies</literal> but only causes the > + <literal>ignore-dependencies</literal>, but only causes the > requirement dependencies to be ignored, the ordering > dependencies will still be honoured.</para> > </listitem> > @@ -451,7 +451,7 @@ along with systemd; If not, see > <http://www.gnu.org/licenses/>. > with identical immediate effects, however, since the latter > is lost on reboot, the changes are lost too.</para> > > - <para>Similar, when used with > + <para>Similarly, when used with > <command>set-property</command>, make changes only > temporarily, so that they are lost on the next > reboot.</para> > @@ -542,7 +542,7 @@ along with systemd; If not, see > <http://www.gnu.org/licenses/>. > <term><command>list-sockets > <optional><replaceable>PATTERN</replaceable>...</optional></command></term> > > <listitem> > - <para>List socket units ordered by the listening address. > + <para>List socket units ordered by listening address. > If one or more <replaceable>PATTERN</replaceable>s are > specified, only socket units matching one of them are > shown. Produces output similar to > @@ -691,7 +691,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket > systemd-udevd.service > <listitem> > <para>Check whether any of the specified units are active > (i.e. running). Returns an exit code 0 if at least one is > - active, non-zero otherwise. Unless <option>--quiet</option> > + active, or non-zero otherwise. Unless <option>--quiet</option> > is specified, this will also print the current unit state to > STDOUT.</para> > </listitem> > @@ -1372,7 +1372,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket > systemd-udevd.service > <refsect2> > <title>Parameter Syntax</title> > > - <para>For unit commands the specified > + <para>For unit commands, the specified > <replaceable>NAME</replaceable> should be the full name of the > unit, or an abbreviated name which is automatically extended with > the <literal>.service</literal> suffix. > @@ -1384,7 +1384,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket > systemd-udevd.service > <programlisting># systemctl status dev-sda.device > # systemctl status home.mount</programlisting></para> > > - <para>For unit file commands the > + <para>For unit file commands, the > specified <replaceable>NAME</replaceable> should be the full name > of the unit file, or the absolute path to the unit file. > <programlisting># systemctl link /path/to/foo.service</programlisting> > diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml > index 0737d05..a39253d 100644 > --- a/man/systemd-halt.service.xml > +++ b/man/systemd-halt.service.xml > @@ -65,7 +65,7 @@ > <para><filename>systemd-halt.service</filename> is a > system service that is pulled in by > <filename>halt.target</filename> and is responsible > - for the actual system halt. Similar, > + for the actual system halt. Similarly, > <filename>systemd-poweroff.service</filename> is > pulled in by <filename>poweroff.target</filename>, > <filename>systemd-reboot.service</filename> by > diff --git a/man/systemd-machine-id-setup.xml > b/man/systemd-machine-id-setup.xml > index fef76bc..bc38d55 100644 > --- a/man/systemd-machine-id-setup.xml > +++ b/man/systemd-machine-id-setup.xml > @@ -80,7 +80,7 @@ > UUID passed is sufficiently unique and is different > for every booted instanced of the VM.</para> > > - <para>Similar, if run inside a Linux container > + <para>Similarly, if run inside a Linux container > environment and a UUID is set for the container this > is used to initialize the machine ID. For details see > the documentation of the <ulink > diff --git a/man/systemd-networkd.service.xml > b/man/systemd-networkd.service.xml > index 6c65fba..908354c 100644 > --- a/man/systemd-networkd.service.xml > +++ b/man/systemd-networkd.service.xml > @@ -64,8 +64,8 @@ > <para>Network configurations applied before networkd is > started > are not removed, and configuration applied by networkd are > not > removed when networkd exits. This ensures restarting networkd > - does not cut the network connection, and in particular that > it > - is safe to transition between the initrd and the real root, > + does not cut the network connection, and, in particular, that > + it is safe to transition between the initrd and the real > root, > and back.</para> > </refsect1> > > @@ -80,10 +80,10 @@ > identical filenames replace each other. Files in > <filename>/etc</filename> have the highest priority, files in > <filename>/run</filename> take precedence over files with > the same > - name in <filename>/lib</filename>. This can be used to > override a > + name in <filename>/usr/lib</filename>. This can be used to > override a > system-supplied configuration file with a local file if > needed; a symlink in > <filename>/etc</filename> with the same name as a > configuration file in > - <filename>/lib</filename>, pointing to > <filename>/dev/null</filename>, > + <filename>/usr/lib</filename>, pointing to > <filename>/dev/null</filename>, > disables the configuration file entirely.</para> > > <refsect2><title>Virtual Network Devices</title> > diff --git a/man/systemd.device.xml b/man/systemd.device.xml > index 1bbd322..619fe19 100644 > --- a/man/systemd.device.xml > +++ b/man/systemd.device.xml > @@ -75,7 +75,7 @@ > udev tag (by default all block and network devices, > and a few others). This may be used to define > dependencies between devices and other units. To tag a > - udev device use <literal>TAG+="systemd"</literal> in > + udev device, use <literal>TAG+="systemd"</literal> in > the udev rules file, see > > <citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry> > for details.</para> > @@ -149,7 +149,7 @@ > even if it shows up in the udev > tree. If this property is unset or set > to 1, the device will be considered > - plugged if it visible in the > + plugged if it is visible in the > udev tree. This property has no > influence on the behavior when a > device disappears from the udev > diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml > index 207592d..e624fc9 100644 > --- a/man/systemd.exec.xml > +++ b/man/systemd.exec.xml > @@ -847,7 +847,7 @@ > processes and mounts private > <filename>/tmp</filename> and > <filename>/var/tmp</filename> > - directories inside it, that are not > + directories inside it that are not > shared by processes outside of the > namespace. This is useful to secure > access to temporary files of the > @@ -857,7 +857,7 @@ > <filename>/var/tmp</filename> > impossible. All temporary data created > by service will be removed after > - service is stopped. Defaults to > + the service is stopped. Defaults to > false. Note that it is possible to run > two or more units within the same > private <filename>/tmp</filename> and > diff --git a/man/systemd.service.xml b/man/systemd.service.xml > index f6b9fe2..c41159b 100644 > --- a/man/systemd.service.xml > +++ b/man/systemd.service.xml > @@ -427,7 +427,7 @@ > <programlisting>ExecStart=/bin/sh -c 'dmesg > | tac' > </programlisting> > > - <para>Only select environment variables > + <para>Only select environment variables that > are set for executed commands. See > > <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>. > </para> > @@ -441,7 +441,7 @@ > <literal>one</literal> and > <literal>two two</literal>, > respectively. Since two commands are > - specified > + specified, > <varname>Type=oneshot</varname> must > be used.</para> > > diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml > index 484287c..bb3a6d1 100644 > --- a/man/systemd.timer.xml > +++ b/man/systemd.timer.xml > @@ -141,7 +141,7 @@ > also include time units. Example: > "OnBootSec=5h 30min" means 5 hours and > 30 minutes after boot-up. For details > - about the syntax of time spans see > + about the syntax of time spans, see > > <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> > > <para>If a timer configured with > @@ -165,8 +165,8 @@ > assignments will have no > effect.</para> > > - <para>Note that timers are not > - necessarily expired at the precise > + <para>Note that timers do not > + necessarily expire at the precise > time configured with these settings, > as they are subject to the > <varname>AccuracySec=</varname> > @@ -182,13 +182,13 @@ > event expressions. See > > <citerefentry><refentrytitle>systemd.time</refentrytitle><manvolnum>7</manvolnum></citerefentry> > for more information on the syntax of > - calendar event expressions. Otherwise > + calendar event expressions. Otherwise, > the semantics are similar to > <varname>OnActiveSec=</varname> and > related settings.</para> > > - <para>Note that timers are not > - necessarily expired at the precise > + <para>Note that timers do not > + necessarily expire at the precise > time configured with this setting, > as it is subject to the > <varname>AccuracySec=</varname> > @@ -201,7 +201,7 @@ > <listitem><para>Specify the accuracy > the timer shall elapse with. Defaults > to 1min. The timer is scheduled to > - expire within a time window starting > + elapse within a time window starting > with the time specified in > <varname>OnCalendar=</varname>, > <varname>OnActiveSec=</varname>, > @@ -211,7 +211,7 @@ > <varname>OnUnitInactiveSec=</varname> > and ending the time configured with > <varname>AccuracySec=</varname> > - later. Within this time window the > + later. Within this time window, the > expiry time will be placed at a > host-specific, randomized but stable > position, that is synchronized between > @@ -220,7 +220,7 @@ > in networked installations, as well as > optimizing power consumption to > suppress unnecessary CPU wake-ups. To > - get best accuracy set this option to > + get best accuracy, set this option to > 1us. Note that the timer is still > subject to the timer slack configured > via > @@ -229,7 +229,7 @@ > setting. See > > <citerefentry><refentrytitle>prctl</refentrytitle><manvolnum>2</manvolnum></citerefentry> > for details. To optimize power > - consumption make sure to set this > + consumption, make sure to set this > value as high as possible and as low > as necessary.</para></listitem> > </varlistentry> > diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml > index 918bbc4..5d73804 100644 > --- a/man/systemd.unit.xml > +++ b/man/systemd.unit.xml > @@ -403,7 +403,7 @@ > what the unit's purpose is, followed > by how it is configured, followed by > any other related documentation. This > - option may be specified more than once > + option may be specified more than once, > in which case the specified list of > URIs is merged. If the empty string is > assigned to this option, the list is > @@ -492,7 +492,7 @@ > <varname>Requires=</varname> and > <varname>RequiresOverridable=</varname>, > respectively. However, if the units > - listed here are not started already > + listed here are not started already, > they will not be started and the > transaction will fail immediately. > </para></listitem> > @@ -506,7 +506,7 @@ > listed in this option will be started > if the configuring unit is. However, > if the listed units fail to start > - or cannot be added to the transaction > + or cannot be added to the transaction, > this has no impact on the validity of > the transaction as a whole. This is > the recommended way to hook start-up > @@ -519,7 +519,7 @@ > symlinks to a > <filename>.wants/</filename> directory > accompanying the unit file. For > - details see above.</para></listitem> > + details, see above.</para></listitem> > </varlistentry> > > <varlistentry> > @@ -528,7 +528,7 @@ > <listitem><para>Configures requirement > dependencies, very similar in style to > <varname>Requires=</varname>, however > - in addition to this behavior it also > + in addition to this behavior, it also > declares that this unit is stopped > when any of the units listed suddenly > disappears. Units can suddenly, > @@ -548,7 +548,7 @@ > of units. When systemd stops or restarts > the units listed here, the action is > propagated to this unit. > - Note that this is a one way dependency — > + Note that this is a one-way dependency — > changes to this unit do not affect the > listed units. > </para></listitem> > @@ -577,9 +577,9 @@ > be modified to be fixed (in case one > or both jobs are not a required part > of the transaction). In the latter > - case the job that is not the required > + case, the job that is not the required > will be removed, or in case both are > - not required the unit that conflicts > + not required, the unit that conflicts > will be started and the unit that is > conflicted is > stopped.</para></listitem> > @@ -606,7 +606,7 @@ > a common pattern to include a unit > name in both the > <varname>After=</varname> and > - <varname>Requires=</varname> option in > + <varname>Requires=</varname> option, in > which case the unit listed will be > started before the unit that is > configured with these options. This > @@ -686,13 +686,13 @@ > directives (see > > <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> > for details). If a unit that has this > - setting set is started its processes > + setting set is started, its processes > will see the same > <filename>/tmp</filename>, > <filename>/tmp/var</filename> and > network namespace as one listed unit > that is started. If multiple listed > - units are already started it is not > + units are already started, it is not > defined which namespace is > joined. Note that this setting only > has an effect if > @@ -979,7 +979,7 @@ > exists, is a regular file and marked > executable.</para> > > - <para>Similar, > + <para>Similarly, > > <varname>ConditionKernelCommandLine=</varname> > may be used to check whether a > specific kernel command line option is > @@ -1270,7 +1270,7 @@ > <row> > <entry><literal>%p</literal></entry> > <entry>Prefix name</entry> > - <entry>For instantiated units this refers to the > string before the <literal>@</literal> character of the unit name. For > non-instantiated units this refers to the name of the unit with the type > suffix removed.</entry> > + <entry>For instantiated units, this refers to the > string before the <literal>@</literal> character of the unit name. For > non-instantiated units, this refers to the name of the unit with the type > suffix removed.</entry> > </row> > <row> > <entry><literal>%P</literal></entry> > @@ -1325,12 +1325,12 @@ > <row> > <entry><literal>%h</literal></entry> > <entry>User home directory</entry> > - <entry>This is the home directory of the configured > user of the unit, or (if none is set) the user running the systemd user > instance. Similar to <literal>%U</literal> this specifier is not available > for units run by the systemd system instance, unless the configured user is > the root user.</entry> > + <entry>This is the home directory of the configured > user of the unit, or (if none is set) the user running the systemd user > instance. Similar to <literal>%U</literal>, this specifier is not available > for units run by the systemd system instance, unless the configured user is > the root user.</entry> > </row> > <row> > <entry><literal>%s</literal></entry> > <entry>User shell</entry> > - <entry>This is the shell of the configured user of > the unit, or (if none is set) the user running the systemd user instance. > Similar to <literal>%U</literal> this specifier is not available for units > run by the systemd system instance, unless the configured user is the root > user.</entry> > + <entry>This is the shell of the configured user of > the unit, or (if none is set) the user running the systemd user instance. > Similar to <literal>%U</literal>, this specifier is not available for units > run by the systemd system instance, unless the configured user is the root > user.</entry> > </row> > <row> > <entry><literal>%m</literal></entry> > diff --git a/man/udev.xml b/man/udev.xml > index bd071e1..32a520e 100644 > --- a/man/udev.xml > +++ b/man/udev.xml > @@ -63,10 +63,10 @@ > regardless of the directories in which they live. However, files with > identical filenames replace each other. Files in > <filename>/etc</filename> > have the highest priority, files in <filename>/run</filename> take > precedence > - over files with the same name in <filename>/lib</filename>. This can be > + over files with the same name in <filename>/usr/lib</filename>. This > can be > used to override a system-supplied rules file with a local file if > needed; > a symlink in <filename>/etc</filename> with the same name as a rules > file in > - <filename>/lib</filename>, pointing to <filename>/dev/null</filename>, > + <filename>/usr/lib</filename>, pointing to > <filename>/dev/null</filename>, > disables the rules file entirely. Rule files must have the extension > <filename>.rules</filename>; other extensions are ignored.</para> > > @@ -715,10 +715,10 @@ > regardless of the directories in which they live. However, files with > identical filenames replace each other. Files in > <filename>/etc</filename> > have the highest priority, files in <filename>/run</filename> take > precedence > - over files with the same name in <filename>/lib</filename>. This can be > + over files with the same name in <filename>/usr/lib</filename>. This > can be > used to override a system-supplied hwdb file with a local file if > needed; > a symlink in <filename>/etc</filename> with the same name as a hwdb > file in > - <filename>/lib</filename>, pointing to <filename>/dev/null</filename>, > + <filename>/usr/lib</filename>, pointing to > <filename>/dev/null</filename>, > disables the hwdb file entirely. hwdb files must have the extension > <filename>.hwdb</filename>; other extensions are ignored.</para> > > @@ -754,10 +754,10 @@ > regardless of the directories in which they live. However, files with > identical filenames replace each other. Files in > <filename>/etc</filename> > have the highest priority, files in <filename>/run</filename> take > precedence > - over files with the same name in <filename>/lib</filename>. This can be > + over files with the same name in <filename>/usr/lib</filename>. This > can be > used to override a system-supplied link file with a local file if > needed; > a symlink in <filename>/etc</filename> with the same name as a link > file in > - <filename>/lib</filename>, pointing to <filename>/dev/null</filename>, > + <filename>/usr/lib</filename>, pointing to > <filename>/dev/null</filename>, > disables the link file entirely.</para> > > <para>The link file contains a <literal>[Match]</literal> section, > which Lennart -- Lennart Poettering, Red Hat _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
