Index: general.ent
===================================================================
--- general.ent	(revision 37bea214402f239356a4659e0d4a36723a60349c)
+++ general.ent	(revision c91a73e07a1017b5c13398d9797d6fe775c65af1)
@@ -984,6 +984,6 @@
 <!ENTITY CDParanoia-version           "III-10.2">
 <!ENTITY freetts-version              "1.2.1">
-<!ENTITY audacious-version            "3.2">
-<!ENTITY audacious-plugins-version    "3.2">
+<!ENTITY audacious-version            "3.2.1">
+<!ENTITY audacious-plugins-version    "3.2.1">
 <!ENTITY amarok-version               "2.5.0">
 <!ENTITY gnome-media-version          "2.32.0">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 37bea214402f239356a4659e0d4a36723a60349c)
+++ introduction/welcome/changelog.xml	(revision c91a73e07a1017b5c13398d9797d6fe775c65af1)
@@ -51,4 +51,7 @@
           <para>[abenton] - Added Gsl 1.15.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - Audacious 3.2.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 37bea214402f239356a4659e0d4a36723a60349c)
+++ multimedia/audioutils/audacious.xml	(revision c91a73e07a1017b5c13398d9797d6fe775c65af1)
@@ -5,13 +5,14 @@
   %general-entities;
 
-  <!ENTITY audacious-download-http "http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
-  <!--<!ENTITY audacious-download-ftp "&gentoo-ftp-repo;/audacious-&audacious-version;.tbz2">-->
+  <!ENTITY audacious-download-http
+  "http://distfiles.audacious-media-player.org/audacious-&audacious-version;.tar.bz2">
   <!ENTITY audacious-download-ftp         " ">
-  <!ENTITY audacious-md5sum               "e968feb712a229e2be0315a855d1c96d">
-  <!ENTITY audacious-size                 "711 KB">
-  <!ENTITY audacious-buildsize            "63 MB (typical)">
+  <!ENTITY audacious-md5sum               "77468d00e8bd47c92f818fcae0090931">
+  <!ENTITY audacious-size                 "704 KB">
+  <!ENTITY audacious-buildsize            "63 MB">
   <!ENTITY audacious-time                 "1 SBU">
-  <!ENTITY audacious-plugins-download "http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
-  <!ENTITY audacious-plugins-md5sum       "2df0b105bf0662f116de2ecbe0c0a107">
+  <!ENTITY audacious-plugins-download
+  "http://distfiles.audacious-media-player.org/audacious-plugins-&audacious-plugins-version;.tar.bz2">
+  <!ENTITY audacious-plugins-md5sum       "d7ce63e2e1837e41334d60eef325a80e">
   <!ENTITY audacious-plugins-size         "1.9 MB">
 
@@ -35,6 +36,8 @@
     <title>Introduction to Audacious</title>
 
-    <para><application>Audacious</application> is a Gtk+ based audio
-    player.</para>
+    <para>
+        <application>Audacious</application> is a Gtk+ based audio
+    player.
+        </para>
 
     &lfs71_checked;
@@ -43,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&audacious-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&audacious-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &audacious-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &audacious-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &audacious-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &audacious-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&audacious-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&audacious-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &audacious-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &audacious-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &audacious-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &audacious-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -66,11 +81,17 @@
     <title>Required</title>
       <listitem>
-        <para>Plugins: <ulink url="&audacious-plugins-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Md5 sum: &audacious-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Size: &audacious-plugins-size;</para>
+        <para>
+          Plugins: <ulink url="&audacious-plugins-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Md5 sum: &audacious-plugins-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Size: &audacious-plugins-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -79,18 +100,24 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk3"/> or <xref linkend="gtk2"/> (if
-    both are installed it defaults to using <xref linkend="gtk3"/>) and
-    <xref linkend="libmowgli"/></para>
+    <para role="required">
+      <xref linkend="gtk3"/> or <xref linkend="gtk2"/> (if both are installed it
+      defaults to using <xref linkend="gtk3"/>) and
+      <xref linkend="libmowgli"/>
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="optional"><xref linkend="dbus"/></para>
+    <para role="optional">
+      <xref linkend="dbus"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pcre"/> or
-    <ulink url="http://www.geocities.jp/kosako3/oniguruma/">Oniguruma</ulink>,
-    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
-    Code</ulink> (a.k.a. libsamplerate),
-    <ulink url="http://www.atheme.org/project/libguess">libguess</ulink> and
-    <xref linkend="doxygen"/></para>
+    <para role="optional">
+      <xref linkend="pcre"/> or
+      <ulink url="http://www.geocities.jp/kosako3/oniguruma/">Oniguruma</ulink>,
+      <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit Code</ulink>
+      (a.k.a. libsamplerate),
+      <ulink url="http://www.atheme.org/project/libguess">libguess</ulink> and
+      <xref linkend="doxygen"/>
+      </para>
 
 
@@ -119,12 +146,12 @@
       <ulink url="http://sourceforge.net/projects/libcue/">libcue</ulink>,
       <ulink url="http://sourceforge.net/projects/bs2b/">The Bauer
-        stereophonic-to-binaural DSP (bs2b) library</ulink>,
+      stereophonic-to-binaural DSP (bs2b) library</ulink>,
       <ulink url="http://sourceforge.net/projects/libbinio/">libbinio</ulink>, and
       <ulink url="http://www.wavpack.com/">WavPack</ulink>.
     </para>
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/audacious"/></para>
-
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/audacious"/>
+    </para>
   </sect2>
 
@@ -132,17 +159,44 @@
     <title>Installation of Audacious</title>
 
