Documentation fixes from Pavel Roskin

diff --git a/amixer/amixer.1 b/amixer/amixer.1
index a2bac4c6874d75c804d35fb1e507fe96f81ef59a..ea77d60811b20e0f65d2537988dd049905003edd 100644 (file)
--- a/amixer/amixer.1
+++ b/amixer/amixer.1
@@ -32,9 +32,9 @@ Shows a complete list of simple mixer controls.
 Shows a complete list of simple mixer controls with their contents.
 
 .TP
-\fIsset\fP
+\fIsset\fP <\fISCONTROL\fP> <\fIPARAMETER\fP> ...
 Sets the simple mixer control contents. The parameter can be the volume
-either as a percentage from 0% to 100% or a exact hardware value.
+either as a percentage from 0% to 100% or an exact hardware value.
 The parameters \fIcapture, nocapture, mute, unmute\fP are used to
 toggle capture (recording) and muting for the group specified.
 The parameters \fIfront, rear, center, woofer\fP are used to specify
@@ -46,7 +46,7 @@ A simple mixer control must be specified. Only one device can be controlled
 at a time.
 
 .TP
-\fIsget\fP
+\fIsget\fP <\fISCONTROL\fP>
 Shows the simple mixer control contents.
 
 A simple mixer control must be specified. Only one device can be controlled
@@ -61,14 +61,14 @@ Shows a complete list of card controls.
 Shows a complete list of card controls with their contents.
 
 .TP
-\fIcset\fP
+\fIcset\fP <\fICONTROL\fP> <\fIPARAMETER\fP> ...
 Sets the card control contents. This feature is not documented and is intended
 for experienced users only.
 
 .TP
-\fIeget\fP
+\fIcget\fP <\fICONTROL\fP>
 Shows the card control contents. This feature is not documented and is
-indended for experienced users only.
+intended for experienced users only.
 
 .SS Options
 
@@ -88,7 +88,7 @@ Quiet mode. Do not show results of changes.
 Example: 
 
 .RS
-\fBamixer -c 1 set Line 80%,40% unmute capture\fR
+\fBamixer -c 1 sset Line,0 80%,40% unmute capture\fR
 
 .ID
 will set the second soundcard's left line input volume to 80% and

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 241d66c59896a23e36818001646d7dd1f3346ce9..91a7af28ef08a7cfcb9a9a294525e8f72b079cbd 100644 (file)
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -57,18 +57,18 @@ static int help(void)
        printf("Usage: amixer <options> command\n");
        printf("\nAvailable options:\n");
        printf("  -h,--help       this help\n");
-       printf("  -c,--card N     use a ctl name, default %s\n", card);
+       printf("  -c,--card N     select the card, default %s\n", card);
        printf("  -D,--debug      debug mode\n");
        printf("  -v,--version    print version of this program\n");
        printf("\nAvailable commands:\n");
        printf("  scontrols       show all mixer simple controls\n");
        printf("  scontents       show contents of all mixer simple controls (default command)\n");
        printf("  sset sID P      set contents for one mixer simple control\n");
-       printf("  sget sID P      get contents for one mixer simple control\n");
+       printf("  sget sID        get contents for one mixer simple control\n");
        printf("  controls        show all controls for given card\n");
        printf("  contents        show contents of all controls for given card\n");
-       printf("  cset cID P      set control contents for one control\n");
-       printf("  cget cID P      get control contents for one control\n");
+       printf("  cset cID P      set control contents for one control\n");
+       printf("  cget cID        get control contents for one control\n");
        return 0;
 }