Merge remote-tracking branch 'johnf/master'

* johnf/master:
  clarify -o and -i usage

2 files changed, 4 insertions, 4 deletions

diff --git a/ponymix.1 b/ponymix.1
index 4c1326e..a9fb00b 100644
--- a/ponymix.1
+++ b/ponymix.1
@@ -12,11 +12,11 @@ perform many operations on both device and application sinks and source.
 Control input and output devices.
 .IP "\fB\-a\fR, \fB\-\-app\fR"
 Control the playback and recording streams.
-.IP "\fB\-o\fR, \fB\-\-sink\fR[\fB=\fR\fISINK\fR]"
+.IP "\fB\-o\fR[\fR\fISINK\fR]\fR, \fB\-\-sink\fR[\fB=\fR\fISINK\fR]"
 Specify the sink to control. If the argument is omitted, the default
 sink is used.
 \fISINK\fR must be the numeric index of the sink.
-.IP "\fB\-i\fR, \fB\-\-source\fR[\fB=\fR\fISOURCE\fR]"
+.IP "\fB\-i\fR[\fR\fISOURCE\fR]\fR, \fB\-\-source\fR[\fB=\fR\fISOURCE\fR]"
 Specify the source to control. If the argument is omitted,
 the default source is assumed.
 \fISOURCE\fR must be the numeric index of the source.
diff --git a/ponymix.c b/ponymix.c
index 17f3d17..44cb3a2 100644
--- a/ponymix.c
+++ b/ponymix.c
@@ -687,8 +687,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 	      "\n -d, --device            set device mode (default)\n"
 	      " -a, --app               set application mode\n"
 
-	      "\n -o, --sink=<name>       control a sink other than the default\n"
-	      " -i, --source=<name>     control a source\n", out);
+	      "\n -o<name>, --sink=<name>       control a sink other than the default\n"
+	      " -i<name>, --source=<name>     control a source\n", out);
 
 	fputs("\nCommon Commands:\n"
 	      "  list                   list available devices\n"