Try to only use a linebreak without hyphenation (\:) where it makes sense.

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

1 files changed, 69 insertions, 69 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 87e0ccb432..01aef51a3d 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -189,7 +189,7 @@ architectures, see the documentation).
 It plays most MPEG/\:VOB, AVI, ASF/\:WMA/\:WMV, RM, QT/\:MOV/\:MP4, Ogg/\:OGM,
 MKV, VIVO, FLI, NuppelVideo, yuv4mpeg, FILM and RoQ files, supported by many
 native and binary codecs.
-You can watch Video CD, SVCD, DVD, 3ivx, DivX\ 3/\:4/\:5 and even WMV movies,
+You can watch Video CD, SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies,
 too.
 .PP
 MPlayer supports a wide range of video and audio output drivers.
@@ -271,7 +271,7 @@ and then go into pause mode again (any other key unpauses).
 .IPs "q / ESC"
 Stop playing and quit.
 .IPs "+ and -"
-Adjust audio delay by +/\:- 0.1 seconds.
+Adjust audio delay by +/- 0.1 seconds.
 .IPs "/ and *"
 Decrease/\:increase volume.
 .IPs "9 and 0"
@@ -300,11 +300,11 @@ Step forward/backward in the subtitle list.
 .IP F\ \ \ \ 
 Toggle displaying "forced subtitles".
 .IPs a\ \ \ \ 
-Toggle subtitle alignment: top/\:middle/\:bottom.
+Toggle subtitle alignment: top / middle / bottom.
 .IPs "x and z"
-Adjust subtitle delay by +/\:- 0.1 seconds.
+Adjust subtitle delay by +/- 0.1 seconds.
 .IPs "r and t"
-Move subtitles up/\:down.
+Move subtitles up/down.
 .IPs i\ \ \ \ 
 Set EDL mark.
 .IPs "s (screenshot filter must be loaded)"
@@ -492,7 +492,7 @@ Even suboptions can be specified in this way.
 vo=xmga
 # I love practicing handstands while watching videos.
 flip=yes
-# Decode/\:encode multiple files from png,
+# Decode/encode multiple files from PNG,
 # start with mf://filemask
 mf=type=png:fps=25
 # Eerie negative images are cool.
@@ -669,7 +669,7 @@ You have to use \-vf [s]pp without parameters in order for this to work.
 .
 .TP
 .B \-autosync <factor>
-Gradually adjusts the A/\:V sync based on audio delay measurements.
+Gradually adjusts the A/V sync based on audio delay measurements.
 Specifying \-autosync 0, the default, will cause frame timing to be based
 entirely on audio delay measurements.
 Specifying \-autosync 1 will do the same, but will subtly change the A/V
@@ -679,9 +679,9 @@ often be helped by setting this to an integer value greater than 1.
 The higher the value, the closer the timing will be to \-nosound.
 Try \-autosync 30 to smooth out problems with sound drivers which do
 not implement a perfect audio delay measurement.
-With this value, if large A/\:V sync offsets occur, they will only take about
+With this value, if large A/V sync offsets occur, they will only take about
 1 or 2 seconds to settle out.
-This delay in reaction time to sudden A/\:V offsets should be the only
+This delay in reaction time to sudden A/V offsets should be the only
 side-effect of turning this option on, for all sound drivers.
 .
 .TP
@@ -739,7 +739,7 @@ xmga, xv, xvidix and dfbmga.
 .
 .TP
 .B \-framedrop (also see \-hardframedrop)
-Skip displaying some frames to maintain A/\:V sync on slow systems.
+Skip displaying some frames to maintain A/V sync on slow systems.
 Video filters are not applied to such frames.
 For B-frames even decoding is skipped completely.
 .
@@ -769,7 +769,7 @@ through input commands.
 .TP
 .B \-input <commands>
 This option can be used to configure certain parts of the input system.
-Paths are relative to ~/\:.mplayer/.
+Paths are relative to ~/.mplayer/.
 .br
 .I NOTE:
 Autorepeat is currently only supported by joysticks.
