diff --git a/en/gnome/docs/Makefile b/en/gnome/docs/Makefile
index a4ba98b7c3..ccbdf96275 100644
--- a/en/gnome/docs/Makefile
+++ b/en/gnome/docs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/gnome/docs/Makefile,v 1.16 2004/11/07 22:55:29 adamw Exp $
+# $FreeBSD: www/en/gnome/docs/Makefile,v 1.17 2005/03/12 10:21:06 marcus Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -10,6 +10,7 @@
 DOCS=	faq2.sgml
 DOCS+=	faq28.sgml
 DOCS+=	faq210.sgml
+DOCS+=	faq212.sgml
 DOCS+=	gnome_porting.sgml
 DOCS+=	gnome1_porting.sgml
 DOCS+=	gnome2_porting.sgml
diff --git a/en/gnome/docs/faq212.sgml b/en/gnome/docs/faq212.sgml
index ebc77d852e..f0e11f42cf 100644
--- a/en/gnome/docs/faq212.sgml
+++ b/en/gnome/docs/faq212.sgml
@@ -28,16 +28,17 @@
       <p><b>What is new in GNOME &gnomever;?</b></p>
 <!-- A1 -->
       <p>Although the canonical summary of new features can be found at
-        <a href="http://www.gnome.org/start/2.12/notes/en/rnusers.html">http://www.gnome.org/start/2.12/notes/en/rnusers.html</a>,
+        <a
+	href="http://www.gnome.org/start/2.12/notes/en/">http://www.gnome.org/start/2.12/notes/en/</a>,
 	some of the most exciting new features of GNOME &gnomever; are:</p>
 
       <ul>
-	<li>FreeBSD support for CPU frequency monitoring, ACPI power
-	  management, wireless signal strength monitoring for all
-	  supported drivers, and disk read/write utilization
-	<li>Better keyboard layout and feature control
-	<li>Sleek selection of desktop backgrounds
-	<li>Many new applications, applets, and UI enhancements
+	<li>Sexy new default theme, Clearlooks
+	<li>More usable and powerful Nautilus file manager
+	<li>Desktop-wide clipboard that can save your paste buffer
+	  even after you have closed the application from which you
+	  copied
+	<li>Enhanced multimedia support
 	<li>Extensive list of stability and speed increases
       </ul>
 
@@ -54,7 +55,7 @@
       <ol>
         <li><a href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/cvsup.html">CVSup
 	  your ports tree</a>.
-	<li>Download the FreeBSD GNOME Project's <a href="http://www.marcuscom.com/downloads/gnome_upgrade212.sh">upgrade
+	<li>Download the FreeBSD GNOME Project's <a href="http://www.FreeBSD.org/gnome/gnome_upgrade.sh">upgrade
 	  script</a>.
 	<li>Run the script as <tt>root</tt>.  Read a good-sized book.
       </ol>
@@ -142,42 +143,11 @@ $ tail -f /path/to/logfile
 	    a couple regressions that slipped in, both in the GNOME code and in its implementation
 		within FreeBSD.  Some of the more visible issues are:</p>
 
-		<ul>
-	  <li>Changing the GTK theme can cause a few apps to crash. This issue is known  to the
-            GNOME/Linux world, so it is not a FreeBSD-specific issue. You can ignore
-			the error message, and click the "Restart" button to restart the
-			crashed application when the dialog pops up. You should be fine after that.
-	  <li>The KDE menu is missing some icons. KDE failed to follow the published
-	        freedesktop.org standards, and places its icons in a non-standard
-			location. GNOME 2.10 introduced a mass move towards complete compliance
-			with freedesktop.org standards, so there's not much that can be done
-			until KDE moves its default icons into a location that GNOME recognizes.
-
-            <a href="http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html">http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html</a>
-	  <li>[gnome-session]: Options for shutting down or rebooting
-	    will not appear on logout unless GDM is running on the
-	    same machine.
-	  <li>[multiload-applet]: The disk reads/writes monitor does
-	    not work on -CURRENT.  A solution is currently being
-	    sought.
-          <li><a href="http://bugzilla.gnome.org/show_bug.cgi?id=137388">
-            #137388</a>: [gnome-terminal] gnome-terminal has a problem
-            with dynamic titles and vim (<b>UPDATE:</b> See this
-	    <a
-	    href="http://lists.freebsd.org/pipermail/freebsd-gnome/2004-May/006689.html">email</a>
-	    for a workaround to this problem)
-	  <li><a
-	    href="http://bugzilla.ximian.com/show_bug.cgi?id=73375">#73375</a>:
-	    [evolution] Evolution will crash when selecting a new
-	    Server Type for an account with malloc debugging enabled.
-	    This only affects -CURRENT users by default.  To disable
-	    malloc debugging, run the command <tt>ln -sf aj
-	    /etc/malloc.conf</tt> as root.
-	  <li>GnomeVFS-2 now has native support for sftp methods.  Fully
-	    non-interactive publickey authentication works on all versions
-            of FreeBSD, but FreeBSD 5.X is required for password or
-	    passphrase authentication.
-		</ul>
+      <p>There are currently no known FreeBSD-specific issues with
+	&gnomever;.  See <a
+	href="http://www.gnome.org/start/2.12/notes/en/rnknownissues.html">
+	http://www.gnome.org/start/2.12/notes/en/rnknownissues.html</a>
+	for the general list of GNOME &gnomever; known issues.</p>
 
       </li>
 
