Index: archive/gvolwheel.xml
===================================================================
--- archive/gvolwheel.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
+++ archive/gvolwheel.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gvolwheel-download-http "&sourceforge-repo;/gvolwheel/gvolwheel-&gvolwheel-version;.tar.gz">
+  <!ENTITY gvolwheel-download-ftp  "">
+  <!ENTITY gvolwheel-md5sum        "4f04f00cdb875894c96b8a3ff8a9edb9">
+  <!ENTITY gvolwheel-size          "340 KB">
+  <!ENTITY gvolwheel-buildsize     "2.8 MB">
+  <!ENTITY gvolwheel-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gvolwheel" xreflabel="gvolwheel-&gvolwheel-version;">
+  <?dbhtml filename="gvolwheel.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>gvolwheel-&gvolwheel-version;</title>
+
+  <indexterm zone="gvolwheel">
+    <primary sortas="a-gvolwheel">gvolwheel</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gvolwheel</title>
+
+    <para>
+      The <application>Gvolwheel</application> package provides a lightweight
+      volume control with a tray icon.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gvolwheel-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gvolwheel-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gvolwheel-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gvolwheel-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gvolwheel-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gvolwheel-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gvolwheel Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-utils"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="intltool"/> and
+      <xref linkend="perl-xml-parser"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gvolwheel"/>
+    </para>
+  </sect2>
+
+  <sect2 role="kernel"  id="gvolwheel-kernel">
+    <title>Kernel Configuration</title>
+
+    <para>
+      In the Device Drivers &rArr; Sound card support &rArr; Advanced Linux
+      Sound Architecture section of the kernel configuration, ensure that OSS Mixer
+      API (CONFIG_SND_MIXER_OSS) is selected. If necessary, recompile and install
+      your new kernel.
+    </para>
+
+    <indexterm zone="gvolwheel gvolwheel-kernel">
+      <primary sortas="d-gvolwheel">gvolwheel</primary>
+    </indexterm>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gvolwheel</title>
+
+    <para>
+      Install <application>Gvolwheel</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' Makefile.in &amp;&amp;
+./configure --prefix=/usr --enable-oss &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a working 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="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' ...</command>:
+      This ensures that the documentation into a versioned directory.
+    </para>
+
+    <para>
+      <parameter>--enable-oss</parameter>: without this, the program will not
+      run unless <command>alsamixer</command> has been run.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuring gvolwheel">
+    <title>Configuring Gvolwheel</title>
+
+    <para>
+      Before using this application, use <command>alsamixer</command> to
+      ensure the channels are not muted, and are set to suitable levels so
+      that the master volume control will provide suitable levels. Once
+      <command>gvolwheel</command> is running you can, if you wish,
+      right-click on its icon in the tray to change it to control the PCM
+      volume instead of the  master volume. Depending on your theme settings,
+      you may also wish to tick &quot;Use Gnome Icons&quot;.
+    </para>
+
+    <para>
+      If you middle-click on the icon, it will mute the volume, that is, it
+      will set it to zero : do not confuse this with the mute/unmute controls in
+      e.g. <command>alsamixer</command>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gvolwheel
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/gvolwheel-&gvolwheel-version; and
+          /usr/share/pixmaps/gvolwheel
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gvolwheel-prog">
+        <term><command>gvolwheel</command></term>
+        <listitem>
+          <para>
+            is a lightweight volume control that sits in a tray.
+          </para>
+          <indexterm zone="gvolwheel gvolwheel">
+            <primary sortas="b-gvolwheel">gvolwheel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 58d0203f5d20649ad39cbe2f9c83b06a39bfbc86)
+++ general.ent	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
@@ -805,5 +805,5 @@
 <!ENTITY audacious-plugins-version    "3.4.1">
 <!ENTITY amarok-version               "2.8.0">
-<!ENTITY gvolwheel-version            "1.0">
+<!ENTITY pnmixer-version              "0.5.1">
 
 <!-- Chapter 40 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 58d0203f5d20649ad39cbe2f9c83b06a39bfbc86)
+++ introduction/welcome/changelog.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Archive gvolwheel, replacing it by pnmixer-0.5.1 which
+          is more capable (has a mute button, obeys alsa overrides).</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to serf-1.3.2. Fixes
           <ulink url="&blfs-ticket-root;4152">#4152</ulink>.</para>
Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision 58d0203f5d20649ad39cbe2f9c83b06a39bfbc86)
+++ multimedia/audioutils/audioutils.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audacious.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amarok.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvolwheel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pnmixer.xml"/>
 
 </chapter>