@@ -815,7 +815,7 @@ set it to 2 for Linux or 1024 for Windows.
 .
 .TP
 .B \-lircconf <filename> (LIRC only)
-Specifies a configuration file for LIRC (default: ~/\:.lircrc).
+Specifies a configuration file for LIRC (default: ~/.lircrc).
 .
 .TP
 .B \-loop <number>
@@ -923,7 +923,7 @@ Since MPlayer can only seek to the next keyframe this may be inexact.
 .
 .
 .
-.SH "DEMUXER/\:STREAM OPTIONS"
+.SH "DEMUXER/STREAM OPTIONS"
 .
 .TP
 .B \-a52drc <level>
@@ -1168,7 +1168,7 @@ See DOCS/\:HTML/\:en/\:edl.html for details on how to use this.
 .TP
 .B \-forceidx
 Force index rebuilding.
-Useful for files with broken index (A/\:V desync, etc).
+Useful for files with broken index (A/V desync, etc).
 This will enable seeking in files where seeking was not possible.
 You can fix the index permanently with MEncoder (see the documentation).
 .br
@@ -1189,7 +1189,7 @@ Play/\:convert only first <number> frames, then quit.
 .B \-hr-mp3-seek (MP3 only)
 Hi-res MP3 seeking.
 Enabled when playing from an external MP3 file, as we need to seek
-to the very exact position to keep A/\:V sync.
+to the very exact position to keep A/V sync.
 Can be slow especially when seeking backwards since it has to rewind
 to the beginning to find an exact frame position.
 .
@@ -1219,7 +1219,7 @@ from a different AVI, but this is sure to cause unfavorable results.
 This option is obsolete now that MPlayer has OpenDML support.
 .
 .TP
-.B \-mc <seconds/\:frame>
+.B \-mc <seconds/frame>
 maximum A-V sync correction per frame (in seconds)
 .
 .TP
@@ -1548,7 +1548,7 @@ Force audio parameters for the VIVO demuxer (for debugging purposes).
 .
 .
 .
-.SH "OSD/\:SUB OPTIONS"
+.SH "OSD/SUB OPTIONS"
 .I NOTE:
 Also see \-vf expand.
 .
@@ -2050,7 +2050,7 @@ Available audio output drivers are:
 .
 .TP
 .B alsa\ \ \ 
-ALSA 0.9/\:1.x audio output driver
+ALSA 0.9/1.x audio output driver
 .PD 0
 .RSs
 .IPs mmap\ \ \ 
@@ -2251,7 +2251,7 @@ on.
 Turns on direct rendering (not supported by all codecs and video outputs)
 .br
 .I WARNING:
-May cause OSD/\:SUB corruption!
+May cause OSD/SUB corruption!
 .
 .TP
 .B \-dxr2 <option1:option2:...>
@@ -2283,7 +2283,7 @@ enable 7.5 IRE output mode
 .IPs no75ire
 disable 7.5 IRE output mode (default)
 .IPs bw\ \ \ 
-b/\:w TV output
+b/w TV output
 .IPs color
 color TV output (default)
 .IPs interlaced
@@ -2721,7 +2721,7 @@ image buffers on monitor retrace only (nVidia).
 Default is not to disable image display (nobenchmark).
 .IPs (no)queue
 Queue frames for display to allow more parallel work of the video hardware.
-May add a small (not noticeable) constant A/\:V desync (default: noqueue).
+May add a small (not noticeable) constant A/V desync (default: noqueue).
 .IPs (no)sleep
 Use sleep function while waiting for rendering to finish
 (not recommended on Linux) (default: nosleep).
@@ -3087,7 +3087,7 @@ Control the output order for interlaced frames (default: disabled).
 Valid values are top = top fields first, bottom = bottom fields first.
 This option does not have any effect on progressive film material
 like most MPEG movies are.
-You need to enable this option if you have tearing issues/\:unsmooth
+You need to enable this option if you have tearing issues or unsmooth
 motions watching interlaced film material.
 .IPs layer=N
 Will force layer with ID N for playback (default: -1 - auto).
