Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index dbfffd297c97b7e7cfb08075370b28c81034ee19..6fa8dc175b447f00057ddd9eeaef2f7548d6b87a 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -9,15 +9,9 @@
 
 @contents
 
-@chapter Synopsys
+@chapter Synopsis
 
-The generic syntax is:
-
-@example
-@c man begin SYNOPSIS
-ffserver [options]
-@c man end
-@end example
+ffserver [@var{options}]
 
 @chapter Description
 @c man begin DESCRIPTION
@@ -87,7 +81,7 @@ to make it work correctly.
 
 @section What do I need?
 
-I use Linux on a 900 MHz Duron with a cheapo Bt848 based TV capture card. I'm
+I use Linux on a 900 MHz Duron with a cheap Bt848 based TV capture card. I'm
 using stock Linux 2.4.17 with the stock drivers. [Actually that isn't true,
 I needed some special drivers for my motherboard-based sound card.]
 
@@ -235,7 +229,7 @@ For example:   @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
 
 @section What is FFM, FFM2
 
-FFM and FFM2 are formats used by ffserver. They allow storing a wide varity of
+FFM and FFM2 are formats used by ffserver. They allow storing a wide variety of
 video and audio streams and encoding options, and can store a moving time segment
 of an infinite movie or a whole movie.
 
@@ -266,21 +260,36 @@ messages to stdout.
 @end table
 @c man end
 
+@chapter See Also
+
+@ifhtml
+The @file{doc/ffserver.conf} example,
+@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
+@url{ffmpeg-utils.html,ffmpeg-utils},
+@url{ffmpeg-scaler.html,ffmpeg-scaler},
+@url{ffmpeg-resampler.html,ffmpeg-resampler},
+@url{ffmpeg-codecs.html,ffmpeg-codecs},
+@url{ffmpeg-bitstream-filters,ffmpeg-bitstream-filters},
+@url{ffmpeg-formats.html,ffmpeg-formats},
+@url{ffmpeg-devices.html,ffmpeg-devices},
+@url{ffmpeg-protocols.html,ffmpeg-protocols},
+@url{ffmpeg-filters.html,ffmpeg-filters}
+@end ifhtml
+
+@ifnothtml
+The @file{doc/ffserver.conf} example, ffmpeg(1), ffplay(1), ffprobe(1),
+ffmpeg-utils(1), ffmpeg-scaler(1), ffmpeg-resampler(1),
+ffmpeg-codecs(1), ffmpeg-bitstream-filters(1), ffmpeg-formats(1),
+ffmpeg-devices(1), ffmpeg-protocols(1), ffmpeg-filters(1)
+@end ifnothtml
+
+@include authors.texi
+
 @ignore
 
 @setfilename ffserver
 @settitle ffserver video server
 
-@c man begin SEEALSO
-
-ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffserver.conf}
-example and the FFmpeg HTML documentation
-@c man end
-
-@c man begin AUTHORS
-The FFmpeg developers
-@c man end
-
 @end ignore
 
 @bye