Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ general/prog/python2.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -261,5 +261,5 @@
         <seg>
           libpython&python2-majorver;.so
-          and several under /usr/lib/python2.7/{config,lib-dynload}
+          and several under /usr/lib/python&python2-majorver;/{config,lib-dynload}
         </seg>
         <seg>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ introduction/welcome/changelog.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -49,4 +49,22 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Python-2.7.8, SeaMonkey-2.31, Firefox-34.0. and
+          Thunderbird-31.3.0: replace <filename
+          class="directory">/usr/lib/python2.7</filename> by <filename
+          class="directory">/usr/lib/python&amp;python2-majorver;</filename>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - xfce4-mixer-4.10.0: uncomment keybinder and
+          replace broken ulink by xref.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to lxpanel-0.8.0. Fixes
+          <ulink url="&blfs-ticket-root;5929">#5929</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Add keybinder2-0.3.0. Fixes
+          <ulink url="&blfs-ticket-root;5931">#5931</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to libsoup-2.48.1. Fixes
           <ulink url="&blfs-ticket-root;5928">#5928</ulink>.</para>
Index: lxde/desktop/lxpanel.xml
===================================================================
--- lxde/desktop/lxpanel.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ lxde/desktop/lxpanel.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -7,8 +7,8 @@
   <!ENTITY lxpanel-download-http "&sourceforge-repo;/lxde/lxpanel-&lxpanel-version;.tar.xz">
   <!ENTITY lxpanel-download-ftp  " ">
-  <!ENTITY lxpanel-md5sum        "1fb85e153867babe0f5ad7078e372b6e">
-  <!ENTITY lxpanel-size          "1.4 MB">
-  <!ENTITY lxpanel-buildsize     "23 MB">
-  <!ENTITY lxpanel-time          "0.2 SBU">
+  <!ENTITY lxpanel-md5sum        "aa5bc73f4fe1d8006248a1f45f0a8a21">
+  <!ENTITY lxpanel-size          "1.5 MB">
+  <!ENTITY lxpanel-buildsize     "25 MB">
+  <!ENTITY lxpanel-time          "0.3 SBU">
 ]>
 
@@ -75,4 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="keybinder2"/>,
       <xref linkend="libwnck2"/>,
       <xref linkend="lxmenu-data"/> and
@@ -82,14 +83,17 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="alsa-lib"/> and
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libxml2"/> (weather plugin) and
       <xref linkend="wireless_tools"/>
     </para>
-<!--
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libxslt"/> with
+      <ulink url="https://launchpad.net/libindicator/">libindicator</ulink>
+      (indicator plugin)
+<!--      <xref linkend="libxslt"/> with
       <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>-->
+      <xref linkend="docbook-xsl"/> (to build man pages)-->
+    </para>
 
     <para condition="html" role="usernotes">
Index: packages.ent
===================================================================
--- packages.ent	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ packages.ent	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -161,4 +161,5 @@
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY imlib2-version               "1.4.6">
+<!ENTITY keybinder2-version           "0.3.0">
 <!ENTITY jasper-version               "1.900.1">
 <!ENTITY lcms-version                 "1.19">
@@ -560,5 +561,5 @@
 <!ENTITY libfm-version                "1.2.3">
 <!ENTITY pcmanfm-version              "1.2.3">
-<!ENTITY lxpanel-version              "0.7.2">
+<!ENTITY lxpanel-version              "0.8.0">
 <!ENTITY lxappearance-version         "0.6.1">
 <!ENTITY lxsession-version            "0.5.2">
