From b19556b54cac5557979b6faf363c05515772315d Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 20 Jun 2013 14:01:29 +0100
Subject: [PATCH] dbus-daemon docs: note options that are unavailable on
 Windows

Also reformat those options so --nofork is presented correctly
as a separate option.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42441
---
 doc/dbus-daemon.1.xml.in | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/doc/dbus-daemon.1.xml.in b/doc/dbus-daemon.1.xml.in
index aea2514..86f3eb0 100644
--- a/doc/dbus-daemon.1.xml.in
+++ b/doc/dbus-daemon.1.xml.in
@@ -86,15 +86,24 @@ with SIGHUP.</para>
   <varlistentry>
   <term><option>--fork</option></term>
   <listitem>
-<para>Force the message bus to fork and become a daemon, even if
-the configuration file does not specify that it should.
-In most contexts the configuration file already gets this
-right, though.
-<option>--nofork</option>
-Force the message bus not to fork and become a daemon, even if
-the configuration file specifies that it should.</para>
+    <para>Force the message bus to fork and become a daemon, even if
+      the configuration file does not specify that it should
+      (in most contexts the configuration file already gets this
+      right, though). This option is not available on Windows,
+      where dbus-daemon never forks.</para>
   </listitem>
   </varlistentry>
+
+  <varlistentry>
+  <term><option>--nofork</option></term>
+  <listitem>
+    <para>Force the message bus not to fork and become a daemon, even
+      if the configuration file specifies that it should.
+      This option is not available on Windows, where dbus-daemon
+      never forks.</para>
+  </listitem>
+  </varlistentry>
+
   <varlistentry>
   <term><option>--print-address[=DESCRIPTOR]</option></term>
   <listitem>
@@ -146,8 +155,9 @@ configured in the configuration file.</para>
   <varlistentry>
   <term><option>--systemd-activation</option></term>
   <listitem>
-<para>Enable systemd-style service activation. Only useful in conjunction
-with the systemd system and session manager on Linux.</para>
+    <para>Enable systemd-style service activation. This option does not
+      exist on Windows, and is only useful in conjunction
+      with the systemd system and session manager on Linux.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-- 
1.8.3.1