try to get "play" right; help/ok naddy

2 files changed, 16 insertions, 16 deletions

diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index e0d8ba47bf0..1ac9e8510f1 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.53 2009/06/03 00:45:59 naddy Exp $
+.\" $OpenBSD: cdio.1,v 1.54 2009/06/09 22:20:44 jmc Exp $
 .\"
 .\" Copyright (c) 1995 Serge V. Vakulenko
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 3 2009 $
+.Dd $Mdocdate: June 9 2009 $
 .Dt CDIO 1
 .Os
 .Sh NAME
@@ -144,22 +144,23 @@ If we're at the last track, stop.
 Stop playing.
 Do not stop the disc.
 .It Xo Ic play
-.Oo Ar track1 Ns Op Ar .index1 Oc
-.Ar track2 Ns Op Ar .index2
+.Oo Ar track1 Ns Op Ar .index1
+.Op Ar track2 Ns Op Ar .index2 Oc
 .Xc
-Play from track
+Play from
 .Ar track1
-to track
-.Ar track2 .
-An index point can be specified for each track.
-The first track has number 1 and may be omitted in all cases.
+to
+.Ar track2 ;
+an optional index point can be specified for each track.
+If only one track is specified, play from that track to the end of the disc.
+If no tracks are specified, play the whole disc.
 .It Xo Ic play
-.Op Ar tr1
+.Oo Op Ar tr1
 .Ar m1 : Ns Ar s1 Ns Oo
 .Ar .f1 Oc
 .Op Ar tr2
 .Oo Ar m2 : Ns Ar s2 Ns
-.Op Ar .f2 Oc
+.Op Ar .f2 Oc Oc
 .Xc
 Play from the absolute address
 (MSF) defined by
@@ -184,12 +185,11 @@ Minutes are in the range 0\(en99.
 Seconds are in the range 0\(en59.
 Frame numbers are in the range 0\(en74.
 .It Ic play Op Ar #block Op Ar len
-Play starting from the logical block
+Play starting from the logical
 .Ar block
 using
 .Ar len
 logical blocks.
-If no block is specified, play the whole disc.
 .It Ic previous
 Play the previous track.
 If we're at the first track, restart.
diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c
index 124371f3056..00bfb3c027b 100644
--- a/usr.bin/cdio/cdio.c
+++ b/usr.bin/cdio/cdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdio.c,v 1.70 2009/06/03 00:45:59 naddy Exp $	*/
+/*	$OpenBSD: cdio.c,v 1.71 2009/06/09 22:20:44 jmc Exp $	*/
 
 /*  Copyright (c) 1995 Serge V. Vakulenko
  * All rights reserved.
@@ -129,8 +129,8 @@ struct cmdtab {
 { CMD_INFO,     "info",         1, "" },
 { CMD_NEXT,	"next",		1, "" },
 { CMD_PAUSE,    "pause",        2, "" },
-{ CMD_PLAY,     "play",         1, "[track1[.index1]] track2[.index2]" },
-{ CMD_PLAY,     "play",         1, "[tr1] m1:s1[.f1] [tr2] [m2:s2[.f2]]" },
+{ CMD_PLAY,     "play",         1, "[track1[.index1] [track2[.index2]]]" },
+{ CMD_PLAY,     "play",         1, "[[tr1] m1:s1[.f1] [tr2] [m2:s2[.f2]]]" },
 { CMD_PLAY,     "play",         1, "[#block [len]]" },
 { CMD_PREV,	"previous",	2, "" },
 { CMD_QUIT,     "quit",         1, "" },