diff --git a/en/gnome/docs/gnome_porting.sgml b/en/gnome/docs/gnome_porting.sgml
index 3a7cd46d5b..7b09ae816c 100644
--- a/en/gnome/docs/gnome_porting.sgml
+++ b/en/gnome/docs/gnome_porting.sgml
@@ -1,201 +1,195 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "../..">
-<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome_porting.sgml,v 1.5 2003/07/20 17:58:10 marcus Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome_porting.sgml,v 1.6 2003/08/26 07:47:07 marcus Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 1 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 1 components">
 		    <tr>
 			  <th>COMPONENT</th>
 			  <th>ASSOCIATED PROGRAM</th>
 			  <th>IMPLIED COMPONENTS</th>
 			</tr>
 
 			<tr>
 			  <td><tt>bonobo</tt></td>
 			  <td><tt>devel/bonobo</tt></td>
 			  <td><tt>oaf gnomeprint</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>esound</tt></td>
 			  <td><tt>audio/esound</tt></td>
 			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gal</tt></td>
 			  <td><tt>x11-toolkits/gal</tt></td>
 			  <td><tt>libglade</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gconf</tt></td>
 			  <td><tt>devel/gconf</tt></td>
 			  <td><tt>oaf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gdkpixbuf</tt></td>
 			  <td><tt>graphics/gdk-pixbuf</tt></td>
 			  <td><tt>gtk12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glib12</tt></td>
 			  <td><tt>devel/glib12</tt></td>
 			  <td><tt>pkgconfig</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>glibwww</tt></td>
 			  <td><tt>www/glibwww</tt></td>
 			  <td><tt>gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomecanvas</tt></td>
 			  <td><tt>graphics/gnomecanvas</tt></td>
 			  <td><tt>gnomelibs gdkpixbuf</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomedb</tt></td>
 			  <td><tt>databases/gnomedb</tt></td>
 			  <td><tt>libgda</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>gnomelibs</tt></td>
 			  <td><tt>x11/gnomelibs</tt></td>
 			  <td><tt>esound imlib libxml orbit</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomemimedata</tt></td>
 			  <td><tt>misc/gnomemimedata</tt></td>
 			  <td><tt>gnomehier pkgconfig</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>gnomeprint</tt></td>
 			  <td><tt>print/gnomeprint</tt></td>
 			  <td><tt>gnomelibs gnomecanvas</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomevfs</tt></td>
 			  <td><tt>devel/gnomevfs</tt></td>
 			  <td><tt>gnomemimedata gconf gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk12</tt></td>
 			  <td><tt>x11-toolkits/gtk12</tt></td>
 			  <td><tt>glib12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtkhtml</tt></td>
 			  <td><tt>www/gtkhtml</tt></td>
 			  <td><tt>glibwww gal libghttp libcapplet</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>imlib</tt></td>
 			  <td><tt>graphics/imlib</tt></td>
 			  <td><tt>gtk12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libcapplet</tt></td>
 			  <td><tt>x11/libcapplet</tt></td>
 			  <td><tt>gnomelibs</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgda</tt></td>
 			  <td><tt>databases/libgda</tt></td>
 			  <td><tt>gconf bonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libghttp</tt></td>
 			  <td><tt>www/libghttp</tt></td>
 			  <td><tt>&nbsp;</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libglade</tt></td>
 			  <td><tt>devel/libglade</tt></td>
 			  <td><tt>gnomedb</tt></td>
 			</tr>
 
-			<tr>
-			  <td><tt>libpanel</tt></td>
-			  <td><tt>x11/libpanel</tt></td>
-			  <td><tt>gnomelibs</tt></td>
-			</tr>
-
 			<tr>
 			  <td><tt>libxml</tt></td>
 			  <td><tt>textproc/libxml</tt></td>
 			  <td><tt>glib12</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>oaf</tt></td>
 			  <td><tt>devel/oaf</tt></td>
 			  <td><tt>orbit libxml</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit</tt></td>
 			  <td><tt>devel/ORBit</tt></td>
 			  <td><tt>glib12</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
`bonobo`	`devel/bonobo`	`oaf gnomeprint`
`esound`	`audio/esound`
`gal`	`x11-toolkits/gal`	`libglade`
`gconf`	`devel/gconf`	`oaf`
`gdkpixbuf`	`graphics/gdk-pixbuf`	`gtk12`
`glib12`	`devel/glib12`	`pkgconfig`
`glibwww`	`www/glibwww`	`gnomelibs`
`gnomecanvas`	`graphics/gnomecanvas`	`gnomelibs gdkpixbuf`
`gnomedb`	`databases/gnomedb`	`libgda`
`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`.
`gnomelibs`	`x11/gnomelibs`	`esound imlib libxml orbit`
`gnomemimedata`	`misc/gnomemimedata`	`gnomehier pkgconfig`
`gnomeprefix`	`gnomeprefix` sets some CONFIGURE_ARGS to ensure data is placed properly within the GNOME hierarchy.
`gnomeprint`	`print/gnomeprint`	`gnomelibs gnomecanvas`
`gnomevfs`	`devel/gnomevfs`	`gnomemimedata gconf gnomelibs`
`gtk12`	`x11-toolkits/gtk12`	`glib12`
`gtkhtml`	`www/gtkhtml`	`glibwww gal libghttp libcapplet`
`imlib`	`graphics/imlib`	`gtk12`
`libcapplet`	`x11/libcapplet`	`gnomelibs`
`libgda`	`databases/libgda`	`gconf bonobo`
`libghttp`	`www/libghttp`
`libglade`	`devel/libglade`	`gnomedb`
`libpanel`	`x11/libpanel`	`gnomelibs`
`libxml`	`textproc/libxml`	`glib12`
`oaf`	`devel/oaf`	`orbit libxml`
`orbit`	`devel/ORBit`	`glib12`