Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 663b79c2dff7933fce44a8b68feda75260433444)
+++ x/lib/qt4.xml	(revision 49d333629c5a08a7f06d479337d95f4dc474daec)
@@ -156,5 +156,5 @@
     </para>
 
-<screen><userinput>export QTLINK=/usr
+<screen><userinput>export QT4LINK=/usr
 
 sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
@@ -232,6 +232,6 @@
     </para>
 
-<screen><userinput>export QTDIR=/opt/qt-&qt4-version; &amp;&amp;
-export QTLINK=/opt/qt4 &amp;&amp;
+<screen><userinput>export QT4DIR=/opt/qt-&qt4-version; &amp;&amp;
+export QT4LINK=/opt/qt4 &amp;&amp;
 
 sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
@@ -241,5 +241,5 @@
      src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
 
-./configure -prefix $QTDIR       \
+./configure -prefix     $QT4DIR  \
             -sysconfdir /etc/xdg \
             -confirm-license     \
@@ -265,5 +265,5 @@
 
 <screen role="root"><userinput>make install
-ln -svfn $QTDIR /opt/qt4</userinput></screen>
+ln -svfn $QT4DIR /opt/qt4</userinput></screen>
 
     <para>
@@ -273,10 +273,10 @@
     </para>
 
-<screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
+<screen role="root"><userinput>for file in `basename -a -s .prl $QT4DIR/lib/lib*.prl`; do
        sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
               -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
-              -i $QTDIR/lib/${file}.prl
-
-   perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
+              -i $QT4DIR/lib/${file}.prl
+
+   perl -pi -e "s, -L$PWD/?\S+,,g" $QT4DIR/lib/pkgconfig/${file##lib}.pc
 done
 
@@ -288,5 +288,5 @@
       <para>
         For all methods, install images and create the menu entries 
-        for installed applications.  Be sure that the <envar>QTLINK</envar>
+        for installed applications.  Be sure that the <envar>QT4LINK</envar>
         variable is defined in root's environment and 
         as the <systemitem class="username">root</systemitem> user:
@@ -314,5 +314,5 @@
 Name=Qt4 Assistant 
 Comment=Shows Qt4 documentation and examples
-Exec=$QTLINK/bin/assistant
+Exec=$QT4LINK/bin/assistant
 Icon=assistant-qt4.png
 Terminal=false
@@ -326,5 +326,5 @@
 Name=Qt4 Designer
 Comment=Design GUIs for Qt4 applications
-Exec=$QTLINK/bin/designer
+Exec=$QT4LINK/bin/designer
 Icon=designer-qt4.png
 MimeType=application/x-designer;
@@ -339,5 +339,5 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
-Exec=$QTLINK/bin/linguist
+Exec=$QT4LINK/bin/linguist
 Icon=linguist-qt4.png
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
@@ -353,5 +353,5 @@
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=$QTLINK/bin/qdbusviewer
+Exec=$QT4LINK/bin/qdbusviewer
 Icon=qdbusviewer-qt4.png
 Terminal=false
@@ -365,5 +365,5 @@
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=$QTLINK/bin/qtconfig
+Exec=$QT4LINK/bin/qtconfig
 Icon=qt4logo.png
 Terminal=false
@@ -465,6 +465,6 @@
 <literal># Begin /etc/profile.d/qt4.sh
 
-QTDIR=/usr
-export QTDIR
+QT4DIR=/usr
+export QT4DIR
 
 # End /etc/profile.d/qt4.sh</literal>
@@ -504,10 +504,10 @@
 <literal># Begin /etc/profile.d/qt4.sh
    
-QTDIR=/opt/qt4
+QT4DIR=/opt/qt4
    
 pathappend /opt/qt4/bin           PATH
 pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
    
-export QTDIR
+export QT4DIR
    
 # End /etc/profile.d/qt4.sh</literal>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 663b79c2dff7933fce44a8b68feda75260433444)
+++ x/lib/qt5.xml	(revision 49d333629c5a08a7f06d479337d95f4dc474daec)
@@ -454,5 +454,5 @@
 <literal># Begin /etc/profile.d/qt5.sh
 
-QTDIR=/usr
+QT5DIR=/usr
 export QT5DIR
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 663b79c2dff7933fce44a8b68feda75260433444)
+++ x/lib/webkitgtk.xml	(revision 49d333629c5a08a7f06d479337d95f4dc474daec)
@@ -149,9 +149,17 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                                    &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkitgtk-1.0    &amp;&amp;
+mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-1.0}</command>:
+      There is a conflict with the directory installed with same name by
+      <xref linkend="webkitgtk2"/>.
+    </para>
 
     <para>
@@ -192,8 +200,9 @@
         </seg>
         <seg>
-          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
+          libjavascriptcoregtk-1.0.so and libwebkitgtk-1.0.so
         </seg>
         <seg>
-          /usr/include/webkit-1.0 and
+          /usr/include/webkit-1.0,
+          /usr/share/gtk-doc/html/webkitgtk-1.0 and
           /usr/share/webkit-1.0
         </seg>
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 663b79c2dff7933fce44a8b68feda75260433444)
+++ x/lib/webkitgtk2.xml	(revision 49d333629c5a08a7f06d479337d95f4dc474daec)
@@ -159,9 +159,17 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                                    &amp;&amp;
+rm -rf /usr/share/gtk-doc/html/webkitgtk-2.0    &amp;&amp;
+mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>mv -vi /usr/share/gtk-doc/html/webkitgtk{,-2.0}</command>:
+      There is a conflict with the directory installed with same name by
+      <xref linkend="webkitgtk"/>.
+    </para>
 
     <para>
@@ -210,6 +218,5 @@
         <seg>
           /usr/include/webkitgtk-3.0, 
-          /usr/lib/webkitgtk3,
-          /usr/share/gtk-doc/html/webkitgtk,
+          /usr/share/gtk-doc/html/webkitgtk-2.0,
           /usr/share/gtk-doc/html/webkit2gtk and
           /usr/share/webkitgtk-3.0
