[MPlayer-cvslog] CVS: main/etc example.conf,1.65,1.66

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/etc
In directory mail:/var2/tmp/cvs-serv6446

Modified Files:
	example.conf 
Log Message:
Improve option descriptions.


Index: example.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/example.conf,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- example.conf	16 Jan 2006 23:58:37 -0000	1.65
+++ example.conf	17 Jan 2006 00:18:21 -0000	1.66
@@ -5,8 +5,11 @@
 # and per user from ~/.mplayer/config, where per-user settings override
 # system-wide settings, all of which are overrriden by the command line.
 #
-# The options are the same as on the command line without the preceding '-'.
-
+# The configuration file settings are the same as the command line
+# options without the preceding '-'.
+#
+# See the CONFIGURATION FILES section in the man page
+# for a detailed description of the syntax.
 
 #
 # video settings
@@ -18,20 +21,17 @@
 # Specify default audio driver (see -ao help for a list).
 #ao=oss
 
-# fullscreen mode
+# Start in fullscreen mode by default.
 #fs=yes
 
-# Change to a different videomode when going fullscreen
-# (dga, x11, sdl video output drivers only).
+# Change to a different videomode when going fullscreen.
 #vm=yes
 
-# Force changing display depth (valid settings are: 0, 15, 16, 24, 32).
-# May need 'vm=yes' as well, only works with fbdev, dga, svga, vesa
-# video output drivers.
+# Override the autodetected color depth, may need 'vm=yes' as well.
 #bpp=0
 
-# Enable software scaling (powerful CPU needed).
-# Some video output drivers (svga, x11, vesa) do not support hardware scaling.
+# Enable software scaling (powerful CPU needed) for video output
+# drivers that do not support hardware scaling.
 #zoom=yes
 
 # standard monitor size, with square pixels
@@ -40,13 +40,11 @@
 # Use this for a widescreen monitor, non-square pixels.
 #monitoraspect=16:9
 
-# Makes the player window stay on top of all other windows.
+# Keep the player window on top of all other windows.
 #ontop=yes
 
-# Specify your preferred default skin here
-# (skins are searched for in /usr/local/share/mplayer/Skin/
-# and ~/.mplayer/Skin/).
-#
+# Specify your preferred skin here (skins are searched for in
+# /usr/local/share/mplayer/Skin/<name> and ~/.mplayer/Skin/<name>).
 #skin = Abyss
 
 #
@@ -84,23 +82,17 @@
 # location of the fb.modes file
 #fbmodeconfig = /etc/fb.modes
 
-# VESA and FBdev driver: Specify your monitor's timings.
-#
-# (see /etc/X11/XF86Config for timings)
-# ** CAUTION! IF YOUR DISPLAY DOESN'T SUPPORT AUTOMATICALLY TURNING OFF WHEN
-#    OVERDRIVED (AND EVEN IF IT DOES), THIS MAY CAUSE DAMAGE TO YOUR DISPLAY!
-#    WE AREN'T RESPONSIBLE, IT'S YOUR DECISION! **
-#
-# k, K: means multiply by 1000
-# m, M: means multiply by 1.000.000
+# Specify your monitor timings for the vesa and fbdev video output drivers.
+# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
+# that exceed the capabilities of your monitor, you may damage it.
 #
-# horizontal frequency range
+# horizontal frequency range (k stands for 1000)
 #monitor-hfreq = 31.5k-50k,70k
 #
 # vertical frequency range
 #monitor-vfreq = 50-90
 #
-# dotclock (or pixelclock) range
+# dotclock (or pixelclock) range (m stands for 1000000)
 #monitor-dotclock = 30M-300M
 
 #
@@ -114,7 +106,7 @@
 
 
 #
-# Other (preferred to be default from configfile) switches
+# other settings
 #
 # Drop frames to preserve audio/video sync.
 #framedrop = yes
@@ -144,5 +136,5 @@
 #af=lavcresample=44100
 
 #
-# You can also include other configfiles
+# You can also include other configuration files.
 #include = /path/to/the/file/you/want/to/include