back to the good old stuff!

6 files changed, 263 insertions, 191 deletions

diff --git a/app-doc/gentoo-web/files/css/main-new.css b/app-doc/gentoo-web/files/css/main-new.css
index 6c4f84687dc5..cafe530e220e 100644
--- a/app-doc/gentoo-web/files/css/main-new.css
+++ b/app-doc/gentoo-web/files/css/main-new.css
@@ -74,6 +74,7 @@ a.altlink:active { color: #7a5ada; text-decoration: underline; }
 .alttext {

 	font-size: 0.65em;

 	font-family: Verdana, Arial, Helvetica;

+	color: #000000;

 /*	padding-left: 1.0em;

 	padding-right: 1.0em;*/

 }

diff --git a/app-doc/gentoo-web/files/css/resume.css b/app-doc/gentoo-web/files/css/resume.css
index acdcf35988f0..d7179a9fece3 100644
--- a/app-doc/gentoo-web/files/css/resume.css
+++ b/app-doc/gentoo-web/files/css/resume.css
@@ -1,5 +1,6 @@
 BODY {

-	font-family: Verdana, Helvetica; 

+	font-family: Georgia, Verdana, Arial; 

+	font-size: 0.9em;

 }

 

 a:link { color: #7a5ada; text-decoration: none; }

@@ -7,14 +8,14 @@ a:visited { color: #7a5ada; text-decoration: none; }
 a:hover { color: #7a5ada; text-decoration: underline; }

 a:active { color: #7a5ada; text-decoration: underline; }

 

-.secthead {

+.employer {

 	font-size: 1.25em;

 	padding-top: 0.15em;

 	padding-left: 1.0cm;

 	padding-right: 0.5cm; 

 }

 

-.chaphead {

+.secthead {

 	font-size: 1.5em;

 	padding-top: 0.15em;

 	padding-left: 0.5cm;

@@ -36,18 +37,12 @@ a:active { color: #7a5ada; text-decoration: underline; }
 	padding-right: 0.5cm; 

 }

 

-P {

+.desc {

 	margin: 0cm;

 	padding-top: 0em;

 	padding-bottom: 0.5em;

 	padding-left: 1.5cm;

-	padding-right: 1.5cm; 

-	font-size: 8pt;

-}

-

-.nopad {

-	margin: 0cm;

-	padding: 0.2cm;

+	padding-right: 0.5cm; 

 }

 

 .list {

diff --git a/app-doc/gentoo-web/files/xml/main-news.xml b/app-doc/gentoo-web/files/xml/main-news.xml
index d880f85df6c1..33ce436bd24e 100644
--- a/app-doc/gentoo-web/files/xml/main-news.xml
+++ b/app-doc/gentoo-web/files/xml/main-news.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<newspage id="news">
+<mainpage id="news">
 <title>Gentoo Linux News</title>
 <author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
 
@@ -87,4 +87,4 @@ Right now, the XML component of the news system is complete, and Thread (dev-wik
 		</body>
 	</news>
 </newsitems>
-</newspage>
+</mainpage>
diff --git a/app-doc/gentoo-web/files/xsl/guide-main.xsl b/app-doc/gentoo-web/files/xsl/guide-main.xsl
index 10a9197f9ff4..58dd54afec74 100755
--- a/app-doc/gentoo-web/files/xsl/guide-main.xsl
+++ b/app-doc/gentoo-web/files/xsl/guide-main.xsl
@@ -38,12 +38,53 @@
 					<tr><td class="logobg" valign="top" align="center" height="36"><a href="/index.html"><img border="0" src="/images/gbot-s.gif"/></a></td></tr>
 				</table>
 			</td>
+<!--			<td width="99%" valign="bottom" bgcolor="#000000">
+				<table class="menu" border="0" cellpadding="10" cellspacing="0">
+				<tr>
+					<td valign="top">
+						<xsl:variable name="mylink"><xsl:value-of select="/guide/@link"/></xsl:variable>
+						main menu ::<br/>
+						&#160;<a class="oldlink" href="/index.html">About Gentoo Linux</a><br/>
+						&#160;<a class="oldlink" href="/index-download.html">Download/Install</a><br/> 
+						&#160;<a class="oldlink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a><br/> 
+						&#160;<a class="oldlink" href="/index-changelog.html">CVS Changelog</a><br/> 
+						&#160;<a class="oldlink" href="/index-projects.html">Projects</a><br/> 
+						<br/>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<xsl:choose>
+						<xsl:when test="/guide/@type='project'">
+							projects
+						</xsl:when>
+						<xsl:otherwise>
+							docs 
+						</xsl:otherwise>
+						</xsl:choose>
+						::
+						<a class="highlight" href="{$mylink}">
+						<xsl:choose>
+						<xsl:when test="/guide/subtitle">
+							<xsl:value-of select="/guide/title"/>: <xsl:value-of select="/guide/subtitle"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="/guide/title"/>
+						</xsl:otherwise>
+						</xsl:choose>
+						</a>
+					</td>
+				</tr>
+				</table>
+			</td>
+		-->
 		</tr>
 		<tr>
 			<td valign="top" align="right" bgcolor="#ffffff">
 		
 <!--content begin-->
 
+<!--Netscape 4.7 hack table start-->
 <!--<table border="0" cellspacing="5" cellpadding="0" height="100%" width="100%">-->
 <table border="0" cellspacing="0" cellpadding="0" width="100%">
 <tr><td width="99%" class="content" valign="top" align="left">
@@ -70,7 +111,7 @@
 <!--		<xsl:variable name="me"><xsl:value-of select="/guide/@link"/></xsl:variable>-->
 		<option value="#{$chapid}"><xsl:number/>. <xsl:value-of select="title"/></option>
 <!--
-		&#160;<xsl:number/>&#160;<a  href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
+		&#160;<xsl:number/>&#160;<a class="altlink" href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
 	<xsl:value-of select="/guide/@link"/>
 	<option value="showdoc.html?i=1514&p=1">Select											
 
@@ -128,7 +169,7 @@
 					Contents:<br/>	
 						<xsl:for-each select="chapter">
 						<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-						&#160;<xsl:number/>&#160;<a  href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
+						&#160;<xsl:number/>&#160;<a class="altlink" href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
 						</xsl:for-each>		
 					</td>
 				</tr> -->
@@ -198,65 +239,215 @@ of your sale will go towards further Gentoo Linux development.</p>
 <xsl:template match="/mainpage">
 <html>
 <head>
-    <link title="new" rel="stylesheet" href="/resume.css" type="text/css"></link>
+    <link title="new" rel="stylesheet" href="/main-new.css" type="text/css"></link>
 	<title>Gentoo Linux -- <xsl:value-of select="title"/></title>
 </head>
-<body bgcolor="#ffffff">
-	
+<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
+	<!--<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">-->
 	<table border="0" width="100%" cellspacing="0" cellpadding="0">
 		<tr>
-			<td align="left" valign="top">
-			<img src="/images/icon-linux.png"/>
+			<td valign="top" height="125" width="1%" bgcolor="#45347b">
+				<table cellspacing="0" cellpadding="0" border="0" width="100%">
+					<tr><td class="logobg" valign="top" align="center" height="88"><a href="/index.html"><img border="0" src="/images/gtop-s.jpg"/></a></td></tr>
+					<tr><td class="logobg" valign="top" align="center" height="36"><a href="/index.html"><img border="0" src="/images/gbot-s.gif"/></a></td></tr>
+	</table>
 			</td>
-			<td rowspan="2" valign="top">	
-				<!--main area-->
-				<xsl:apply-templates select="chapter"/> 
+			
+			<td colspan="2" valign="bottom" align="left" bgcolor="#000000">
+				<p class="menu">
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='news'">
+							<a class="highlight" href="/index.html"> gentoo.org News</a> |
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="menulink" href="/index.html"> gentoo.org News</a> |
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='about'">
+							<a class="highlight" href="/index-about.html"> About Gentoo Linux</a> |
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="menulink" href="/index-about.html"> About Gentoo Linux</a> |
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='download'">
+							<a class="highlight" href="/index-download.html">Download/Install</a> | <a class="menulink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a> |
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="menulink" href="/index-download.html">Download/Install</a> | <a class="menulink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a> |
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='changelog'">
+							<a class="highlight" href="/index-changelog.html">CVS Changelog</a> |
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="menulink" href="/index-changelog.html">CVS Changelog</a> |
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='projects'">
+							<a class="highlight" href="/index-projects.html">Projects</a>
+						</xsl:when>
+						<xsl:otherwise>
+							<a class="menulink" href="/index-projects.html">Projects</a>
+						</xsl:otherwise>
+					</xsl:choose>
+				</p>
 			</td>
 		</tr>
 		<tr>
-			<td>
-				<br/><br/>
-				<p>Welcome to gentoo.org, the home of Gentoo Linux</p>
-				<p>
-					Download Mirrors:<br/>
-							<a href="http://www.ibiblio.org/gentoo">ibiblio.org (USA)</a><br/>
-							<a href="http://cfx5.tgv.net/">tgv.net (France, high speed)</a><br/>
-							<a href="ftp://ftp.ilug-bom.org.in/Linux/distributions/gentoo/">ILUG Bombay (India)</a><br/><br/>
-
-				</p>
-				<p>
-					User Docs:<br/>
-						<font color="#ff0000">Updated</font> <a href="/doc/faq.html">FAQ</a><br/>
-						<a  href="/doc/desktop.html">Desktop Guide</a><br/>
-						<a  href="/doc/portage-user.html">Portage User Guide</a><br/>
-						<font color="#ff0000">New!</font> <a  href="/doc/openafs.html">OpenAFS Installation Guide</a><br/>
-						<font color="#ff0000">New for 1.0_rc6!</font><a  href="/doc/build.html">"From Source" CD Install Guide</a><br/>
-						<a  href="/doc/nvidia_tsg.html">nvidia Troubleshooting Guide</a><br/>
+			<td valign="top" align="right" width="1%" bgcolor="#dddaec">
+				<!--<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">-->
+				<table width="100%" cellspacing="0" cellpadding="0" border="0">
+					<tr><td height="1%" valign="top" align="right">
+							<img src="/images/gridtest.gif"/>
+					</td></tr>
+					<tr><td height="99%" valign="top" align="right">
+						<!--info goes here-->			
+						<table cellspacing="0" cellpadding="5" border="0">
+						<!--<table width="90%" height="100%" cellspacing="0" cellpadding="5" border="0">-->
+						<tr><td valign="top">
+						<p class="altmenu">
+						Download Mirrors:<br/>
+							<a class="altlink" href="http://www.ibiblio.org/gentoo">ibiblio.org (USA)</a><br/>
+							<a class="altlink" href="http://cfx5.tgv.net/">tgv.net (France, high speed)</a><br/>
+							<a class="altlink" href="ftp://ftp.ilug-bom.org.in/Linux/distributions/gentoo/">ILUG Bombay (India)</a><br/><br/>
+<a href="http://www.qksrv.net/click-477620-5033206" target="_top" >
+<img src="http://www.qksrv.net/image-477620-5033206" width="88" height="31" alt="Factory-direct memory upgrades" border="0"/></a><br/><br/>
+User Docs:<br/>
+						<font color="#ff0000">Updated</font> <a class="altlink" href="/doc/faq.html">FAQ</a><br/>
+						<a class="altlink" href="/doc/desktop.html">Desktop Guide</a><br/>
+						<a class="altlink" href="/doc/portage-user.html">Portage User Guide</a><br/>
+						<font color="#ff0000">New!</font> <a class="altlink" href="/doc/openafs.html">OpenAFS Installation Guide</a><br/>
+						<font color="#ff0000">New for 1.0_rc6!</font><a class="altlink" href="/doc/build.html">"From Source" CD Install Guide</a><br/>
+						<a class="altlink" href="/doc/nvidia_tsg.html">nvidia Troubleshooting Guide</a><br/>
 						<br/>
 										<a href="http://www.qksrv.net/click-477620-57886" target="_top" >
 					<img src="http://www.qksrv.net/image-477620-57886" width="88" height="31" alt="Online Auto Loans" border="0"/></a><br/><br/>	
-					</p>
 						Developer Docs:<br/>
-						<font color="#ff0000">New!</font> <a  href="/doc/cvs-tutorial.html">CVS Tutorial</a><br/>
-						<font color="#ff0000">Updated 21 Sep 2001:</font> <a  href="/doc/gentoo-howto.html">Development HOWTO</a><br/>
-						<a  href="/doc/xml-guide.html">XML Documentation Guide</a><br/>
+						<font color="#ff0000">New!</font> <a class="altlink" href="/doc/cvs-tutorial.html">CVS Tutorial</a><br/>
+						<font color="#ff0000">Updated 21 Sep 2001:</font> <a class="altlink" href="/doc/gentoo-howto.html">Development HOWTO</a><br/>
+						<a class="altlink" href="/doc/xml-guide.html">XML Documentation Guide</a><br/>
 						<br/>
 	
 						Mailing Lists:<br/>
-						<font color="#ff0000">New!</font> <a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</a><br/>
-						<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</a><br/>
-						<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</a><br/>
-						<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-cvs">gentoo-cvs</a><br/>
-						<a  href="http://cvs.gentoo.org/mailman/listinfo">complete list</a><br/>
+						<font color="#ff0000">New!</font> <a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</a><br/>
+						<a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</a><br/>
+						<a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</a><br/>
+						<a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo/gentoo-cvs">gentoo-cvs</a><br/>
+						<a class="altlink" href="http://cvs.gentoo.org/mailman/listinfo">complete list</a><br/>
 						<br/>
 						Other Resources:<br/>
-						<a  href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> (browse our repository)<br/>
-						IRC: #gentoo on <a  href="http://www.openprojects.net/">OPN</a><br/>
-</td>
+						<a class="altlink" href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> (browse our repository)<br/>
+						IRC: #gentoo on <a class="altlink" href="http://www.openprojects.net/">OPN</a><br/>
+						<br/><br/></p></td></tr></table>
+					</td></tr>
+				</table>
+			</td>
+			<td valign="top" align="right" bgcolor="#ffffff">
+				<table border="0" cellspacing="5" cellpadding="0" width="100%">
+				<tr>
+					<td class="content" valign="top" align="left">
+					<xsl:choose>
+						<xsl:when test="/mainpage/@id='news'">
+							<img src="/images/gentoo-new.gif"/>
+							<br/>
+							<br/>
+							<xsl:apply-templates select="newsitems"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<p class="subhead"><xsl:value-of select="/mainpage/title"/></p> 
+							<br/>
+							<xsl:apply-templates select="chapter"/> 
+							<br/>
+							<br/>
+						</xsl:otherwise>
+					</xsl:choose>
+						<!--content end-->
+					</td>
+				</tr>
+				</table>
+			</td>
+			<td width="1%" bgcolor="#dddaec" valign="top">
+				<table border="0" cellspacing="5" cellpadding="0">
+				<tr>
+				<td>
+				<img src="/images/line.gif"/>
+				</td>
+				</tr>
+				<tr>
+				<td align="center" class="alttext">
+					Updated <xsl:value-of select="/mainpage/date"/>
+				</td>
+				</tr>
+				<tr>
+				<td>
+				<img src="/images/line.gif"/>
+				</td>
+				</tr>
+				<tr>
+				<td align="center">
+					<p class="alttext">Support our development efforts by donating via credit card!</p>
+							<!-- Begin PayPal Logo -->
+						<form action="https://www.paypal.com/cgi-bin/webscr" methd="post">
+						<input type="hidden" name="cmd" value="_xclick"/>
+						<input type="hidden" name="business" value="drobbins@gentoo.org"/>
+						<input type="hidden" name="item_name" value="Gentoo Linux Support"/>
+						<input type="hidden" name="item_number" value="1000"/>
+						<input type="hidden" name="image_url" value="http://www.gentoo.org/images/paypal.png"/>
+						<input type="hidden" name="no_shipping" value="1"/>
+						<input type="hidden" name="return" value="http://www.gentoo.org"/>
+						<input type="hidden" name="cancel_return" value="http://www.gentoo.org"/>
+						<input type="image" src="http://images.paypal.com/images/x-click-but21.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>
+						</form>
+						<!-- End PayPal Logo -->
+				</td>
+				</tr>
+				<tr>
+				<td>
+				<img src="/images/line.gif"/>
+				</td>
+				</tr>
+				<tr>
+				<td align="center">
+					<p class="alttext">Purchase RAM using this link, and a percentage
+of your sale will go towards further Gentoo Linux development.</p>
+<a href="http://www.qksrv.net/click-477620-5032687" target="_top" ><img src="http://www.qksrv.net/image-477620-5032687" width="125" height="125" alt="DDR Memory at Crucial.com" border="0"/></a>
+						<p class="alttext">Why these guys?  Because <b>cvs.gentoo.org</b> and <b>inventor.gentoo.org</b> use high-quality Crucial RAM. We know that it's good stuff because we rely on it ourselves.</p>
+				</td></tr>
+			<tr>
+				<td>
+				<img src="/images/line.gif"/>
+				</td>
+				</tr>
+					</table>
+			</td>
+			<!--
+			<td width="15%" class="infotext" valign="top" align="left" bgcolor="#ddddff">
+				<table border="0" cellspacing="5" cellpadding="0" width="100%">
+				<tr>
+					<td>
+						<br/>
+					</td>
+				</tr>
+			</table>
+			</td>
+			-->
+		</tr>
+		<tr>
+			<td align="right" class="infohead" width="100%" colspan="3" bgcolor="#7a5ada">
+			Copyright 2001 Gentoo
+		Technologies, Inc.  Questions, Comments, Corrections?  Email <a class="highlight"
+		href="mailto:gentoo-dev@gentoo.org">gentoo-dev@gentoo.org</a>.
+			</td>
 		</tr>
 	</table>
 </body>
 </html>
+
 </xsl:template>
 
 <xsl:template match="newsitems">
@@ -308,7 +499,7 @@ of your sale will go towards further Gentoo Linux development.</p>
 </xsl:template>
 
 <xsl:template match="author/mail">
-	<b><a  href="mailto:{@link}"><xsl:value-of select="."/></a></b>
+	<b><a class="altlink" href="mailto:{@link}"><xsl:value-of select="."/></a></b>
 </xsl:template>
 
 <xsl:template match="author">
diff --git a/app-doc/gentoo-web/files/xsl/resume-html.xsl b/app-doc/gentoo-web/files/xsl/resume-html.xsl
index 39379d6ba131..c637115ca56e 100644
--- a/app-doc/gentoo-web/files/xsl/resume-html.xsl
+++ b/app-doc/gentoo-web/files/xsl/resume-html.xsl
@@ -3,141 +3,25 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output encoding="iso-8859-1" method="html" indent="yes"/> 
 
-<xsl:template match="mainpage">
-<html>
-<head>
-    <link title="new" rel="stylesheet" href="/resume.css" type="text/css"></link>
-	<title>Daniel Robbins</title>
-</head>
-<body bgcolor="#ffffff">
-	<xsl:apply-templates select="chapter"/>
-</body>
-</html>
-</xsl:template>
-
-<xsl:template match="newspage">
-<html>
-<head>
-    <link title="new" rel="stylesheet" href="/resume.css" type="text/css"></link>
-	<title>Daniel Robbins</title>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-	<table width="100%" border="0" cellpadding="0" cellspacing="0">
-	<tr>
-	<td valign="top" align="left">
-	<center>
-	<img src="images/newg.png"/>
-	<br/>
-	<p class="secthead"><b>gentoo.org: </b><a href="">foo</a> | <a href="">foo</a> | <a href="">foo</a></p>
-	</center>
-	<br/>
-	<xsl:apply-templates select="newsitems"/>
-	</td><!--
-	<td valign="top" bgcolor="#d2d9a3" width="150">-->
-	<td valign="top" align="left" width="150">
-		<br/>
-		<img src="/images/icon-linux.png"/>
-		<br/>
-		<br/>
-		<p class="nopad">
-			Download Mirrors:<br/>
-			<a href="http://www.ibiblio.org/gentoo">ibiblio.org (USA)</a><br/>
-			<a href="http://cfx5.tgv.net/">tgv.net (France, high speed)</a><br/>
-			<a href="ftp://ftp.ilug-bom.org.in/Linux/distributions/gentoo/">ILUG Bombay (India)</a><br/><br/>
-		</p>
-		<p class="nopad">
-			User Docs:<br/>
-			<font color="#ff0000">Updated</font> <a href="/doc/faq.html">FAQ</a><br/>
-			<a  href="/doc/desktop.html">Desktop Guide</a><br/>
-			<a  href="/doc/portage-user.html">Portage User Guide</a><br/>
-			<font color="#ff0000">New!</font> <a  href="/doc/openafs.html">OpenAFS Installation Guide</a><br/>
-			<font color="#ff0000">New for 1.0_rc6!</font><a  href="/doc/build.html">"From Source" CD Install Guide</a><br/>
-			<a  href="/doc/nvidia_tsg.html">nvidia Troubleshooting Guide</a>
-		</p>
-		<p class="nopad">
-			<a href="http://www.qksrv.net/click-477620-57886" target="_top" >
-			<img src="http://www.qksrv.net/image-477620-57886" width="88" height="31" alt="Online Auto Loans" border="0"/></a>	
-		</p>
-		<p class="nopad">
-			Developer Docs:<br/>
-			<font color="#ff0000">New!</font> <a  href="/doc/cvs-tutorial.html">CVS Tutorial</a><br/>
-			<font color="#ff0000">Updated 21 Sep 2001:</font> <a  href="/doc/gentoo-howto.html">Development HOWTO</a><br/>
-			<a  href="/doc/xml-guide.html">XML Documentation Guide</a><br/>
-		</p>
-		<p class="nopad">
-			Mailing Lists:<br/>
-			<font color="#ff0000">New!</font> <a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</a><br/>
-			<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</a><br/>
-			<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</a><br/>
-			<a  href="http://cvs.gentoo.org/mailman/listinfo/gentoo-cvs">gentoo-cvs</a><br/>
-			<a  href="http://cvs.gentoo.org/mailman/listinfo">complete list</a><br/>
-		</p>
-		<p class="nopad">
-			Other Resources:<br/>
-			<a  href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> (browse our repository)<br/>
-			IRC: #gentoo on <a  href="http://www.openprojects.net/">OPN</a><br/>
-		</p>
-	</td>
-	</tr>
-	</table>
-</body>
-</html>
-</xsl:template>
-
-<xsl:template match="newsitems">
-	<xsl:apply-templates select="news"/>
-</xsl:template>
-
-<xsl:template match="news">
-	<p class="secthead"><b><xsl:value-of select="title"/></b></p>
-	<p>Posted by <xsl:value-of select="poster"/> on <xsl:value-of select="date"/></p>
-	<xsl:apply-templates select="body"/>
-	<br/>
-</xsl:template>
-
-
-<xsl:template match="chapter">
-	<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-	<xsl:choose>
-	<xsl:when test="title">
-		<p class="chaphead"><b><a name="{$chapid}"><xsl:number/>.</a> <xsl:value-of select="title"/></b></p>
-	</xsl:when>
-	<xsl:otherwise>
-		<xsl:if test="/guide">
-			<p class="chaphead"><b><a name="{$chapid}"><xsl:number/>.</a></b></p> 
-		</xsl:if>
-	</xsl:otherwise>
-	</xsl:choose>
-	<xsl:apply-templates select="section"/>
-</xsl:template>
-
-<xsl:template match="section">
-	<xsl:if test="title">
-		<xsl:variable name="sectid"><xsl:value-of select="$chapid"/>_sect<xsl:number/></xsl:variable>
-		<p class="secthead"><a name="{$sectid}"><xsl:value-of select="title"/>&#160;</a></p>
-	</xsl:if>
-	<xsl:apply-templates select="body"/>
-</xsl:template>
-
 <xsl:template match="/resume">
 <html>
 <head>
-    <link title="new" rel="stylesheet" href="/resume.css" type="text/css"></link>
+    <link title="new" rel="stylesheet" href="resume.css" type="text/css"></link>
 	<title>Daniel Robbins</title>
 </head>
 <body bgcolor="#ffffff">
 <br/>
 <center>
 <p class="address">
-<b><span class="chaphead"><xsl:value-of select="name"/></span><br/><br/>
+<b><span class="secthead"><xsl:value-of select="name"/></span><br/><br/>
 <xsl:apply-templates select="contactinfo"/>
 </b></p>
 </center>
-<p class="chaphead"><b>Experience</b></p>
+<p class="secthead"><b>Experience</b></p>
 <xsl:apply-templates select="employer"/>
-<p class="chaphead"><b>Skills</b></p>
+<p class="secthead"><b>Skills</b></p>
 <xsl:apply-templates select="skills"/>
-<p class="chaphead"><b>Education</b></p>
+<p class="secthead"><b>Education</b></p>
 <xsl:apply-templates select="education"/>
 <br/>
 <br/>
@@ -155,11 +39,9 @@
 </xsl:template>
 
 <xsl:template match="education">
-	<p>
-	<table border="0" width="100%">
+	<table class="desc" border="0" width="100%">
 		<xsl:apply-templates select="school"/>
 	</table>
-	</p>
 </xsl:template>
 
 <xsl:template match="school">
@@ -178,7 +60,7 @@
 </xsl:template>
 
 <xsl:template match="employer">
-	<p class="secthead"><b><xsl:apply-templates select="name"/></b>
+	<p class="employer"><b><xsl:apply-templates select="name"/></b>
 	</p>
 	<xsl:apply-templates select="position"/>
 </xsl:template>
@@ -192,7 +74,7 @@
 </xsl:template>
 
 <xsl:template match="body/p">
-	<p><xsl:apply-templates /></p>
+	<p class="desc"><xsl:apply-templates /></p>
 </xsl:template>
 
 
diff --git a/app-doc/gentoo-web/gentoo-web-2.2.ebuild b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
index 36c024ac89e0..3537409906f6 100644
--- a/app-doc/gentoo-web/gentoo-web-2.2.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc. Distributed under the terms
 # of the GNU General Public License, v2 or later 
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.21 2001/10/10 21:39:31 drobbins Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.2.ebuild,v 1.22 2001/10/11 03:43:46 drobbins Exp $
  
+# WARNING: THIS EBUILD SHOULD BE EDITED BY DANIEL ROBBINS ONLY
+ 
+TEMPLATE="xsl/guide-main.xsl"
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
 SRC_URI="http://www.red-bean.com/cvs2cl/cvs2cl.pl"
@@ -25,7 +28,7 @@ src_install() {
 	local x
 	for x in build desktop xml-guide portage-user gentoo-howto faq nvidia_tsg openafs cvs-tutorial
 	do
-		xsltproc xsl/resume-html.xsl xml/${x}.xml > ${D}/usr/local/httpd/htdocs/doc/${x}.html || die
+		xsltproc $TEMPLATE xml/${x}.xml > ${D}/usr/local/httpd/htdocs/doc/${x}.html || die
 	done
 	dodir /usr/local/httpd/htdocs/images
 	insinto /usr/local/httpd/htdocs/images
@@ -38,16 +41,16 @@ src_install() {
 	
 	#dynamic firewalls tools page
 	cd ${FILESDIR}
-	xsltproc xsl/guide-main.xsl xml/dynfw.xml > ${D}/usr/local/httpd/htdocs/projects/dynfw.html	|| die
-	xsltproc xsl/guide-main.xsl xml/project-xml.xml > ${D}/usr/local/httpd/htdocs/projects/xml.html	|| die
+	xsltproc $TEMPLATE xml/dynfw.xml > ${D}/usr/local/httpd/htdocs/projects/dynfw.html	|| die
+	xsltproc $TEMPLATE xml/project-xml.xml > ${D}/usr/local/httpd/htdocs/projects/xml.html	|| die
 	
 	#resume
 	xsltproc xsl/resume-html.xsl xml/resume.xml > ${D}/usr/local/httpd/htdocs/resume.html || die
 	
 	#both URLs should work
 	dodir /usr/local/httpd/htdocs/projects/keychain
-	xsltproc xsl/guide-main.xsl xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain.html || die	
-	xsltproc xsl/guide-main.xsl xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain/index.html	|| die
+	xsltproc $TEMPLATE xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain.html || die	
+	xsltproc $TEMPLATE xml/keychain.xml > ${D}/usr/local/httpd/htdocs/projects/keychain/index.html	|| die
 	
 	insinto /usr/local/httpd/htdocs/projects
 	doins dynfw/dynfw-1.0.1.tar.gz 
@@ -58,10 +61,10 @@ src_install() {
 	
 	insinto /usr/local/httpd/htdocs
 
-	xsltproc xsl/resume-html.xsl xml/main-news.xml > ${D}/usr/local/httpd/htdocs/index.html || die
-	xsltproc xsl/resume-html.xsl xml/main-about.xml > ${D}/usr/local/httpd/htdocs/index-about.html || die
-	xsltproc xsl/resume-html.xsl xml/main-download.xml > ${D}/usr/local/httpd/htdocs/index-download.html || die
-	xsltproc xsl/resume-html.xsl xml/main-projects.xml > ${D}/usr/local/httpd/htdocs/index-projects.html || die
+	xsltproc $TEMPLATE xml/main-news.xml > ${D}/usr/local/httpd/htdocs/index.html || die
+	xsltproc $TEMPLATE xml/main-about.xml > ${D}/usr/local/httpd/htdocs/index-about.html || die
+	xsltproc $TEMPLATE xml/main-download.xml > ${D}/usr/local/httpd/htdocs/index-download.html || die
+	xsltproc $TEMPLATE xml/main-projects.xml > ${D}/usr/local/httpd/htdocs/index-projects.html || die
 
 	doins css/main-new.css css/resume.css