diff --git a/en/gnome/index.xsl b/en/gnome/index.xsl
index ba3909132e..9f5e50741c 100644
--- a/en/gnome/index.xsl
+++ b/en/gnome/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.75 2005/10/16 20:00:53 adamw Exp $ -->
+<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.76 2005/10/16 20:04:38 adamw Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -9,7 +9,7 @@
   <xsl:import href="includes.xsl"/>
 
   <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/gnome/index.xsl,v 1.75 2005/10/16 20:00:53 adamw Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/gnome/index.xsl,v 1.76 2005/10/16 20:04:38 adamw Exp $'"/>
   <xsl:variable name="section" select="'developers'"/>
   <xsl:variable name="title" select="'FreeBSD GNOME Project'"/>
 
@@ -117,7 +117,7 @@
 		<h2>GNOME on FreeBSD</h2>
 		<ul>
 		  <li><a href="docs/faq2.html#q1">Installation Instructions</a></li>
-		  <li><a href="docs/faq210.html#q2">Upgrade Instructions</a></li>
+		  <li><a href="docs/faq212.html#q2">Upgrade Instructions</a></li>
 		  <li><a href="../ports/gnome.html">Available Applications</a></li>
 		  <li><a href="docs/volunteer.html">How to Help</a></li>
 		  <li><a href="docs/bugging.html">Reporting a Bug</a></li>
@@ -128,10 +128,10 @@
 		<h2>Documentation</h2>
 		<ul>
 		  <li><a href="docs/faq2.html">FAQ</a></li>
-		  <li><a href="docs/faq210.html">2.8 to 2.10 Upgrade FAQ</a></li>
+		  <li><a href="docs/faq212.html">2.8 to 2.10 Upgrade FAQ</a></li>
 		  <li><a href="docs/develfaq.html">Development Branch FAQ</a></li>
 		  <li><a href="docs/porting.html">Creating Ports</a></li>
-		  <li><a href="docs/faq210.html#q5">Known Issues</a></li>
+		  <li><a href="docs/faq212.html#q5">Known Issues</a></li>
 		</ul>
 
 		<h2>Where is GNOME 2.12?</h2>
@@ -152,7 +152,7 @@
 		<h2>Upgrading to GNOME 2.10?</h2>
 
 		<p>If you are upgrading from GNOME 2.8 to GNOME 2.10, read the
-		  <a href="docs/faq210.html">Upgrade FAQ</a> for upgrade
+		  <a href="docs/faq212.html">Upgrade FAQ</a> for upgrade
 		  instructions, and be sure to use the
 		  <a href="gnome_upgrade.sh">upgrade script</a>!</p>
 
diff --git a/en/gnome/news.xml b/en/gnome/news.xml
index d31a10c1eb..aaff44fb6c 100644
--- a/en/gnome/news.xml
+++ b/en/gnome/news.xml
@@ -266,10 +266,10 @@ encoding="ISO-8859-1" ?>
           changes</a>
 
           , including some brand new
-          <a href="$base/gnome/docs/faq210.html#q1">goodies</a>
+          <a href="$base/gnome/docs/faq212.html#q1">goodies</a>
 
           now available on FreeBSD. Be sure to check out our
-          <a href="$base/gnome/docs/faq210.html">upgrade FAQ</a>
+          <a href="$base/gnome/docs/faq212.html">upgrade FAQ</a>
 
           prior to jumping in. For those that do not want to spend time
           compiling, packages for i386 are almost done building on our