# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: heymrdjd@gmail.com-20100321063424-6mixp17hu7hjkqi4
# target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-\
#   doc/ubuntu-docs/lucid/
# testament_sha1: dc5e3ff56c189c653e796cda3a53c88b5657e098
# timestamp: 2010-03-21 01:36:57 -0500
# base_revision_id: rocket2dmn@ubuntu.com-20100313015843-\
#   z2v71t3i3rswiw9j
# 
# Begin patch
=== modified file 'musicvideophotos/C/video.xml'
--- musicvideophotos/C/video.xml	2009-10-04 19:49:53 +0000
+++ musicvideophotos/C/video.xml	2010-03-21 06:34:24 +0000
@@ -215,13 +215,70 @@
     
     <sect1 id="video-editing" status="review">
         <title>Recording and editing video</title>
-        <para>
-        There are numerous video capture and editing programs available for 
-        Ubuntu. Some of the most popular include 
-        <ulink url="apt:kino">Kino</ulink>, 
-        <ulink url="apt:kdenlive">Kdenlive</ulink>, and 
-        <ulink url="apt:pitivi">Pitivi</ulink>.
-        </para>
+        <para>Ubuntu offers numerous programs for recording and editing video.</para>
+	<itemizedlist>
+		<listitem>
+		To create screencasts (recordings of desktop sessions), use the 
+		programs <ulink url="apt:istanbul"><application>Istanbul</application></ulink> 
+		or <ulink url="apt:gtk-recordmydesktop"><application>gtk-recordMyDesktop</application></ulink>.
+		</listitem> 
+		<listitem>
+		Use <ulink url="apt:cheese"><application>Cheese</application></ulink> 
+		to record video using a webcam.
+		</listitem>
+		<listitem>
+		To backup DVD's, use <ulink url="apt:thoggen"><application>Thoggen 
+		DVD Ripper</application></ulink> which rips video DVD files into 
+		patent-free, royalty-free, Ogg/Theora video files, or 
+		<ulink url="apt:acidrip"><application>AcidRip</application>
+		</ulink> which provides a bit more flexibilty by encoding video 
+		DVD files into other video formats.
+		</listitem>
+		<listitem>
+		<ulink url="apt:kdenlive"><application>Kdenlive</application></ulink>, 
+		<ulink url="apt:kino"><application>Kino</application></ulink>, 
+		and <ulink url="apt:pitivi"><application>PiTiVi Video Editor</application>
+		</ulink> are some of the programs available to edit video.
+			<para>
+			<application>Kdenlive</application> is multi-track video 
+			editor that offers support for a range of camcorders and 
+			cameras.  It includes guides and markers to organize 
+			timelines, support for a wide range of codecs and formats, 
+			and the capability to use different media types such as 
+			video, audio and images.
+			</para> 
+			<para>
+			<application>Kino</application> is a video editor that 
+			features excellent integration with IEEE-1394 (Firewire) 
+			for capture, VTR control, and recording back to the camera.  
+			It captures video to disk in Raw DV and AVI format, in both 
+			type-1 DV and type-2 DV (separate audio stream) encodings.
+			</para>
+			<para>
+			<application>PiTiVi Video Editor</application> is a simple, 
+			easy to use video editor.
+			</para>
+		</listitem>
+		<listitem>
+		<ulink url="apt:devede"><application>DeVeDe</application></ulink> 
+		is a DVD authoring application capable of creating DVD discs 
+		which can be played in set-top DVD players.
+		</listitem>
+		<listitem>
+		Some other interesting recording and video editing programs 
+		include <ulink url="apt:stopmotion"><application>Stopmotion</application>
+		</ulink> that creates videos using the stop-motion animation technique, 
+		and <ulink url="apt:subtitleeditor"><application>Subtitle Editor</application>
+		</ulink> that edits subtitles for videos.
+		</listitem>
+	</itemizedlist>
+	<para>
+	More recording and video editing program options are available in the
+	<application>Ubuntu Software Center</application> or 
+	<application>Synaptic Package Manager</application>.  See the 
+	<ulink type="help" url="ghelp:add-applications">Add Applications</ulink> 
+	section for help on installing new software.
+	</para>
     </sect1>
     
 <!--<sect1 id="codecs" status="review">

# Begin bundle
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