doc: add libavformat.texi and ffmpeg-formats.texi files

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 4f46f5d116ef5cdbbb8e9742609548d3373250c8..dbfffd297c97b7e7cfb08075370b28c81034ee19 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -28,11 +28,6 @@ several live feeds, streaming from files and time shifting on live feeds
 (you can seek to positions in the past on each live feed, provided you
 specify a big enough feed storage in ffserver.conf).
 
-ffserver runs in daemon mode by default; that is, it puts itself in
-the background and detaches from its TTY, unless it is launched in
-debug mode or a NoDaemon option is specified in the configuration
-file.
-
 This documentation covers only the streaming aspects of ffserver /
 ffmpeg. All questions about parameters for ffmpeg, codec questions,
 etc. are not covered here. Read @file{ffmpeg.html} for more
@@ -240,13 +235,13 @@ 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
-video and audio streams, encoding options and can store a moving time segment
-of a infinite movie or a whole movie.
+FFM and FFM2 are formats used by ffserver. They allow storing a wide varity of
+video and audio streams and encoding options, and can store a moving time segment
+of an infinite movie or a whole movie.
 
-FFM, is version specific, there is limited compatibility of FFM files
+FFM is version specific, and there is limited compatibility of FFM files
 generated by one version of ffmpeg/ffserver and another version of
-ffmpeg/ffserver. It may work but its not guranteed to work.
+ffmpeg/ffserver. It may work but its not guaranteed to work.
 
 FFM2 is extensible while maintaining compatibility and should work between
 differing versions of tools. FFM2 is the default.
@@ -267,8 +262,7 @@ within the various <Stream> sections. Since ffserver will not launch
 any ffmpeg instances, you will have to launch them manually.
 @item -d
 Enable debug mode. This option increases log verbosity, directs log
-messages to stdout and causes ffserver to run in the foreground
-rather than as a daemon.
+messages to stdout.
 @end table
 @c man end