@@ -3420,7 +3420,7 @@ mplayer video.nut \-vf format=bgr15 \-vo tga
 .
 .
 .
-.SH "DECODING/\:FILTERING OPTIONS"
+.SH "DECODING/FILTERING OPTIONS"
 .
 .TP
 .B \-ac <[-|+]codec1,[-|+]codec2,...[,]>
@@ -3715,7 +3715,7 @@ Prints some statistics and stores them in ./vstats_*.log.
 .B \-noslices
 Disable drawing video by 16-pixel height slices/\:bands, instead draws the
 whole frame in a single run.
-May be faster or slower, depending on card/\:cache.
+May be faster or slower, depending on video card and available cache.
 It has effect only with libmpeg2 and libavcodec codecs.
 .
 .TP
@@ -4639,9 +4639,9 @@ incapable of scaling, it defaults to d_width/\:d_height!
 .br
 -1:   original width/\:height
 .br
--2:   Calculate w/\:h using the other dimension and the prescaled aspect ratio.
+-2:   Calculate w/h using the other dimension and the prescaled aspect ratio.
 .br
--3:   Calculate w/\:h using the other dimension and the original aspect ratio.
+-3:   Calculate w/h using the other dimension and the original aspect ratio.
 .br
 -(n+8): Like -n above, but rounding the dimension to the closest multiple of 16.
 .REss
@@ -4704,7 +4704,7 @@ spal:    768x576 (square pixel PAL)
 .B dsize[=aspect|w:h:aspect-method:r]
 Changes the intended display size/\:aspect at an arbitrary point in the
 filter chain.
-Aspect can be given as a fraction (4/\:3) or floating point number
+Aspect can be given as a fraction (4/3) or floating point number
 (1.33).
 Alternatively, you may specify the exact display width and height
 desired.
@@ -4720,12 +4720,12 @@ Can also be these special values:
 .RSss
  0:   original display width and height
 .br
--1:   original video width\:/height (default)
+-1:   original video width and height (default)
 .br
--2:   Calculate w/\:h using the other dimension and the original display
+-2:   Calculate w/h using the other dimension and the original display
 aspect ratio.
 .br
--3:   Calculate w/\:h using the other dimension and the original video
+-3:   Calculate w/h using the other dimension and the original video
 aspect ratio.
 .REss
 .sp 1
@@ -4782,7 +4782,7 @@ Clamps YUV color values to the CCIR 601 range without doing real conversion.
 .
 .TP
 .B rgb2bgr[=swap]
-RGB 24/\:32 <\-> BGR 24/\:32 colorspace conversion.
+RGB 24/32 <\-> BGR 24/32 colorspace conversion.
 .PD 0
 .RSs
 .IPs swap\ 
@@ -4792,7 +4792,7 @@ Also perform  R <-> B swapping.
 .
 .TP
 .B palette
-RGB/\:BGR 8 \-> 15/\:16/\:24/\:32bpp colorspace conversion using palette.
+RGB/BGR 8 \-> 15/16/24/32bpp colorspace conversion using palette.
 .
 .TP
 .B format[=fourcc]
@@ -4825,7 +4825,7 @@ format name like rgb15, bgr24, yv12, etc (default: yv12)
 .PD 1
 .
 .TP
-.B pp[=filter1[:option1[:option2...]]/\:[-]filter2...] (also see \-pphelp)
+.B pp[=filter1[:option1[:option2...]]/[-]filter2...] (also see \-pphelp)
 Enables the specified chain of postprocessing subfilters.
 Subfilters must be separated by '/' and can be disabled by
 prepending a '\-'.
@@ -5076,7 +5076,7 @@ Only useful together with expand and scale.
 .RSs
 .IPs <aspect>
 Control aspect ratio, calculate as DVB_HEIGHT*ASPECTRATIO (default:
-576*4/\:3=768), set it to 576*(16/\:9)=1024 for a 16:9 TV.
+576*4/3=768), set it to 576*(16/9)=1024 for a 16:9 TV.
 .RE
 .sp 1
 .RS
