=== modified file 'doc/C/conformance.xml'
--- doc/C/conformance.xml	2008-05-16 12:23:38 +0000
+++ doc/C/conformance.xml	2009-08-05 15:51:36 +0000
@@ -35,11 +35,11 @@
       </para>
 
       <para>
-	Gnash uses ffmpeg for codecs, so any file supported by Mplayer
+	Gnash uses FFmpeg for codecs, so any file supported by Mplayer
 	should work with Gnash. Gnash supports the loading of patent
 	free codecs like Ogg Vorbis or Theora from disk based files,
 	while work is being done to support these codecs when embedded
-	in a SWF file. Ffmpeg contains the codecs used by the current
+	in a SWF file. FFmpeg contains the codecs used by the current
 	SWF definition, FLV, VP6 (ON2), H.263, H.264, and MP3.
       </para>
 

=== modified file 'doc/C/introduction.xml'
--- doc/C/introduction.xml	2008-05-16 12:23:38 +0000
+++ doc/C/introduction.xml	2009-08-05 15:51:12 +0000
@@ -84,11 +84,11 @@
     </para>
     
     <para>
-      Gnash uses ffmpeg for codecs, so any file supported by Mplayer
+      Gnash uses FFmpeg for codecs, so any file supported by Mplayer
       should work with Gnash. Gnash supports the loading of patent
       free codecs like Ogg Vorbis or Theora from disk based files,
       while work is being done to support these codecs when embedded
-      in a SWF file. Ffmpeg contains the codecs used by the current
+      in a SWF file. FFmpeg contains the codecs used by the current
       SWF defintion, FLV, VP6 (ON2), H.263, H.264, and MP3.
     </para>
   </sect1>

=== modified file 'doc/C/refmanual/code_dependencies.xml'
--- doc/C/refmanual/code_dependencies.xml	2008-11-22 16:09:45 +0000
+++ doc/C/refmanual/code_dependencies.xml	2009-08-05 15:53:07 +0000
@@ -247,7 +247,7 @@
 	  <entry>Possibly Required</entry>
 	  <entry></entry>
 	  <entry>
-	    gst-ffmpeg allows you to use the FFMPEG decoder
+	    gst-ffmpeg allows you to use the FFmpeg decoder
 	    with Gstreamer.
 	  </entry>
 	  <entry>
@@ -260,18 +260,18 @@
 	</row>
 	
 	<row>
-	  <entry>FFMPEG</entry>
+	  <entry>FFmpeg</entry>
 	  <entry>Possibly Required</entry>
 	  <entry></entry>
 	  <entry>
-	    FFMPEG is a video handler.
+	    FFmpeg is a video handler.
 	  </entry>
 	  <entry>
 	    If you would like video playback, you must
 	    install one of the video handlers. When using the
 	    gstreamer-ffmpeg plugin, ffmpeg doesn't need to be
 	    installed, as it's part of the plugin. For systems
-	    without Gstreamer support, ffmpeg can be used directly.
+	    without Gstreamer support, FFmpeg can be used directly.
 	  </entry>
 	  <entry><filename>ffmpeg-dev</filename></entry>
 	  <entry><filename>ffmpeg-devel</filename></entry>

=== modified file 'doc/C/refmanual/feature_configuration.xml'
--- doc/C/refmanual/feature_configuration.xml	2008-10-20 16:45:27 +0000
+++ doc/C/refmanual/feature_configuration.xml	2009-08-05 15:53:57 +0000
@@ -165,7 +165,7 @@
 	  </entry>
 	  <entry>  <para>
 	    Select the specified media decoder and sound engine.
-	    FFMPEG uses the SDL sound engine; GST uses its own.
+	    FFmpeg uses the SDL sound engine; GST uses its own.
 	    <option>GST</option> is the default decoder.
 	  </para>
 	  <para>

=== modified file 'doc/C/refmanual/internals.xml'
--- doc/C/refmanual/internals.xml	2008-09-23 14:56:51 +0000
+++ doc/C/refmanual/internals.xml	2009-08-05 15:52:36 +0000
@@ -51,7 +51,7 @@
 		dealing with streamed video and sound as well as decoding
 		embedded media frames. Besides the standard SWF formats
 		FLV, MPEG4, Nellymoser, ADPCM, MP3 and RAW, &app; can 
-		decode other formats supports by gstreamer or ffmpeg, 
+		decode other formats supports by Gstreamer or FFmpeg, 
 		including the free OGG container and free codecs.
 	</para>
       </sect3>

=== modified file 'doc/C/usermanual/glossary.xml'
--- doc/C/usermanual/glossary.xml	2008-09-23 14:56:51 +0000
+++ doc/C/usermanual/glossary.xml	2009-08-05 15:52:20 +0000
@@ -163,11 +163,11 @@
     
     <glossentry>
       <glossterm>
-	ffmpeg
+	FFmpeg
       </glossterm>
       <glossdef>
 	<para>
-	  ffmpeg is an audio and video decoding library which can be 
+	  FFmpeg is an audio and video decoding library which can be 
 	  used by Gnash to decode mp3, FLV and other media types.  
 	</para>
       </glossdef>
@@ -528,7 +528,7 @@
 	  are independent of each other: you can use it for a task and
 	  not for the other if you wish.  This version of Gnash does not
           implement menus in the SDL GUI; the SDL sound handler is the
-          most feature rich, supporting video through ffmpeg. 
+          most feature rich, supporting video through FFmpeg. 
 	</para>
       </glossdef>
     </glossentry>
@@ -548,7 +548,7 @@
 	</para>
 	<para>
 	  There are currently two sound handlers available in &app;:
-	  ffmpeg and Gstreamer.  The ffmpeg sound handler uses SDL for
+	  FFmpeg and Gstreamer.  The ffmpeg sound handler uses SDL for
 	  mixing.
 	  The Gstreamer-sound handler uses the available 
 	  plugins to decode the audio, so it might not work if some