Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision d74470c73367750c3f4e98c5d7804fb4559f50a3)
+++ general/sysutils/pciutils.xml	(revision c503fad7c2939e9f482324006e9b5d04d6ce4d72)
@@ -66,21 +66,22 @@
     <title>Installation of PCI Utilities</title>
 
-    <para>First, fix a minor script error.  If you want to compress the PCI
-    data, use 1 instead of 0 in the instruction below.  The uncompressed data
-    is currently about 710KB.</para>
-
-<screen><userinput>sed -i -e 's/^PCI_COMPRESSED_IDS=/&amp;0/' update-pciids.sh </userinput></screen>
-
-    <para>Install <application>PCI Utilities</application> by
-    running the following commands:</para>
+    <para>
+      Install <application>PCI Utilities</application> by
+      running the following commands:
+    </para>
 
 <screen><userinput>make PREFIX=/usr MANDIR=/usr/share/man \
-     ZLIB=no SHARED=yes all</userinput></screen>
+     ZLIB=no SHARED=yes PCI_COMPRESSED_IDS=0 all</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
-<screen role="root"><userinput>make PREFIX=/usr MANDIR=/usr/share/man SHARED=yes \
+<screen role="root"><userinput>make PREFIX=/usr MANDIR=/usr/share/man \
+     ZLIB=no SHARED=yes PCI_COMPRESSED_IDS=0 \
      install install-lib</userinput></screen>
 
@@ -90,9 +91,18 @@
     <title>Command Explanations</title>
 
-    <para><parameter>ZLIB=no</parameter>: This parameter prevents compression of
-    the <filename>pci.ids</filename> file.</para>
+    <para>
+      <parameter>ZLIB=no</parameter>: This parameter prevents compression of
+      the <filename>pci.ids</filename> file.
+    </para>
 
-    <para><parameter>SHARED=yes</parameter>: This parameter enables building of
-    shared library instead of static one.</para>
+    <para>
+      <parameter>SHARED=yes</parameter>: This parameter enables building of
+      shared library instead of static one.
+    </para>
+
+    <para>
+      <parameter>PCI_COMPRESSED_IDS=0</parameter>: This parameter ensures
+      that compression won't be used when updating <filename>pci.ids</filename>.
+    </para>
 
   </sect2>
Index: gnome/core/eog.xml
===================================================================
--- gnome/core/eog.xml	(revision d74470c73367750c3f4e98c5d7804fb4559f50a3)
+++ gnome/core/eog.xml	(revision c503fad7c2939e9f482324006e9b5d04d6ce4d72)
@@ -71,5 +71,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="librsvg"/> and
       <xref linkend="rarian"/>
     </para>
@@ -79,7 +80,6 @@
       <xref linkend="exempi"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libexif"/> and
-      <xref linkend="librsvg"/>
+      <xref linkend="lcms2"/> and
+      <xref linkend="libexif"/>
     </para>
 
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision d74470c73367750c3f4e98c5d7804fb4559f50a3)
+++ networking/netlibs/libtirpc.xml	(revision c503fad7c2939e9f482324006e9b5d04d6ce4d72)
@@ -30,8 +30,10 @@
     <title>Introduction to libtirpc</title>
 
-    <para>The <application>libtirpc</application> package contains
-    libraries that support programs that use the Remote Procedure Call (RPC) 
-    API. It replaces the RPC, but not the NIS library entries that 
-    used to be in glibc.</para>
+    <para>
+      The <application>libtirpc</application> package contains
+      libraries that support programs that use the Remote Procedure Call (RPC) 
+      API. It replaces the RPC, but not the NIS library entries that 
+      used to be in glibc.
+    </para>
 
     &lfs70_checked;