@@ -5597,7 +5597,7 @@ using a method that keeps one field and interpolates the other, the result is
 a juddering video that has every fourth frame duplicated.
 This filter is intended to find and drop those duplicates and restore the
 original film framerate.
-When using this filter, you must specify \-ofps that is 4/\:5 of
+When using this filter, you must specify \-ofps that is 4/5 of
 the fps of the input file and place the softskip later in the
 filter chain to make sure that divtc sees all the frames.
 Two different modes are available:
@@ -5716,7 +5716,7 @@ Apply 3:2 'telecine' process to increase framerate by 20%.
 This most likely will not work correctly with MPlayer, but it can
 be used with 'mencoder \-fps 30000/1001 \-ofps 30000/1001 \-vf telecine'.
 Both fps options are essential!
-(A/\:V sync will break if they are wrong.)
+(A/V sync will break if they are wrong.)
 The optional start parameter tells the filter where in the telecine
 pattern to start (0\-3).
 .
@@ -5933,7 +5933,7 @@ Renders only every nth frame or every intra frame (keyframe).
 If you call the filter with I (uppercase) as the parameter, then
 .B only
 keyframes are rendered.
-For DVDs it generally means one in every 15/\:12  frames (IBBPBBPBBPBBPBB),
+For DVDs it generally means one in every 15/12 frames (IBBPBBPBBPBBPBB),
 for AVI it means every scene change or every keyint value (see \-lavcopts
 keyint= value if you use MEncoder to encode the video).
 .sp 1
@@ -6712,7 +6712,7 @@ FFmpeg's experimental wavelet-based codec
 .
 .TP
 .B vqmin=<1\-31>
