diff --git a/multimedia/audioutils/mpg123.xml b/multimedia/audioutils/mpg123.xml
index e2807bb578..942ce74a88 100644
--- a/multimedia/audioutils/mpg123.xml
+++ b/multimedia/audioutils/mpg123.xml
@@ -4,7 +4,6 @@
&mpg123-intro;
&mpg123-inst;
-&mpg123-exp;
&mpg123-desc;
diff --git a/multimedia/audioutils/mpg123/mpg123-desc.xml b/multimedia/audioutils/mpg123/mpg123-desc.xml
index d53b2b6ebe..1e614305df 100644
--- a/multimedia/audioutils/mpg123/mpg123-desc.xml
+++ b/multimedia/audioutils/mpg123/mpg123-desc.xml
@@ -1,14 +1,16 @@
Contents
-The mpg123 package contains mpg123.
+The mpg123 package contains mpg123
+.
Description
mpg123
-mpg123 is used for playing mp3 files via the console.
+mpg123 is used for playing mp3 files via the console.
+
diff --git a/multimedia/audioutils/mpg123/mpg123-exp.xml b/multimedia/audioutils/mpg123/mpg123-exp.xml
index e35c88d9e4..a9d7f35272 100644
--- a/multimedia/audioutils/mpg123/mpg123-exp.xml
+++ b/multimedia/audioutils/mpg123/mpg123-exp.xml
@@ -1,12 +1,11 @@
Command explanations
-make linux : This command builds
-mpg123 for linux.
-make linux-help : This command lists
-all build-options for mpg123.
-make install : This command installs
-mpg123 in /usr/local/bin.
+make linux : This command builds
+mpg123 for Linux.
+
+make linux-help : This command lists
+all build-options for mpg123.
diff --git a/multimedia/audioutils/mpg123/mpg123-inst.xml b/multimedia/audioutils/mpg123/mpg123-inst.xml
index 56e42c78bc..675a6bec1e 100644
--- a/multimedia/audioutils/mpg123/mpg123-inst.xml
+++ b/multimedia/audioutils/mpg123/mpg123-inst.xml
@@ -1,19 +1,12 @@
-Installation of mpg123
+Installation of mpg123
-Install mpg123 by running the following commands:
+Install mpg123 by running the following
+commands:
-make PREFIX=/usr linux &&
-make PREFIX=/usr install
+make PREFIX=/usr linux &&
+make PREFIX=/usr install
-You can optimize the build of mpg123 for your processor.
-To do this, type
-make linux-help
-
-and select the optimization appropriate for your machine.
-However, this may not always work. There have been problems reported
-with using optimizations with mpg123; make PREFIX=/usr linux always
-seems to work.
diff --git a/multimedia/audioutils/mpg123/mpg123-intro.xml b/multimedia/audioutils/mpg123/mpg123-intro.xml
index 7dc1779635..7da4b7db28 100644
--- a/multimedia/audioutils/mpg123/mpg123-intro.xml
+++ b/multimedia/audioutils/mpg123/mpg123-intro.xml
@@ -1,16 +1,26 @@
-Introduction to mpg123
+Introduction to mpg123
-Download location (HTTP):
-Download location (FTP):
-Version used: &mpg123-version;
-Package size: &mpg123-size;
-Estimated Disk space required: &mpg123-buildsize;
+The mpg123 package contains a console-based
+mp3 player. It claims to be the fastest mp3 decoder for unix.
-The mpg123 package contains a console-based mp3-player. It claims to
-be the fastest mp3-decoder for unix.
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &mpg123-size;
+Estimated Disk space required:
+&mpg123-buildsize;
+Estimated build time:
+&mpg123-time;
+
+
+mpg123 dependencies
+Required
+oss or
+
-mpg123 depends on:
-oss or
diff --git a/multimedia/audioutils/vorbistools/vorbistools-desc.xml b/multimedia/audioutils/vorbistools/vorbistools-desc.xml
index 6628dfa077..d2f64ae0f3 100644
--- a/multimedia/audioutils/vorbistools/vorbistools-desc.xml
+++ b/multimedia/audioutils/vorbistools/vorbistools-desc.xml
@@ -1,37 +1,41 @@
Contents
-The vorbis-tools package contains oggdec,
-oggenc,
-ogg123, vcut and
-vorbiscomment.
+The vorbis-tools package contains
+oggdec,
+oggenc,
+ogg123, vcut and
+vorbiscomment.
Description
oggdec
-oggdec is a simple decoder which converts Ogg Vorbis file into
-PCM audio files (WAV or RAW).
+oggdec is a simple decoder which converts Ogg Vorbis
+file into PCM audio files (WAV or
+raw.
oggenc
-oggenc is the encoder that turns raw, WAV or AIFF files
+oggenc is the encoder that turns raw,
+WAV or AIFF files
into an Ogg Vorbis stream.
ogg123
-ogg123 is a command line audio player for Ogg Vorbis streams.
+ogg123 is a command line audio player for Ogg Vorbis
+streams.
ogginfo
-ogginfo prints information stored in the audio
+ogginfo prints information stored in the audio
file.
vcut
-vcut will split a file into two files at a designated cut
-point.
+vcut will split a file into two files at a designated
+cut point.
vorbiscomment
-vorbiscomment is an editor that changes information in the audio
-file metadata tags.
+vorbiscomment is an editor that changes information in
+the audio file metadata tags.
diff --git a/multimedia/audioutils/vorbistools/vorbistools-inst.xml b/multimedia/audioutils/vorbistools/vorbistools-inst.xml
index aeb42a689f..efd37b02e1 100644
--- a/multimedia/audioutils/vorbistools/vorbistools-inst.xml
+++ b/multimedia/audioutils/vorbistools/vorbistools-inst.xml
@@ -1,11 +1,12 @@
-Installation of vorbis-tools
+Installation of vorbis-tools
-Install vorbis-tools by running the following commands:
+Install vorbis-tools by running the following
+commands:
-./configure --prefix=/usr &&
+./configure --prefix=/usr &&
make &&
-make install
+make install
diff --git a/multimedia/audioutils/vorbistools/vorbistools-intro.xml b/multimedia/audioutils/vorbistools/vorbistools-intro.xml
index de771ab831..d4fa2aa276 100644
--- a/multimedia/audioutils/vorbistools/vorbistools-intro.xml
+++ b/multimedia/audioutils/vorbistools/vorbistools-intro.xml
@@ -1,18 +1,28 @@
-Introduction to vorbis-tools
+Introduction to vorbis-tools
-Download location (HTTP):
-Download location (FTP):
-Version used: &vorbistools-version;
-Package size: &vorbistools-size;
-Estimated Disk space required: &vorbistools-buildsize;
-Estimated build time: &vorbistools-time;
+The vorbis-tools package contains command line
+tools for ogg audio files. This is useful for encoding, playing or editing
+files using the ogg CODEX.
-The vorbis-tools package contains command line tools for ogg audio
-files. This is useful for encoding, playing or editing files using the ogg CODEX.
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &vorbistools-size;
+Estimated Disk space required:
+&vorbistools-buildsize;
+Estimated build time:
+&vorbistools-time;
+
+
+vorbis-tools dependencies
+Required
+, , and
+
-vorbis-tools depends on:
-, , and
diff --git a/multimedia/audioutils/xmms/xmms-config.xml b/multimedia/audioutils/xmms/xmms-config.xml
index c953de7635..b63929af22 100644
--- a/multimedia/audioutils/xmms/xmms-config.xml
+++ b/multimedia/audioutils/xmms/xmms-config.xml
@@ -1,5 +1,5 @@
-Configuring xmms
+Configuring xmms
Config files
~/.xmms/config
@@ -7,10 +7,10 @@
Configuration Information
-When you start XMMS for the first time, you can configure it with
-CTRL+P Note that you can extend XMMS' functionality
-with plugins and skins. You can find these at .
-
+When you start xmms for the first time, you can
+configure it with CTRL+P Note that you can extend XMMS'
+functionality with plugins and skins. You can find these at
+.
diff --git a/multimedia/audioutils/xmms/xmms-desc.xml b/multimedia/audioutils/xmms/xmms-desc.xml
index d468261319..d698b3ee21 100644
--- a/multimedia/audioutils/xmms/xmms-desc.xml
+++ b/multimedia/audioutils/xmms/xmms-desc.xml
@@ -1,17 +1,18 @@
Contents
-The xmms package contains xmms, xmms-config, gnomexmss and wmxmms.
+The xmms package contains xmms, xmms-config, gnomexmss and wmxmms.
Description
xmms
-XMMS, which stands for X Multimedia System, is a program comparable in
-function with WinAMP. It's main function is playing audio files like wav and
-mp3. It can be extended with plugins to play a number of other audio or video
-formats. It's look can be customized with WinAMP style skins.
+XMMS, which stands for X MultiMedia System, is a
+program comparable in function with WinAMP. It's main function is playing audio
+files like wav and mp3. It can be extended with plugins to play a number of
+other audio or video formats. It's look can be customized with WinAMP style
+skins.
xmms-config
This script is used by other programs which need to link with xmms to
@@ -19,9 +20,10 @@ retrieve the library and include paths XMMS was compiled with.
gnomexmms
This is an applet for the GNOME desktop environment that will dock into
-the GNOME panel. From the applet you can start and control xmms.
+the GNOME panel. From the applet you can start and control
+xmms.
wmxmms
wmxmms is a dock applet for the Window Maker window manager. From the
-applet you ca start and control xmms.
+applet you ca start and control xmms.
diff --git a/multimedia/audioutils/xmms/xmms-exp.xml b/multimedia/audioutils/xmms/xmms-exp.xml
index 5f12c5e942..bc453f93e9 100644
--- a/multimedia/audioutils/xmms/xmms-exp.xml
+++ b/multimedia/audioutils/xmms/xmms-exp.xml
@@ -1,9 +1,8 @@
Command explanations
-./configure --prefix=/usr \
---enable-one-plugin-dir &&
-This command ensures that all plugins are located under
+./configure --prefix=/usr --enable-one-plugin-dir
+ : This command ensures that all plugins are located under
/usr/lib/xmms/Plugins.
diff --git a/multimedia/audioutils/xmms/xmms-inst.xml b/multimedia/audioutils/xmms/xmms-inst.xml
index 40aa4d4c8c..68b4b09e48 100644
--- a/multimedia/audioutils/xmms/xmms-inst.xml
+++ b/multimedia/audioutils/xmms/xmms-inst.xml
@@ -1,11 +1,11 @@
-Installation of XMMS
+Installation of XMMS
-Install XMMS by running the following commands:
+Install XMMS by running the following commands:
+
-./configure --prefix=/usr \
---enable-one-plugin-dir &&
-make &&
-make install
+./configure --prefix=/usr --enable-one-plugin-dir &&
+make &&
+make install
diff --git a/multimedia/audioutils/xmms/xmms-intro.xml b/multimedia/audioutils/xmms/xmms-intro.xml
index f3b7e145b1..47137c1876 100644
--- a/multimedia/audioutils/xmms/xmms-intro.xml
+++ b/multimedia/audioutils/xmms/xmms-intro.xml
@@ -1,17 +1,31 @@
-Introduction to XMMS
+Introduction to XMMS
-Download location (HTTP):
-Download location (FTP):
-Version used: &XMMS-version;
-Package size: &XMMS-size;
-Estimated Disk space required: &XMMS-buildsize;
+XMMS is an audio player for the
+X Window System.
-XMMS is an audio player for the X Window System.
+Package information
+
+Download (HTTP):
+Download (FTP):
+Download size: &XMMS-size;
+Estimated Disk space required:
+&XMMS-buildsize;
+Estimated build time:
+&XMMS-time;
+
+
+XMMS dependencies
+Required
+a working soundcard, , and
+Optional
+, ,
+gnome-applets, libmikmod,
+, and
+
-XMMS depends on:
-a working soundcard, , and
-XMMS will utilize:
-, , gnome-applets, libmikmod,
-, and
diff --git a/multimedia/audioutils/xmms/xmms.ent b/multimedia/audioutils/xmms/xmms.ent
index f2fec5a260..293c12c01c 100644
--- a/multimedia/audioutils/xmms/xmms.ent
+++ b/multimedia/audioutils/xmms/xmms.ent
@@ -9,4 +9,4 @@
-
+