summaryrefslogtreecommitdiff
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 16:42:42 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-28 17:03:09 +0100
commit2989281d4d97fa49b02289bceb5d7d7a6ce4e4f7 (patch)
treecb8fd06782837852b5b56ac68fdd4e5524661229 /doc/ffserver.texi
parent0003379926673860014c969e3c652083a22a9a79 (diff)
doc/ffserver: document NoDaemon deprecated option
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 7a6171bc02..c0742c9292 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -262,6 +262,11 @@ Default value is 1000.
Set access log file (uses standard Apache log file format).
'-' is the standard output.
+
+@item NoDaemon
+Set no-daemon mode. This option is currently ignored since now
+@command{ffserver} will work in no-daemon mode, and is deprecated.
+
@end table
@section ACL syntax