-minimum quantizer (pass 1/\:2)
+minimum quantizer (pass 1/2)
 .RSs
 .IPs 1
 Not recommended (much larger file, little quality difference and weird side
@@ -6746,7 +6746,7 @@ A lower value means better quality but larger files (default: 0 (disabled)).
 .
 .TP
 .B vqmax=<1\-31>
-Maximum quantizer (pass\ 1/\:2), 10\-31 should be a sane range (default: 31).
+Maximum quantizer (pass 1/2), 10\-31 should be a sane range (default: 31).
 .
 .TP
 .B mbqmin=<1\-31>
@@ -6759,7 +6759,7 @@ obsolete, use vqmax
 .TP
 .B vqdiff=<1\-31>
 maximum quantizer difference between consecutive I- or P-frames
-(pass 1/\:2) (default: 3)
+(pass 1/2) (default: 3)
 .
 .TP
 .B vmax_b_frames=<0\-4>
@@ -6880,7 +6880,7 @@ Higher values than 6 may give very slightly better PSNR (approximately
 .
 .TP
 .B vb_strategy=<0\-2> (pass one only)
-strategy to choose between I/\:P/\:B-frames:
+strategy to choose between I/P/B-frames:
 .PD 0
 .RSs
 .IPs 0
@@ -6976,7 +6976,7 @@ This will probably reduce global PSNR a little bit (around 0.01dB) and
 change individual frame type and PSNR a little bit more (up to 0.03dB).
 .
 .TP
-.B aspect=<x/\:y>
+.B aspect=<x/y>
 Store movie aspect internally, just like with MPEG files.
 Much nicer than rescaling, because quality is not decreased.
 Only MPlayer will play these files correctly, other players will display
@@ -6988,7 +6988,7 @@ The aspect parameter can be given as a ratio or a floating point number.
 .RE
 .RSs
 .PD 0
-.IPs "aspect=16/\:9 or aspect=1.78"
+.IPs "aspect=16/9 or aspect=1.78"
 .PD 1
 .RE
 .
@@ -7002,7 +7002,7 @@ always on.
 .
 .TP
 .B vbitrate=<value>
-Specify bitrate (pass 1/\:2) (default: 800).
+Specify bitrate (pass 1/2) (default: 800).
 .br
 .I WARNING:
 1kbit = 1000 bits
@@ -7028,17 +7028,17 @@ be problems if vrc_(min|max)rate is used.
 .
 .TP
 .B vrc_maxrate=<value>
-maximum bitrate in kbit/\:sec (pass 1/\:2)
+maximum bitrate in kbit/\:sec (pass 1/2)
 (default: 0, unlimited)
 .
 .TP
 .B vrc_minrate=<value>
-minimum bitrate in kbit/\:sec (pass 1/\:2)
+minimum bitrate in kbit/\:sec (pass 1/2)
 (default: 0, unlimited)
 .
 .TP
 .B vrc_buf_size=<value>
-buffer size in kbit (pass 1/\:2).
+buffer size in kbit (pass 1/2).
 For MPEG-1/2 this also sets the vbv buffer size, use 327 for VCD,
 917 for SVCD and 1835 for DVD.
 .
@@ -7052,23 +7052,23 @@ Dummy, reserved for future use.
 .
 .TP
 .B vb_qfactor=<-31.0\-31.0>
-quantizer factor between B- and non-B-frames (pass 1/\:2) (default: 1.25)
+quantizer factor between B- and non-B-frames (pass 1/2) (default: 1.25)
 .
 .TP
 .B vi_qfactor=<-31.0\-31.0>
-quantizer factor between I- and non-I-frames (pass 1/\:2) (default: 0.8)
+quantizer factor between I- and non-I-frames (pass 1/2) (default: 0.8)
 .
 .TP
 .B vb_qoffset=<-31.0\-31.0>
-quantizer offset between B- and non-B-frames (pass 1/\:2) (default: 1.25)
+quantizer offset between B- and non-B-frames (pass 1/2) (default: 1.25)
 .
 .TP
 .B vi_qoffset=<-31.0\-31.0>
-(pass 1/\:2) (default: 0.0)
+(pass 1/2) (default: 0.0)
 .br
 if v{b|i}_qfactor > 0
 .br
-I/\:B-frame quantizer = P-frame quantizer * v{b|i}_qfactor + v{b|i}_qoffset
+I/B-frame quantizer = P-frame quantizer * v{b|i}_qfactor + v{b|i}_qoffset
 .br
 else
 .br
@@ -7077,7 +7077,7 @@ set q= -q * v{b|i}_qfactor + v{b|i}_qoffset
 .br
 .I HINT:
 To do constant quantizer encoding with different quantizers for
-I/\:P- and B-frames you can use:
+I/P- and B-frames you can use:
 lmin= <ip_quant>:lmax= <ip_quant>:vb_qfactor= <b_quant/\:ip_quant>.
 .
 .TP
@@ -7100,7 +7100,7 @@ the quantizer more over time (slower change).
 .
 .TP
 .B vqcomp=<0.0\-1.0>
-Quantizer compression, vrc_eq depends upon this (pass 1/\:2) (default: 0.5).
+Quantizer compression, vrc_eq depends upon this (pass 1/2) (default: 0.5).
 For instance, assuming the default rate control equation is used,
 if vqcomp=1.0, the ratecontrol allocates to each frame the number of bits
 needed to encode them all at the same QP.
@@ -7112,7 +7112,7 @@ Perceptual quality will be optimal somewhere in between these two extremes.
 .
 .TP
 .B vrc_eq=<equation>
-main ratecontrol equation (pass 1/\:2)
+main ratecontrol equation (pass 1/2)
 .RE
 .RSs
 .IPs 1\ \ \ \ 
@@ -7163,7 +7163,7 @@ temporal complexity
 .IPs qComp
 qcomp from the command line
 .IPs "isI, isP, isB"
-Is 1 if picture type is I/\:P/\:B else 0.
+Is 1 if picture type is I/P/B else 0.
 .IPs Pi,E\ 
 See your favorite math book.
 .RE
@@ -7185,9 +7185,9 @@ is 1 if a==b, 0 otherwise
 .
 .TP
 .B vrc_override=<options>
-User specified quality for specific parts (ending, credits, ...) (pass 1/\:2).
-The options are <start-frame>, <end-frame>, <quality>[/\:<start-frame>,
-<end-frame>, <quality>[/\:...]]:
+User specified quality for specific parts (ending, credits, ...) (pass 1/2).
+The options are <start-frame>, <end-frame>, <quality>[/<start-frame>,
+<end-frame>, <quality>[/...]]:
 .PD 0
 .RSs
 .IPs "quality (2\-31)"
@@ -7207,7 +7207,7 @@ initial buffer occupancy, as a fraction of vrc_buf_size (default: 0.9)
 .
 .TP
 .B vqsquish=<0|1>
-Specify how to keep the quantizer between qmin and qmax (pass 1/\:2).
+Specify how to keep the quantizer between qmin and qmax (pass 1/2).
 .PD 0
 .RSs
 .IPs 0
@@ -7946,14 +7946,14 @@ Sets the bitrate to be used in kbits/\:second if <16000 or in bits/\:second
 if >16000.
 If <value> is negative, XviD will use its absolute value as the target size
 (in kBytes) of the video and compute the associated bitrate automagically
-(default: 687 kbits/\:s).
+(default: 687 kbits/s).
 .
 .TP
 .B fixed_quant=<1\-31>
 Switch to fixed quantizer mode and specify the quantizer to be used.
 .
 .TP
-.B zones=<zone0>[/\:<zone1>[/\:...]] (CBR or two pass mode)
+.B zones=<zone0>[/<zone1>[/...]] (CBR or two pass mode)
 User specified quality for specific parts (ending, credits, ...).
 Each zone is <start-frame>,<mode>,<value> where <mode> may be
 .PD 0
@@ -8030,10 +8030,10 @@ bitrate and tries to achieve CBR.
 size of the rate control buffer
 .
 .TP
-.B quant_range=<1\-31>\-<1\-31>[/\:<1\-31>\-<1\-31>]
+.B quant_range=<1\-31>\-<1\-31>[/<1\-31>\-<1\-31>]
 CBR mode: min & max quantizer for all frames (default: 2\-31)
 .br
-two pass mode: min & max quantizer for I/\:P-frames (default: 2\-31/\:2\-31)
+two pass mode: min & max quantizer for I/P-frames (default: 2\-31/\:2\-31)
 .br
 .I WARNING:
 As of XviD-1.0.x, this option is replaced by the
@@ -8138,7 +8138,7 @@ autodetection of some decoders might be confused.
 .
 .TP
 .B max_bframes=<0\-4>
-Maximum number of B-frames to put between I/\:P-frames (default: 2).
+Maximum number of B-frames to put between I/P-frames (default: 2).
 .
 .TP
 .B bquant_ratio=<0\-1000>
@@ -8472,7 +8472,7 @@ Specifies the width of the custom pixel aspect ratio.
 Specifies the height of the custom pixel aspect ratio.
 .
 .TP
-.B aspect=<x/\:y | f (float value)>
+.B aspect=<x/y | f (float value)>
 Store movie aspect internally, just like MPEG files.
 Much nicer solution than rescaling, because quality is not decreased.
 MPlayer and a few others players will play these files correctly, others
@@ -8773,7 +8773,7 @@ Lower values allow the quantizer value to jump around more,
 higher values force it to vary more smoothly.
 .
 .TP
-.B zones=<zone0>[/\:<zone1>[/\:...]]
+.B zones=<zone0>[/<zone1>[/...]]
 User specified quality for specific parts (ending, credits, ...)
 (ABR or two pass).
 Each zone is <start-frame>,<end-frame>,<option> where option may be
@@ -9569,13 +9569,13 @@ mplayer dvd://1 \-dumpstream \-dumpfile title1.vob
 .PP
 .B Stream from HTTP:
 .nf
-mplayer http://mplayer.hq/\:example.avi
+mplayer http://mplayer.hq/example.avi
 .fi
 .
 .PP
 .B Stream using RTSP:
 .nf
-mplayer rtsp://server.example.com/\:streamName
+mplayer rtsp://server.example.com/streamName
 .fi
 .
 .PP