Improve disorder-playrtp docs/--help

diff --git a/clients/playrtp.c b/clients/playrtp.c
index eb879feb7d57da9edc2f6e0c80371201c98d6edc..f5103a30865c486a5b60f5c92525620d7e84b641 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -474,7 +474,7 @@ struct packet *playrtp_next_packet(void) {
 /* display usage message and terminate */
 static void help(void) {
   xprintf("Usage:\n"
 /* display usage message and terminate */
 static void help(void) {
   xprintf("Usage:\n"

-         "  disorder-playrtp [OPTIONS] ADDRESS [PORT]\n"
+         "  disorder-playrtp [OPTIONS] [[ADDRESS] PORT]\n"

          "Options:\n"
           "  --device, -D DEVICE     Output device\n"
           "  --min, -m FRAMES        Buffer low water mark\n"
          "Options:\n"
           "  --device, -D DEVICE     Output device\n"
           "  --min, -m FRAMES        Buffer low water mark\n"

diff --git a/doc/disorder-playrtp.1.in b/doc/disorder-playrtp.1.in
index b8147ad0a76c83305422fab2bf6de2e32f6ef41a..440604ffae32f47bbf3a5690db58304ee440d6f3 100644 (file)
--- a/doc/disorder-playrtp.1.in
+++ b/doc/disorder-playrtp.1.in
@@ -1,5 +1,5 @@
 .\"
 .\"

-.\" Copyright (C) 2007, 2008 Richard Kettlewell
+.\" Copyright (C) 2007-2009 Richard Kettlewell

 .\"
 .\" This program is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\"
 .\" This program is free software: you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by


@@ -21,21 +21,21 @@ disorder-playrtp \- play DisOrder network broadcasts
 .B disorder\-playrtp
 .RI [ OPTIONS ]
 .RB [ \-\- ]
 .B disorder\-playrtp
 .RI [ OPTIONS ]
 .RB [ \-\- ]

-.RI [[ GROUP ]
+.RI [[ ADDRESS ]

 .IR PORT ]
 .SH DESCRIPTION
 \fBdisorder\-playrtp\fR plays a network broadcast sent from the specified
 address.
 .PP
 .IR PORT ]
 .SH DESCRIPTION
 \fBdisorder\-playrtp\fR plays a network broadcast sent from the specified
 address.
 .PP

-If neither a group nor port are specified then the local DisOrder
+If neither an address nor port are specified then the local DisOrder

 configuration is consulted to find the server and the server is asked where the
 RTP stream is.
 .PP
 If just a port is specified then the RTP stream is assumed to be unicast or
 broadcast to that port.
 .PP
 configuration is consulted to find the server and the server is asked where the
 RTP stream is.
 .PP
 If just a port is specified then the RTP stream is assumed to be unicast or
 broadcast to that port.
 .PP

-If a group and a port are specified then the RTP stream is assumed to be
-multicast to that group and port.
+If an address and a port are specified then the RTP stream is assumed to be
+multicast to that group address and port.

 .SH OPTIONS
 The default sound API is the first of the ones listed below that are available.
 Usually this implies ALSA under Linux and Core Audio under OS X.
 .SH OPTIONS
 The default sound API is the first of the ones listed below that are available.
 Usually this implies ALSA under Linux and Core Audio under OS X.