Index: en_US.ISO8859-1/htdocs/gnome/index.xsl
===================================================================
--- en_US.ISO8859-1/htdocs/gnome/index.xsl
+++ en_US.ISO8859-1/htdocs/gnome/index.xsl
@@ -39,8 +39,8 @@
 			select="descendant::year[position() = 1]/name"/></p>
 		    <ul>
 
-		      <!-- Pull in the 10 most recent news items -->
-		      <xsl:for-each select="descendant::event[position() &lt;= 10]">
+		      <!-- Pull in the 5 most recent news items -->
+		      <xsl:for-each select="descendant::event[position() &lt;= 5]">
 			<li><a>
 			    <xsl:attribute name="href">
 			      newsflash.html#<xsl:call-template name="generate-event-anchor"/>
@@ -58,117 +58,92 @@
 		      <li><a href="newsflash.html">More...</a></li>
 		    </ul>
 		  </div> <!-- rightnav -->
-
-		  <br />
-
-		  <div class="rightnav">
-
-		    <h2>GNOME Project News</h2>
-<!-- XXX: (1) does not work at the moment
-          (2) should we really copy over GNOME news?
-
-		    <ul>
-		      <xsl:for-each select="document('http://gnomedesktop.org/node/feed')/rss/channel/*[name() = 'item'][position() &lt; 10]">
-			<li><a>
-			    <xsl:attribute name="href">
-			      <xsl:value-of select="link"/>
-			    </xsl:attribute>
-			    <xsl:value-of select="title"/><br/>
-			  </a></li>
-		      </xsl:for-each>
-		      <li><a>
-			  <xsl:for-each select="document('http://gnomedesktop.org/backend.php')/rss/*[name() = 'channel'][position() = 1]">
-			    <xsl:attribute name="href">
-			      <xsl:value-of select="link"/>
-			    </xsl:attribute>More...
-			  </xsl:for-each>
-			</a></li>
-		    </ul>
--->
-                  </div> <!-- rightnav -->
                 </div> <!-- rightwrap -->
 
 		<h1>&title;</h1>
 
+		<h2>What software does the GNOME Team maintain?</h2>
+
+		<p>The GNOME Team maintains the GNOME, MATE, and
+		  Cinnamon desktop environments.</p>
+
 		<h2>What is GNOME?</h2>
 
 		<img src="&base;/gnome/images/gnome.png" align="right"
                    border="0" alt="GNOME Logo"/>
 
-	       		<p>GNOME is a complete graphical desktop for X,
+		<p>GNOME is a complete graphical desktop for X,
 	       	   including everything from a window manager to
