Patch for bug 370085 - (Music: consider not recommending gpixpod)

[Michael Fitzhugh]

Here's a patch for bug 370085 - (Music: consider not recommending
gpixpod). I removed the reference to gpixpod and elaborated on current
state or iPod and iPhone support in commonly available music
management packages, ending with a pointer to the community docs,
which offer further instructions about using portable devices.

- Michael

Michael Fitzhugh
(415) 269-7757 - cell
michael.fitzhugh at gmail.com
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: michael.fitzhugh at gmail.com-20090511203052-\
#   3kbhkl9gn8us838h
# target_branch: http://bazaar.launchpad.net/%7Eubuntu-core-\
#   doc/ubuntu-doc/ubuntu-karmic/
# testament_sha1: 8418171f69e06f9c0a6c814418e69c3ce4a5739e
# timestamp: 2009-05-11 13:34:16 -0700
# base_revision_id: mdke at ubuntu.com-20090429220413-mnxcp87uywznpasb
# 
# Begin patch
=== modified file 'musicvideophotos/C/music.xml'
--- musicvideophotos/C/music.xml	2009-04-18 21:21:16 +0000
+++ musicvideophotos/C/music.xml	2009-05-11 20:30:52 +0000
@@ -153,12 +153,26 @@
         <sect2 id="music-portable-ipod" status="review">
         	<title>iPod</title>
 			<para>
-			If you have a portable music player which can also display photos and 
-			videos, you may prefer to use <ulink url="apt:banshee">Banshee</ulink>, 
-			which is a music player with good support for such devices. 
-			iPod owners may also like to try specialized applications such as 
-			<ulink url="apt:gpixpod">GPixPod</ulink> and 
-			<ulink url="apt:gtkpod">gtkpod</ulink> for handling multimedia.
+			Ubuntu's default music management application,
+			<application>Rhythmbox</application> (&rhythmbox;), supports first to fifth
+			generation iPods, including the iPod mini, iPod Photo, iPod Shuffle, iPod nano,
+			and iPod Video. Rhythmbox can transfer music to these iPods and create playlists.
+			</para>
+			<para>
+			The applications <ulink url="apt:banshee">Banshee</ulink>, <ulink
+			url="apt:amarok">Amarok</ulink> and <ulink url="apt:gtkpod">gtkpod</ulink> can
+			also handle music transfer to and from these iPod devices. These applications
+			also include added support for transferring photos and videos encoded in
+			iPod-compatible formats to and from first to fifth generation iPods
+			</para>
+			<para>
+			Neither the iPod Touch nor the iPhone are officially supported by any Linux
+			music management applications at this time.
+			</para>
+			<para>
+			For more information on using iPods and iPhones with Ubuntu, see the <ulink
+			url="https://help.ubuntu.com/community/PortableDevices">Ubuntu Community
+			Documentation for Portable Devices</ulink>.
 			</para>
 		</sect2>
 		<sect2 id="music-portable-mtp" status="review">

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ0fPL0AAgjfgAAwWef//3+H
XwC////wUAWGb3XQRNbWxLM2yWwkkTQU9ExqnsmieU1PaAhoIBo8oDynqCIJNkmnmpGgBkNDQMjQ
aaAANAlNJoUeRJ4im1GEmmEzU/1SegAGhGBDmmJkyaMJgmJpgEwCGCMCMAkiQaNGiU/QZBMk2qeh
D9TSA0A0BvVGBDAIn/TT2Loyw/eOHq/pxK6pif81zFsFGMsLS5Ox8QDu1zlJwmjmqPXGwzUcTlFG
MzDPndTxyceXOL912Rx8zpb1XfbHaTkbcqiUor0aSUOLYUf7T2dPLeu0xtKRoO+TkrPxeZSc9vEn
swU70neHs9JxeHl/yL2idomB0glamhQCDIYBainEDqZe8xVr9m2bPYKV/SQhrwurE7JBddze3o5L
Vr05+LznZ1pN+0mI48NwvqNlucFm0544vnb19QMJmS5YV5ZC7zx+Tq4sNESRflF1s482BZ1cxoIC
+k0P7OlCoEbxDxkJMWObGuRVwayRXiP90pjT2tJxrO/dVyW3FvETLGRS0I1r3ih+S5qeDlMT0nPJ
K9oIUxYKbmyvLNURKn2FPPMlYXQhXFMGozGIYEilYOA4ObXPhE9W0yFEyGLxU3yozkOEHdf9AtPW
sOAx2KS4z1te88c6yYKDuV4bazVhuImJ3LrbTR6yiFpG3gblvOTGhl6lfOBWfOtOtZsIOotfGDv7
BQsvOiwgSr2GqgW/qK6QJlxJlRoKzkrdeYqtMWQmjQwClPQkvU3qOhenhyclJsmR1o7wT7a0uLp4
NF3XFElxG/jU1ylRypmDwRDtqzSDNGaEP8dCFvm7oq/9tLscDimJclnSoh3c7WLXQ050YtvIBoaw
2i86jdpff6WgXlgTPRLI1HtoL+RUV3JVtbXQvLrSbvR1wXPIUGFcMmdieUqYOUYCbZTfx6zMXG5h
+TuJyQpNQvZmYwKnmrBZNQSBBlMtPM6H2RKhZHhKCZ3ETZ18AVXPt7FC1qnR0d0M44kh3MQzxNSb
eUhnpixzkzoMs6abthN++R1hPRMG1tei9a+SIcPZtL21EMntaF5qiyNt5lMcsN0x1ngDx0W7EmGe
UaZv6Jb6HTWF/uYHPS59qRIzJCunRYccbGhlhrKMWrCGpcixXL+JNcBJUbNZoeZCZgHNeLM8KTfp
ctqUWN6GbWxMeE0FrLQI/GAHFLxFwm91fcXOM70zPSdUDAXoc2UsDyfEy7BMuQafTnsA3am7Vm3H
VhSMrBJRFiS7xSKHPalon6I6SdR4EZ4pMoKYe8NT4TjfgB8vn7rLLJIZMMDK49MALe/a/Wd4peEo
lJmx73Zw+ItYaBgLEnNdknSuVFYqwi0XSNPQ97RC3gcLfV7pmHb6qhqhLvSsJOmJHK2vUjOhuN2v
fmfeRsZYc/ybJuDRfCMSpPqRayrgbBnTaDIByjWeY7sDgoOtQKBsMhwKV8raVqhEQKmRWg8IBgqe
NCOY3raPP49UF7N4OHHUwQQu7GFDAzCORkzqpGFPnhDAPLKCJkxlSGKm+eksyuroUWCxaE5zs6xK
CheBjALhsHIsFaie4t8N2cLspO4uVz1qBoDhVngUadWU+aY2P+T3Jpe6uMcQki6RgVagqjyIoc2u
OMvGAw793lU1RU71ii5AZvIuUFjvuTF45YBICFi4kTEaywKuD2sUq8rmDeKdJlPISKkoIh8LFdMF
IHTatpXYQzjGBLSBp4hiz4Q0qbKSJJrfy7A8kkBVBD8PxD87rsS35MBvDgGWPLyOaDJHbYNT9Yqk
qMtK4mJ6/BnUbANvLVdIrJVlUqsfRa/MzmanKp18C+RgVAhr9h/4u5IpwoSAaPnl6A==