-    <para>Install <application>Audacious</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Audacious</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>TPUT=/bin/true ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/audacious-&audacious-version;/README</userinput></screen>
-
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Audacious Plugins</title>
+
+    <para>
+      Install the required plugins package by unpacking the tarball, changing
+      into the newly created directory, and issuing the following
+      commands:
+    </para>
+
+<screen><userinput>TPUT=/bin/true ./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
@@ -150,35 +204,12 @@
     <title>Command Explanations</title>
 
-    <para><parameter>TPUT=/bin/true</parameter>: the default is for
-    <command>make</command> to output text in color. This is fine if you're
-    building in a terminal, but if you script the build process and pipe the
-    output from <command>make</command> to a log file then the control
-    characters used to color the text can make the logfile unreadable. This
-    option stops it coloring the text.</para>
-
-    <para><option>--enable-one-plugin-dir</option> and
-    <option>--disable-user-plugin-dir</option>: These options are used to
-    determine how the plugins are stored. Review the output from
-    <command>./configure --help</command> for information.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Audacious Plugins</title>
-
-    <para>Install the required plugins package by unpacking the tarball,
-    changing into the newly created directory, and issuing the following
-    commands:</para>
-
-<screen><userinput>TPUT=/bin/true ./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
+    <para>
+      <parameter>TPUT=/bin/true</parameter>: the default is for
+      <command>make</command> to output text in color. This is fine if you're
+      building in a terminal, but if you script the build process and pipe the
+      output from <command>make</command> to a log file then the control
+      characters used to color the text can make the logfile unreadable. This
+      option stops it coloring the text.
+    </para>
   </sect2>
 
@@ -186,9 +217,10 @@
     <title>Configuring Audacious</title>
 
-    <para>If you prefer the old, smaller, Winamp/XMMS interface click on
-    View&gt; Interface&gt; Winamp Classic Interface</para>
-
-
-  </sect2>
+    <para>
+      If you prefer the old, smaller, Winamp/XMMS interface click on View&gt;
+      Interface&gt; Winamp Classic Interface
+    </para>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -201,12 +233,17 @@
       <seglistitem>
         <seg>audacious and audtool</seg>
-        <seg>libaudacious.so, libaudclient.so, libaudgui.so and numerous
-        Container, Effect, General, Input, Output, Transport and Visualization
-        plugin modules (exactly what gets installed depends on the dependencies
-        you installed first)</seg>
-        <seg>/usr/include/audacious, /usr/include/libaudcore,
-        /usr/include/libaudgui, /usr/lib/audacious and
-        /usr/share/audacious
-        <!--/usr/share/doc/audacious-&audacious-version;,-->
+        <seg>
+          libaudacious.so,
+          libaudclient.so,
+          libaudgui.so and
+          numerous Container, Effect, General, Input, Output, Transport and
+          Visualization plugin modules (exactly what gets installed depends on
+          the dependencies you installed first).</seg>
+        <seg>
+          /usr/include/audacious,
+          /usr/include/libaudcore,
+          /usr/include/libaudgui,
+          /usr/lib/audacious and
+          /usr/share/audacious.
         </seg>
       </seglistitem>
@@ -221,6 +258,8 @@
         <term><command>audacious</command></term>
         <listitem>
-          <para>is a Gtk2 port of <application>XMMS</application> based on the
-          <application>Beep Media Player</application>.</para>
+          <para>
+            is a Gtk2 port of <application>XMMS</application> based on the
+            <application>Beep Media Player</application>.
+          </para>
           <indexterm zone="audacious audacious-prog">
             <primary sortas="b-audacious">audacious</primary>
@@ -232,6 +271,8 @@
         <term><command>audtool</command></term>
         <listitem>
-          <para>is a small tool to modify the behavior of a running
-          <command>audacious</command> instance.</para>
+          <para>
+            is a small tool to modify the behavior of a running
+            <command>audacious</command> instance.
+          </para>
           <indexterm zone="audacious audtool">
             <primary sortas="b-audtool">audtool</primary>
@@ -243,7 +284,8 @@
         <term><filename class='libraryfile'>libaudacious.so</filename></term>
         <listitem>
-          <para>contains functions that are used by
-          <command>audacious</command> to render its
-          graphical interface.</para>
+          <para>
+            contains functions that are used by <command>audacious</command> to
+            render its graphical interface.
+          </para>
           <indexterm zone="audacious libaudacious">
             <primary sortas="c-libaudacious">libaudacious.so</primary>
@@ -256,5 +298,7 @@
         <term><filename class='libraryfile'>libaudclient.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>
+            contains functions that .....
+          </para>
           <indexterm zone="audacious libaudclient">
             <primary sortas="c-libaudclient">libaudclient.so</primary>
@@ -266,5 +310,7 @@
         <term><filename class='libraryfile'>libaudgui.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>
+            contains functions that .....
+          </para>
           <indexterm zone="audacious libaudgui">
             <primary sortas="c-libaudgui">libaudgui.so</primary>
@@ -273,8 +319,5 @@
       </varlistentry>
 -->
-
     </variablelist>
-
-  </sect2>
-
+  </sect2>
 </sect1>
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 37bea214402f239356a4659e0d4a36723a60349c)
+++ xsoft/other/inkscape.xml	(revision c91a73e07a1017b5c13398d9797d6fe775c65af1)
@@ -100,5 +100,4 @@
       <xref linkend="gnome-vfs"/>,
       <xref linkend="imagemagick"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="popt"/>,
       <xref linkend="doxygen"/>,
@@ -162,10 +161,4 @@
 <screen><userinput>./configure --prefix=/usr --disable-lcms &amp;&amp;
 make</userinput></screen>
-
-    <!--
-    <para>
-      This package does not come with a working test suite.
-    </para>
-    -->
 
     <para>
