X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fshutdown.xml;h=737258514f45bf036b3a1a01c314e44d5a0308f0;hp=c48e14187907770fab083a9c4b7382a339aa249e;hb=1b9e5b126359a2a2ec37de1f94f046093abc74b8;hpb=6b5ad000aba61a5312b5c3fac7dd85a0d33816af

diff --git a/man/shutdown.xml b/man/shutdown.xml
index c48e14187..737258514 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -8,20 +8,21 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="shutdown">
+<refentry id="shutdown"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>shutdown</title>
@@ -76,11 +77,11 @@
                 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
-                <filename>/etc/nologin</filename> file is created to
+                <filename>/run/nologin</filename> file is created to
                 ensure that further logins shall not be
                 allowed.</para>
         </refsect1>
@@ -94,8 +95,7 @@
                         <varlistentry>
                                 <term><option>--help</option></term>
 
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
+                                <xi:include href="standard-options.xml" xpointer="help-text" />
                         </varlistentry>
 
                         <varlistentry>
@@ -133,7 +133,7 @@
                         <varlistentry>
                                 <term><option>-k</option></term>
 
-                                <listitem><para>Don't halt, power-off,
+                                <listitem><para>Do not halt, power-off,
                                 reboot, just write wall
                                 message.</para></listitem>
                         </varlistentry>
@@ -141,31 +141,11 @@
                         <varlistentry>
                                 <term><option>--no-wall</option></term>
 
-                                <listitem><para>Don't send wall
+                                <listitem><para>Do not send wall
                                 message before
                                 halt, power-off, reboot.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>-f</option></term>
-
-                                <listitem><para>Skip file system check
-                                on reboot. This is equivalent to
-                                creating the
-                                <filename>/fastboot</filename> file
-                                before going down.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-F</option></term>
-
-                                <listitem><para>Force file system
-                                check on reboot. This is equivalent to
-                                creating the
-                                <filename>/forcefsck</filename> file
-                                before going down.</para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><option>-c</option></term>
 
@@ -184,17 +164,10 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>
 
-        <refsect1>
-                <title>Notes</title>
-
-                <para>This is a legacy command available for
-                compatibility only.</para>
-        </refsect1>
-
         <refsect1>
                 <title>See Also</title>
                 <para>