diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index ffc65dc2c7..d47564a131 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,317 +1,311 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.6 2003/07/13 05:11:09 marcus Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.7 2003/08/26 07:47:07 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 2 Components">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
 
 <!-- Begin USE_GNOME components list -->
           <table border="1" summary="GNOME 2 components">
 		    <tr>
 			  <th>COMPONENT</th>
 			  <th>ASSOCIATED PROGRAM</th>
 			  <th>IMPLIED COMPONENTS</th>
 			</tr>
 
 			<tr>
 			  <td><tt>atk</tt></td>
 			  <td><tt>devel/atk</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>atspi</tt></td>
 			  <td><tt>x11-toolkits/at-spi</tt></td>
 			  <td><tt>gail libbonobo</tt></td>
 			</tr>
 
-			<tr>
-			  <td><tt>bonoboactivation</tt></td>
-			  <td><tt>devel/bonoboactivation</tt></td>
-			  <td><tt>libxml2 orbit2</tt></td>
-			</tr>
-			
 			<tr>
 			  <td><tt>eel2</tt></td>
 			  <td><tt>x11-toolkits/eel2</tt></td>
 			  <td><tt>gnomevfs2 libgnomeui gail</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>esound</tt></td>
 			  <td><tt>audio/esound</tt></td>
 			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gail</tt></td>
 			  <td><tt>x11-toolkits/gail</tt></td>
 			  <td><tt>libgnomecanvas</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gal2</tt></td>
 			  <td><tt>x11-toolkits/gal2</tt></td>
 			  <td><tt>gnomeui libgnomeprintui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gconf2</tt></td>
 			  <td><tt>devel/gconf2</tt></td>
-			  <td><tt>orbit2 libxml2 gtk20</tt></td>
+			  <td><tt>orbit2 libxml2 gtk20 linc</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glib20</tt></td>
 			  <td><tt>devel/glib20</tt></td>
 			  <td><tt>gnometarget pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomecontrolcenter2</tt></td>
 			  <td><tt>sysutils/gnomecontrolcenter2</tt></td>
-			  <td><tt>gnomedesktop metacity</tt></td>
+			  <td><tt>gnomedesktop metacity nautilus2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedesktop</tt></td>
 			  <td><tt>x11/gnomedesktop</tt></td>
 			  <td><tt>libgnomeui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehack</tt></td>
 			  <td colspan="2"><tt>gnomehack</tt> makes common GNOME
 			    Makefile substitutions that nearly every GNOME port
 				requires to fit into the proper mtree structure.  <b>Note</b>:
 				Including this option adds a <tt>pre-patch</tt> target to
 				your Makefile.  Therefore, only explicitly define
 				<tt>post-patch</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomehier</tt></td>
 			  <td colspan="2"><tt>gnomehier</tt> installs all the
 			    directories needed for both the GNOME 1 and 2 desktops.  
 				Only include this option if your port calls <tt>@dirrm</tt>
 				on one of the directories listed in the plist for
 				<tt>gnomehier</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomepanel</tt></td>
 			  <td><tt>x11/gnomepanel</tt></td>
 			  <td><tt>libwnck gnomedesktop</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomeprefix</tt></td>
 			  <td colspan="2"><tt>gnomeprefix</tt> sets some CONFIGURE_ARGS
 			    to ensure data is placed properly within the GNOME hierarchy.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnometarget</tt></td>
 			  <td colspan="2"><tt>gnometarget</tt> sets
 			    <tt>CONFIGURE_TARGET</tt> to
 				<tt>--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}</tt>.
 			  </td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomevfs2</tt></td>
 			  <td><tt>devel/gnomevfs2</tt></td>
 			  <td><tt>gconf2 libbonobo gnomemimedata</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk20</tt></td>
 			  <td><tt>x11-toolkits/gtk20</tt></td>
 			  <td><tt>atk pango</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>gtksourceview</tt></td>
 			  <td><tt>x11-toolkits/gtksourceview</tt></td>
 			  <td><tt>libgnome libgnomeprintui</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libartlgpl2</tt></td>
 			  <td><tt>graphics/libartlgpl2</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libbonobo</tt></td>
 			  <td><tt>devel/libbonobo</tt></td>