Index: ltimedia/audioutils/gvolwheel.xml
===================================================================
--- multimedia/audioutils/gvolwheel.xml	(revision 58d0203f5d20649ad39cbe2f9c83b06a39bfbc86)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gvolwheel-download-http "&sourceforge-repo;/gvolwheel/gvolwheel-&gvolwheel-version;.tar.gz">
-  <!ENTITY gvolwheel-download-ftp  "">
-  <!ENTITY gvolwheel-md5sum        "4f04f00cdb875894c96b8a3ff8a9edb9">
-  <!ENTITY gvolwheel-size          "340 KB">
-  <!ENTITY gvolwheel-buildsize     "2.8 MB">
-  <!ENTITY gvolwheel-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gvolwheel" xreflabel="gvolwheel-&gvolwheel-version;">
-  <?dbhtml filename="gvolwheel.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gvolwheel-&gvolwheel-version;</title>
-
-  <indexterm zone="gvolwheel">
-    <primary sortas="a-gvolwheel">gvolwheel</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gvolwheel</title>
-
-    <para>
-      The <application>Gvolwheel</application> package provides a lightweight
-      volume control with a tray icon.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gvolwheel-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gvolwheel-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gvolwheel-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gvolwheel-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gvolwheel-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gvolwheel-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gvolwheel Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-utils"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="perl-xml-parser"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gvolwheel"/>
-    </para>
-  </sect2>
-
-  <sect2 role="kernel"  id="gvolwheel-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      In the Device Drivers &rArr; Sound card support &rArr; Advanced Linux
-      Sound Architecture section of the kernel configuration, ensure that OSS Mixer
-      API (CONFIG_SND_MIXER_OSS) is selected. If necessary, recompile and install
-      your new kernel.
-    </para>
-
-    <indexterm zone="gvolwheel gvolwheel-kernel">
-      <primary sortas="d-gvolwheel">gvolwheel</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gvolwheel</title>
-
-    <para>
-      Install <application>Gvolwheel</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' Makefile.in &amp;&amp;
-./configure --prefix=/usr --enable-oss &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working 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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's%doc/gvolwheel%share/doc/gvolwheel-&gvolwheel-version;%' ...</command>:
-      This ensures that the documentation into a versioned directory.
-    </para>
-
-    <para>
-      <parameter>--enable-oss</parameter>: without this, the program will not
-      run unless <command>alsamixer</command> has been run.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuring gvolwheel">
-    <title>Configuring Gvolwheel</title>
-
-    <para>
-      Before using this application, use <command>alsamixer</command> to
-      ensure the channels are not muted, and are set to suitable levels so
-      that the master volume control will provide suitable levels. Once
-      <command>gvolwheel</command> is running you can, if you wish,
-      right-click on its icon in the tray to change it to control the PCM
-      volume instead of the  master volume. Depending on your theme settings,
-      you may also wish to tick &quot;Use Gnome Icons&quot;.
-    </para>
-
-    <para>
-      If you middle-click on the icon, it will mute the volume, that is, it
-      will set it to zero : do not confuse this with the mute/unmute controls in
-      e.g. <command>alsamixer</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gvolwheel
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/gvolwheel-&gvolwheel-version; and
-          /usr/share/pixmaps/gvolwheel
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvolwheel-prog">
-        <term><command>gvolwheel</command></term>
-        <listitem>
-          <para>
-            is a lightweight volume control that sits in a tray.
-          </para>
-          <indexterm zone="gvolwheel gvolwheel">
-            <primary sortas="b-gvolwheel">gvolwheel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/pnmixer.xml
===================================================================
--- multimedia/audioutils/pnmixer.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
+++ multimedia/audioutils/pnmixer.xml	(revision b7643a16990b1ef05aa03980ccaccf9b3ed48c8d)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY pnmixer-download-http "https://github.com/downloads/nicklan/pnmixer/pnmixer-&pnmixer-version;.tar.gz">
+  <!ENTITY pnmixer-download-ftp  "">
+  <!ENTITY pnmixer-md5sum        "2288af95ab280721b39b7c33601d5dd4">
+  <!ENTITY pnmixer-size          "135 KB">
+  <!ENTITY pnmixer-buildsize     "2.3 MB">
+  <!ENTITY pnmixer-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="pnmixer" xreflabel="pnmixer-&pnmixer-version;">
+  <?dbhtml filename="pnmixer.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>pnmixer-&pnmixer-version;</title>
+
+  <indexterm zone="pnmixer">
+    <primary sortas="a-pnmixer">pnmixer</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Pnmixer</title>
+
+    <para>
+      The <application>Pnmixer</application> package provides a lightweight
+      volume control with a tray icon.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&pnmixer-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&pnmixer-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &pnmixer-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &pnmixer-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &pnmixer-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &pnmixer-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gvolwheel Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-utils"/>,
+      <xref linkend="gtk2"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/pnmixer"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Pnmixer</title>
+
+    <para>
+      Install <application>Pnmixer</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./autogen.sh --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not have a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          pnmixer
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/pnmixer
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pnmixer-prog">
+        <term><command>pnmixer</command></term>
+        <listitem>
+          <para>
+            is a lightweight volume control that sits in a tray.
+          </para>
+          <indexterm zone="pnmixer pnmixer">
+            <primary sortas="b-pnmixer">pnmixer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
