# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: peppe84@ubuntu-it.org-20110422084531-jxr1ibtoujofmrw3
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu-\
#   docs/natty/
# testament_sha1: b6072053388a6968fc501e1d9ccc65c7fcfee01b
# timestamp: 2011-04-22 10:45:49 +0200
# base_revision_id: mdke@ubuntu.com-20110422075806-m2ktearynn0lrmoi
# 
# Begin patch
=== modified file 'internet/C/web-apps.xml'
--- internet/C/web-apps.xml	2010-10-06 15:48:21 +0000
+++ internet/C/web-apps.xml	2011-04-22 08:45:31 +0000
@@ -52,7 +52,7 @@
 			<sect3 id="web-browsing-addons-audiovideo" status="review">
 				<title>Audio and video plugins</title>
 				<para>Many different multimedia formats are used on the Internet and you may find that you are unable to play some audio and video files without installing an appropriate plugin.</para>
-				<para>Quicktime, Real, WMV and many others are available.</para>
+				<para>Quicktime, WMV and many others are available.</para>
 				<orderedlist>
 					<listitem><para>Open &software-center;.</para></listitem>
 					<listitem><para>Click <guibutton>Sound &amp; Video</guibutton>.</para></listitem>

=== modified file 'musicvideophotos/C/music.xml'
--- musicvideophotos/C/music.xml	2011-04-22 07:08:15 +0000
+++ musicvideophotos/C/music.xml	2011-04-22 08:45:31 +0000
@@ -283,7 +283,7 @@
         <para>
         <emphasis role='strong'>RealAudio streams</emphasis>, as used by some 
         Internet radio stations, are not supported by Banshee. To listen to 
-        this type of stream, <link linkend="video-realplayer">
+        this type of stream, <link linkend="video-playback-streaming">
         install RealPlayer</link>.
         </para>
     </sect1>

=== modified file 'musicvideophotos/C/video.xml'
--- musicvideophotos/C/video.xml	2010-03-21 20:56:43 +0000
+++ musicvideophotos/C/video.xml	2011-04-22 08:45:31 +0000
@@ -137,8 +137,7 @@
         </para>
         <para>
         The most reliable way of playing RealVideo-format videos is to install 
-        the official RealPlayer software. See <link linkend="video-realplayer">
-        Installing and configuring RealPlayer</link> for full instructions.
+        the official RealPlayer software. See <ulink url='https://help.ubuntu.com/community/RealPlayer'>community help wiki</ulink> for full instructions.
         </para>
         <para>
         Support for most other types of streaming video can be added by 
@@ -164,55 +163,7 @@
         </sect2>
         
     </sect1>
-    
-    <sect1 id="video-realplayer" status="review">
-        <title>Installing and configuring RealPlayer</title>
-        <para>
-        RealPlayer is a proprietary application, and so is not installed in the 
-        usual way.
-        </para>
-        <procedure>
-        <step>
-            <para>
-            Download a suitable Linux installer from the 
-            <ulink url='http://uk.real.com/player/select/'>
-            RealPlayer website</ulink> and save it in your Home folder.
-            </para>
-        </step>
-        <step>
-            <para>
-            Open a Terminal (&terminal;) and type the following, pressing 
-            <keycap>Enter</keycap> at the end of each line and typing your 
-            password when prompted:
-            </para>
-            <screen>
-sudo chmod a+x RealPlayer*
-sudo ./RealPlayer*</screen>
-        </step>
-        <step>
-            <para>
-            You should see the text <guilabel>Extracting files for Helix 
-            installation</guilabel> on the screen if the installer has started 
-            properly. When asked a question by the installer, press 
-            <keycap>Enter</keycap> to accept the default.
-            </para>
-        </step>
-        <step>
-            <para>
-            When the installer has finished copying files, press &realplayer; 
-            and follow the instructions on the screen to complete set-up.
-            </para>
-        </step>
-        </procedure>
-        
-        <para>
-         For more in-depth instructions, see the <ulink 
-         url='https://help.ubuntu.com/community/RealPlayerInstallationMethods'>
-         community help wiki</ulink>.
-        </para>
-        
-    </sect1>
-    
+               
     <sect1 id="video-editing" status="review">
         <title>Recording and editing video</title>
         <para>Ubuntu offers numerous programs for recording and editing video.</para>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVQus1EAAtFfgEQ4UOf/91KC
