[FFmpeg-cvslog] doc/ffserver: clearly specify whence ffserver reads the configuration file

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 17:27:01 2013 +0100| [b89983c4ead6e0b7258df9c1bff4317032ff4cae] | committer: Stefano Sabatini

doc/ffserver: clearly specify whence ffserver reads the configuration file

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

 doc/ffserver.texi |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index a408ca8..11f6d68 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -16,11 +16,14 @@ ffserver [@var{options}]
 @chapter Description
 @c man begin DESCRIPTION
 
- at command{ffserver} is a streaming server for both audio and video. It
-supports 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
- at file{ffserver.conf}).
+ at command{ffserver} is a streaming server for both audio and video.
+It supports 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.
+
+ at command{ffserver} is configured through a configuration file, which
+is read at startup. If not explicitly specified, it will read from
+ at file{/etc/ffserver.conf}.
 
 @command{ffserver} receives prerecorded files or FFM streams from some
 @command{ffmpeg} instance as input, then streams them over
@@ -191,7 +194,8 @@ differing versions of tools. FFM2 is the default.
 
 @table @option
 @item -f @var{configfile}
-Use @file{configfile} instead of @file{/etc/ffserver.conf}.
+Read configuration file @file{configfile}. If not specified it will
+read by default from @file{/etc/ffserver.conf}.
 
 @item -n
 Enable no-launch mode. This option disables all the @code{Launch}