Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision e7138cbbc5b04c4df33aa86c771c811d4a911079)
+++ multimedia/audioutils/amarok.xml	(revision fc7a8b79233f94af8715591c3a2971f2937a352e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY amarok-download-http "http://mirrors.isc.org/pub/kde/stable/amarok/1.4.8/src/amarok-1.4.8.tar.bz2">
-  <!ENTITY amarok-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/amarok/1.4.8/src/amarok-1.4.8.tar.bz2">
+  <!ENTITY amarok-download-http "http://mirrors.isc.org/pub/kde/stable/amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
+  <!ENTITY amarok-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
   <!ENTITY amarok-md5sum        "7f65c4a8f3f0ff9042a5b5dd21b36cc8">
   <!ENTITY amarok-size          "13 MB">
@@ -31,5 +31,7 @@
 
     <para><application>Amarok</application> is an audio player for KDE.
-    Features include a context browser, Magnatunes and last.fm integration,
+    Features include a context browser, 
+    <ulink url="http://www.magnatunes.com/">Magnatunes</ulink> and 
+    <ulink url="http://www.last.fm/">Last.fm</ulink> integration,
     support for multimedia devices, and scripting through Ruby.</para>
 
@@ -56,5 +58,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">amarok Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Amarok Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -64,5 +66,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="kdebase"/>, and
+    <para role="recommended"><xref linkend="kdebase"/> and
     <xref linkend="xine-lib"/></para>
 
@@ -81,5 +83,5 @@
     <ulink url="http://ifp-driver.sourceforge.net/libifp/">libifp</ulink>,
     <ulink url="http://libnjb.sourceforge.net/">libnjp</ulink>,
-    <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>,
+    <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink>, and
     <ulink url="http://linux-karma.sourceforge.net/">libkarma</ulink> (requires
     <ulink url="http://linux-karma.sourceforge.net/">omfs</ulink>)</para>
@@ -91,5 +93,5 @@
 
   <sect2 role="installation">
-    <title>Installation of amarok</title>
+    <title>Installation of Amarok</title>
 
     <para>Install <application>Amarok</application> by running the following
@@ -125,11 +127,11 @@
 
     <para><parameter>--without-included-sqlite</parameter>: This option forces
-    the use of a system-installed copy of sqlite.</para>
+    the use of a system-installed copy of <application>SQLite</application>.</para>
 
     <para><parameter>--enable-mysql</parameter>: This option enables use of a 
-    MySQL database for music collections.</para>
+    <application>MySQL</application> database for music collections.</para>
 
     <para><parameter>--enable-postresql</parameter>: This option enables use of a
-    PostgreSQL database for music collections.</para>
+    <application>PostgreSQL</application> database for music collections.</para>
 
     <para>Support for other optional dependencies may require passing options 
@@ -165,5 +167,5 @@
         <term><command>amarok</command></term>
         <listitem>
-          <para>is a wrapper for amarokapp to speed up
+          <para>is a wrapper for <command>amarokapp</command> to speed up
           command line argument passing</para>
           <indexterm zone="amarok amarok-prog">
@@ -176,5 +178,5 @@
         <term><command>amarokapp</command></term>
         <listitem>
-          <para>is the amarok audio player</para>
+          <para>is the <application>Amarok</application> audio player</para>
           <indexterm zone="amarok amarokapp">
             <primary sortas="b-amarokapp">amarokapp</primary>
@@ -196,5 +198,5 @@
         <term><command>amarok_daapserver.rb</command></term>
         <listitem>
-          <para>is a DAAP server for Amarok</para>
+          <para>is a DAAP server for <application>Amarok</application></para>
           <indexterm zone="amarok amarok_daapserver.rb">
             <primary sortas="b-amarok_daapserver.rb">amarok_daapserver.rb</primary>
@@ -206,5 +208,6 @@
         <term><command>amarok_proxy.rb</command></term>
         <listitem>
-          <para>is a proxy server for DAAP and Last.fm</para>
+          <para>is a proxy server for DAAP and 
+          <ulink url="http://www.last.fm/">Last.fm</ulink></para>
           <indexterm zone="amarok amarok_proxy.rb">
             <primary sortas="b-amarok_proxy.rb">amarok_proxy.rb</primary>
