Merge commit 'origin/master-tx' into master-tx

[pulseaudio] / man / pulseaudio.1.xml.in

diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index 9ce66f8718c808a2e37a637abf7513cc27c4acb7..df828242b29b6812e74cbb158f6779b83c13d423 100644 (file)
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -118,7 +118,7 @@ USA.
       <p><opt>--system</opt><arg>[=BOOL]</arg></p>
 
       <optdesc><p>Run as system-wide instance instead of
-      per-user. Please not that this disables certain features of
+      per-user. Please note that this disables certain features of
       PulseAudio and is generally not recommended unless the system
       knows no local users (e.g. is a thin client). This feature needs
       special configuration and a dedicated UNIX user set up. It is
@@ -127,7 +127,7 @@ USA.
     </option>
 
     <option>
-      <p><opt>-D | --daemon</opt><arg>[=BOOL]</arg></p>
+      <p><opt>-D | --daemonize</opt><arg>[=BOOL]</arg></p>
 
       <optdesc><p>Daemonize after startup, i.e. detach from the
       terminal.</p></optdesc>