digest and web stuff

12 files changed, 719 insertions, 249 deletions

diff --git a/app-doc/gentoo-web/files/css/main-new.css b/app-doc/gentoo-web/files/css/main-new.css
index cafe530e220e..6c4f84687dc5 100644
--- a/app-doc/gentoo-web/files/css/main-new.css
+++ b/app-doc/gentoo-web/files/css/main-new.css
@@ -74,7 +74,6 @@ 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 d7179a9fece3..acdcf35988f0 100644
--- a/app-doc/gentoo-web/files/css/resume.css
+++ b/app-doc/gentoo-web/files/css/resume.css
@@ -1,6 +1,5 @@
 BODY {

-	font-family: Georgia, Verdana, Arial; 

-	font-size: 0.9em;

+	font-family: Verdana, Helvetica; 

 }

 

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

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

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

 

-.employer {

+.secthead {

 	font-size: 1.25em;

 	padding-top: 0.15em;

 	padding-left: 1.0cm;

 	padding-right: 0.5cm; 

 }

 

-.secthead {

+.chaphead {

 	font-size: 1.5em;

 	padding-top: 0.15em;

 	padding-left: 0.5cm;

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

 }

 

-.desc {

+P {

 	margin: 0cm;

 	padding-top: 0em;

 	padding-bottom: 0.5em;

 	padding-left: 1.5cm;

-	padding-right: 0.5cm; 

+	padding-right: 1.5cm; 

+	font-size: 8pt;

+}

+

+.nopad {

+	margin: 0cm;

+	padding: 0.2cm;

 }

 

 .list {

diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-2.1 b/app-doc/gentoo-web/files/digest-gentoo-web-2.1
new file mode 100644
index 000000000000..d7385e79d031
--- /dev/null
+++ b/app-doc/gentoo-web/files/digest-gentoo-web-2.1
@@ -0,0 +1 @@
+MD5 bb5da6e1cf5083a747eda47cfe1d52a2 cvs2cl.pl
diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-2.2 b/app-doc/gentoo-web/files/digest-gentoo-web-2.2
new file mode 100644
index 000000000000..d7385e79d031
--- /dev/null
+++ b/app-doc/gentoo-web/files/digest-gentoo-web-2.2
@@ -0,0 +1 @@
+MD5 bb5da6e1cf5083a747eda47cfe1d52a2 cvs2cl.pl
diff --git a/app-doc/gentoo-web/files/xml/install.txt b/app-doc/gentoo-web/files/xml/install.txt
new file mode 100644
index 000000000000..a261ac889081
--- /dev/null
+++ b/app-doc/gentoo-web/files/xml/install.txt
@@ -0,0 +1,19 @@
+<drobbins> 1. create partitions
+<drobbins> 2. mount to /mnt/gentoo, /mnt/gentoo/boot
+<drobbins> 3. export ROOT=/mnt/gentoo
+<drobbins> 4. mkdir /etc, /etc/env.d, create make.profile symlink
+<drobbins> 5. emerge --usepkg system
+<drobbins> 6. /mnt/gentoo/etc/rc.d/init.d/initscripts-install
+6.5 emerge linux[-sources]-2.4.4.9
+<drobbins> ?
+<achim> nope
+<achim> 6. chroot $ROOT
+	(optional kernel compile stage)
+<drobbins> it should work without chroot
+<achim> emerge whatever
+<achim> k
+<drobbins> 7. chroot
+<drobbins> 8. keymap, fstab, etc. etc.
+<achim> ....
+<drobbins> 9. grub
+<drobbins> 10. reboot
diff --git a/app-doc/gentoo-web/files/xml/main-news.xml b/app-doc/gentoo-web/files/xml/main-news.xml
index 33ce436bd24e..d880f85df6c1 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'?>
-<mainpage id="news">
+<newspage 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>
-</mainpage>
+</newspage>
diff --git a/app-doc/gentoo-web/files/xml/resume.xml b/app-doc/gentoo-web/files/xml/resume.xml
new file mode 100644
index 000000000000..4f2f21e68aca
--- /dev/null
+++ b/app-doc/gentoo-web/files/xml/resume.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resume>
+	<name>Daniel Robbins</name>
+	<contactinfo>
+	<line>205 Tulane SE</line>
+	<line>Albuquerque, NM 87106</line>
+	<line>(505) 268-5844</line>
+	<line>email: drobbins@gentoo.org</line>
+	</contactinfo>
+	<employer>
+		<name><uri link="http://www.ibm.com/developerworks">IBM developerWorks</uri></name>
+		<position>
+			<title>Regular Columnist</title>
+			<start>January 2000</start>
+			<stop>Present</stop>
+
+<body>
+
+<p>Author of in-depth Unix-related articles
+geared towards developers and IT professionals.
+Special emphasis on Linux technologies. Past
+topics:</p>
+
+<ul>
+<li><b>Network security:</b> Stateful firewall design, dynamic firewall scripts</li>
+<li><b>Software development:</b> POSIX threads, cvs, bash, awk, sed, rebol</li>
+<li><b>Unix apps:</b> OpenSSH authentication strategies, Samba, vi, GRUB, tape backup and restore</li>
+<li><b>Filesystems:</b> LVM, Software RAID, ReiserFS, ext3, tmpfs, devfs</li>
+</ul>
+
+</body>
+
+		</position>
+	</employer>
+	<employer>
+		<name><uri link="http://www.gentoo.org">Gentoo Technologies, Inc.</uri></name>
+		<position>
+			<title>Chief Architect, Gentoo Linux</title>
+			<start>January 1999</start>
+			<stop>Present</stop>
+
+			<body>
+
+<p>Creator of <uri link="http://www.gentoo.org">Gentoo Linux</uri>, a
+next-generation Linux distribution. Responsible for all aspects of Gentoo
+Linux, including:</p>
+
+<ul>
+<li><b>Project leadership:</b> Management of 25+ member development team, strategic planning, distribution design</li>
+<li><b>Development:</b> Principal developer of Portage, our advanced ports system</li>
+<li><b>Quality Control:</b> Security and overall distribution quality</li>
+<li><b>Network infrastructure:</b> gentoo.org servers, Web site, XML documentation, developer access, CVS, mirroring, backup</li>
+</ul>
+
+</body>
+
+		</position>
+	</employer>
+<employer>
+		<name><uri link="http://www.macmillanusa.com">Macmillan Computer Publishing</uri></name>
+		<position>
+			<title>Contributing Author</title>
+			<start>January 1999</start>
+			<stop>January 2000</stop>
+
+			<body>
+<p>Contributing Author for the following books: <e>Samba Unleashed</e>, <e>SuSE Linux Unleashed</e> and <e>Caldera OpenLinux Unleashed</e>.</p>
+			</body>
+	
+		</position>
+	</employer>
+		<employer>
+		<name><uri link="http://www.unm.edu">University of New Mexico</uri></name>
+		<position>
+			<title>Visiting Faculty</title>
+			<start>January 2000</start>
+			<stop>May 2000</stop>
+
+			<body>
+
+<p>Created and taught a Python-based introductory computer programming curriculum.</p>
+
+			</body>
+		</position>
+		<position>
+			<title>LAN Administrator</title>
+			<start>July 1997</start>
+			<stop>May 1999</stop>
+
+			<body>
+<!--<p>Administrated 70+ machine departmental Windows NT/Linux computing environment.  Executed transition from Windows NT 3.51 to 4.0, deployed  Linux-based computing services and created departmental Intranet.  Built and repaired servers and workstations. Trained faculty and staff.</p>-->
+
+<p>Responsible for a departmental network consisting of 70+ Windows NT/Linux systems.  Responsibilities: departmental Windows NT 3.51 to 4.0 transition, Linux-based computing services deployment, Intranet deployment, computer construction and maintenance and user training.</p>
+			</body>
+		</position>
+		<position>
+			<title>User Support Specialist</title>
+			<start>December 1996</start>
+			<stop>July 1997</stop>
+
+			<body>
+<p>Supervised UNM North Campus transition to Novell GroupWise; trained new support staff and maintained technical documentation.</p>
+			</body>
+		</position>
+	
+	</employer>
+<employer>
+		<name><uri link="http://www.sony.com">Sony Electronic Publishing</uri></name>
+		<location>Cambridge, MA</location>
+		<position>
+			<title>Assistant Producer/Lead Graphic Artist</title>
+			<start>August 1994</start>
+			<stop>August 1995</stop>
+			<body>
+
+<p>Created new graphics for an enhanced version of the extremely popular
+<e>Lemmings</e> video game.  Submitted all North American cartridge and CD
+titles to Nintendo and Sega.  Created an internationally-replicated Lotus Notes
+database to track all game submissions.</p>
+
+			</body>
+		</position>
+		<position>
+			<title>Tech Support Representative</title>
+			<start>June 1993</start>
+			<stop>January 1994</stop>
+			<body>
+
+<p>Provided phone and Internet support for all Psygnosis titles.  Maintained
+in-house support documentation and mailings.  Established Psygnosis' Internet
+presence, including domain registration and email.  Created Psygnosis' US
+product catalog.  Beta-tested games in development.</p>
+
+			</body>
+		</position>
+</employer>
+<skills>
+	<ul>
+		<li><b>System Administration:</b><br/>
+			<ul>
+				<li><b>Linux expertise:</b> distribution design, deployment, administration (4+ years)</li>
+				<li><b>Operating systems:</b> Linux, FreeBSD, Windows NT</li>
+				<li><b>Network security/performance:</b> Stateful firewall design, QoS, OpenSSH</li>
+				<li><b>Network apps:</b> Samba (4+ years), cvs, apache, postfix, qmail, exim and more</li>
+			</ul>
+		</li>
+		<li><b>Software Development:</b><br/>
+			<ul>
+				<li><b>Python</b> (4+ years)</li>
+				<li><b>C</b> (4+ years)</li>
+				<li><b>XML, XSLT, XSL:FO, HTML, CSS</b></li>
+				<li><b>Bash</b> (4+ years)</li>
+				<li><b>Multithreading, socket programming</b></li>
+				<li><b>Object Pascal, x86 assembly, others</b></li>
+			</ul>
+		</li>
+		<li><b>Graphic Design:</b><br/>
+			<ul>
+				<li><b>Web (<uri>http://www.gentoo.org</uri>) and video game graphics</b></li>
+				<li><b>Extensive 3D experience:</b> modeling and animation</li>
+				<li><b>Page layout:</b> Web and print</li>
+			</ul>
+		</li>
+	</ul>
+</skills>
+<education>
+	<school>
+		<name>Worcester Polytechnic Institute</name>
+		<location>Worcester, MA</location>
+		<start>1992</start>
+		<stop>1993</stop>
+	</school>
+	<school>
+		<name>Brookline High School</name>
+		<location>Brookline, MA</location>
+		<start>1988</start>
+		<stop>1992</stop>
+	</school>
+</education>
+</resume>
diff --git a/app-doc/gentoo-web/files/xml/xml-test.xml b/app-doc/gentoo-web/files/xml/xml-test.xml
new file mode 100644
index 000000000000..e17d047f7a44
--- /dev/null
+++ b/app-doc/gentoo-web/files/xml/xml-test.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<guide>
+<title>Gentoo Linux Documentation Guide</title>
+<author title="Chief Architect"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
+<author title="Editor"><mail link="thomasfl@gentoo.org">Thomas Flavel</mail></author>
+
+<abstract>This guide shows you how to compose web documentation using the new lightweight Gentoo guide
+XML syntax.  This syntax is the official format for Gentoo Linux documentation, and this document
+itself was created using guide XML.  This guide assumes a basic working knowledge of XML and HTML.
+</abstract>
+
+<version>1.0</version>
+<date>29 Mar 2001</date>
+
+<chapter>
+<title>Guide basics</title>
+
+<section>
+<title>Guide XML design goals</title>
+<body>
+
+<p> The guide XML syntax is lightweight yet expressive, so that it is easy to
+learn yet also provides all the features we need for the creation of web
+documentation.  The number of tags is kept to a minimum -- just those we need.
+This makes it easy to transform guide into other formats, such as DocBook
+XML/SGML or web-ready HTML.  </p>
+
+<p>The goal is to make it easy to <e>create</e> and <e>transform</e> guide XML
+documents.</p>
+
+</body>
+</section>
+
+</chapter>
+</guide>
+
diff --git a/app-doc/gentoo-web/files/xsl/guide-main.xsl b/app-doc/gentoo-web/files/xsl/guide-main.xsl
index 58dd54afec74..10a9197f9ff4 100755
--- a/app-doc/gentoo-web/files/xsl/guide-main.xsl
+++ b/app-doc/gentoo-web/files/xsl/guide-main.xsl
@@ -38,53 +38,12 @@
 					<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">
@@ -111,7 +70,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 class="altlink" href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
+		&#160;<xsl:number/>&#160;<a  href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
 	<xsl:value-of select="/guide/@link"/>
 	<option value="showdoc.html?i=1514&p=1">Select											
 
@@ -169,7 +128,7 @@
 					Contents:<br/>	
 						<xsl:for-each select="chapter">
 						<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-						&#160;<xsl:number/>&#160;<a class="altlink" href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
+						&#160;<xsl:number/>&#160;<a  href="#{$chapid}"><xsl:value-of select="title"/></a><br/>
 						</xsl:for-each>		
 					</td>
 				</tr> -->
@@ -239,215 +198,65 @@ of your sale will go towards further Gentoo Linux development.</p>
 <xsl:template match="/mainpage">
 <html>
 <head>
-    <link title="new" rel="stylesheet" href="/main-new.css" type="text/css"></link>
+    <link title="new" rel="stylesheet" href="/resume.css" type="text/css"></link>
 	<title>Gentoo Linux -- <xsl:value-of select="title"/></title>
 </head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-	<!--<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">-->
+<body bgcolor="#ffffff">
+	
 	<table border="0" width="100%" cellspacing="0" cellpadding="0">
 		<tr>
-			<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 align="left" valign="top">
+			<img src="/images/icon-linux.png"/>
 			</td>
-			
-			<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 rowspan="2" valign="top">	
+				<!--main area-->
+				<xsl:apply-templates select="chapter"/> 
 			</td>
 		</tr>
 		<tr>
-			<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/>
+			<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/>
 						<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 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/>
+						<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/>
 						<br/>
 	
 						Mailing Lists:<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/>
+						<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/>
 						<br/>
 						Other Resources:<br/>
-						<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>
+						<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>
 		</tr>
 	</table>
 </body>
 </html>
-
 </xsl:template>
 
 <xsl:template match="newsitems">
@@ -499,7 +308,7 @@ of your sale will go towards further Gentoo Linux development.</p>
 </xsl:template>
 
 <xsl:template match="author/mail">
-	<b><a class="altlink" href="mailto:{@link}"><xsl:value-of select="."/></a></b>
+	<b><a  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-fo.xsl b/app-doc/gentoo-web/files/xsl/resume-fo.xsl
new file mode 100644
index 000000000000..07edb42fa4f9
--- /dev/null
+++ b/app-doc/gentoo-web/files/xsl/resume-fo.xsl
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:output encoding="iso-8859-1" method="xml" indent="yes"/> 
+
+<xsl:template match="/resume">
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+	<fo:layout-master-set>
+		<fo:simple-page-master master-name="US-Letter" page-height="11in" page-width="8.5in" margin-top="0.5in" margin-bottom="0.5in" margin-left="1.0in"  margin-right="1.0in">
+			<fo:region-body/>
+		</fo:simple-page-master>
+	</fo:layout-master-set>
+  	<fo:page-sequence master-name="US-Letter">
+
+		<fo:flow flow-name="xsl-region-body">
+		<fo:block font-size="18pt" 
+				font-family="Times Roman" 
+				font-variant="small-caps"
+				font-weight="bold"
+				line-height="24pt"
+				text-align="center"
+				padding-top="3pt">
+		<xsl:apply-templates select="name"/>
+		</fo:block>
+		<fo:block font-size="10pt" 
+				font-family="Times Roman" 
+				text-align="center">
+		<xsl:apply-templates select="contactinfo"/>
+		</fo:block>
+		<fo:block font-size="16pt" 
+				font-family="Times Roman" 
+				font-variant="small-caps"
+				padding-top="3pt">
+				Experience
+		</fo:block>
+		<fo:block text-align="justify">
+			<xsl:apply-templates select="employer"/>	
+		</fo:block>
+		</fo:flow>
+	</fo:page-sequence>
+</fo:root>
+</xsl:template>
+
+<xsl:template match="name">
+	<xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="contactinfo">
+	<xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="line">
+	<fo:block><xsl:apply-templates/></fo:block>
+</xsl:template>
+
+<xsl:template match="employer">
+	<fo:block font-size="10pt" start-indent="0.25cm"
+				font-family="Times Roman" 
+				font-weight="bold"
+				padding-top="0.25cm"
+				border-bottom-style="solid"
+				border-bottom-width="0.1pt"
+				>
+	<xsl:apply-templates select="name"/>
+	</fo:block>
+	<xsl:apply-templates select="position"/>
+</xsl:template>
+
+<xsl:template match="position">
+	<fo:block padding-top="0.25cm" start-indent="0.5cm">
+	<fo:table>
+		<fo:table-column column-width="3.25in"/>
+		<fo:table-column column-width="3.25in"/>
+		<fo:table-body>
+		<fo:table-row>
+		<fo:table-cell>
+		<fo:block font-size="10pt" 
+			font-family="Times Roman" 
+			font-weight="bold"
+			font-variant="small-caps">
+			<xsl:apply-templates select="title"/> 
+		</fo:block>
+		</fo:table-cell>
+		<fo:table-cell>
+		<fo:block text-align="end" font-size="10pt" 
+			font-family="Times Roman" 
+			font-variant="small-caps">
+			<xsl:value-of select="start"/> to <xsl:value-of select="stop"/>
+		</fo:block>
+		</fo:table-cell>
+		</fo:table-row>
+		</fo:table-body>
+	</fo:table>
+		<fo:block font-size="9pt" 
+			font-family="Times Roman" 
+			padding-top="3pt">
+			<xsl:apply-templates select="body"/>
+		</fo:block>
+	</fo:block>
+</xsl:template>
+
+<xsl:template match="body">
+	<xsl:apply-templates /> 
+</xsl:template>
+
+<xsl:template match="p">
+	<fo:block><xsl:apply-templates /></fo:block>
+</xsl:template>
+
+<xsl:template match="e">
+	<fo:inline font-style="italic"><xsl:apply-templates /></fo:inline>
+</xsl:template> 
+</xsl:stylesheet>
diff --git a/app-doc/gentoo-web/files/xsl/resume-html.xsl b/app-doc/gentoo-web/files/xsl/resume-html.xsl
new file mode 100644
index 000000000000..39379d6ba131
--- /dev/null
+++ b/app-doc/gentoo-web/files/xsl/resume-html.xsl
@@ -0,0 +1,300 @@
+<?xml version='1.0' encoding="iso-8859-1"?>
+
+<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>
+	<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/>
+<xsl:apply-templates select="contactinfo"/>
+</b></p>
+</center>
+<p class="chaphead"><b>Experience</b></p>
+<xsl:apply-templates select="employer"/>
+<p class="chaphead"><b>Skills</b></p>
+<xsl:apply-templates select="skills"/>
+<p class="chaphead"><b>Education</b></p>
+<xsl:apply-templates select="education"/>
+<br/>
+<br/>
+<br/>
+</body>
+</html>
+</xsl:template>
+
+<xsl:template match="contactinfo">
+<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="line">
+<xsl:apply-templates /><br/>
+</xsl:template>
+
+<xsl:template match="education">
+	<p>
+	<table border="0" width="100%">
+		<xsl:apply-templates select="school"/>
+	</table>
+	</p>
+</xsl:template>
+
+<xsl:template match="school">
+	 	<tr>
+			<td>
+				<b><xsl:apply-templates select="name"/></b>, <xsl:value-of select="location"/>
+			</td>
+			<td>
+				<xsl:value-of select="start"/> to <xsl:value-of select="stop"/>
+			</td>
+		</tr>
+</xsl:template>
+
+<xsl:template match="skills">
+	<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="employer">
+	<p class="secthead"><b><xsl:apply-templates select="name"/></b>
+	</p>
+	<xsl:apply-templates select="position"/>
+</xsl:template>
+
+<xsl:template match="position">
+	<p class="header">
+	<b><xsl:apply-templates select="title"/></b><br/>
+	<xsl:value-of select="start"/> to <xsl:value-of select="stop"/>
+	</p>
+	<xsl:apply-templates select="body"/>
+</xsl:template>
+
+<xsl:template match="body/p">
+	<p><xsl:apply-templates /></p>
+</xsl:template>
+
+
+<xsl:template match="ul">
+	<ul class="list"><xsl:apply-templates /></ul>
+</xsl:template>
+
+<xsl:template match="li/ul">
+	<ul class="sublist"><xsl:apply-templates /></ul>
+</xsl:template>
+
+<xsl:template match="p">
+	<p><xsl:apply-templates /></p>
+</xsl:template>
+
+<xsl:template match="ol">
+	<ol class="list"><xsl:apply-templates /></ol>
+</xsl:template>
+
+<xsl:template match="li/ol">
+	<ol class="sublist"><xsl:apply-templates /></ol>
+</xsl:template>
+
+<xsl:template match="li">
+	<li class="listitem"><xsl:apply-templates /></li>
+</xsl:template>
+
+<xsl:template match="body/ul/li">
+	<li><xsl:apply-templates /></li>
+</xsl:template>
+
+<xsl:template match="body/ol/li">
+	<li><xsl:apply-templates /></li>
+</xsl:template>
+
+
+<xsl:template match="li/ol/li">
+	<li class="sublistitem"><xsl:apply-templates /></li>
+</xsl:template>
+
+<xsl:template match="li/ul/li">
+	<li class="sublistitem"><xsl:apply-templates /></li>
+</xsl:template>
+
+
+<xsl:template match="br"><br/></xsl:template>
+
+<xsl:template match="i">
+	<font class="input"><xsl:apply-templates /></font>
+</xsl:template>
+
+<xsl:template match="b">
+	<b><xsl:apply-templates /></b>
+</xsl:template>
+
+<xsl:template match="brite">
+	<font color="#ff0000"><b><xsl:apply-templates /></b></font>
+</xsl:template>
+
+<xsl:template match="body">
+	<xsl:apply-templates />
+</xsl:template>
+
+<xsl:template match="path">
+	<font class="path"><xsl:value-of select="."/></font>
+</xsl:template>
+
+<xsl:template match="uri">
+	<!-- expand templates to handle things like <uri link="http://bar"><c>foo</c></uri> -->
+	<xsl:choose>
+		<xsl:when test="@link">
+			<a href="{@link}"><xsl:apply-templates /></a>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:variable name="loc" select="."/>
+			<a href="{$loc}"><xsl:apply-templates /></a>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+<xsl:template match="e">
+	<i><xsl:apply-templates /></i>
+</xsl:template>
+
+<xsl:template match="mail">
+	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
+</xsl:template>
+
+<xsl:template match="table">
+	<table class="ntable"><xsl:apply-templates /></table>
+</xsl:template>
+
+<xsl:template match="tr">
+	<tr><xsl:apply-templates /></tr>
+</xsl:template>
+
+<xsl:template match="ti">
+	<td bgcolor="#ddddff" class="tableinfo"><xsl:apply-templates /></td>
+</xsl:template>
+
+<xsl:template match="th">
+	<td bgcolor="#7a5ada" class="infohead"><b><xsl:apply-templates /></b></td>
+</xsl:template>
+</xsl:stylesheet>
+
diff --git a/app-doc/gentoo-web/gentoo-web-2.2.ebuild b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
index bef9441af063..36c024ac89e0 100644
--- a/app-doc/gentoo-web/gentoo-web-2.2.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.2.ebuild
@@ -1,7 +1,7 @@
 # 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.20 2001/10/06 17:22:51 azarah Exp $
+# $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 $
  
 S=${WORKDIR}/${P}
 DESCRIPTION="www.gentoo.org website"
@@ -25,19 +25,25 @@ src_install() {
 	local x
 	for x in build desktop xml-guide portage-user gentoo-howto faq nvidia_tsg openafs cvs-tutorial
 	do
-		xsltproc xsl/guide-main.xsl xml/${x}.xml > ${D}/usr/local/httpd/htdocs/doc/${x}.html || die
+		xsltproc xsl/resume-html.xsl 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
 	cd ${FILESDIR}/images
-	doins paypal.png gtop-s.jpg gbot-s.gif gridtest.gif gentoo-new.gif install*.gif fishhead.gif line.gif icon-* keychain-2.gif
+	doins paypal.png gtop-s.jpg gbot-s.gif gridtest.gif gentoo-new.gif install*.gif fishhead.gif line.gif icon-* keychain-2.gif gentoo-2.gif
 	insinto /usr/local/httpd/htdocs
 	doins favicon.ico
+	
+
+	
 	#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
 	
+	#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	
@@ -52,12 +58,12 @@ src_install() {
 	
 	insinto /usr/local/httpd/htdocs
 
-	xsltproc xsl/guide-main.xsl xml/main-news.xml > ${D}/usr/local/httpd/htdocs/index.html || die
-	xsltproc xsl/guide-main.xsl xml/main-about.xml > ${D}/usr/local/httpd/htdocs/index-about.html || die
-	xsltproc xsl/guide-main.xsl xml/main-download.xml > ${D}/usr/local/httpd/htdocs/index-download.html || die
-	xsltproc xsl/guide-main.xsl xml/main-projects.xml > ${D}/usr/local/httpd/htdocs/index-projects.html || die
+	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
 
-	doins css/main-new.css
+	doins css/main-new.css css/resume.css
 	
 	#install XSL for later use
 	dodir /usr/local/httpd/htdocs/xsl