Index: multimedia/audioutils/vorbistools.xml
===================================================================
--- multimedia/audioutils/vorbistools.xml	(revision d0323de45ed10e5ae127aaff70083ea0cdb6590f)
+++ multimedia/audioutils/vorbistools.xml	(revision c67fbf64e9e9860fc2f9db1ebefc10cfbb68877e)
@@ -30,7 +30,9 @@
     <title>Introduction to Vorbis Tools</title>
 
-    <para>The <application>Vorbis Tools</application> package contains
-    command-line tools for Ogg audio files.  This is useful for encoding,
-    playing or editing files using the Ogg CODEC.</para>
+    <para>
+      The <application>Vorbis Tools</application> package contains
+      command-line tools useful for encoding, playing or editing
+      files using the Ogg CODEC.
+    </para>
 
     &lfs73_checked;
@@ -39,20 +41,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&vorbistools-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&vorbistools-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &vorbistools-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &vorbistools-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &vorbistools-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &vorbistools-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&vorbistools-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&vorbistools-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &vorbistools-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &vorbistools-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &vorbistools-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &vorbistools-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -61,5 +75,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libvorbis"/></para>
+    <para role="required">
+      <xref linkend="libvorbis"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional (required to build the
@@ -78,6 +94,6 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/vorbistools"/></para>
-
+      <ulink url="&blfs-wiki;/vorbistools"/>
+    </para>
   </sect2>
 
@@ -85,6 +101,8 @@
     <title>Installation of Vorbis Tools</title>
 
-    <para>Install <application>Vorbis Tools</application> by running the
-    following commands:</para>
+    <para>
+      Install <application>Vorbis Tools</application> by running the
+      following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr \
@@ -93,7 +111,11 @@
 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>
+    <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>
@@ -104,32 +126,14 @@
     <title>Command Explanations</title>
 
-    <!-- <para><command>sed -i '/MUTE/d' ogg123/http_transport.c </command>: This
-    command fixes a build problem with new versions of
-    <application>cURL</application>.</para>
-
-    <para><command>patch -Np1 -i
-    ../vorbis-tools-&vorbistools-version;-utf8-1.patch</command>: This patch
-    fixes a bug in <command>vorbiscomment</command> in UTF-8 locales.</para>
-
-    <para><command>patch -Np1 -i
-    ../vorbis-tools-&vorbistools-version;-flac-1.patch</command>: This patch
-    allows <application>Vorbis-Tools</application> to link against new
-    versions of <application>FLAC</application>.</para>
-
-    <para><command>autoconf</command>: This command is used to regenerate the
-    <command>configure</command> script as the <application>FLAC</application>
-    patch modifies the <filename>configure.ac</filename> file.</para> -->
-
-    <para><parameter>--enable-vcut</parameter>: This parameter is used so that
-    the <command>vcut</command> program is built as it is not by
-    default.</para>
-
-    <!-- <para><parameter>-mandir=/usr/share/man</parameter>: This parameter
-    ensures that the man pages are installed under
-    <filename class="directory">/usr/share/man</filename>.</para> -->
-
-    <para><parameter>--without-curl</parameter>: This parameter disables HTTP
-    streaming in <command>ogg123</command>. Remove this parameter if you have
-    <application>cURL</application> installed.</para>
+    <para>
+      <parameter>--enable-vcut</parameter>: This parameter is used so that
+      the <command>vcut</command> program is built as it is not by default.
+    </para>
+
+    <para>
+      <parameter>--without-curl</parameter>: This parameter disables HTTP
+      streaming in <command>ogg123</command>. Remove this parameter if you have
+      <application>cURL</application> installed.
+    </para>
 
  </sect2>
@@ -141,7 +145,9 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/libao.conf</filename>,
-      <filename>~/.libao</filename>, and
-      <filename>~/.ogg123rc</filename></para>
+      <para>
+        <filename>/etc/libao.conf</filename>,
+        <filename>~/.libao</filename> and
+        <filename>~/.ogg123rc</filename>
+      </para>
 
       <indexterm zone="vorbistools vorbistools-config">
@@ -162,7 +168,10 @@
       <title>Configuration Information</title>
 
-      <para>Issue <command>man libao.conf</command> for information
-      about setting the default output device. Also see
-      <filename>/usr/share/doc/vorbis-tools-1.1.1/ogg123rc-example</filename>.</para>
+      <para>
+        Issue <command>man libao.conf</command> for information
+        about setting the default output device. Also see
+        <filename>/usr/share/doc/vorbis-tools-&vorbistools-version;/ogg123rc-example
+        </filename>.
+      </para>
 
     </sect3>
@@ -179,7 +188,13 @@
 
       <seglistitem>
-        <seg>ogg123, oggdec, oggenc, ogginfo, vcut, and vorbiscomment</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/vorbis-tools-&vorbistools-version;</seg>
+        <seg>
+          ogg123, oggdec, oggenc, ogginfo, vcut and vorbiscomment
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/vorbis-tools-&vorbistools-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -193,5 +208,7 @@
         <term><command>ogg123</command></term>
         <listitem>
-          <para>is a command-line audio player for Ogg Vorbis streams.</para>
+          <para>
+            is a command-line audio player for Ogg Vorbis streams.
+          </para>
           <indexterm zone="vorbistools ogg123">
             <primary sortas="b-ogg123">ogg123</primary>
@@ -203,6 +220,8 @@
         <term><command>oggdec</command></term>
         <listitem>
-          <para>is a simple decoder which converts Ogg Vorbis files into
-          PCM audio files (WAV or raw).</para>
+          <para>
+            is a simple decoder which converts Ogg Vorbis files into
+            PCM audio files (WAV or raw).
+          </para>
           <indexterm zone="vorbistools oggdec">
             <primary sortas="b-oggdec">oggdec</primary>
@@ -214,6 +233,8 @@
         <term><command>oggenc</command></term>
         <listitem>
-          <para>is an encoder that turns raw, WAV or
-          AIFF files into an Ogg Vorbis stream.</para>
+          <para>
+            is an encoder that turns raw, WAV or
+            AIFF files into an Ogg Vorbis stream.
+          </para>
           <indexterm zone="vorbistools oggenc">
             <primary sortas="b-oggenc">oggenc</primary>
@@ -225,5 +246,7 @@
         <term><command>ogginfo</command></term>
         <listitem>
-          <para>prints information stored in an audio file.</para>
+          <para>
+            prints information stored in an audio file.
+          </para>
           <indexterm zone="vorbistools ogginfo">
             <primary sortas="b-ogginfo">ogginfo</primary>
@@ -235,5 +258,7 @@
         <term><command>vcut</command></term>
         <listitem>
-          <para>will split a file into two files at a designated cut point.</para>
+          <para>
+            splits a file into two files at a designated cut point.
+          </para>
           <indexterm zone="vorbistools vcut">
             <primary sortas="b-vcut">vcut</primary>
@@ -245,6 +270,8 @@
         <term><command>vorbiscomment</command></term>
         <listitem>
-          <para>is an editor that changes information in the audio file
-          metadata tags.</para>
+          <para>
+            is an editor that changes information in the audio file
+            metadata tags.
+          </para>
           <indexterm zone="vorbistools vorbiscomment">
             <primary sortas="b-vorbiscomment">vorbiscomment</primary>