-			  <td><tt>bonoboactivation</tt></td>
+			  <td><tt>libxml2 orbit2</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libbonoboui</tt></td>
 			  <td><tt>x11-toolkits/libbonoboui</tt></td>
 			  <td><tt>libgnomecanvas libgnome</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgailgnome</tt></td>
 			  <td><tt>x11-toolkits/libgail-gnome</tt></td>
 			  <td><tt>libgnomeui atspi</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda2</tt></td>
 			  <td><tt>databases/libgda2</tt></td>
 			  <td><tt>glib20 libxslt</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libglade2</tt></td>
 			  <td><tt>devel/libglade2</tt></td>
 			  <td><tt>libxml2 gtk20</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libgnome</tt></td>
 			  <td><tt>x11/libgnome</tt></td>
 			  <td><tt>libxslt gnomevfs2 esound</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeui</tt></td>
 			  <td><tt>x11-toolkits/libgnomeui</tt></td>
 			  <td><tt>libbonoboui</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomecanvas</tt></td>
 			  <td><tt>graphics/libgnomecanvas</tt></td>
 			  <td><tt>libglade2 libartlgpl2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomedb</tt></td>
 			  <td><tt>databases/libgnomedb</tt></td>
 			  <td><tt>libgnomeui libgda2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeprint</tt></td>
 			  <td><tt>print/libgnomeprint</tt></td>
 			  <td><tt>libbonobo libartlgpl2 gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgnomeprintui</tt></td>
 			  <td><tt>x11-toolkits/libgnomeprintui</tt></td>
 			  <td><tt>libgnomeprint libgnomecanvas</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgsf</tt></td>
 			  <td><tt>devel/libgsf</tt></td>
 			  <td><tt>gnomevfs2 libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgtkhtml</tt></td>
 			  <td><tt>www/libgtkhtml</tt></td>
 			  <td><tt>libxslt gnomevfs2 gail</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libidl</tt></td>
 			  <td><tt>devel/libIDL</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libwnck</tt></td>
 			  <td><tt>x11-toolkits/libwnck</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>librsvg2</tt></td>
 			  <td><tt>graphics/librsvg2</tt></td>
 			  <td><tt>gtk20 libgsf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libxml2</tt></td>
 			  <td><tt>textproc/libxml2</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libxslt</tt></td>
 			  <td><tt>textproc/libxslt</tt></td>
 			  <td><tt>libxml2</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>libzvt</tt></td>
 			  <td><tt>x11-toolkits/libzvt</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>linc</tt></td>
 			  <td><tt>net/linc</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>nautilus2</tt></td>
 			  <td><tt>x11-fm/nautilus</tt></td>
-			  <td><tt>librsvg2 eel2 gnomedesktop gnomecontrolcenter</tt></td>
+			  <td><tt>librsvg2 eel2 gnomedesktop</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>metacity</tt></td>
 			  <td><tt>x11-wm/metacity</tt></td>
 			  <td><tt>gconf2 glade2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit2</tt></td>
 			  <td><tt>devel/ORBit2</tt></td>
-			  <td><tt>libidl linc</tt></td>
+			  <td><tt>libidl</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>pango</tt></td>
 			  <td><tt>x11-toolkits/pango</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 			
 			<tr>
 			  <td><tt>pkgconfig</tt></td>
 			  <td><tt>devel/pkgconfig</tt></td>
 			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>vte</tt></td>
 			  <td><tt>x11-toolkits/vte</tt></td>
 			  <td><tt>gtk20</tt></td>
 			</tr>
 
 		  </table>
 <!-- End GNOME-related Makefile macros -->
 
           <p>If you still need help with your port, have a look at some of
 	    the <a href="/ports/gnome.html">existing ports</a> for examples.
 	    The <a href="mailto:&email;@FreeBSD.org">freebsd-gnome mailing
 	    list</a> is also there for you.</p>
 
   &footer;
   </body>
 </html>