fYC////wUAWYkzxFLdrkNXbNxa4SRUaehMhT8jJplTbISeUe1T0hoGjQNBJQTAjRNTMimam1NGmg
9QaAAAEkImhTyGjSeiepGjIPUGmgHqD1B6g5gE0wCZDAAEwTAAABJJMqfqbTTRoVPTSPJimjIaeo
aAAZNHmMpacNbZrVa644zKbduUARljv0ICU9+mciyOilk3pgIdWYr2q1MmYZmY4/IDlKprWTt0QP
exDQwzPKUZ0+GPHdE+/lHLm6z/ESb62yfaqE6oSbi4sba+Wum0qfQm3tU6u+1/VGXycAoa+HnVEe
snL0wRCkERLTnCB+H1YV/tIyCOC88yOPdbdTZI8tLImSLoS7HGHPDcr8vDV78Z6VEjqatB1suxh2
WxmOxIZklJD6TMOAZWWlTIYSrgGhSaRWxIOqaOiBDg8koCm5ULm4rcjCTEr5tGMve8rgkeKq2+7A
SoHedJ28pCVURR5CsI3QRBDN1pR1gWsrEENaP6JzllO81SPX1aFdhbQiu8MzPTC4R6A189HCMmAK
35iVrkRfsEue0jzIhkGeMB9oXXZDh6zwGgPxmKQxM4tijepBTHwL2DYEYIsTSeFoiNLIBkOHdOsi
ERlNHlCRx3EMy8t5oy0kYVuRvatGA4S/iNv9wyGCIFClfCGqLPNpIlJm4HJGp5w3Gh0h4GbaSq3o
vs1kXXBlqTCJGoi+Gc2GMsOCutNx6rB9qJGniF+Fw01re5m45ZWFp5sXTIOoxGkEZmFjBjzLerVY
mQ5XvUOGY2o/cX8aXMDGyLFsyY0syUZIvrCU9hgjNO1eQurSORFQKREYGxIo1hmQro/psxyYuxLS
I5qFxlQNVRxAawvZ5WOZwx13FmjUUJWK489xwm8gZtDdOva0TwRAWyhGx63eoJBRyNZZ4BZ4scql
OWpnfmmHZmq3e0ax73+nKGtIlJGCZMMfdt/hRO7sjBj9NmtVzAb+54ujcNYjXN1yMC9Xm8wJcTps
sOZ2amamMXXt35kzVpq822GrGY42Ic2oKKc1WE9gc45hmdwYo03jzUixxAuXpuM+rQR3oDtSOtOU
CBy5ndgeolWAWvuJmRrgOGfFuyUtnTpmz0S08Z6SlhzWaaywkQ5IiPJEhmPTnGVnKIKrTgHDgHqk
2x1R7JJME/TPlyhHNi8O7CzIkUdFnXYIaG1sPOphaf4tRBdNzFJt/vffjW1cfdfRW0nJygqoDFMi
8NNqRoWS2qL/SwpuJs4o0s2XfjMcOpuNgwdZPiFAk76LsXWniNrl7L0PssnDMRMG7Ev67A2AVSS9
cmRsPHZvoAk3hAy1zT4CIJ66cbfRKYH2qe4MuckgeteIst3aD5d/T0R0FLhUVUiei8IqmfkEUEbq
DDSBn9nbuF2qW629BV1heLBE4uZZ1qndzTr5sLbSWwfa0p1U8VyVar8JdSuDRGncfZ5IJQ1xUIh2
9PERavn2NO4wTKDUUrjmFnBxXROCgdCIWHMkzIggHKNPLAK5NefIRtxW3ckTFybUTmL5pDrCFdg4
jMxRfPd48oTIkFmXS6RQ3gyqrvpxRHeC4UUnrHsRCcGmxDOIhg4eLluzeTGIK8toSSIT7MXrRSpd
lFdaI3TEYuWCtwjMJcadWNtGBir3qonKa62GdCQmzwdRpNIg5yyFhzb3KtRY88WtfGmg2Qiu4V6y
EXQQ03Rq7roQG+SpYyA5AHHXLxqI38LjcqoCt9Hr2hWq5B1FzbRYiM9spt5rL+HoCzJBwEd96Vl1
TaXdvjd0ydU6qlLrLQlCFQR9Q/4u5IpwoSCoXWai