[FFmpeg-cvslog] doc/ffserver: clarify that note in NoDaemon option documentation

Stefano Sabatini git at videolan.org
Sat Nov 30 14:47:53 CET 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Nov 30 14:46:53 2013 +0100| [8209dd332ff858ba498f624b606077da2df8dfa2] | committer: Stefano Sabatini

doc/ffserver: clarify that note in NoDaemon option documentation

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8209dd332ff858ba498f624b606077da2df8dfa2
---

 doc/ffserver.texi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index d14bb4a..3e4f58a 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -391,8 +391,8 @@ ignored, and the log is written to standard output.
 
 @item NoDaemon
 Set no-daemon mode. This option is currently ignored since now
- at command{ffserver} will work in no-daemon mode, and is deprecated.
-
+ at command{ffserver} will always work in no-daemon mode, and is
+deprecated.
 @end table
 
 @section Feed section



More information about the ffmpeg-cvslog mailing list