summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2014-11-15 16:06:22 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2015-02-12 20:33:45 +0100
commita95a9d05e5816968da9e930c49d233a25540cab0 (patch)
tree8656b50797082ea0dcc4b9308bb67e13ddb3cb24 /man
parent75355690b01852650d7ebfbd73281ec66bf4475f (diff)
downloadpulseaudio-a95a9d05e5816968da9e930c49d233a25540cab0.tar.gz
man: Describe optional prefix {string} in server address
see https://bugs.freedesktop.org/show_bug.cgi?id=84024 v2: (thanks Tanu Kaskinen) * fix wording wrt machine id Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Diffstat (limited to 'man')
-rw-r--r--man/pulseaudio.1.xml.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
index aed21f6c3..0d278b7b7 100644
--- a/man/pulseaudio.1.xml.in
+++ b/man/pulseaudio.1.xml.in
@@ -457,7 +457,9 @@ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
server addresses separated by whitespace which are tried in turn. A server
address consists of an optional address type specifier (unix:, tcp:, tcp4:,
tcp6:), followed by a path or host address. A host address may include an
- optional port number.</p>
+ optional port number. A server address may be prefixed by a string enclosed
+ in {}. In this case the following server address is ignored unless the prefix
+ string equals the local hostname or the machine id (/etc/machine-id).</p>
<p><arg>$PULSE_SINK</arg>: the symbolic name of the sink to connect to when a client creates a playback stream and doesn't explicitly ask for a specific sink.</p>