aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2014-08-02 16:33:16 +0200
committerStefano Sabatini <stefasab@gmail.com>2014-08-03 11:27:27 +0200
commitac1e3882cce593f5e56a14f11a73b5b032fab8d9 (patch)
treede4970b0f6a2fd01e8ff45e7fc486e323d0de4d8
parentd0f56ca0710157144fe00c075dd508085df716ef (diff)
downloadffmpeg-ac1e3882cce593f5e56a14f11a73b5b032fab8d9.tar.gz
doc/ffserver: merge paragraph starting with "What happens next?" with previous one
The name of the paragraph sounded a bit silly, and its text is small so it's better to merge it with the previous paragraph.
-rw-r--r--doc/ffserver.texi8
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index fb90dd650d..2bf815223d 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -203,11 +203,9 @@ WARNING: trying to stream test1.mpg doesn't work with WMP as it tries to
transfer the entire file before starting to play.
The same is true of AVI files.
-@section What happens next?
-
-You should edit the ffserver.conf file to suit your needs (in terms of
-frame rates etc). Then install ffserver and ffmpeg, write a script to start
-them up, and off you go.
+You should edit the @file{ffserver.conf} file to suit your needs (in
+terms of frame rates etc). Then install @command{ffserver} and
+@command{ffmpeg}, write a script to start them up, and off you go.
@section What else can it do?