[systemd-commits] 2 commits - man/pam_systemd.xml man/shutdown.xml man/systemd.conf.xml man/systemd.exec.xml man/systemd.service.xml man/systemd.unit.xml man/tmpfiles.d.xml src/shutdown.c

Lennart Poettering lennart at kemper.freedesktop.org
Sat Jan 1 11:04:36 PST 2011


 man/pam_systemd.xml     |    4 ++--
 man/shutdown.xml        |    2 +-
 man/systemd.conf.xml    |    6 +++---
 man/systemd.exec.xml    |    4 ++--
 man/systemd.service.xml |    8 ++++----
 man/systemd.unit.xml    |    6 +++---
 man/tmpfiles.d.xml      |    6 +++---
 src/shutdown.c          |    1 -
 8 files changed, 18 insertions(+), 19 deletions(-)

New commits:
commit 5471472d441d9ac48640f11a3b07e6a1fd6d1b63
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Dec 31 01:50:51 2010 +0100

    man: remaining spelling fixes

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index d43ed23..cd806da 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -205,9 +205,9 @@
                                 <term><option>controllers=</option></term>
 
                                 <listitem><para>Takes a comma
-                                seperated list of cgroup controllers
+                                separated list of cgroup controllers
                                 in which hierarchies a user/session
-                                cgroup will be created by defautl for
+                                cgroup will be created by default for
                                 each user logging in. If ommited,
                                 defaults to 'cpu', meaning that in
                                 addition to creating per-user and
diff --git a/man/shutdown.xml b/man/shutdown.xml
index d6bdad3..c8c4b54 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -76,7 +76,7 @@
                 implied.</para>
 
                 <para>Note that to specify a wall message you must
-                speciy a time argument, too.</para>
+                specify a time argument, too.</para>
 
                 <para>If the time argument is used, 5 minutes
                 before the system goes down the
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 32eae2b..54a8398 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -85,7 +85,7 @@
                                 <listitem><para>Configures various
                                 parameters of basic manager
                                 operation. These options may be
-                                overriden by the respective command
+                                overridden by the respective command
                                 line arguments. See
                                 <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                                 for details about these command line
@@ -121,10 +121,10 @@
                                 create per-service cgroups
                                 automatically, in addition to the
                                 name=systemd named hierarchy. Defaults
-                                to 'cpu'. Takes a space seperated list
+                                to 'cpu'. Takes a space separated list
                                 of controller names. Pass an empty
                                 string to ensure that systemd does not
-                                touch any hiearchies but its
+                                touch any hierarchies but its
                                 own.</para></listitem>
                         </varlistentry>
                 </variablelist>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 7c8005c..b24792b 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -382,7 +382,7 @@
                                 available options are identical to
                                 those of
                                 <varname>StandardOutput=</varname>,
-                                whith one exception: if set to
+                                with one exception: if set to
                                 <option>inherit</option> the file
                                 descriptor used for standard output is
                                 duplicated for standard error. This
@@ -678,7 +678,7 @@
                                 restricting access with these options
                                 does not extend to submounts of a
                                 directory. You must list submounts
-                                separately in these setttings to
+                                separately in these settings to
                                 ensure the same limited access. These
                                 options may be specified more than
                                 once in which case all directories
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c77992d..e4fa6bc 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -271,11 +271,11 @@
                                 <literal>-</literal> an exit code of
                                 the command normally considered a
                                 failure (i.e. non-zero exit status or
-                                abormal exit due to signal) is ignored
+                                abnormal exit due to signal) is ignored
                                 and considered success. If both
                                 <literal>-</literal> and
                                 <literal>@</literal> are used for the
-                                same command the former must preceed
+                                same command the former must precede
                                 the latter. Unless
                                 <varname>Type=forking</varname> is
                                 set, the process started via this
@@ -314,7 +314,7 @@
                                 after the other,
                                 serially. Alternatively, these
                                 directives may be specified more than
-                                once whith the same effect. However,
+                                once with the same effect. However,
                                 the latter syntax is not recommended
                                 for compatibility with parsers
                                 suitable for XDG
@@ -441,7 +441,7 @@
                                 i.e. terminated with an exit code of
                                 0. If set to
                                 <option>on-failure</option> it will be
-                                restared only when it exited with an
+                                restarted only when it exited with an
                                 exit code not equalling 0, or when
                                 terminated by a signal. If set to
                                 <option>on-abort</option> it will be
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 968ee58..14ec456 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -598,7 +598,7 @@
                                 exist. <varname>ConditionDirectoryNotEmpty=</varname>
                                 is similar to
                                 <varname>ConditionPathExists=</varname>
-                                but verifies whether a cetrain path is
+                                but verifies whether a certain path is
                                 exists and is a non-empty
                                 directory. Similarly
                                 <varname>ConditionKernelCommandLine=</varname>
@@ -607,7 +607,7 @@
                                 set (or if prefixed with the
                                 exclamation mark unset). The argument
                                 must either be a single word, or an
-                                assignment (i.e. two words, seperated
+                                assignment (i.e. two words, separated
                                 by the equality sign). In the former
                                 case the kernel command line is
                                 searched for the word appearing as is,
@@ -624,7 +624,7 @@
                                 will always fail, otherwise
                                 succeed. If multiple conditions are
                                 specified the unit will be executed
-                                iff at least one of them applies
+                                if at least one of them applies
                                 (i.e. a logical OR is
                                 applied).</para></listitem>
                         </varlistentry>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 1df4a04..e6b4c1b 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -116,7 +116,7 @@ d    /var/run/user 0755 root root 10d</programlisting>
                         <title>Mode</title>
 
                         <para>The file access mode to use for this
-                        file or directory. If ommited or when set to -
+                        file or directory. If omitted or when set to -
                         the default is used: 0755 for directories,
                         0644 for files.</para>
                 </refsect2>
@@ -127,7 +127,7 @@ d    /var/run/user 0755 root root 10d</programlisting>
                         <para>The user and group to use for this file
                         or directory. This may either be a numeric
                         user/group ID or a user or group name. If
-                        ommited or when set to - the default 0 is
+                        omitted or when set to - the default 0 is
                         used.</para>
                 </refsect2>
 
@@ -155,7 +155,7 @@ d    /var/run/user 0755 root root 10d</programlisting>
 
                         <para>If multiple integers and units are specified the time values are summed up.</para>
 
-                        <para>The age field only applies to lines starting with d, D and x. If ommited or set to - no automatic clean-up is done.</para>
+                        <para>The age field only applies to lines starting with d, D and x. If omitted or set to - no automatic clean-up is done.</para>
 
                 </refsect2>
 

commit abd41c86b51fc70ccfbe3b2bfe267ab6f2b4fcfe
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jan 1 19:54:12 2011 +0100

    shutdown: drop redundant sync() invocation

diff --git a/src/shutdown.c b/src/shutdown.c
index 11c7544..10d8413 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -362,7 +362,6 @@ int main(int argc, char *argv[]) {
         r = -errno;
 
   error:
-        sync();
         log_error("Critical error while doing system shutdown: %s", strerror(-r));
 
         freeze();



More information about the systemd-commits mailing list