update master

man/meson.build

@@ -14,11 +14,33 @@ if get_option('daemon')
   ]
 endif
 
+<<<<<<< HEAD
 manpages += [
   ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
   ['pactl', '1'],
   ['pulse-client.conf', '5'],
 ]
+=======
+if get_option('client')
+  manpages += [
+    ['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
+    ['pactl', '1'],
+    ['pulse-client.conf', '5'],
+  ]
+
+  if cdata.has('HAVE_OSS_WRAPPER')
+    manpages += [
+      ['padsp', '1'],
+    ]
+  endif
+
+  if x11_dep.found()
+    manpages += [
+      ['pax11publish', '1'],
+    ]
+  endif
+endif
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
 
 if cdata.has('HAVE_OSS_WRAPPER')
   manpages += [

man/pacat.1.xml.in

@@ -79,7 +79,7 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
     <option>
       <p><opt>-d | --device</opt><arg>=SINKORSOURCE</arg></p>
 
-      <optdesc><p>Specify the symbolic name of the sink/source to play/record this stream on/from.</p></optdesc>
+      <optdesc><p>Specify the symbolic name of the sink/source to play/record this stream on/from. The special names @DEFAULT_SINK@, @DEFAULT_SOURCE@ and @DEFAULT_MONITOR@ can be used to specify the default sink, source and monitor respectively.</p></optdesc>
     </option>
 
     <option>

man/pactl.1.xml.in

@@ -174,7 +174,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
     <option>
       <p><opt>set-default-sink</opt> <arg>SINK</arg></p>
+<<<<<<< HEAD
       <optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.</p></optdesc>
+=======
+      <optdesc><p>Make the specified sink (identified by its symbolic name or numerical index) the default sink.
+         Use the special name \@NONE@ to unset the user defined default sink. This will make pulseaudio return to the default
+         sink selection based on sink priority.</p></optdesc>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     </option>
 
     <option>
@@ -189,7 +195,13 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
     <option>
       <p><opt>set-default-source</opt> <arg>SOURCE</arg></p>
+<<<<<<< HEAD
       <optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.</p></optdesc>
+=======
+      <optdesc><p>Make the specified source (identified by its symbolic name or numerical index) the default source.
+         Use the special name \@NONE@ to unset the user defined default source. This will make pulseaudio return to the default
+         source selection based on source priority.</p></optdesc>
+>>>>>>> c1990dd02647405b0c13aab59f75d05cbb202336
     </option>
 
     <option>

man/pulse-cli-syntax.5.xml.in

@@ -143,8 +143,10 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
       <p><opt>set-default-sink|set-default-source</opt> <arg>index|name</arg></p>
       <optdesc><p>Make a sink (resp. source) the default. You may specify the
       sink (resp. source) by its index in the sink (resp. source) list or by its
-      name.</p><p>Note that defaults may be overridden by various policy modules
-      or by specific stream configurations.</p></optdesc>
+      name. Use the special name \@NONE@ to unset the user defined default sink or
+      source. In this case, pulseaudio will return to the default sink or source
+      selection based on priority.</p><p>Note that defaults may be overridden by
+      various policy modules or by specific stream configurations.</p></optdesc>
     </option>
 
     <option>

man/pulse-client.conf.5.xml.in

@@ -71,7 +71,7 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
     </option>
 
     <option>
-      <p><opt>default-server=</opt> The default sever to connect
+      <p><opt>default-server=</opt> The default server to connect
       to. The environment variable <opt>$PULSE_SERVER</opt> takes
       precedence.</p>
     </option>