From 60b51bb262f59f1267242e7af7dd2050af7300c9 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 22 Jun 2008 16:30:21 +0000
Subject: [PATCH] Document ffserver daemon mode.

Originally committed as revision 13895 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffserver-doc.texi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 6099fd23550..ddc8014b28d 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -16,6 +16,11 @@ 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-doc.html} for more
-- 
GitLab