Index: x/lib/keybinder2.xml
===================================================================
--- x/lib/keybinder2.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
+++ x/lib/keybinder2.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -0,0 +1,182 @@
+<?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 keybinder2-download-http
+           "&fedora-http-repo;/keybinder/keybinder-&keybinder2-version;.tar.gz/&keybinder2-md5sum;/keybinder-&keybinder2-version;.tar.gz">
+  <!ENTITY keybinder2-download-ftp " ">
+  <!ENTITY keybinder2-md5sum        "2a0aed62ba14d1bf5c79707e20cb4059">
+  <!ENTITY keybinder2-size          "372 KB">
+  <!ENTITY keybinder2-buildsize     "2.9 MB">
+  <!ENTITY keybinder2-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="keybinder2" xreflabel="keybinder2-&keybinder2-version;">
+  <?dbhtml filename="keybinder2.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>keybinder2-&keybinder2-version;</title>
+
+  <indexterm zone="keybinder2">
+    <primary sortas="a-keybinder2">keybinder2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to keybinder2</title>
+
+    <para>
+      The <application>keybinder2</application> package contains a utility
+      library registering global <application>X</application> keyboard
+      shortcuts.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&keybinder2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&keybinder2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &keybinder2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &keybinder2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &keybinder2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &keybinder2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">keybinder2 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="pygtk"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="lua"/> (currently broken, because older lua version
+      is required)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/keybinder2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of keybinder2</title>
+
+    <para>
+      Install <application>keybinder2</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-lua &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>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--disable-lua</parameter>: Use this switch to disable <xref
+      linkend="lua"/> bindings (currently broken, because older lua version is
+      required) <filename class="directory">/usr</filename>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libkeybinder.so and
+          /usr/lib/python&python2-majorver;/site-packages/keybinder/_keybinder.so
+        </seg>
+        <seg>
+          /usr/lib/python&python2-majorver;/site-packages/keybinder and
+          /usr/share/gtk-doc/html/keybinder
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="keybinder2-lib">
+        <term><filename class="libraryfile">libkeybinder.so</filename></term>
+        <listitem>
+          <para>
+            is the library that registers global <application>X</application>
+            keyboard shortcuts.
+          </para>
+          <indexterm zone="keybinder2 keybinder2-lib">
+            <primary sortas="c-keybinder2">libkeybinder.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ x/lib/lib.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -47,4 +47,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libepoxy.xml"/>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ x/lib/libxklavier.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -126,5 +126,5 @@
     <para>
       <parameter>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</parameter>:
-      Use this swithc if the $XORG_PREFIX is anything other than
+      Use this switch if the $XORG_PREFIX is anything other than
       <filename class="directory">/usr</filename>.
     </para>
@@ -147,7 +147,7 @@
 
       <seglistitem>
-	<seg>
-	  None
-	</seg>
+        <seg>
+          None
+        </seg>
         <seg>
           libxklavier.so
Index: xfce/apps/xfce4-mixer.xml
===================================================================
--- xfce/apps/xfce4-mixer.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ xfce/apps/xfce4-mixer.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -82,10 +82,8 @@
     </para>
 
-    <!-- URL broken
     <bridgehead renderas="sect4">Optional</bridgehead>
       <para role="optional">
-      <ulink url="http://kaizer.se/wiki/keybinder/">Keybinder</ulink>
+      <xref linkend="keybinder2"/>
     </para>
-    -->
 
     <para condition="html" role="usernotes">
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ xsoft/graphweb/firefox.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -108,11 +108,11 @@
         <application>Python 2</application> or the build system will quickly
         fail with output including "ImportError: cannot import name
-        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
-        from an older version of Firefox), check if
-        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
-        If it does not, reinstall <xref linkend="python2"/> (after
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of Firefox), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists.  If it does not, reinstall <xref linkend="python2"/> (after
         installing <xref linkend="openssl"/>.  The latest version of any
-        <emphasis>currently maintained</emphasis> version of Openssl should
-        be satisfactory if already installed. 
+        <emphasis>currently maintained</emphasis> version of Openssl should be
+        satisfactory if already installed. 
       </para>
     </note>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ xsoft/graphweb/seamonkey.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -119,7 +119,7 @@
         HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
         an older version of Seamonkey), check if
-        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.  If
-        it does not, reinstall <xref linkend="python2"/> (after installing
-        <xref linkend="openssl"/>.  The latest version of any
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists.  If it does not, reinstall <xref linkend="python2"/> (after
+        installing <xref linkend="openssl"/>.  The latest version of any
         <emphasis>currently maintained</emphasis> version of Openssl should be
         satisfactory if already installed. 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 74c98866d4314b7435b32c2c03a851bb9c5111b9)
+++ xsoft/other/thunderbird.xml	(revision 0c3e9be85b40660536e571ed0374e2ed46752756)
@@ -106,15 +106,15 @@
     <note>
       <para>
-        With <application>Thunderbird-31.0</application> and later versions, you
-        must have installed <application>Openssl</application> before
+        With <application>Thunderbird-31.0</application> and later versions,
+        you must have installed <application>Openssl</application> before
         <application>Python 2</application>, or the build system will quickly
         fail with output including "ImportError: cannot import name
-        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
-        from an older version of Thunderbird), check if
-        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
-        If it does not, reinstall <xref linkend="python2"/> (after
+        HTTPSHandler". If you are in any doubt about this (e.g. upgrading from
+        an older version of Thunderbird), check if
+        <filename>/usr/lib/python&python2-majorver;/lib-dynload/_ssl.so</filename>
+        exists.  If it does not, reinstall <xref linkend="python2"/> (after
         installing <xref linkend="openssl"/>  - the latest version of any
-        <emphasis>currently maintained</emphasis> version of Openssl should
-        be satisfactory if already installed - if that package has not already
+        <emphasis>currently maintained</emphasis> version of Openssl should be
+        satisfactory if already installed - if that package has not already
         been installed).
       </para>
