[FFmpeg-cvslog] doc/ffserver: merge paragraph starting with "What happens next?" with previous one

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Aug  2 16:33:16 2014 +0200| [ac1e3882cce593f5e56a14f11a73b5b032fab8d9] | committer: Stefano Sabatini

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.

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

 doc/ffserver.texi |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index fb90dd6..2bf8152 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.
 
- at 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
+ at command{ffmpeg}, write a script to start them up, and off you go.
 
 @section What else can it do?