-	       	   web browsers, audio players, office programs, and
-	       	   more.</p>
-
-		       <p>The &os; GNOME Project is a team of devoted
-			 developers and users that manage the
-			 integration of GNOME and &os;.</p>
-
-		<h2>How to install GNOME</h2>
-
-		<p>The easiest way to install GNOME is to install either of
-		the following ports:</p>
-		<ul>
-			<li>x11/gnome2 (the full desktop)</li>
-			<li>x11/gnome2-lite (the minimum desktop environment)</li>
-		</ul>
-
-		<p>And, as desired, one or all of:</p>
-		<ul>
-			<li>x11/gnome2-fifth-toe (common applications)</li>
-			<li>x11/gnome2-power-tools (tools/toys for power users)</li>
-			<li>editors/gnome2-office (office productivity)</li>
-			<li>devel/gnome2-hacker-tools (development tools)</li>
-		</ul>
-
-		<h2>Upgrading to GNOME 2.32?</h2>
-
-		<p>If you are upgrading from GNOME 2.30 to GNOME 2.32, read the
-		  <a href="docs/faq232.html">Upgrade FAQ</a> for upgrade
-		  instructions.</p>
-
-              <h2>State of the port</h2>
-
-	      <p>GNOME for &os; is currently fully supported on
-		8.4, 8-STABLE, 9.1, 9.2, and 9-STABLE, 10.0 and 10-STABLE while
-                11.0-CURRENT is provided on a best effort basis.
-		Work is being done to replace Gnome 2 with Mate and Gnome3.  
-		There is still <a href="docs/volunteer.html">plenty left to be done</a>!</p>
-
-	      <h2>One stop solution shop!</h2>
-
-	      <p>GNOME is simple and easy to build using the &os; ports system, but
-	        sometimes things simply go wrong. If GNOME -- or anything that uses
-		GNOME libraries -- is not building the way it should, simply run the
-		<a href="/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a>
-		tool from the directory of the failed port, and let the gnomelogalyzer
-		figure out what's wrong and how to fix it!</p>
+		   web browsers, audio players, office programs,
+		   graphical login programs and more.  MATE is
+		   a continuation of the old GNOME 2 desktop
+		   environment.  Cinnamon is originally a fork
+		   of GNOME 3's gnome-shell, but grew into its own
+		   desktop environment.</p>
+
+		<h2>How to install these desktop environments?</h2>
+
+		<p>There are some so called meta ports available for
+		  installing these desktop environments or parts of
+		  them.  They are:
+		  <ul>
+		    <li>gnome3 (full GNOME desktop)</li>
+		    <li>gnome3-lite (minimal GNOME desktop)</li>
+		    <li>mate (full MATE desktop)</li>
+		    <li>mate-lite (minimal MATE desktop)</li>
+		    <li>cinnamon</li>
+		  </ul><br/>
+		  The easiest way of installing is to run the
+		  following command and replace gnome3 with the
+                  desktop environment of choice:
+		  <pre>
+# pkg install gnome3
+		  </pre>
+		  Or if you prefer to build from source:
+		  <pre>
+# cd /usr/ports/x11/gnome3
+# make clean
+# make install clean
+		  </pre>
+		</p>
+<!-- instead of copying text, link to the faq3.xml which has a item
+for how to geting stuff -->
+
+		<h2>State of the port:</h2>
+
+		<p>GNOME, MATE, and Cinnamon for &os; are currently
+		  fully supported on 10.2, 10.1, and 10-STABLE while
+		  support for 9.3, 9-STABLE, and 11.0-CURRENT is provided
+		  on a best effort basis. <!-- xxx volunteer page needs
+		  updating. There is still
+		  <a href="docs/volunteer.html">plenty left to be done</a>!--></p>
+
+		<p>GNOME is simple and easy to build using the &os; ports
+		  system, but sometimes things simply go wrong.  Please
+		  see our <a href="&base;/gnome/docs/bugging.html">Bug reporting</a>
+		  page for more info.</p>
 
 		<h2>Resources</h2>
 		<ul>
+		  <li><a href="https://wiki.freebsd.org/Gnome">FreeBSD GNOME's wiki page</a></li>
 		  <li><a href="http://www.gnome.org/">GNOME Project</a></li>
+		  <li><a href="http://news.gnome.org">GNOME Project news</a></li>
 		  <li><a href="http://developer.gnome.org">GNOME development platform</a></li>
-		  <li><a href="http://gnomedesktop.org">FootNotes</a></li>
-		  <li><a href="http://www.gnomejournal.org">GNOME Journal</a></li>
-		  <li><a href="http://www.gnomefiles.org">GNOME Files</a></li>
+		  <li><a href="http://www.gnomefiles.org">GTK+ software repository</a></li>
 		  <li><a href="http://planet.gnome.org">Planet GNOME (blogs)</a></li>
+		  <li><a href="http://mate-desktop.org/">MATE Project</a></li>
+		  <li><a href="http://cinnamon.linuxmint.com/">Cinnamon Project</a></li>
 		</ul>
 
 		<h2>Related Projects</h2>
 		<ul>
 		  <li><a href="http://www.kde.org/">KDE Project</a></li>
 		  <li><a href="http://freebsd.kde.org/">KDE on FreeBSD</a></li>
+		  <li><a href="http://www.xfce.org/">XFCE Project</a></li>
+		  <li><a href="https://wiki.freebsd.org/Xfce">XFCE on FreeBSD</a></li>
 		  <li><a href="http://www.opengroup.org/desktop/">CDE (commercial)</a></li>
 		</ul>
 
-		<a id="search" name="search"></a>
-		<form action="http://freebsd.rambler.ru/srch" method="get">
-		  <p>Search the freebsd-gnome mailing list archives:</p>
-		  <input type="text" name="words" size="25"/>
-		  <input type="hidden" name="rubric" value="122" />
-		  <input type="submit" value="Search"/>
-		</form>
-
 	  	</div> <!-- contentwrap -->
 
 	      <br class="clearboth" />