util: make http url validity checks more generic, and move them to util.c

[elogind.git] / man / halt.xml

diff --git a/man/halt.xml b/man/halt.xml
index 7ba85ed88d7b0ae01fb7f47361bb134a42aa9a91..e9ed6554a91193f06e29035f7bf08c672a711b1a 100644 (file)
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="halt">
+<refentry id="halt"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>halt</title>
@@ -80,15 +81,14 @@
                         <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>
                                 <term><option>--halt</option></term>
 
                                 <listitem><para>Halt the machine,
-                                regardless which one of the three
+                                regardless of which one of the three
                                 commands is invoked.</para></listitem>
                         </varlistentry>
 
@@ -97,7 +97,7 @@
                                 <term><option>--poweroff</option></term>
 
                                 <listitem><para>Power-off the machine,
-                                regardless which one of the three
+                                regardless of which one of the three
                                 commands is invoked.</para></listitem>
                         </varlistentry>
 
@@ -105,7 +105,7 @@
                                 <term><option>--reboot</option></term>
 
                                 <listitem><para>Reboot the machine,
-                                regardless which one of the three
+                                regardless of which one of the three
                                 commands is invoked.</para></listitem>
                         </varlistentry>
 
@@ -114,7 +114,7 @@
                                 <term><option>--force</option></term>
 
                                 <listitem><para>Force immediate halt,
-                                power-off, reboot. Don't contact the
+                                power-off, reboot. Do not contact the
                                 init system.</para></listitem>
                         </varlistentry>
 
@@ -123,7 +123,7 @@
                                 <term><option>--wtmp-only</option></term>
 
                                 <listitem><para>Only write wtmp
-                                shutdown entry, don't actually halt,
+                                shutdown entry, do not actually halt,
                                 power-off, reboot.</para></listitem>
                         </varlistentry>
 
@@ -131,23 +131,14 @@
                                 <term><option>-d</option></term>
                                 <term><option>--no-wtmp</option></term>
 
-                                <listitem><para>Don't write wtmp
+                                <listitem><para>Do not write wtmp
                                 shutdown entry.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>-n</option></term>
-                                <term><option>--no-sync</option></term>
-
-                                <listitem><para>Don't sync hard disks/storage media before
-                                halt, power-off,
-                                reboot.</para></listitem>
-                        </varlistentry>
-
                         <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>
@@ -157,7 +148,7 @@
         <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>
 
@@ -174,7 +165,7 @@
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                        <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>