@@ -1,5 +1,5 @@

 # Port on which the server is listening. You must select a different

-# port from your standard http web server if it is running on the same

+# port from your standard HTTP web server if it is running on the same

 # computer.

 Port 8090

@@ -13,14 +13,14 @@ BindAddress 0.0.0.0

 MaxClients 1000

 # This the maximum amount of kbit/sec that you are prepared to

-# consume when streaming to clients

+# consume when streaming to clients.

 MaxBandwidth 1000

-# Access Log file (uses standard Apache log file format)

-# '-' is the standard output

+# Access log file (uses standard Apache log file format)

+# '-' is the standard output.

 CustomLog -

-# Suppress that if you want to launch ffserver as a daemon

+# Suppress that if you want to launch ffserver as a daemon.

 NoDaemon

@@ -48,12 +48,12 @@ FileMaxSize 200K

 # You could specify

 # ReadOnlyFile /saved/specialvideo.ffm

-# This marks the file as readonly and it will not be deleted or updated

+# This marks the file as readonly and it will not be deleted or updated.

-# Specify launch in order to start ffmpeg automatically

+# Specify launch in order to start ffmpeg automatically.

 #Launch

-# Only allow connections from localhost to the feed

+# Only allow connections from localhost to the feed.

 ACL allow 127.0.0.1

 </Feed>

@@ -71,9 +71,9 @@ ACL allow 127.0.0.1

 Feed feed1.ffm

 # Format of the stream : you can choose among:

-# mpeg       : MPEG1 multiplexed video and audio

-# mpegvideo  : only MPEG1 video

-# mp2        : MPEG2 audio (use AudioCodec to select layer 2 and 3 codec)

+# mpeg       : MPEG-1 multiplexed video and audio

+# mpegvideo  : only MPEG-1 video

+# mp2        : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec)

 # ogg        : Ogg format (Vorbis audio codec)

 # rm         : Real Networks compatible stream. Multiplexed audio and video.

 # ra         : Real Networks compatible stream. Audio only.

@@ -81,7 +81,7 @@ Feed feed1.ffm

 # jpeg       : Generate a single JPEG image.

 # asf        : ASF compatible streaming (Windows Media Player format).

 # swf        : Macromedia flash(tm) compatible stream

-# avi        : AVI format (open divx video, mpeg audio sound)

+# avi        : AVI format (open DivX video, MPEG audio sound)

 # master     : special ffmpeg stream used to duplicate a server

 Format mpeg

@@ -97,7 +97,7 @@ AudioChannels 1

 # depend on the selected audio codec.

 AudioSampleRate 44100

-# Bitrate for the video stream.

+# Bitrate for the video stream

 VideoBitRate 64

 # Ratecontrol buffer size

@@ -110,14 +110,14 @@ VideoFrameRate 3

 # The following abbreviation are defined : sqcif, qcif, cif, 4cif

 VideoSize 160x128

-# transmit only intra frames (useful for low bitrates, but kills frame rate) 

+# Transmit only intra frames (useful for low bitrates, but kills frame rate).

 #VideoIntraOnly

-# If non intra only, an intra frame is transmitted every VideoGopSize

-# frames Video synchronization can only begin at an I frames.

+# If non-intra only, an intra frame is transmitted every VideoGopSize

+# frames. Video synchronization can only begin at an intra frame.

 VideoGopSize 12

-# More MPEG4 parameters

+# More MPEG-4 parameters

 # VideoHighQuality

 # Video4MotionVector

@@ -136,7 +136,7 @@ VideoGopSize 12

 # Set this to the number of seconds backwards in time to start. Note that

 # most players will buffer 5-10 seconds of video, and also you need to allow

-# for a key frame to appear in the data stream.

+# for a keyframe to appear in the data stream.

 #PreRoll 15

 # ACL:

@@ -262,8 +262,8 @@ StartSendOnKey

 ##################################################################

 # A stream coming from a file : you only need to set the input

-# filename and optionnally a new format. Supported conversions:

-#    avi -> asf

+# filename and optionally a new format. Supported conversions:

+#    AVI -> ASF

 #<Stream file.rm>

 #File "/usr/local/httpd/htdocs/tlive.rm"

@@ -283,10 +283,10 @@ StartSendOnKey

 ##################################################################

 # RTSP examples

 #

-# You can access to this stream with the RTSP URL:

+# You can access this stream with the RTSP URL:

 #   rtsp://localhost:5454/test1-rtsp.mpg

 #

-# A non standard RTSP redirector is also created. Its URL is:

+# A non-standard RTSP redirector is also created. Its URL is:

 #   http://localhost:8090/test1-rtsp.rtsp

 #<Stream test1-rtsp.mpg>

@@ -328,7 +328,7 @@ StartSendOnKey

 <Stream stat.html>

 Format status

-# Only allow local people to get to the status

+# Only allow local people to get the status

 ACL allow localhost

 ACL allow 192.168.0.0 192.168.255.255