@@ -40,20 +42,32 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Download (HTTP): <ulink url="&libtirpc-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&libtirpc-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&libtirpc-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&libtirpc-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &libtirpc-md5sum;</para>
+        <para>
+          Download MD5 sum: &libtirpc-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &libtirpc-size;</para>
+        <para>
+          Download size: &libtirpc-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &libtirpc-buildsize;</para>
+        <para> 
+          Estimated disk space required: &libtirpc-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &libtirpc-time;</para>
+        <para>
+          Estimated build time: &libtirpc-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -62,12 +76,14 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required header tar file (Add rpc/nis headers):
-        <ulink
-        url="&sources-anduin-other;/rpcnis-headers.tar.bz2"/></para>
+        <para>
+          Required header tar file (Add rpc/nis headers):
+          <ulink url="&sources-anduin-other;/rpcnis-headers.tar.bz2"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Required Patch (Remove nis dependencies):
-        <ulink
-        url="&patch-root;/libtirpc-&libtirpc-version;-remove-nis-2.patch"/></para>
+        <para>
+          Required Patch (Remove nis dependencies):
+          <ulink url="&patch-root;/libtirpc-&libtirpc-version;-remove-nis-2.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
@@ -93,6 +109,8 @@
     <title>Installation of libtirpc</title>
 
-    <para>Glibc-2.14 and later do not install NIS and RPC related headers by
-    default.  If needed, install them here:</para>
+    <para>
+      Glibc-2.14 and later do not install NIS and RPC related headers by
+      default. If needed, install them here:
+    </para>
 
 <screen><userinput>if [ ! -r /usr/include/rpc/rpc.h ]; then
@@ -100,18 +118,25 @@
 fi</userinput></screen>
 
-    <para>Install <application>libtirpc</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>libtirpc</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>patch -Np1 -i ../libtirpc-&libtirpc-version;-remove-nis-2.patch &amp;&amp;
-autoreconf                              &amp;&amp;
-./configure --prefix=/usr --libdir=/lib CFLAGS="-fPIC" &amp;&amp;
+autoreconf &amp;&amp;
+./configure --prefix=/usr CFLAGS="-fPIC" &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
-<screen role='root'><userinput>make pkgconfigdir=/usr/lib/pkgconfig install &amp;&amp;
-mv -v /lib/libtirpc.*a /usr/lib</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+mv -v /usr/lib/libtirpc.so.* /lib &amp;&amp;
+ln -sfv ../../lib/libtirpc.so.1.0.10 /usr/lib/libtirpc.so</userinput></screen>
 
   </sect2>
@@ -120,17 +145,8 @@
     <title>Command Explanations</title>
 
-    <para><userinput>patch -Np1 -i
-    ../libtirpc-&libtirpc-version;-remove-nis-2.patch</userinput>: This patch
-    removes references to nis functions no longer in
-    <application>glibc</application>.</para>
-
-    <para><option>--libdir=/lib</option>: Since this library may be used before 
-    /usr is mounted, place the library in /lib.</para>
-
-    <para><option>pkgconfigdir=/usr/lib/pkgconfig</option>: Ensure the .pc file
-    is placed in the proper location.</para>
-
-    <para><option>mv -v /lib/libtirpc.*a</option>: Static libraries and .la files
-    belong in /usr/lib.</para>
+    <para>
+      <command>mv -v /usr/lib/libtirpc.so.* ...</command>: Move shared 
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
 
   </sect2>
@@ -140,12 +156,15 @@
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>liblibtirpc.{so,a}</seg>
-        <seg>/usr/include/libtirpc</seg>
+        <seg>
+          libtirpc.{so,a}
+        </seg>
+        <seg>
+          /etc/netconfig and
+          /usr/include/libtirpc
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -159,8 +178,10 @@
         <term><filename class='libraryfile'>libtirpc.{so,a}</filename></term>
         <listitem>
-          <para>provides the Remote Procedure Call (RPC) API functions required by
-          other programs.</para>
+          <para>
+            provides the Remote Procedure Call (RPC) API functions required by
+            other programs.
+          </para>
           <indexterm zone="libtirpc libtirpc-lib">
-            <primary sortas="c-libtirpc-lib">liblibtirpc.{so,a}</primary>
+            <primary sortas="c-libtirpc">libtirpc.{so,a}</primary>
           </indexterm>
         </listitem>
