# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: heymrdjd@gmail.com-20100920142600-gf2o7vulh0jtwz63
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/xubuntu-\
#   docs/maverick/
# testament_sha1: 33da84c3fbf84dd9f8229dfa6924e0fa44875ce0
# timestamp: 2010-09-20 09:35:41 -0500
# base_revision_id: heymrdjd@gmail.com-20100920055534-dt5wnrjmax4334xs
# 
# Begin patch
=== modified file 'desktop-guide/musicvideophotos/C/troubleshooting-multimedia.xml'
--- desktop-guide/musicvideophotos/C/troubleshooting-multimedia.xml	2009-09-13 23:29:38 +0000
+++ desktop-guide/musicvideophotos/C/troubleshooting-multimedia.xml	2010-09-20 14:26:00 +0000
@@ -14,13 +14,13 @@
 	<title>Solutions to common problems</title>
 	<para>This section offers some solutions to commonly asked problems.</para>
 	<orderedlist>
-		<listitem><para>Song names and covert art are wrong, see <xref linkend="music-missingmetadata" /></para></listitem>
-		<listitem><para>Listen can't rip an MP3, see <xref linkend="music-missingmetadata" /></para></listitem>
+		<listitem><para>Song names and cover art are wrong, see <xref linkend="music-missingmetadata" /></para></listitem>
+		<listitem><para><application>Exaile</application> can't rip an MP3 file, see <xref linkend="music-missingmetadata" /></para></listitem>
 		<listitem><para>My MP3 player works in Windows but not in Xubuntu, see <xref linkend="music-portable-mtp" /></para></listitem>
-		<listitem><para>I cant play videos, see <xref linkend="video-dvd" /></para></listitem>
-		<listitem><para>I can't find menus on dvd, see <xref linkend="video-dvdmenus" /></para></listitem>
+		<listitem><para>I can't play videos, see <xref linkend="video-dvd" /></para></listitem>
+		<listitem><para>I can't find menus on DVD, see <xref linkend="video-dvdmenus" /></para></listitem>
 		<listitem><para>I can't play Quicktime or WMV, see <xref linkend="video-playback-file" /></para></listitem>
-		<listitem><para>I can't play flash video, see <xref linkend="video-playback-flash" /></para></listitem>
+		<listitem><para>I can't play Flash video, see <xref linkend="video-playback-flash" /></para></listitem>
 		<listitem><para>I can't play Realmedia, see <xref linkend="video-realplayer" /></para></listitem>
 		<listitem><para>My microphone isn't working, see <xref linkend="music-microphone" /></para></listitem>		
 	</orderedlist>

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