diff --git a/en/gnome/docs/gnome2_porting.sgml b/en/gnome/docs/gnome2_porting.sgml
index f687153733..abe6060379 100644
--- a/en/gnome/docs/gnome2_porting.sgml
+++ b/en/gnome/docs/gnome2_porting.sgml
@@ -1,316 +1,334 @@
 <!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.15 2004/05/22 21:36:40 pav Exp $">
+<!ENTITY date "$FreeBSD: www/en/gnome/docs/gnome2_porting.sgml,v 1.16 2004/11/16 18:31:10 mezz Exp $">
 <!ENTITY title "FreeBSD GNOME Project: GNOME 2 Components">
 <!ENTITY % gnomeincludes SYSTEM "../includes.sgml"> %gnomeincludes;
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 <html>
   &header;
 
 		<p> To see how to utilize these components, please examine the
 		  <a href="example-Makefile.html">example Makefile</a>.
 		</p>
 
 
 <!-- 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>accessibility/atk</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>atspi</tt></td>
 			  <td><tt>accessibility/at-spi</tt></td>
 			  <td><tt>gail libbonobo</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>desktopfileutils</tt></td>
 			  <td><tt>devel/desktop-file-utils</tt></td>
 			  <td><tt>glib20</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>eel2</tt></td>
 			  <td><tt>x11-toolkits/eel2</tt></td>
-			  <td><tt>gnomevfs2 libgnomeui gail</tt></td>
+			  <td><tt>gnomemenus gnomedesktop gail</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>evolutiondataserver</tt></td>
 			  <td><tt>databases/evolution-data-server</tt></td>
 			  <td><tt>libgnome</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gail</tt></td>
 			  <td><tt>accessibility/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 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 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>gnomemenus</tt></td>
+			  <td><tt>x11/gnome-menus</tt></td>
+			  <td><tt>gnomevfs2</tt></td>
+			</tr>
+
 			<tr>
 			  <td><tt>gnomepanel</tt></td>
 			  <td><tt>x11/gnomepanel</tt></td>
-			  <td><tt>libwnck gnomedesktop</tt></td>
+			  <td><tt>gnomedesktop libwnck</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gnomespeech</tt></td>
 			  <td><tt>accessibility/gnomespeech</tt></td>
 			  <td><tt>libbonobo</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>gstreamerplugins</tt></td>
 			  <td><tt>multimedia/gstreamer-plugins</tt></td>
 			  <td><tt>gconf2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtk20</tt></td>
 			  <td><tt>x11-toolkits/gtk20</tt></td>
 			  <td><tt>intltool atk pango</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>gtkhtml3</tt></td>
 			  <td><tt>www/gtkhtml3</tt></td>
 			  <td><tt>gail libgnomeui libgnomeprintui</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>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>libgnomeui</tt></td>
+			  <td><tt>x11-toolkits/libgnomeui</tt></td>
+			  <td><tt>libbonoboui</tt></td>
+			</tr>
+
 			<tr>
 			  <td><tt>libgsf</tt></td>
 			  <td><tt>devel/libgsf</tt></td>
 			  <td><tt>glib20 libxml2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>libgsf_gnome</tt></td>
 			  <td><tt>devel/libgsf-gnome</tt></td>
 			  <td><tt>libgsf gnomevfs2</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>libartlgpl2 libgsf gnomevfs2</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>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>metacity</tt></td>
+			  <td><tt>x11-wm/metacity</tt></td>
+			  <td><tt>gconf2 glade2</tt></td>
+			</tr>
+
 			<tr>
 			  <td><tt>nautilus2</tt></td>
 			  <td><tt>x11-fm/nautilus2</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>
+			  <td><tt>nautiluscdburner</tt></td>
+			  <td><tt>sysutils/nautilus-cd-burner</tt></td>
+			  <td><tt>nautilus2</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>orbit2</tt></td>
 			  <td><tt>devel/ORBit2</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>pygnome2</tt></td>
 			  <td><tt>x11-toolkits/py-gnome2</tt></td>