COMPONENT	ASSOCIATED PROGRAM	IMPLIED COMPONENTS
`atk`	`devel/atk`	`glib20`
`atspi`	`x11-toolkits/at-spi`	`gail libbonobo`
`bonoboactivation`	`devel/bonoboactivation`	`libxml2 orbit2`
`eel2`	`x11-toolkits/eel2`	`gnomevfs2 libgnomeui gail`
`esound`	`audio/esound`
`gail`	`x11-toolkits/gail`	`libgnomecanvas`
`gal2`	`x11-toolkits/gal2`	`gnomeui libgnomeprintui`
`gconf2`	`devel/gconf2`	`orbit2 libxml2 gtk20`	`orbit2 libxml2 gtk20 linc`
`glib20`	`devel/glib20`	`gnometarget pkgconfig`
`gnomecontrolcenter2`	`sysutils/gnomecontrolcenter2`	`gnomedesktop metacity`	`gnomedesktop metacity nautilus2`
`gnomedesktop`	`x11/gnomedesktop`	`libgnomeui`
`gnomehack`	`gnomehack` makes common GNOME Makefile substitutions that nearly every GNOME port requires to fit into the proper mtree structure. Note: Including this option adds a `pre-patch` target to your Makefile. Therefore, only explicitly define `post-patch`.
`gnomehier`	`gnomehier` installs all the directories needed for both the GNOME 1 and 2 desktops. Only include this option if your port calls `@dirrm` on one of the directories listed in the plist for `gnomehier`.
`gnomepanel`	`x11/gnomepanel`	`libwnck gnomedesktop`
`gnomeprefix`	`gnomeprefix` sets some CONFIGURE_ARGS to ensure data is placed properly within the GNOME hierarchy.
`gnometarget`	`gnometarget` sets `CONFIGURE_TARGET` to `--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}`.
`gnomevfs2`	`devel/gnomevfs2`	`gconf2 libbonobo gnomemimedata`
`gtk20`	`x11-toolkits/gtk20`	`atk pango`
`gtksourceview`	`x11-toolkits/gtksourceview`	`libgnome libgnomeprintui`
`libartlgpl2`	`graphics/libartlgpl2`	`pkgconfig`
`libbonobo`	`devel/libbonobo`	`bonoboactivation`	`libxml2 orbit2`
`libbonoboui`	`x11-toolkits/libbonoboui`	`libgnomecanvas libgnome`
`libgailgnome`	`x11-toolkits/libgail-gnome`	`libgnomeui atspi`
`libgda2`	`databases/libgda2`	`glib20 libxslt`
`libglade2`	`devel/libglade2`	`libxml2 gtk20`
`libgnome`	`x11/libgnome`	`libxslt gnomevfs2 esound`
`libgnomeui`	`x11-toolkits/libgnomeui`	`libbonoboui`
`libgnomecanvas`	`graphics/libgnomecanvas`	`libglade2 libartlgpl2`
`libgnomedb`	`databases/libgnomedb`	`libgnomeui libgda2`
`libgnomeprint`	`print/libgnomeprint`	`libbonobo libartlgpl2 gtk20`
`libgnomeprintui`	`x11-toolkits/libgnomeprintui`	`libgnomeprint libgnomecanvas`
`libgsf`	`devel/libgsf`	`gnomevfs2 libbonobo`
`libgtkhtml`	`www/libgtkhtml`	`libxslt gnomevfs2 gail`
`libidl`	`devel/libIDL`	`glib20`
`libwnck`	`x11-toolkits/libwnck`	`gtk20`
`librsvg2`	`graphics/librsvg2`	`gtk20 libgsf`
`libxml2`	`textproc/libxml2`	`pkgconfig`
`libxslt`	`textproc/libxslt`	`libxml2`
`libzvt`	`x11-toolkits/libzvt`	`gtk20`
`linc`	`net/linc`	`glib20`
`nautilus2`	`x11-fm/nautilus`	`librsvg2 eel2 gnomedesktop gnomecontrolcenter`	`librsvg2 eel2 gnomedesktop`
`metacity`	`x11-wm/metacity`	`gconf2 glade2`
`orbit2`	`devel/ORBit2`	`libidl linc`	`libidl`
`pango`	`x11-toolkits/pango`	`glib20`
`pkgconfig`	`devel/pkgconfig`
`vte`	`x11-toolkits/vte`	`gtk20`