some options fixed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@475 b3059339-0415-0410-9bf9-f77b7e298cf2

DOCS/example.conf

@@ -12,7 +12,6 @@ vo=xv			# To specify your default video output see -vo help for
 			# valid settings
 
 fs=yes			# Enlarges movie window to your desktop's size.
-			# (even for SVGAlib!)
 			# Used by drivers: all
 
 vm=no			# Tries to change to a different videomode
@@ -26,8 +25,8 @@ vm=no			# Tries to change to a different videomode
 zoom=no			# Enable software scaling (powerful CPU needed)
 			# Used by drivers: svga, (sdl - why not?)
 
-# x=TODO
-# y=TODO
+# x=800			# scale movie to <x> width 
+# y=600			# scale movie to <y> height
 
 ##
 ## Multiple languages are available :)
@@ -44,7 +43,7 @@ zoom=no			# Enable software scaling (powerful CPU needed)
 sound	= 1
 nosound	= nein
 mixer	= /dev/mixer
-master	= no		# no : PCM volume  	yes : MASTER volume
+master	= no		# no : set PCM volume  	yes : set MASTER volume
 
 ##
 ## Remember the -noalsa switch ? You can specify it either with:

DOCS/mplayer.1

@@ -194,6 +194,8 @@ q or ESC        stop playing and quit program
 / or *          decrease/increase volume
 
 o               toggle OSD:  none / seek / seek+timer
+
+m or c          use mixer master or pcm channel
 .IP
 .SH FILES AND DIRECTORIES
 .TP