-			  <td><tt>libgnomeprintui libgtkhtml gnomepanel libzvt nautilus2 pygtk2</tt></td>
+			  <td><tt>libgnomeui pygtk2</tt></td>
+			</tr>
+
+			<tr>
+			  <td><tt>pygnomeextras</tt></td>
+			  <td><tt>x11-toolkits/py-gnome-extras</tt></td>
+			  <td><tt>pygnome2 libgnomeprintui libgtkhtml gnomepanel gtksourceview libwnck nautiluscdburner</tt></td>
 			</tr>
 
 			<tr>
 			  <td><tt>pygtk2</tt></td>
 			  <td><tt>x11-toolkits/py-gtk2</tt></td>
 			  <td><tt>libglade2</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`	`accessibility/atk`	`glib20`
`atspi`	`accessibility/at-spi`	`gail libbonobo`
`desktopfileutils`	`devel/desktop-file-utils`	`glib20`
`eel2`	`x11-toolkits/eel2`	`gnomevfs2 libgnomeui gail`	`gnomemenus gnomedesktop gail`
`evolutiondataserver`	`databases/evolution-data-server`	`libgnome`
`gail`	`accessibility/gail`	`libgnomecanvas`
`gal2`	`x11-toolkits/gal2`	`gnomeui libgnomeprintui`
`gconf2`	`devel/gconf2`	`orbit2 libxml2 gtk20 linc`
`glib20`	`devel/glib20`	`gnometarget pkgconfig`
`gnomecontrolcenter2`	`sysutils/gnomecontrolcenter2`	`gnomedesktop metacity nautilus2`
`gnomedesktop`	`x11/gnomedesktop`	`libgnomeui`
`gnomemenus`	`x11/gnome-menus`	`gnomevfs2`
`gnomepanel`	`x11/gnomepanel`	`libwnck gnomedesktop`	`gnomedesktop libwnck`
`gnomespeech`	`accessibility/gnomespeech`	`libbonobo`
`gnomevfs2`	`devel/gnomevfs2`	`gconf2 libbonobo gnomemimedata`
`gstreamerplugins`	`multimedia/gstreamer-plugins`	`gconf2`
`gtk20`	`x11-toolkits/gtk20`	`intltool atk pango`
`gtkhtml3`	`www/gtkhtml3`	`gail libgnomeui libgnomeprintui`
`gtksourceview`	`x11-toolkits/gtksourceview`	`libgnome libgnomeprintui`
`libartlgpl2`	`graphics/libartlgpl2`	`pkgconfig`
`libbonobo`	`devel/libbonobo`	`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`
`libgnomeui`	`x11-toolkits/libgnomeui`	`libbonoboui`
`libgsf`	`devel/libgsf`	`glib20 libxml2`
`libgsf_gnome`	`devel/libgsf-gnome`	`libgsf gnomevfs2`
`libgtkhtml`	`www/libgtkhtml`	`libxslt gnomevfs2 gail`
`libidl`	`devel/libIDL`	`glib20`
`libwnck`	`x11-toolkits/libwnck`	`gtk20`
`librsvg2`	`graphics/librsvg2`	`libartlgpl2 libgsf gnomevfs2`
`libwnck`	`x11-toolkits/libwnck`	`gtk20`
`libxml2`	`textproc/libxml2`	`pkgconfig`
`libxslt`	`textproc/libxslt`	`libxml2`
`libzvt`	`x11-toolkits/libzvt`	`gtk20`
`linc`	`net/linc`	`glib20`
`metacity`	`x11-wm/metacity`	`gconf2 glade2`
`nautilus2`	`x11-fm/nautilus2`	`librsvg2 eel2 gnomedesktop`
`metacity`	`x11-wm/metacity`	`gconf2 glade2`	`nautiluscdburner`	`sysutils/nautilus-cd-burner`	`nautilus2`
`orbit2`	`devel/ORBit2`	`libidl`
`pango`	`x11-toolkits/pango`	`glib20`
`pygnome2`	`x11-toolkits/py-gnome2`	`libgnomeprintui libgtkhtml gnomepanel libzvt nautilus2 pygtk2`	`libgnomeui pygtk2`
`pygnomeextras`	`x11-toolkits/py-gnome-extras`	`pygnome2 libgnomeprintui libgtkhtml gnomepanel gtksourceview libwnck nautiluscdburner`
`pygtk2`	`x11-toolkits/py-gtk2`	`libglade2`
`vte`	`x11-toolkits/vte`	`gtk20`