removing a bunch of my Web junk from Portage

154 files changed, 0 insertions, 14709 deletions

diff --git a/app-doc/gentoo-web/files/bin/cvslog.sh b/app-doc/gentoo-web/files/bin/cvslog.sh
deleted file mode 100755
index e02a959b832e..000000000000
--- a/app-doc/gentoo-web/files/bin/cvslog.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-USER=drobbins
-HOMEDIR=/home/d/${USER}
-CVSDIR=${HOMEDIR}/scripts/gentoo-x86
-OUTLOG=${HOMEDIR}/scripts/cvslog.out
-OUTMAIL=${HOMEDIR}/scripts/cvsmail.out
-WEBDIR=/www/virtual/www.gentoo.org/htdocs
-XSLTP=/usr/bin/xsltproc
-TMPFILE=${HOMEDIR}/scripts/cvslog.tmp
-
-if [ -z "$CVSMAIL" ]
-then
-	export CVSMAIL="yes"
-fi
-
-cd $CVSDIR 
-cvs -q update -dP
-yesterday=`date -d "1 day ago 00:00" -R`
-today=`date -d "00:00" -R`
-cvsdate=-d\'${yesterday}\<${today}\'
-nicedate=`date -d yesterday +"%d %b %Y %Z (%z)"`
-/usr/bin/cvs2cl.pl --xml -f $OUTLOG -l "${cvsdate}" 
-/usr/bin/sed -e 's/xmlns=".*"//' $OUTLOG > ${OUTLOG}.2
-$XSLTP ${WEBDIR}/xsl/cvs.xsl ${OUTLOG}.2 > $TMPFILE
-$XSLTP ${WEBDIR}/xsl/guide-main.xsl $TMPFILE > ${WEBDIR}/index-changelog.html
-chmod 0644 ${WEBDIR}/index-changelog.html
-if [ "$CVSMAIL" = "yes" ]
-then
-	/usr/bin/cvs2cl.pl -f ${OUTMAIL} -l "${cvsdate}" 
-	mutt -x gentoo-cvs -s "cvs log for $nicedate" < ${OUTMAIL} 
-fi
diff --git a/app-doc/gentoo-web/files/bin/pytext b/app-doc/gentoo-web/files/bin/pytext
deleted file mode 100755
index f0bd4336d880..000000000000
--- a/app-doc/gentoo-web/files/bin/pytext
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-# pytext 2.1
-# Copyright 1999-2000 Daniel Robbins
-# Distributed under the GPL
-
-import sys
-
-def runfile(myarg):
-	"interprets a text file with embedded elements"
-	mylocals={}
-	try:
-		a=open(myarg,'r')
-	except IOError:
-		sys.stderr.write("!!! Error opening "+myarg+"!\n")
-		return
-	mylines=a.readlines()
-	a.close()
-	pos=0
-	while pos<len(mylines):
-		if mylines[pos][0:8]=="<!--code":
-			mycode=""
-			pos=pos+1
-			while (pos<len(mylines)) and (mylines[pos][0:3]!="-->"):
-				mycode=mycode+mylines[pos]
-				pos=pos+1
-			exec(mycode,globals(),mylocals)
-		else:
-			sys.stdout.write(mylines[pos])
-		pos=pos+1
-
-if len(sys.argv)>1:
-	for x in sys.argv[1:]:
-		runfile(x)
-	sys.exit(0)
-else:
-	sys.stderr.write("pytext 2.1 -- Copyright 1999-2000 Daniel Robbins. Distributed under the\nGNU Public License\n\nUsage: "+sys.argv[0]+" file0 [file1]...\n")
-	sys.exit(1)
diff --git a/app-doc/gentoo-web/files/bin/update-web b/app-doc/gentoo-web/files/bin/update-web
deleted file mode 100755
index 98b7e0386b6c..000000000000
--- a/app-doc/gentoo-web/files/bin/update-web
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/portage/app-doc/gentoo-web
-emerge $1
diff --git a/app-doc/gentoo-web/files/bin/wiki.pl b/app-doc/gentoo-web/files/bin/wiki.pl
deleted file mode 100755
index a6291e9d3a89..000000000000
--- a/app-doc/gentoo-web/files/bin/wiki.pl
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/perl
-#
-
-use DBI;
-
-# EDITME
-$sql_user = '##USER##';
-$sql_pass = '##PASS##';
-
-unless ( $ARGV[0] =~ /^add$/i || $ARGV[0] =~ /^remove$/i ) {
-	print STDERR "\nGentoo Linux dev-wiki admin tool!\n\n\tUsage: wiki.pl <add|remove>\n\n";
-	exit;
-}
-
-$dbh = DBI->connect( "DBI:mysql:##DB##", $sql_user, $sql_pass ) or die "Can't connect: $DBI::err.\n";
-
-if ( $ARGV[0] =~ /^add$/i ) {
-	print "****************\n";
-	print "** ADD A USER **\n";
-	print "** (dev-wiki) **\n";
-	print "****************\n\n";
-
-	print 'username: ';
-	chomp( $username = <STDIN> );
-	die "Empty username!\n" if $username eq '';
-
-	print 'password: ';
-	chomp( $password = <STDIN> );
-	die "Empty password!\n" if $password eq '';
-
-	print "\nWould you like this user to be an admin (y/n)? ";
-	chomp( $admin = <STDIN> );
-
-	if ( $admin =~ /^y/i ) {
-		$admin = 1;
-		$admin_word = "yes";
-	} else {
-		$admin = 0;
-		$admin_word = "no";
-	}
-
-	print "\nDid I get that right: ($username/$password/admin: $admin_word)? ";
-	chomp( $check = <STDIN> );
-	die "Okay, try again then.\n" unless $check =~ /^y/i;
-
-	$sth = $dbh->prepare( "insert into ##DB##.users set username='$username',password='$password',admin=$admin" );
-	$sth->execute();
-	
-	print "\nUser $username added.\n";
-	exit;
-} else {
-	print "*******************\n";
-	print "** REMOVE A USER **\n";
-	print "**    (dev-wiki) **\n";
-	print "*******************\n\n";
-
-	print 'username: ';
-	chomp( $username = <STDIN> );
-	die "Empty username!\n" if $username eq '';
-
-	$sth = $dbh->prepare( "select uid from ##DB##.users where username='$username'" );
-	$sth->execute();
-	( $uid ) = $sth->fetchrow_array();
-	die "$username does not exist!\n" if !$uid;
-
-	print "Are you absolutely sure you want to remove $username\n";
-	print "from the database? This will remove all of his/her\n";
-	print "todo items and follow-ups past and present. (y/n): ";
-	chomp( $check = <STDIN> );
-	die "Okaythen. No changes made.\n" unless $check =~ /^y/i;
-
-	$sth = $dbh->prepare( "delete from ##DB##.users where uid=$uid" );
-	$sth->execute();
-	$sth = $dbh->prepare( "delete from ##DB##.todos where owner=$uid" );
-	$sth->execute();
-	$sth = $dbh->prepare( "delete from ##DB##.followups where uid=$uid" );
-	$sth->execute();
-
-	print "\nWow, sucks to be $username; he's gone.\n";
-}
-
diff --git a/app-doc/gentoo-web/files/bin/xmlcvslog.sh b/app-doc/gentoo-web/files/bin/xmlcvslog.sh
deleted file mode 100644
index d7c1562b4646..000000000000
--- a/app-doc/gentoo-web/files/bin/xmlcvslog.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-HOMEDIR=/home/drobbins
-CVSDIR=${HOMEDIR}/gentoo/gentoo-x86
-OUTLOG=${HOMEDIR}/gentoo/xmlcvslog.txt
-WEBDIR=/usr/local/httpd/htdocs
-XSLTP=/opt/gnome/bin/xsltproc
-
-cd $CVSDIR 
-cvs -q update -dP
-yesterday=`date -d "1 day ago 00:00" -R`
-today=`date -d "00:00" -R`
-cvsdate=-d\'${yesterday}\<${today}\'
-nicedate=`date -d yesterday +"%d %b %Y %Z (%z)"`
-/usr/bin/cvs2cl.pl --xml -f $OUTLOG -l "${cvsdate}" 
-$XSLTP ${WEBDIR}/xsl/cvs.xsl $OUTLOG | $XSLTP ${WEBDIR}/xsl/guide-main.xsl > ${WEBDIR}/index-changelog.html
-chmod 0644 ${WEBDIR}/index-changelog.html
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/g.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/g.blend.bz2
deleted file mode 100755
index fff8900d0369..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/g.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/g2.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/g2.blend.bz2
deleted file mode 100755
index 08ca622b0110..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/g2.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/g3.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/g3.blend.bz2
deleted file mode 100755
index 31a9f759fc8b..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/g3.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/g4.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/g4.blend.bz2
deleted file mode 100755
index 9c16e5666d7a..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/g4.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gdn.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gdn.blend.bz2
deleted file mode 100755
index d436692c6c79..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gdn.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gdn2.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gdn2.blend.bz2
deleted file mode 100755
index d69c6b1e51e3..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gdn2.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo.blend.bz2
deleted file mode 100755
index 47d42d756900..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo2.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo2.blend.bz2
deleted file mode 100755
index a074fc4dc5a6..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo2.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo3.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo3.blend.bz2
deleted file mode 100755
index b26f0480ee41..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo3.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo4.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo4.blend.bz2
deleted file mode 100755
index 93f9297becee..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo4.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo5.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo5.blend.bz2
deleted file mode 100755
index b99bfd0d6cf2..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo5.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo6.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo6.blend.bz2
deleted file mode 100755
index d7e62846c0a8..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo6.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo7.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo7.blend.bz2
deleted file mode 100755
index f6093bb714b3..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo7.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo8.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo8.blend.bz2
deleted file mode 100755
index 65b159c78f86..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo8.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/gentoo9.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/gentoo9.blend.bz2
deleted file mode 100755
index e0577a79ef4a..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/gentoo9.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/linux.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/linux.blend.bz2
deleted file mode 100755
index 9673dbe661fe..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/linux.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/linux2.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/linux2.blend.bz2
deleted file mode 100755
index 6e4774df1b6c..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/linux2.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/blend-archive/linux3.blend.bz2 b/app-doc/gentoo-web/files/blend/blend-archive/linux3.blend.bz2
deleted file mode 100755
index 08ce815e237c..000000000000
--- a/app-doc/gentoo-web/files/blend/blend-archive/linux3.blend.bz2
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/g-gold.blend b/app-doc/gentoo-web/files/blend/g-gold.blend
deleted file mode 100755
index 56410ca397eb..000000000000
--- a/app-doc/gentoo-web/files/blend/g-gold.blend
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/g-metal.blend b/app-doc/gentoo-web/files/blend/g-metal.blend
deleted file mode 100755
index c5049ec4af8a..000000000000
--- a/app-doc/gentoo-web/files/blend/g-metal.blend
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/metallandscape1.jpg b/app-doc/gentoo-web/files/blend/metallandscape1.jpg
deleted file mode 100644
index 44d1f0fadb8a..000000000000
--- a/app-doc/gentoo-web/files/blend/metallandscape1.jpg
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/blend/webobjects.blend b/app-doc/gentoo-web/files/blend/webobjects.blend
deleted file mode 100755
index 0d8360bbc142..000000000000
--- a/app-doc/gentoo-web/files/blend/webobjects.blend
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/css/gentoo-doc.css b/app-doc/gentoo-web/files/css/gentoo-doc.css
deleted file mode 100755
index 3595c5d06fc8..000000000000
--- a/app-doc/gentoo-web/files/css/gentoo-doc.css
+++ /dev/null
@@ -1,181 +0,0 @@
-BODY { 
-	background: white; 
-	color: black; 
-	font-size: 0.9em; 
-	font-family: Georgia, Verdana, Arial, Helvetica; 
-}
-
-P,H2,H3,UL,OL { 
-	margin: 0.5em 5% 0.5em 5%; 
-}
-
-TABLE {
-	margin: 0.5em 5% 0.5em 5%;
-}
-
-PRE {
-	margin: 0.5em 5% 0.5em 5%; 
-	background: #ddddff;
-	font-family: Lucida Console, Courier;
-	color: #000000;
-}
-
-/*
-H1 { 
-	margin: 4.0em 10% 0em 8%; 
-	font-size: 1.8em; 
-	font-weight: bold; 
-}
-*/
-.dochead { 
-	margin: 1.5em 0% 0em 0%; 
-	font-size: 1.6em; 
-	font-weight: bold; 
-}
-
-.chaphead { 
-	margin: 1.2em 14% 0.5em 3%; 
-	font-size: 1.6em; 
-	font-weight: bold; 
-}
-
-.chapnum {
-	font-size: 0.8em;
-}
-
-.secthead {
-	margin: 1.0em 14% 0.2em 4%;
-	color: #7a5ada;
-	font-size: 1.0em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-/*	text-decoration: underline; */
-}
-
-.code {
-	font-family: Lucida Console, Courier;
-	color: #0000ff;
-}
-
-.path {
-	font-family: Lucida Console, Courier;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.note {
-	background: #bbffbb;
-}
-
-.impo {
-	background: #ffffbb;
-}
-
-.warn {
-	background: #ffbbbb;
-}
-
-.input {
-	color: #0000ff;
-}
-
-.comment {
-	color: #ff0000; 
-}
-
-.notehead {
-	font-weight: bold;
-}
-
-/*.secthead { 
-	font-family: Verdana,Arial,Helvetica; 
-	margin: 0.5em 10% 0.2em 8%; 
-	font-size: 1.1em; 
-	font-weight: bold; 
-}
-*/
-.toptable { 
-	margin: 0em 0% 0em 0%; 
-}
-
-.secondtable { 
-	margin: 4.0em 0% 0.1em 3%; 
-}
-
-.tableinfo {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	font-size: 0.7em; 
-	background: #ddddff;
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.doclink { 
-	padding: 0.5em; 
-	background: black; 
-	color: #33ff00; 
-	font-weight: bold; 
-	font-size: 0.75em; 
-	font-family: Verdana, Arial, Helvetica; 
-}
-
-.caption {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	margin: 0em 5% 0em 5%;
-	font-size: 0.7em; 
-	background:#7a5ada; 
-	color: white; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.caption a:link {
-	color: #00ff00;
-}
-
-.caption a:visited {
-	color: #00dd00;
-}
-
-.tochead {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	margin: 0em 0% 0.2em 0%;
-	font-size: 0.7em; 
-	background:#7a5ada; 
-	color: white; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.tochead a:link {
-	color: #00ff00;
-}
-
-.tochead a:visited {
-	color: #00dd00;
-}
-
-.tocitem { 
-	margin: 0em 0% 0em 2%;
-	font-size: 0.7em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica; 
-}
-
-.abstract { 
-	color: #7a5ada; 
-	margin: 0em 0% 0em 0%; 
-	font-size: 0.7em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-.info {
-	margin: 0em 0% 1em 0%; 
-	font-size: 0.8em; 
-}
- 
diff --git a/app-doc/gentoo-web/files/css/gentoo-new.css b/app-doc/gentoo-web/files/css/gentoo-new.css
deleted file mode 100755
index a6759245a2b7..000000000000
--- a/app-doc/gentoo-web/files/css/gentoo-new.css
+++ /dev/null
@@ -1,198 +0,0 @@
-BODY {

-	BACKGROUND: white; 

-	COLOR: black; 

-	FONT-FAMILY: Georgia, Verdana, Arial, Helvetica; 

-	FONT-SIZE: 1.0em

-}

-

-a.highlight:link { color: #00ff00; text-decoration: none; }

-a.highlight:visited { color: #00ff00; text-decoration: none; }

-a.highlight:hover { color: #00ff00; text-decoration: underline; }

-a.highlight:active { color: #00ff00; text-decoration: underline; }

-

-a.menulink:link { color: #c0c0c0; text-decoration: none; }

-a.menulink:visited { color: #c0c0c0; text-decoration: none; }

-a.menulink:hover { color: #00ff00; text-decoration: underline; }

-a.menulink:active { color: #00ff00; text-decoration: underline; }

-

-

-.menu {

-	font-size: 0.75em;

-	font-weight: bold;

-	font-family: Verdana, Arial, Helvetica;

-	color: #a0a0a0;

-	padding-left: 0.5em;

-	padding-right: 0.5em;

-	padding-top: 0.5em;

-	padding-bottom: 0.5em;

-	background: black;

-}

-

-.infotab {

-	background: #e7e6ea;	

-	padding: 0em;

-	margin: 1em;

-}

-

-.infohead {

-	font-size: 0.7em;	

-	font-family: Verdana, Arial, Helvetica;

-	margin-top: 0.25em;

-	margin-bottom: 0.25em;

-	margin-left: 1.5em;

-	margin-right: 1.5em;

-	padding: 0.25em;

-	color: #ffffff;

-	font-weight: bold;

-	background: #7a5ada;

-}

-

-.infosub {

-	margin-top: 0.25em;

-	margin-bottom: 0.15em;

-	margin-left: 0em;

-	margin-right: 0.5em;

-	padding: 0em;

-	font-weight: bold;

-}

-

-.infolist {

-	margin-top: 0.05em;

-	margin-bottom: 0.05em;

-	margin-left: 2.0em;

-	margin-right: 0.5em;

-	padding: 0em;

-	font-weight: normal;

-}

-

-.infogfx {

-	background: #e7e6ea;

-	padding: 0em;

-}

-

-.infotext {

-	font-size: 0.7em;	

-	font-family: Verdana, Arial, Helvetica;

-	color: #320f61;

-	margin-left: 1.5em;

-	margin-right: 1.5em;

-}

-

-UL	{

-	margin-left: 0.25em;

-	padding-left: 1.0em;

-}

-

-.chaphead {

-        margin: 1.2em 14% 0.5em 3%;

-        font-size: 1.6em;

-        font-weight: bold;

-}

-

-.copyright {

-        padding-left: 1.0em;

-        padding-right: 1.0em;

-        margin: 0em 0% 0.2em 0%;

-        font-size: 0.7em;

-        font-family: Verdana, Arial, Helvetica;

-	text-align: right;

-	background: #ffffff;

-	color: #808080;

-}

-

-.copyright:link {

-	text-decoration: underline;

-	color: #808080;

-}

-

-.copyright:visited {

-	text-decoration: underline;

-	color: #808080;

-}

-

-.copyright:hover { 

-	text-decoration: underline;

-	color: #0000ff;

-	

-}

-

-.subhead {

-	font-family: Georgia, Verdana, Arial, Helvetica;

-	font-size: 1.2em;

-	font-weight: bold;

-	/*margin: 0.5em 0% 0.5em 0%;*/

-}

-

-.content {

-	/*padding: 3em;*/

-	padding-top: 0em;

-	padding-left: 1.0em;

-	padding-right: 1.0em;

-	font-family: Georgia, Times, Sans-serif;

-	font-size: 0.9em;

-}

-

-.contentbox {

-	margin-left: 5%;

-	margin-right: 5%;

-	margin-top: 2%;

-	margin-bottom: 2%;

-	padding: 0.8em;

-}

-

-.logobg {

-	background: #45347b;

-}

-

-.top {

-	background: black;

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-	color: #c0c0c0;

-	padding: 0em;

-	margin: 0em;

-}

-

-.topnews {

-	background: #5f4e4e;

-	color: white;

-}

-

-.tophead {

-	color: #a7f3fe;

-	font-weight: bold;

-	margin: 0em;

-}

-/*

-.top UL {

-	margin: 0em;

-	padding-top: 0em;

-	padding-bottom: 1em;

-	padding-left: 1em;

-	padding-right: 0em;

-}

-*/

-.toptext {

-	color: #ffffff;

-	margin-bottom: 7px;

-}

-.toptext a:hover {

-        color: #00ff00;

-}

-

-.toptext a:link {

-	font-style: normal;

-        color: #00dd00;

-}

-

-.bartext {

-	color: #40ff00;

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-	padding: 0em;

-}

-

-.ahem {

-	display: none;

-}

-

diff --git a/app-doc/gentoo-web/files/css/gentoo-project.css b/app-doc/gentoo-web/files/css/gentoo-project.css
deleted file mode 100755
index 0e93bc90da9f..000000000000
--- a/app-doc/gentoo-web/files/css/gentoo-project.css
+++ /dev/null
@@ -1,181 +0,0 @@
-BODY { 
-	background: white; 
-	color: black; 
-	font-size: 0.9em; 
-	font-family: Georgia, Verdana, Arial, Helvetica; 
-}
-
-P,H2,H3,UL,OL { 
-	margin: 0.5em 5% 0.5em 5%; 
-}
-
-TABLE {
-	margin: 0.5em 5% 0.5em 5%;
-}
-
-PRE {
-	margin: 0.5em 5% 0.5em 5%; 
-	background: #ddddff;
-	font-family: Lucida Console, Courier;
-	color: #000000;
-}
-
-/*
-H1 { 
-	margin: 4.0em 10% 0em 8%; 
-	font-size: 1.8em; 
-	font-weight: bold; 
-}
-*/
-.dochead { 
-	margin: 1.5em 0% 0em 0%; 
-	font-size: 1.6em; 
-	font-weight: bold; 
-}
-
-.chaphead { 
-	margin: 1.2em 14% 0.5em 3%; 
-	font-size: 1.6em; 
-	font-weight: bold; 
-}
-
-.chapnum {
-	font-size: 0.8em;
-}
-
-.secthead {
-	margin: 1.0em 14% 0.2em 4%;
-	color: #ececec;
-	font-size: 1.0em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-/*	text-decoration: underline; */
-}
-
-.code {
-	font-family: Lucida Console, Courier;
-	color: #0000ff;
-}
-
-.path {
-	font-family: Lucida Console, Courier;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.note {
-	background: #bbffbb;
-}
-
-.impo {
-	background: #ffffbb;
-}
-
-.warn {
-	background: #ffbbbb;
-}
-
-.input {
-	color: #0000ff;
-}
-
-.comment {
-	color: #ff0000; 
-}
-
-.notehead {
-	font-weight: bold;
-}
-
-/*.secthead { 
-	font-family: Verdana,Arial,Helvetica; 
-	margin: 0.5em 10% 0.2em 8%; 
-	font-size: 1.1em; 
-	font-weight: bold; 
-}
-*/
-.toptable { 
-	margin: 0em 0% 0em 0%; 
-}
-
-.secondtable { 
-	margin: 4.0em 0% 0.1em 3%; 
-}
-
-.tableinfo {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	font-size: 0.7em; 
-	background: #ececec;
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.doclink { 
-	padding: 0.5em; 
-	background: black; 
-	color: #33ff00; 
-	font-weight: bold; 
-	font-size: 0.75em; 
-	font-family: Verdana, Arial, Helvetica; 
-}
-
-.caption {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	margin: 0em 5% 0em 5%;
-	font-size: 0.7em; 
-	background:#ececec; 
-	color: white; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.caption a:link {
-	color: #00ff00;
-}
-
-.caption a:visited {
-	color: #00dd00;
-}
-
-.tochead {
-	padding-left: 1.0em;
-	padding-right: 1.0em;
-	margin: 0em 0% 0.2em 0%;
-	font-size: 0.7em; 
-	background:#ececec; 
-	color: white; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-
-.tochead a:link {
-	color: #00ff00;
-}
-
-.tochead a:visited {
-	color: #00dd00;
-}
-
-.tocitem { 
-	margin: 0em 0% 0em 2%;
-	font-size: 0.7em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica; 
-}
-
-.abstract { 
-	color: #7a5ada; 
-	margin: 0em 0% 0em 0%; 
-	font-size: 0.7em; 
-	font-weight: bold; 
-	font-family: Verdana, Arial, Helvetica;
-}
-.info {
-	margin: 0em 0% 1em 0%; 
-	font-size: 0.8em; 
-}
- 
diff --git a/app-doc/gentoo-web/files/css/gentoo.css b/app-doc/gentoo-web/files/css/gentoo.css
deleted file mode 100644
index 26c31cf97b50..000000000000
--- a/app-doc/gentoo-web/files/css/gentoo.css
+++ /dev/null
@@ -1,15 +0,0 @@
-BODY 	{ background: white; color: black; font-size: 0.9em; font-family: Georgia, Verdana, Arial, Helvetica; }
-.main	{ margin-top: 0.2in; margin-bottom: 0.2in; margin-left: 1.0in; margin-right: 0.5in; font-size: 0.9em; font-weight: normal; }
-.tab	{ margin-top: 0.0in; margin-bottom: 0.0in; margin-left: 1.0in; margin-right: 0.5in; font-size: 0.9em; font-weight: normal; }
-.title	{ margin-left: 0.5in; margin-top: 0.4in; font-size: 1.5em; font-weight: bold; }
-.copy { font-size: 0.8em; font-style: italic; color: #b0b0b0; text-align: right;}
-.bgimage { background-repeat: no-repeat; background-position: center; }
-.outabit { margin-left: 0.5in; margin-top: 0.1in; font-size:0.8em; color: #808080; margin-bottom: 0.1in; margin-right: 0.5in;}
-.navbar { background: #e0e0ff; }
-.navtitle { margin-left: 0.2in; margin-right: 0.2in; margin-top: 0.25in; margin-bottom: 0.05in; font-size: 0.8em; font-weight: bold; }
-.navitem { margin-left: 0.25in; margin-right: 0.2in; margin-top: 0.0in; margin-bottom: 0.0in; font-size: 0.8em; }
-.itemdesc { margin-left: 0.25in; margin-right: 0.2in; margin-top: 0.0in; margin-bottom: 0.1em; font-size: 0.7em; }
-.ibm { font-weight: bold; color: #0000ff; }
-.navarticle { font-style: italic; }
-.infobox { margin: 0.5em; background: #e0e0ff; }
-.info { font-size: 0.6em; margin: 0.5em; color: #505080; text-align: center; background: #e0e0ff; }
diff --git a/app-doc/gentoo-web/files/css/main-new.css b/app-doc/gentoo-web/files/css/main-new.css
deleted file mode 100644
index cafe530e220e..000000000000
--- a/app-doc/gentoo-web/files/css/main-new.css
+++ /dev/null
@@ -1,308 +0,0 @@
-BODY {

-	color: black; 

-	font-family: Verdana, Arial, Helvetica; 

-	font-size: 1.0em;

-}

-

-.dochead {

-	margin-top: 1.5em;

-	font-size: 1.7em;

-	font-weight: bold;

-}

-

-.chaphead { 

-/*	margin: 1.2em 14% 0.5em 3%;  */

-	font-size: 1.3em; 

-	font-weight: bold; 

-}

-

-.chapnum {

-	font-size: 0.8em;

-}

-

-.secthead {

-/*	margin: 1.0em 14% 0.2em 4%;*/

-	color: #7a5ada;

-	font-size: 1.0em; 

-	font-weight: bold; 

-	font-family: Verdana, Arial, Helvetica;

-/*	text-decoration: underline; */

-}

-

-

-a.highlight:link { color: #00ff00; text-decoration: none; }

-a.highlight:visited { color: #00ff00; text-decoration: none; }

-a.highlight:hover { color: #00ff00; text-decoration: underline; }

-a.highlight:active { color: #00ff00; text-decoration: underline; }

-

-a.menulink:link { color: #a0a0d0; text-decoration: none; }

-a.menulink:visited { color: #a0a0d0; text-decoration: none; }

-a.menulink:hover { color: #00ff00; text-decoration: underline; }

-a.menulink:active { color: #00ff00; text-decoration: underline; }

-

-a.oldlink:link { color: #9090c0; text-decoration: none; }

-a.oldlink:visited { color: #9090c0; text-decoration: none; }

-a.oldlink:hover { color: #00ff00; text-decoration: underline; }

-a.oldlink:active { color: #00ff00; text-decoration: underline; }

-

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

-a.altlink:visited { color: #5a3aba; text-decoration: none; }

-a.altlink:hover { color: #7a5ada; text-decoration: underline; }

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

-

-

-.menu {

-	font-size: 0.75em;

-	font-weight: bold;

-	font-family: Verdana, Arial, Helvetica;

-	color: #c0c0f0;

-	padding-left: 1.0em;

-	padding-right: 1.0em;

-	padding-top: 0.5em;

-	padding-bottom: 0.75em;

-}

-

-.altmenu {

-	font-size: 0.65em;

-	font-weight: bold;

-	font-family: Verdana, Arial, Helvetica;

-	color: #000000;

-	padding-left: 1.0em;

-	padding-right: 1.0em;

-}

-

-.alttext {

-	font-size: 0.65em;

-	font-family: Verdana, Arial, Helvetica;

-	color: #000000;

-/*	padding-left: 1.0em;

-	padding-right: 1.0em;*/

-}

-

-.infotab {

-	padding: 0.5em;

-	margin-top: 1.0em;

-	margin-left: 1.0em;

-	margin-bottom: 1.0em; 

-}

-

-.infohead {

-	font-size: 0.7em;	

-	font-family: Verdana, Arial, Helvetica;

-/*	padding: 0.25em; */

-	padding-top: 0.2em;

-	padding-bottom: 0.2em;

-	padding-left: 1.0em;

-	margin-left: 1.0em;

-	color: #ffffff;

-	font-weight: bold;

-}

-

-.infosub {

-	margin-top: 0.25em;

-	margin-bottom: 0.15em;

-	margin-left: 0em;

-	margin-right: 0.5em;

-	padding: 0em;

-	font-weight: bold;

-}

-

-.infolist {

-	margin-top: 0.05em;

-	margin-bottom: 0.05em;

-	margin-left: 1.0em;

-	margin-right: 0.5em;

-	padding: 0em;

-	padding-top: 0.3em;

-}

-

-.infogfx {

-	padding: 0em;

-}

-

-.infotext {

-	font-size: 0.7em;	

-	font-family: Verdana, Arial, Helvetica;

-	color: #320f61;

-	margin-left: 1.5em;

-	margin-right: 1.5em;

-}

-/*

-.chaphead {

-        margin: 1.2em 14% 0.5em 3%;

-        font-size: 1.6em;

-        font-weight: bold;

-}

-*/

-.copyright {

-        padding-left: 1.0em;

-        padding-right: 1.0em;

-        margin: 0em 0% 0.2em 0%;

-        font-size: 0.7em;

-        font-family: Verdana, Arial, Helvetica;

-	text-align: right;

-	color: #808080;

-}

-

-.copyright:link {

-	text-decoration: underline;

-	color: #808080;

-}

-

-.copyright:visited {

-	text-decoration: underline;

-	color: #808080;

-}

-

-.copyright:hover { 

-	text-decoration: underline;

-	color: #0000ff;

-	

-}

-

-.subhead {

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 1.2em;

-	font-weight: bold;

-	/*margin: 0.5em 0% 0.5em 0%;*/

-}

-

-.content {

-	/*padding: 3em;*/

-	padding-top: 0em;

-	padding-left: 1.0em;

-	padding-right: 1.0em; 

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-}

-

-.ntable {

-	padding: 0em;

-	margin-top: 0.5em;

-	margin-bottom: 0.5em;

-}

-

-.ncontent {

-	/*content with no padding, for an ugly Netscape 4.7 compatibility hack*/

-	padding: 0em;

-	margin-top: 0.5em;

-	margin-bottom: 0.5em;

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-}

-

-PRE {

-	padding: 0.5em;

-	font-family: Lucida Console, Courier;

-	color: #000000;

-	font-size: 0.75em;

-}

-

-.input {

-	color: #0000ff;

-}

-

-.comment {

-	color: #ff0000; 

-}

-

-.code {

-	font-family: Lucida Console, Courier;

-	color: #0000ff;

-	font-size: 0.9em;

-}

-

-.path {

-	font-family: Lucida Console, Courier;

-	font-size: 0.9em;

-}

-

-.emphasis {

-	font-style: italic;

-}

-

-P.note {

-	padding: 0.5em;

-}

-

-P.impo {

-	padding: 0.5em;

-}

-

-P.warn {

-	padding: 0.5em;

-}

-

-.contentbox {

-	margin-left: 5%;

-	margin-right: 5%;

-	margin-top: 2%;

-	margin-bottom: 2%;

-	padding: 0.8em;

-}

-

-.logobg {

-	background: #45347b;

-}

-

-.top {

-	background: black;

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-	color: #c0c0c0;

-	padding: 0em;

-	margin: 0em;

-}

-

-.topnews {

-	background: #5f4e4e;

-	color: white;

-}

-

-.tophead {

-	color: #a7f3fe;

-	font-weight: bold;

-	margin: 0em;

-}

-

-.tableinfo {

-	padding-left: 1.0em;

-	padding-right: 1.0em;

-	font-size: 0.7em; 

-	background: #ddddff;

-	font-weight: bold; 

-	font-family: Verdana, Arial, Helvetica;

-}

-

-/*

-UL {

-	margin: 0em;

-	padding-top: 0em;

-	padding-bottom: 1em;

-	padding-left: 1em;

-	padding-right: 0em;

-}

-

-LI {

-	padding-bottom: 0.3em;

-}

-*/

-.toptext {

-	color: #ffffff;

-	margin-bottom: 7px;

-}

-.toptext a:hover {

-        color: #00ff00;

-}

-

-.toptext a:link {

-	font-style: normal;

-        color: #00dd00;

-}

-

-.bartext {

-	color: #40ff00;

-	font-family: Verdana, Arial, Helvetica;

-	font-size: 0.8em;

-	padding: 0em;

-}

diff --git a/app-doc/gentoo-web/files/css/resume.css b/app-doc/gentoo-web/files/css/resume.css
deleted file mode 100644
index d7179a9fece3..000000000000
--- a/app-doc/gentoo-web/files/css/resume.css
+++ /dev/null
@@ -1,73 +0,0 @@
-BODY {

-	font-family: Georgia, Verdana, Arial; 

-	font-size: 0.9em;

-}

-

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

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

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

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

-

-.employer {

-	font-size: 1.25em;

-	padding-top: 0.15em;

-	padding-left: 1.0cm;

-	padding-right: 0.5cm; 

-}

-

-.secthead {

-	font-size: 1.5em;

-	padding-top: 0.15em;

-	padding-left: 0.5cm;

-	padding-right: 0.5cm; 

-	font-variant: small-caps;

-}

-

-.address {

-	padding-top: 0.5em;

-	padding-left: 1.0cm;

-	padding-right: 0.5cm; 

-}

-

-.header {

-	margin 0cm;

-	padding-top: 0em;

-	padding-bottom: 0em;

-	padding-left: 1.0cm;

-	padding-right: 0.5cm; 

-}

-

-.desc {

-	margin: 0cm;

-	padding-top: 0em;

-	padding-bottom: 0.5em;

-	padding-left: 1.5cm;

-	padding-right: 0.5cm; 

-}

-

-.list {

-	margin: 0cm;

-	padding-top: 0em;

-	padding-bottom: 0.5em;

-	padding-left: 2.0cm;

-	padding-right: 0.5cm; 

-}

-

-.sublist {

-	font-size: 0.9em;

-	padding-left: 0.5cm;

-}

-

-.listitem {

-	margin-top: 0.3cm;

-}

-

-.sublistitem {

-	margin-top: 0.1cm;

-}

-

-

-.path {

-	font-family: Lucida Console, Courier;

-	font-size: 0.9em;

-}

diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-1.0 b/app-doc/gentoo-web/files/digest-gentoo-web-1.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-doc/gentoo-web/files/digest-gentoo-web-1.0
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-2.0 b/app-doc/gentoo-web/files/digest-gentoo-web-2.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-doc/gentoo-web/files/digest-gentoo-web-2.0
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-2.1 b/app-doc/gentoo-web/files/digest-gentoo-web-2.1
deleted file mode 100644
index ccbbb652ca43..000000000000
--- a/app-doc/gentoo-web/files/digest-gentoo-web-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb5da6e1cf5083a747eda47cfe1d52a2 cvs2cl.pl 61440
diff --git a/app-doc/gentoo-web/files/digest-gentoo-web-2.2 b/app-doc/gentoo-web/files/digest-gentoo-web-2.2
deleted file mode 100644
index ccbbb652ca43..000000000000
--- a/app-doc/gentoo-web/files/digest-gentoo-web-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb5da6e1cf5083a747eda47cfe1d52a2 cvs2cl.pl 61440
diff --git a/app-doc/gentoo-web/files/dynfw/dynfw-1.0.1.tar.gz b/app-doc/gentoo-web/files/dynfw/dynfw-1.0.1.tar.gz
deleted file mode 100644
index b3f0d799c7aa..000000000000
--- a/app-doc/gentoo-web/files/dynfw/dynfw-1.0.1.tar.gz
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/html/dev.html b/app-doc/gentoo-web/files/html/dev.html
deleted file mode 100644
index 3a3ea4bc1307..000000000000
--- a/app-doc/gentoo-web/files/html/dev.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>Gentoo Technologies, Inc.</title>
-   
-  </head>
-  
-  <body bgcolor=ffffff color=000000 topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
- <html>
-<table width="100%" border=0><td width="99%" valign="top"><p><center><img src="gentoolinux.gif">
-<h2>Gentoo Linux Development Guide</h2></center></p>
-<p class="main">
-<font size=+2><b>Getting Started</b></font><br>
-After you get Gentoo Linux installed and you play around a bit, you may find some bugs or quirks in some packages,
-or maybe you'd like to install the latest Gentoo Linux software packages or update your current packages.  To do
-this, you'll need to download our Portage ports tree.  We have provided an anonymous rsync server that you can 
-use to get our latest Portage tree.  Here's how you use it.<br><br>
-
-First, make a directory called /usr/portage.  Then, make sure rsync is
-installed.  If it isn't, download it from our ibiblio mirror and
-install it by typing "pkgmerge rsync-x.y.z.tbz2".  Then, use the
-following command to synchronize your Portage directory:
-<pre>
-# rsync -avz rsync://cvs.gentoo.org/gentoo-x86-portage/* /usr/portage
-</pre>
-
-Periodically, you'll want to run this next form of the rsync command,
-which will delete any old ebuild scripts.  <font
-color="#ff0000">Please note that it will delete any of your personal
-changes or additions to the /usr/portage tree, so use this command
-with caution.  If you are making regular changes to your /usr/portage
-tree, you may want to contact Daniel for CVS access so that you can
-commit some or all of them to our official CVS tree.  With that being said, here's the rsync update command with
-deletion:</font>
-
-<pre>
-# rsync -avz --delete --exclude=distfiles/* --exclude=packages/* rsync://cvs.gentoo.org/gentoo-x86-portage/* /usr/portage
-</pre>
-</p><p>
-<font size=+2><b>Updating Portage</b></font><br>
-Before using our Portage tree, it's important that you update Portage.  To do this, do the following:
-<pre>
-# cd /usr/portage/sys-apps/portage
-# ebuild portage-x.y.z.ebuild merge
-</pre>
-Now you'll be using the most recent version of portage, and you can start to use our ebuild system to update your installed software.
-</p><p>
-<font size=+2><b>Important Commands</b></font><br>
-To see how up-to-date your system is, type "portage-maintain | more".  Portage will display a list of those
-packages which could be updated to the most recent version.<br><br>
-To install a package, enter its directory in /usr/portage, i.e:
-<pre>
-# cd /usr/portage/net-irc/xchat
-</pre>
-Then, run "ebuild merge":
-<pre>
-# ebuild xchat-1.4.2.ebuild merge
-</pre>
-The xchat sources will be downloaded (and stored in /usr/portage/distfiles), verified, unpacked, compiled and installed to a temporary directory.  Then, they will be merged into the local filesystem and a package database will be created at /var/db/pkg/net-irc/xchat/CONTENTS, containing the files installed and the md5sums for all files.
-</p>
-
-<p> <font size=+2><b>Upgrading packages</b></font><br> The standard
-way to upgrade packages under Gentoo Linux is to merge the new
-package, and then unmerge the old package.  This is safe (and fun!) to
-do.  First, merge the new package as per the above instructions.
-Then, uninstall the old package by typing something like:
-<pre>
-# portage-unmerge net-irc/xchat-1.0.0-r1
-</pre>
-
-It's important to specify the category and exact package version in
-the above format.  Then, this particular package will be unmerged.
-Portage uses what is called a "safe" unmerge; it's only going to
-unlink original files.  If a file has been overwritten or modified in
-some way, it will be left on the filesystem (presumably, you've
-installed a newer version of the package).  So, if you unmerge an old
-version of xchat after merging a newer version, the xchat executable
-will not be deleted off your filesystem, since it has a newer
-timestamp and different md5sum.  Safe unmerges are really great
-because they ensure that some version of the application is available
-at all times.  If you had to unmerge first, then xchat wouldn't be
-available for a few minutes while the new version was being merged.
-</p>
-<p><font color="#ff0000">That's all for now -- more instructions will
-follow as I have time.  I hope this helps.</font></p>
-
-
-</td></tr></table>
-
-</body>
-</html>
diff --git a/app-doc/gentoo-web/files/html/index-download.html b/app-doc/gentoo-web/files/html/index-download.html
deleted file mode 100644
index 5044839f204c..000000000000
--- a/app-doc/gentoo-web/files/html/index-download.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<html>
-<head>
-<title>Gentoo Linux</title>
-    <link title="new" rel="stylesheet" href="gentoo-new.css" type="text/css"></link>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-</body>
-<table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="black">
-<tr><td height="168"width="30%" bgcolor="#45347b">
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
-	<tr><td class="logobg" valign="bottom" align="center" height="120"><img src="gtop.jpg"></td></tr>
-    <tr><td class="logobg" valign="bottom" align="center" height="48"><img src="gmid.gif"></td></tr>
-</table>
-</td><td valign="bottom">
-    <table cellspacing="3" cellpadding="0" border="0" height="100%" width="100%">
-		<!--	<tr>
-				<td class="menu" width="100%" valign="top" align="left">
-				</td>
-			</tr>
-		-->
-			<tr>
-				<td class="menu" width="100%" valign="bottom">
-					<a class="menulink" href="index.html">About Gentoo Linux</a>
-					| <a class="highlight" href="index-download.html">Download/Install</a>
-				</td>
-			</tr>
-		</table>
-</td></tr>
-<!--/table><table cellspacing="0" cellpadding="0" border="0" width="100%" height="80%" bgcolor="white"//-->
-<tr><td width="30%" height="100%" valign="top" bgcolor="#e7e6ea">
-    <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#e7e6ea">
-		<tr>
-			<td valign="top">
-                <table width="100%" cellspacing="0" cellpadding="5" border="0">
-					<tr>
-						<td align="center" class="infohead" bgcolor="#7a5ada">Important News</td>
-					</tr>
-					<tr valign="top" bgcolor="#e7e6ea">
-						<td class="infotext">
-			<p><font color="#ff0000">
-						We are working hard on a new release of Gentoo Linux, 
-						but right now, the 1.0_rc4_pre2 release on ibiblio.org
-						and its mirrors is a bit out of date.  If you're interested in installing Gentoo Linux,
-						we recommend you wait until the 1.0_rc5 release (coming soon to a mirror near you) or
-						install a <a
-						href="http://www.ibiblio.org/gentoo/gentoo-x86-distro/gentoo-1.0_rc4/packages/snapshots/">
-						system snapshot</a> rather than using the official 1.0_rc4_pre2 version.  You'll find installation READMEs at the above link, and you can also reach us on #gentoo or the gentoo-dev mailing list if you have any questions.  Please note that until
-						version 1.0 is released, Gentoo Linux is geared for developers only.  The distro is quite
-						refined at this point, but installation requires some skill.</font></p>
- 
-						</td>
-					</tr>
-				</table>
-			   <table width="100%" cellspacing="0" cellpadding="5" border="0">
-					<tr>
-						<td align="center" class="infohead" bgcolor="#7a5ada">Gentoo Linux Installation Resources</td>
-					</tr>
-					<tr valign="top" bgcolor="#e7e6ea">
-						<td class="infotext">
-					<p class="infosub">Download sites:</p>
-				<p class="infolist"><a href="http://www.ibiblio.org/gentoo">ibiblio.org mirror</a></p>
-				<p class="infolist"><a href="http://download.sourceforge.net/pub/mirrors/metalab/Linux/distributions/gentoo/">SourceForge mirror</a></p>
-
-				<p class="infosub">Mailing lists:</p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-dev">Developer discussion</a></p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-announce">Announcements</a></p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-cvs">Daily CVS log</a></p>
-
-				<p class="infosub">Other resources:</p>
-				<p class="infolist">Use <a href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> to browse our repository</p>
-				<p class="infolist">IRC: #gentoo on <a href="http://www.openprojects.net/">irc.openprojects.net</a></p>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-</td><td bgcolor="white" valign="top" class="content"><!--contient area-->
-        <table cellpadding="5" cellspacing="0" border="0"><tr><td>
-		<p><br>
-        <img src="znr.gif">
-        </p>
-<p class="subhead">Installation Overview</p>
-
-<p>
-Currently, we have three different methods of installing Gentoo Linux,
-depending on your needs: the install CD method, the system snapshot method and the
-build image method.
-</p>
-
-
-<p>
-For every official Gentoo Linux release, we create a bootable ISO image that
-can be used to install Gentoo Linux.  The process works as follows: you burn
-the ISO image using a CD-R, and then boot the CD and are presented with a
-minimal CD-based Gentoo Linux system.  You then use this system to create
-partitions and set up filesystems as needed.  Once your filesystems are
-created, you mount them and extract the system-image ("sys.tbz2") tarball
-included on the CD, which contains a basic Gentoo Linux system.  After a few
-more configuration steps, you can umount your Gentoo Linux partitions and
-install a boot manager; Gentoo Linux is now ready to run.  Since our CD releases
-include precompiled packages for most applications, they're generally around
-600Mb in size.
-</p>
-
-
-<p>
-In-between our official Gentoo Linux ISO CD releases, we create up-to-date
-sys.tbz2 files, called "system snapshots".  These sys.tbz2 files are identical
-in design to the sys.tbz2 image included on our official CDs, except that they
-are more up-to-date and are used by our developers as we are refining a Gentoo
-Linux for the next official CD release.  A lot of the time, we'll recommend
-that you install a system snapshot rather than our latest official Gentoo Linux
-CD release, because our system snapshots are often the most stable and
-up-to-date version of Gentoo Linux available.  However, since system snapshots
-are for developers only, we don't provide an ISO image; instead, we provide the
-sys.tbz2 tarball only -- it's up to you to get the tarball extracted to a spare
-partition.  However, we will often include bootdisks to make this process
-easier, depending on whether or not the system snapshot is truly ready for
-prime-time use.  System images average around 70Mb in size.
-</p>
-
-
-<p>
-Our third, and possibly most interesting install method uses a "build image",
-or build.tbz2 file.  This build.tbz2 file contains a minimal chrootable Gentoo
-Linux environment; you use it by extracting build.tbz2 to a spare partition and
-then chrooting to it from an existing Linux system.  Then, you can build a
-complete Gentoo Linux system from scratch using Portage -- as well as your
-desired optimization settings and compile-time extensions enabled.  Using the
-"build image" approach, you can create a complete Gentoo Linux system from
-scratch that's set up just the way you want it.
-</p>
-
-
-<p>
-However, build image installation is a bit more labor intensive than the other
-approaches.  First, you must download the build.tbz2 file (typically about 17Mb
-in size), extract it to a spare partition, chroot to the build environment, configure
-networking, and use emerge to grab the latest version of our Portage tree using
-rsync.  Then, you can configure your /etc/make.conf with your desired system-wide
-compilation settings, and use a special bootstrap script to automatically rebuild
-the system to the point where it's the equivalent to a sys.tbz2 file.  At this
-point, your Gentoo Linux system is ready to boot on its own.
-</p>
-
-
-
-
-        </td></tr></table>
-		<br>
-</td></tr>
-<tr><td align="right" colspan="2" class="menu">Copyright 2001 Gentoo
-		Technologies, Inc.  Questions, Comments, Corrections?  Email <a class="menulink"
-		href="mailto:gentoo-dev@gentoo.org">gentoo-dev@gentoo.org</a>.</td></tr>
-</table>
-</html>
diff --git a/app-doc/gentoo-web/files/html/index.html b/app-doc/gentoo-web/files/html/index.html
deleted file mode 100644
index 117e55d83f01..000000000000
--- a/app-doc/gentoo-web/files/html/index.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<html>
-<head>
-<title>Gentoo Linux</title>
-    <link title="new" rel="stylesheet" href="gentoo-new.css" type="text/css"></link>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-</body>
-<table cellspacing="0" cellpadding="0" border="0" width="100%" bgcolor="black">
-<tr><td height="168"width="30%" bgcolor="#45347b">
-<table cellspacing="0" cellpadding="0" border="0" width="100%">
-	<tr><td class="logobg" valign="bottom" align="center" height="120"><img src="gtop.jpg"></td></tr>
-    <tr><td class="logobg" valign="bottom" align="center" height="48"><img src="gmid.gif"></td></tr>
-</table>
-</td><td valign="bottom">
-    <table cellspacing="3" cellpadding="0" border="0" height="100%" width="100%">
-		<!--	<tr>
-				<td class="menu" width="100%" valign="top" align="left">
-				</td>
-			</tr>
-		-->
-			<tr>
-				<td class="menu" width="100%" valign="bottom">
-					<a class="highlight" href="index.html">About Gentoo Linux</a>
-					| <a class="menulink" href="index-download.html">Download/Install</a>
-				</td>
-			</tr>
-		</table>
-</td></tr>
-<!--/table><table cellspacing="0" cellpadding="0" border="0" width="100%" height="80%" bgcolor="white"//-->
-<tr><td width="30%" height="100%" valign="top" bgcolor="#e7e6ea">
-    <table height="100%" width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#e7e6ea">
-        <tr><td align="center" valign="middle" rowspan="3"><p class="infotext">Here's our master list of Gentoo Linux resources...</p></td>
-            <td align="right"><img width="119" height="43" src="znl_0.gif"></td>
-            <td bgcolor="black"><img width="2" height="1" src="1x1.gif"></td>
-        </tr>
-        <tr><td align=right><img width="119" height="10" src="znl_1.gif"></td>
-            <td bgcolor="white"><img width="2" height="1" src="1x1.gif"></td>
-        </tr>
-        <tr><td align=right><img width="119" height="53" src="znl_2.gif"></td>
-            <td bgcolor="black"><img width="2" height="1" src="1x1.gif"></td>
-        </tr>
-        <tr><td colspan="2">&#160;</td>
-            <td bgcolor="black"><img width="2" height="1" src="1x1.gif"></td></tr>
-		<tr>
-			<td height="100%" colspan="2" valign="top">
-            	<!--info goes here-->			
-				<table width="100%" height="100%" cellspacing="0" cellpadding="5" border="0">
-				<tr><td class="infotext" valign="top">
-				<p class="infosub">Download Sites:</p>
-				<p class="infolist"><a href="http://www.ibiblio.org/gentoo">ibiblio.org mirror</a></p>
-				<p class="infolist"><a href="http://download.sourceforge.net/pub/mirrors/metalab/Linux/distributions/gentoo/">SourceForge mirror</a></p>
-
-				<p class="infosub">Mailing Lists (click to subscribe/access archive):</p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-dev">Developer discussion</a></p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-announce">Announcements</a></p>
-				<p class="infolist"><a href="http://www.gentoo.org/mailman/listinfo/gentoo-cvs">Daily CVS log</a></p>
-
-				<p class="infosub">Gentoo Linux Documentation:</p>
-				<p class="infolist"><a href="doc/faq.html">Gentoo Linux FAQ</a></p>
-				<p class="infolist"><a href="doc/xml-guide.html">Gentoo Linux Documentation Guide</a></p>
-				<p class="infolist"><a href="doc/install.html">Gentoo Linux CD Installation Guide</a></p>
-				<p class="infolist"><a href="doc/portage-user.html">Portage User Guide</a></p>
-				<p class="infolist"><a href="doc/gentoo-howto.html">Development HOWTO</a></p>
-				<p class="infolist"><a href="doc/nvidia_tsg.html">nvidia Troubleshooting Guide</a></p>
-
-				<p class="infosub">Other Resources:</p>
-				<p class="infolist">Use <a href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">cvsweb</a> to browse our repository</p>
-				<p class="infolist">IRC: #gentoo on <a href="http://www.openprojects.net/">irc.openprojects.net</a></p>
-				</td></tr></table>						
-			</td>
-            <td bgcolor="black"><img width="2" height="1" src="1x1.gif"></td>
-		</tr>
-        <tr><td colspan="2">&#160;<br>&#160;<br>&#160;<br>&#160;<br></td>
-            <td bgcolor="black"><img width="2" height="1" src="1x1.gif"></td></tr>
-    </table>
-</td><td bgcolor="white" valign="top" class="content"><!--contient area-->
-        <table cellpadding="5" cellspacing="0" border="0"><tr><td>
-		<table class="infotab" width="40%" align="right" cellpadding="3px" cellspacing="0px" border="0px" bgcolor="gray">
-		    <tr>
-			<td align="center" class="infohead" bgcolor="#7a5ada">Gentoo Linux Features</td>
-		</tr>
-		<tr valign="top" bgcolor="#e7e6ea">
-			<td class="infotext">
-				<ul> <li> <b>Linux 2.4.4+</b>, <b>glibc-2.2.2</b>, <b>gcc
-				2.95.3</b> and the latest development tools </li><li>
-				<b>ReiserFS</b>, <b>LVM</b>, <b>ALSA</b>, <b>PCMCIA-CS</b> and
-				<b>lm_sensors</b> support built-in </li><li> <b>Xfree86
-				4.0.3</b>, <b>OpenGL</b>, <b>KDE 2.1.1</b> and <b>GNOME 1.4</b>
-				</li><li> tcp-wrappers, uscpi-tcp ("tcpserver"), xinetd,
-				<b>iptables</b> and Linux <b>QoS</b> tools (tc) included
-				</li><li> modern <b>qmail</b> (with optional <b>mysql</b> and
-				LDAP support), <b>postfix</b> and <b>exim</b> MTAs </li><li>
-				<b>GRUB</b> boot loader (LILO is still available if you need
-				it) </li><li> D.J. Bernstein's supervise (daemontools) used to
-				ensure availability for important services </li><li> syslogd
-				and klogd have been replaced with multilog (higher-performance,
-				auto-rotation and 64-bit timestamps) </li><li> 600+ up-to-date
-				ebuild scripts for your favorite apps </li><li>...as well as
-				Portage and a completely open design</li> </ul> <center><p><b>XFS</b>,
-				<b>GFS</b> and <b>MOSIX</b> are coming soon.</p></center>
-                </td>
-		</tr>
-		</table>
-        <p><br>
-        <img src="znr.gif">
-        </p>
-		<p class="subhead">About Gentoo Linux</a>
-		<p>
-		Gentoo Linux is a fast and modern, completely free x86-based Linux
-		distribution with a clean and flexible design. Unlike other distros,
-		Gentoo Linux has an advanced package management system called Portage.
-		Portage is a true ports system in the tradition of BSD ports, but is
-		Python-based and sports a number of advanced features including
-		dependencies, fine-grained package management, "fake" (OpenBSD-style)
-		installs, safe unmerging, system profiles, virtual packages, config
-		file management, and more.
-		</p>
-
-		<p>Portage allows you to set up Gentoo Linux the way <i>you</i> like
-		it -- with the optimization settings that you want, and with optional
-		build-time functionality (like GNOME, KDE, mysql, ALSA, LDAP support,
-		etc.) enabled or disabled as you desire.  If you don't want GNOME on
-		your system, your apps won't have optional GNOME support enabled, and
-		if you do, then they will.  That's why we prefer thinking of Gentoo
-		Linux as a <i>meta</i>-distribution or Linux <i>technology engine</i>.
-		You decide what kind of system you want, and Portage will create it for
-		you.</p>
-
-		<p> We maintain an official Gentoo Linux "Portage tree" that contains
-		the most recent versions of our ebuild autobuild scripts.  By updating
-		your Portage tree, you gain instant access to the latest and greatest
-		Linux technologies and applications.  Tell Portage what ebuild you'd
-		like to install, and Portage will auto-download, unpack, patch,
-		configure, compile and install the package.  Thanks to Portage
-		auto-dependency resolution, you can install of KDE 2.1.1 or GNOME 1.4
-		by typing in a single command, and the resultant installed binaries
-		will be optimized and customized to your exact specifications.  </p>
-
-		<p>If this kind of power and flexibility appeals to you, then we
-		encourage you to try Gentoo Linux for yourself.  You won't be
-		disappointed.</p>
-
-
-        </td></tr></table>
-		<br>
-</td></tr>
-<tr><td align="right" colspan="2" class="menu">Copyright 2001 Gentoo
-		Technologies, Inc.  Questions, Comments, Corrections?  Email <a class="menulink"
-		href="mailto:gentoo-dev@gentoo.org">gentoo-dev@gentoo.org</a>.</td></tr>
-</table>
-</html>
diff --git a/app-doc/gentoo-web/files/html/nvidia_tsg.html b/app-doc/gentoo-web/files/html/nvidia_tsg.html
deleted file mode 100755
index b915702db50c..000000000000
--- a/app-doc/gentoo-web/files/html/nvidia_tsg.html
+++ /dev/null
@@ -1,795 +0,0 @@
-<html>
-  <head>
-    <title> nVidia Linux Troubleshooting Guide </title>
-  </head>
-
-  <body bgcolor=#ffffff fbcolor=#000000>
-    <pre>
-
-    nVidia Linux Driver Troubleshooting Guide   (Feb 13 2001)
-    =========================================
-
-    allright, you've installed the nVidia Linux drivers and fired up X
-    in anticipation of all the wonderful things it can do. For some
-    reason however, things didn't quite work out as expected and now
-    you're sitting looking at a blank screen or, if you were lucky,
-    at a nice console. while you can't deny the beauty of a 80x40 terminal
-    you wouldn't mind fraggin' the guy next door ... what to do?
-
-    luckily, most problems you could have run into have already been
-    encountered by other people. even better, there are fixes to most of
-    those problems. but: where to look for (and get) answers? this document
-    may just be what you want.
-
-    before going any further - most of the information herein is what i
-    have seen in #nvidia (irc.openprojects.net) and my own experience with
-    the drivers. i've also taken the liberty to take some information from
-    the driver and its documentation. the IRC channel mentioned is a good
-    place to look for both help and various files/patches.
-
-    you may want to check your system with the nv_check.sh script first. it
-    can be downloaded (like all the patches i refer to) from iCE-DCC, a DCC
-    offer bot at home in the above IRC channel.
-
-    suggestions, questions, etc:
-
-        christian zander <a href=phoenix@minion.de>phoenix@minion.de</a>
-
-
-    AGP / KERNEL
-    =============
-
-    as you may have noticed already, the nVidia driver needs a kernel level
-    resource manager to function properly. this resource manager is the
-    NVdriver kernel module. among its responsibilities are access control
-    to the device(s), locating and initializing certain aspects of the
-    hardware, controlling the AGP driver, DMA to name some. 
-
-    it is extremely important that the kernel module works properly, or you
-    will never have the fun that you were promised in exchange for $$.
-
-
-    o  AGPGART vs. NVAGP
-
-       as far as linux is concerned, your nice AGP port is just another
-       PCI slot and is detected as such. since you want to use what AGP
-       has to offer beyond that, you need a proper driver. with the 
-       nVidia Linux drivers, you get to choose between nVidia's AGP
-       driver that was ported from NT (NVAGP) and AGPGART, which was/is
-       developed by Jeff Hartmann and a number of contributors. AGPGART
-       is part of the official kernel (2.2.18+, 2.3.??+) and enabled in
-       many distributions by default. Which one of the two you want to
-       use largely depends on (1) your AGP chipset (2) your preferences.
-
-       if everything worked out for you with whichever driver you chose
-       to use, you need not worry about this. chances are however, that
-       things didn't quite work out for you (you're reading this).
-
-       one way of figuring out if it is your AGP setup that is causing
-       problems (and sometimes the only way to get things going at all)
-       is to completely disable AGP support in the driver. to do this,
-       you add this option to the Screen setion of your XF86Config file:
-
-            Option "NvAgp" "0"
-
-       some combinations of drivers and AGP chipsets can make your system
-       unstable or even unusable, so look out. these combinations should
-       work (very incomplete, let me know about other configs):
-
-       Intel:    440BX   NVAGP   / AGPGART (doesn't work for some people)
-                 810     NVAGP   / AGPGART
-                 815(e)  NVAGP   / AGPGART (w/ 815 patch)
-                 
-       Via:      Apollo  AGPGART / NVAGP
-                 MVP3    AGPGART
-                 MVP4    AGPGART
-                 KX133   NVAGP
-                 KT133   NVAGP
-
-       ALi:      ...     AGPGART (2.4.0+,  2.2.18 w/ ALi patch)
-
-       SiS:      ...     AGPGART (?)
-
-
-       in case you're wondering what AGP chipset your mainboard may be
-       using - either consult your mainboard's documentation or try to
-       retrieve the information from /proc/pci
-
-           grep AGP /proc/pci
-
-
-       now that you know what driver you want, how do you actually go
-       about setting the system up to use it?
-
-        o  NVAGP
-
-           compile the NVdriver kernel module with:
-
-               make clean
-               make NVdriver BUILD_PARAMS=NOAGPGART
-               make install
-
-        o  AGPGART
-
-           enable support for AGPGART in your kernel. no special action
-           must be taken thereafter, NVdriver will automagically be
-           built with support for it. i strongly recomment that you use
-           at least 2.2.18 or a recent development kernel with AGPGART.
-
-
-        == 0.9-6 changes ==
-
-        starting with this version, the driver will load the AGP
-        driver dynamically when X starts. Which driver it loads will
-        be controlled by the NvAgp option in the Screen section of the
-        XF86Config file:
-
-           Option "NvAgp" "0"  ... disable AGP support
-           Option "NvAgp" "1"  ... use NVAGP
-           Option "NvAgp" "2"  ... use AGPGART
-
-        make sure you don't have the 'other' AGP driver loaded when
-        instructing X to load e.g. NVAGP. some distributions load
-        AGPGART by default - X will catch this case, but won't be
-        able to switch the AGP driver on the fly (see below).
-
-
-        bear in mind that switching AGP drivers or disabling them
-        usually requires a system reboot before the changes really take
-        effect. loading different AGP drivers w/o a reboot may cause
-        lockups or general system instability.
-
-
-    o  AGP Aperture
-
-       basically, this is the amount of RAM that you allow your card to
-       use via the AGP interface (for textures, etc). while it is left
-       to you to decide on the value for this setting, it is generally
-       desirable to use no more than 1/2 of your RAM. 32M-64M seem to be
-       reasonable values. don't set this to a value equal to the amount
-       of RAM you have or even higher. AGPGART may lock your machine if
-       you do. (set this in your BIOS)
-
-
-    o  AGP Fast Writes
-
-       meant to increase performance, this setting usually locks up
-       machines. in any case, the performance gains aren't worth the
-       hazzle. (set this in your BIOS)
-
-       (alternatively, you can pass NVreg_EnableAGPFW=0 to NVdriver)
-
-
-    o  AGP Speeds (1x, 2x, 4x)
-
-       this controls the bandwidth with which your AGP bus operates. while
-       most of todays chipsets support 4x operation, this can cause lockups
-       and strange behaviour with some of them. the driver knows about many
-       such flaws and enables workarounds. Via chipsets are forced to 2x
-       operation by default.
-
-       you can influence the AGP speed setting with an option passed to
-       NVdriver:
-
-           modprobe NVdriver NVreg_ReqAGPRate=0x2  ( 0x1 | 0x2 | 0x4 )
-
-       or with an options entry in modules.conf:
-
-           alias char-major-195 NVdriver
-           options NVdriver NVreg_ReqAGPRate=0x2
-
-       (if you want 4x operation with Via chipsets, use NVreg_EnableVia4x=1)
-
-
-    o  AGP Workarounds && AGPGART
-
-       as mentioned in the previous section, the driver enables a set of
-       workarounds for certain AGP chipsets. starting with version 0.9-5 of
-       the driver, these workarounds are applied to both NVAGP and AGPGART.
-       if you don't want to use them with AGPGART (for whatever reason), you
-       can disable the default behaviour with the NVreg_UpdateKernelAGP=0
-       option to NVdriver.
-
-
-    o  IRQ / Assigning an Interrupt to VGA
-
-       the nVidia driver needs an interrupt assigned to your graphics
-       adapter to work properly. make sure that you enable the 'assign
-       IRQ to vga' option in your BIOS (or however your BIOS calls it).
-
-
-    o  Building NVdriver
-
-       building the NVdriver kernel module is straight forward in most
-       cases:
-
-           make clean
-           make NVdriver (optionally BUILD_PARAMS=NOAGPGART, see above)
-           make install
-
-       there are situations, however when this won't work out. i already
-       mentioned options that allow you to choose between AGPGART and NVAGP.
-
-       the driver assumes that you have your kernel headers installed in
-       /usr/src/linux/include. if that is not correct, use the SYSINCLUDE
-       option:
-
-           make clean
-           make NVdriver SYSINCLUDE=/where/ever/your/headers/are
-           make install
-
-    o  Character Special Files
-
-       nVidia's XFree86 driver module communicates with the NVdriver kernel
-       module through a set of character special files located in the /dev
-       directory. if they weren't created or have improper permissions, X
-       will fail.
-
-       crw-rw----    1 root     video    195,   0 Jan  4 23:19 /dev/nvidia0
-       crw-rw----    1 root     video    195,   1 Jan  4 23:19 /dev/nvidia1
-       crw-rw----    1 root     video    195,   2 Jan  4 23:19 /dev/nvidia2
-       crw-rw----    1 root     video    195,   3 Jan  4 23:19 /dev/nvidia3
-       crw-rw----    1 root     video    195, 255 Jan  4 23:19 /dev/nvidiactl
-
-       as you can see, i chose to make the files accessible only to root and
-       members of the group 'video'. your choice may be different - in any
-       case, make sure that the user you're trying to run X as has access to
-       these files (read and write access).
-
-
-    o  devFS
-
-       as of version 2.3.?? of the linux kernel, an alternative method has
-       been introduced, the socalled devFS. while explaining the mechanism
-       itself is out of the scope of this document, i want to note that a
-       patch exists for NVdriver that makes it devFS aware.
-
-
-    o  procFS
-
-       starting with 0.9-6, the nVidia driver will provide information about
-       your setup in /proc/nv/card[0-3]. There's a patch to enable part of
-       that for 0.9-5.
-
-    o  BIOS Repost
-
-       the driver attempts to repost the card's bios when X starts to ensure
-       that the card is in a state known to the driver. unfortunately, this
-       causes problems with some cards. you can disable this behaviour with
-       yet another option to NVdriver:
-
-           modprobe NVdriver NVreg_SkipBiosPost=1
-
-
-    o  TNT SGRAM vs. SDRAM
-
-       the driver detects the type of memory used on TNT cards by reading
-       its embedded bios. unfortunately, some cards have been flashed with
-       improper bioses. if you feel that this may be the case with your
-       setup, you may want to try the NVreg_VideoMemoryTypeOverride option
-       to NVdriver ( SDRAM = 1, SGRAM = 2 ). this doesn't always work, see
-       os-registry.c for details.
-
-
-    o  Kernel 2.4.0
-
-       quite some changed since 2.2.x and lots of these changes affected the
-       nVidia driver. you can get patches for this kernel series from #nvidia.
-
-       o "Ignoring changed section attributes for .modinfo"
-
-         if this message annoys you, you'll want to comment out the
-         offending line in /usr/src/linux/include/linux/modules.h. If you
-         don't mind it - leave it alone, its harmless.
-
-
-
-    XFree86 / OpenGL
-    ================
-
-
-    before i start describing some of the most common problems with this
-    part of the driver, i want to explain some things that are commonly
-    misunderstood and seem to confuse a fair amount of people:
-
-    o  nVidia's Driver Architecture vs. DRI and DRM
-
-       nVidia's driver does not make use of the Direct Rendering Interface
-       that made its debut with XFree86 4.0.0. instead, nVidia chose to
-       implement its own mechanism. the architectures are quite similar:
-       both use a kernel level resource manager (NVdriver vs. DRM) and both
-       provide a mechanism by means of which high performance OpenGL
-       rendering can be achieved by allowing the OpenGL implementation to
-       talk directly to the hardware instead of using GLX when running
-       locally.
-
-
-    o  nVidia's OpenGL Implementation vs. Mesa
-
-       nVidia's driver comes with its own OpenGL implementation and does not
-       use Mesa, which is shipped with XFree86. nVidia's OpenGL libraries
-       are based on SGI's OpenGL 1.2 implementation and provide a set of
-       extensions that allow making use of advanced features such as using
-       S3TC compressed textures.
-
-
-    o  nVidia's XFree86 Driver Module vs. XFree86's
-
-       the 'nv' driver module shipped with XFree86 has nothing in common
-       with the 'nvidia' driver module provided by nVidia. it does not
-       rely on a kernel module to operate, does not require an interrupt
-       and 'only' supports 2D operation. starting with 4.0.2 it works on
-       all of nVidia's graphics adapters, including GeForce 2 cards. if
-       you installed a distribution with XFree86 4.0.x, you are likely to
-       have this driver installed. it is a good idea to test your X
-       installation by attempting to start X with the 'nv' driver module.
-
-
-    i will now list some of the most common problems that people encounter
-    with the nVidia drivers. many of the things listed here are covered in
-    the official documentation included with the driver package, but since
-    nobody seems to read it, i list them here anyway.
-
-
-    o  libglx.a / libGLcore.a / libGL.so.1.2.303... (Mesa)
-
-       my alltime favorites ... as mentioned above, nVidia's driver does
-       not make use of the Mesa libraries shipped with XFree86 - in fact,
-       it conflicts with them.
-
-       !! This is THE most common error source !!
-
-       if your distribution installed and configured X for you, you are
-       likely to have a Module section in your XF86Config that looks like
-       this:
-
-           Section "Module"
-             ...
-             Load  "glx"
-             Load  "GLcore"
-             ...
-           EndSection
-
-       these two statements are what you need to pay particular attention
-       to:
-
-       o  Load "glx"
-
-          this instructs X to load the GLX extension module. with a default
-          XFree86 installation, this translates to libglx.a. the nVidia
-          driver provides its own GLX extension, libglx.so. this is where
-          the fun begins: if you didn't remove libglx.a, X will continue to
-          load libglx.a, which can't work with nVidia's driver.
-
-          !! delete or rename libglx.a (/usr/X11R6/lib/modules/extensions) !!
-
-
-       o  Load "GLcore"
-
-          not much to say here other than that you don't want this line in
-          your modules section. libGLcore.so as provided by nVidia will be
-          loaded dynamically - don't load it as an X extension, it won't
-          work.
-
-          You can easily find out if you're loading libglx.a and/or
-          libGLcore.a by looking at /var/log/XFree86.0.log:
-
-              ...
-              (II) LoadModule: "glx"
-              (II) Loading /usr/X11R6/lib/modules/extensions/libglx.a
-              (II) Module glx: vendor="The XFree86 Project"
-                      compiled for 4.0.1, module version = 1.0.0
-                      ABI class: XFree86 Server Extension, version 0.1
-              (II) Loading extension GLX
-              (II) Loading sub module "GLcore"
-              (II) LoadModule: "GLcore"
-              (II) Reloading /usr/X11R6/lib/modules/extensions/libGLcore.a
-              ...
-
-          what you want to see here is something like:
-
-              ...
-              (II) LoadModule: "glx"
-              (II) Loading /usr/X11R6.4/lib/modules/extensions/libglx.so
-              (II) Module glx: vendor="NVIDIA Corporation"
-                      compiled for 4.0.1, module version = 1.0.5
-                      Module class: XFree86 Server Extension
-                      ABI class: XFree86 Server Extension, version 0.1
-              (II) Loading extension GLX
-              ...
-
-
-    the last part of Mesa that can cause problems is the actual OpenGL
-    library, commonly called libGL.so.1.2.303... or similar. depending on
-    where it is installed, it will conflict with nVidia's OpenGL library
-    sooner or later. most games load libGL.so dynamically - they load it
-    when they first start and reload it when loading a map or when applying
-    new video settings. it happens quite often that a game loads the proper
-    libGL.so the first time around and Mesa later on.
-
-    symptoms of conflicts with Mesa (libraries and extensions) are crashes
-    with Segmentation Faults (Signal 11) - either instantaneously after you
-    start X or when you attempt to run an OpenGL application. another
-    indication of such a conflict is extremely poor performance (1-5 fps),
-    which happens when you get Mesa software rendering.
-
-
-    o  nv_drv.o vs. nvidia_drv.o
-
-       another common problem - after a default installation, XFree86's 'nv'
-       driver module will be loaded. you want to load 'nvidia'. make sure
-       your Device section in XF86Config looks somewhat like:
-
-           Section "Device"
-             Identifier  "nVidia GeForce 256 DDR"
-             Driver      "nvidia"
-           EndSection
-
-
-    o  X Instantaneously Crashes With Signal 11
-
-       check /var/log/XFree86.0.log for warnings like:
-
-       (WW) module ABI minor version (2) is newer than the server's version (1)
-
-       this commonly happens when you attempt to run 0.9-5 or later with
-       XFree86 4.0.0 or 0.9-4 or earlier with XFree86 4.0.1 or later. i
-       recommend you upgrade X to 4.0.2 and get whichever is the latest
-       driver when you read this document.
-
-
-    o  X Crashes Complaining about DMA
-
-       probably an improper kernel - use 2.2.18+ or 2.4.0+.
-
-
-    o  Monitor Looses Sync when staring X
-
-       this can have various reasons:
-
-       o  you specified improper modelines - either delete any explicit
-          modeline that may have been installed in your Monitor section or
-          correct them.
-
-
-       o  the modelines are find, but the driver doesn't appear to like
-          them - try these options in your Screen section:
-
-              Option      "IgnoreEdid"       "1"
-              Option      "GenerateRTList"   "0"
-
-
-    o  X && MTRRs
-
-       if you want support for MTRRs (you do), you'll have to enable support
-       for them in the kernel itself before the driver will be able to use
-       them. MTRRs greatly influence the speed of your setup.
-
-
-    o  X Deletes Desired Modes (hsync out of range)
-
-       X decided that your monitor is not capable of safely displaying the
-       mode you asked it for. make sure the values you specified for
-       HorizSync and VertRefresh match your monitor (look them up in your
-       monitor's manual). if no values are specified, X will use rather
-       conservative values.
-
-
-    o  X Keeps Telling (Warning) You About a Polarity Option
-
-       commonly happens when switching to console - usually harmless; if
-       you don't know that X is talking about and want to get rid of the
-       messages, use this in your Screen section:
-
-           Option      "OverridePolarity" "1"
-
-       This may speed up the console switches as well.
-
-
-    o  DDC
-
-       yes, XFree86 4.0.x supports DDC - you can enable support for it by
-       loading the appropriate module:
-
-           Load "ddc"
-
-       this will only work if both your video card and monitor support DDC.
-       don't use explicit modelines alongside this option.
-
-
-    o  Game XY Doesn't Go Fullscreen
-
-       this is a config problem. two prerequisites must be met before a game
-       will be able to change resolutions using the X Vidmode Extenstion:
-
-       you must have this line in XF86Config's Module Section:
-
-           Load "extmod"    (or alternatively, a SubSection for "extmod")
-
-       you must have a proper Display SubSection in your Screen section - it
-       must define the mode the game needs for the color depth you're
-       running X at. e.g.:
-
-           Subsection "Display"
-             Depth  24
-             Modes  "1152x864" "1024x768" "800x600" "640x480"
-           EndSubsection
-
-
-    o  X Goes 16bpp, You Want 32, But That Doesn't Work
-
-       24/32bpp in X 4.x is now labeled Depth 24. This is controlled by two
-       options in your Screen Section:
-
-           DefaultDepth 24
-           DefaultFbBpp 32
-
-       again, make sure you have a proper Display Subsection.
-
-
-    o  Wheelmouse Doesn't Work
-
-       not nvidia related, but still asked quite often. you need to set
-       the protocol to IMPS/2 and map the 4th and 5th button to the Z
-       Axis. this is what my config looks like:
-
-           Section "InputDevice"
-             Identifier  "Mouse"
-             Driver      "mouse"
-             Option      "Device"  "/dev/mouse"
-             Option      "Protocol"    "IMPS/2"
-             Option      "ZAxisMapping"   "4 5"
-           EndSection
-
-       i'm using a USB mouse, /dev/mouse is a symling to /dev/input/mice in
-       my case.
-
-
-    o  Mouse SUCKS In Games (QuakeIII, FPS XY)
-
-       many games use DGA mouse for mouse input in games. this is similar
-       to the directmouse thing in windows. all versions of XFree86 prior to
-       4.0.2 had a somewhat broken DGA 1 mouse handling. If you want decent
-       mouse performance upgrade to 4.0.2.
-
-       in addition to that, you'll have to load the DGA extension. many
-       config tools disable that by default. use:
-
-           Load "extmod"
-
-       instead of a SubSection if you want to make sure it gets loaded.
-       after that, you'll have to enable DGA mouse in the game itself. for
-       QuakeIII this comes down to
-
-           seta in_dgamouse "1"
-
-       in the QuakeIII config file ( ~/.q3a/baseq3/q3config.cfg ).
-
-       XFree86 4.0.2 introduce DGA 2, which is said to work even better.
-       while QuakeIII doesn't support it yet, you can make pretty much all
-       Loki games use it by compiling SDL with support for it.
-
-    o  Application XY misses GLUT or GLU (glut.h / glu.h)
-
-       GLUT is a windowing toolkit that provides programmers with an easy
-       way to setup windows with OpenGL contexts and allows some basic
-       event handling (OpenGL knows nothing about that). It is not
-       distributed as part of the nVidia driver. GLU is an utility library
-       that sits on top of OpenGL. It is also not part of nVidia's driver
-       distribution.
-
-       Both GLUT and GLU can be obtained from the Mesa Project homepage and
-       are likely to be available as packages from your Linux distribution.
-
-
-    == Additions from Michael Thome <mthome@bbn.com> ==
-
-
-    o  Don't use the kernel nvidia FBdev driver, it conflicts with the
-       proprietary NVIDIA drivers and causes all kinds of unpleasant
-       effects (crashes, display problems, etc).
-
-    o  Aureal's closed source Vortex drivers don't seem to come along
-       with NVIDIA's binary drivers on some configuratins, possibly due
-       to IRQ conflicts.
-
-       /* 
-          IRQ sharing seems to be a problem with NVIDIA's driver. I was
-          unable to persuade a Fast Ethernet card (RTL8139) to work with 
-          the driver under similar circumstances. If you have problems
-          with hardware failing to operate properly or not at all, you
-          may want to double-check that its not sharing its interrupt
-          with your graphics adapter.
-       */
-
-    o  100dpi mode
-
-       Unlike the XFree86 driver, the NVIDIA module does not use DDC to
-       figure out the screen resolution (dpi). I needed to add the
-       following to my monitor section in order to get into 100dpi mode:
-
-
-           Section "Monitor"
-                   Identifier   "Monitor0"
-                   VendorName   "Dell"
-                   ModelName    "Monitor Model"
-
-                   HorizSync    30.0-107.0
-                   VertRefresh  48.0-160.0
-
-                   # for 100dpi
-                   DisplaySize  406 304
-           EndSection
-
-       The parameters are the monitor's displayable width and height
-       in mm. I chose these values to result in 100x100dpi while in
-       1600x1200 mode.
-
-       /*
-          I didn't play around with this myself ...
-       */
-
-
-    The End.
-
-
-    My /etc/X11/XF86Config [0.9-6] for those who are interested:
-
-
-    Section "Module"
-      Load  "bitmap"
-      Load  "dbe"
-      Load  "extmod"
-      Load  "freetype"
-      Load  "glx"
-      Load  "type1"
-      Load  "v4l"
-    EndSection
-
-    Section "Files"
-      RgbPath   "/usr/X11R6.4/lib/X11/rgb"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/misc/"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/75dpi/:unscaled"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/100dpi/:unscaled"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/75dpi/"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/100dpi/"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/TrueType/"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/local/"
-      FontPath  "/usr/X11R6.4/lib/X11/fonts/Type1/"
-    EndSection
-
-    Section "ServerFlags"
-      Option  "SuspendTime"  "0"
-      Option  "StandbyTime"  "0"
-      Option  "BlankTime"    "0"
-      Option  "OffTime"      "0"
-    EndSection
-
-    Section "InputDevice"
-      Identifier  "Keyboard"
-      Driver      "Keyboard"
-      Option      "XkbRules"  "xfree86"
-      Option      "XkbModel"    "pc102"
-      Option      "XkbLayout"      "us"
-    EndSection
-
-    Section "InputDevice"
-      Identifier  "Mouse"
-      Driver      "mouse"
-      Option      "Device"  "/dev/mouse"
-      Option      "Protocol"    "IMPS/2"
-      Option      "ZAxisMapping"   "4 5"
-      Option      "Buttons"          "5"
-    EndSection
-
-    Section "Monitor"
-      Identifier  "Vision Master Pro 17"
-
-      HorizSync    27.0-92.0
-      VertRefresh  50-160
-
-      Mode "1152x864"
-        DotClock 137.65
-        HTimings 1152 1184 1312 1536
-        VTimings  864  866  882  902
-        Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "1024x768"
-        DotClock 115.50
-        HTimings 1024 1056 1248 1440
-        VTimings  768  771  781  802
-        Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "800x600"
-        DotClock 69.65
-        HTimings 800 864 928 1088
-        VTimings 600 604 610  640
-        Flags    "-HSync" "-VSync"
-      EndMode
-
-      Mode "640x480"
-        DotClock 45.80
-        HTimings 640 672 768 864
-        VTimings 480 488 494 530
-        Flags    "-HSync" "-VSync"
-      EndMode
-    EndSection
-
-    Section "Device"
-      Identifier  "nVidia GeForce 256 DDR"
-      Driver      "nvidia"
-    EndSection
-
-    Section "Screen"
-      Identifier  "Screen"
-      Device      "nVidia GeForce 256 DDR"
-      Monitor     "Vision Master Pro 17"
-      Option      "NvAgp" "2"
-
-      DefaultDepth 24
-      DefaultFbBpp 32
-
-      Subsection "Display"
-        Depth  16
-        Modes  "1152x864" "1024x768" "800x600" "640x480"
-      EndSubsection
-
-      Subsection "Display"
-        Depth  24
-        Modes  "1152x864" "1024x768" "800x600" "640x480"
-      EndSubsection
-    EndSection
-
-    Section "ServerLayout"
-      Identifier   "Chronos"
-      Screen       "Screen"
-      InputDevice  "Keyboard" "CoreKeyboard"
-      InputDevice  "Mouse"  "CorePointer"
-    EndSection
-
-
-    Ror those who compile X themselves, this is my host.def that gets
-    rid of some of the stuff you don't need anyway and adds some PPro 
-    optimization (copy to xc/config/cf):
-
-
-    #define DefaultCCOptions     -O3 -march=i686 -Wall -ansi -pedantic
-    #define DefaultGcc2i386Opt   -O3 -march=i686 -fno-strength-reduce
-    #define LibraryCDebugFlags   -O3 -march=i686 -fno-strength-reduce
-    #define DefaultCDebugFlags   -O3 -march=i686 -fno-strength-reduce
-    #define OptimizedCDebugFlags -O3 -march=i686 -fno-strength-reduce
-
-    #define Freetype2Dir      /usr/local
-    #define ProjectRoot     /usr/X11R6.4
-
-    #define XF86CardDrivers       nv v4l
-    #define XInputDrivers          mouse
-
-    #define BuildServersOnly          NO
-    #define BuildXF86DRI              NO
-    #define XnestServer               NO
-    #define XprtServer                NO
-    #define XVirtualFramebufferServer NO
-    #define BuildFontServer           NO
-    #define BuildXinerama             NO
-    #define BuildXF86RushExt          NO
-    #define BuildPexExt               NO
-    #define BuildGlxExt               NO
-    #define LinuxFBDevSupport         NO
-    #define XF1Bpp                    NO
-    #define XF4Bpp                    NO
-    #define BuildXTrueType            NO
-
-    #define BuildSpeedo               NO
-    #define BuildCID                  NO
-
-    #define BuildCyrillicFonts        NO
-    #define BuildSpeedoFonts          NO
-    #define BuildCIDFonts             NO
-    #define MakeLocalFontDir          NO
-
-    </pre>
-  </body>
-</html>
diff --git a/app-doc/gentoo-web/files/images/1x1.gif b/app-doc/gentoo-web/files/images/1x1.gif
deleted file mode 100755
index 406e061daf74..000000000000
--- a/app-doc/gentoo-web/files/images/1x1.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/XF86Config.png b/app-doc/gentoo-web/files/images/XF86Config.png
deleted file mode 100644
index fc0810e888a2..000000000000
--- a/app-doc/gentoo-web/files/images/XF86Config.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/devfsd.png b/app-doc/gentoo-web/files/images/devfsd.png
deleted file mode 100644
index 1334bf01b9b9..000000000000
--- a/app-doc/gentoo-web/files/images/devfsd.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/favicon.ico b/app-doc/gentoo-web/files/images/favicon.ico
deleted file mode 100644
index 0d01a39e58b5..000000000000
--- a/app-doc/gentoo-web/files/images/favicon.ico
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/fishhead.gif b/app-doc/gentoo-web/files/images/fishhead.gif
deleted file mode 100644
index 8bacafd2acac..000000000000
--- a/app-doc/gentoo-web/files/images/fishhead.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gbot-new.gif b/app-doc/gentoo-web/files/images/gbot-new.gif
deleted file mode 100755
index b7e2725cc68a..000000000000
--- a/app-doc/gentoo-web/files/images/gbot-new.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gbot-s.gif b/app-doc/gentoo-web/files/images/gbot-s.gif
deleted file mode 100644
index 9dc9ed3317aa..000000000000
--- a/app-doc/gentoo-web/files/images/gbot-s.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gentoo-2.gif b/app-doc/gentoo-web/files/images/gentoo-2.gif
deleted file mode 100755
index bd45c4a05ef8..000000000000
--- a/app-doc/gentoo-web/files/images/gentoo-2.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gentoo-doc.gif b/app-doc/gentoo-web/files/images/gentoo-doc.gif
deleted file mode 100755
index 5358540919bf..000000000000
--- a/app-doc/gentoo-web/files/images/gentoo-doc.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gentoo-new.gif b/app-doc/gentoo-web/files/images/gentoo-new.gif
deleted file mode 100755
index 9153b82c0200..000000000000
--- a/app-doc/gentoo-web/files/images/gentoo-new.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gentoo-project.gif b/app-doc/gentoo-web/files/images/gentoo-project.gif
deleted file mode 100755
index e1d0062859dc..000000000000
--- a/app-doc/gentoo-web/files/images/gentoo-project.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gentoolinux.gif b/app-doc/gentoo-web/files/images/gentoolinux.gif
deleted file mode 100644
index 12a6611a9488..000000000000
--- a/app-doc/gentoo-web/files/images/gentoolinux.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gmid.gif b/app-doc/gentoo-web/files/images/gmid.gif
deleted file mode 100755
index 63f00f736235..000000000000
--- a/app-doc/gentoo-web/files/images/gmid.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gridtest.gif b/app-doc/gentoo-web/files/images/gridtest.gif
deleted file mode 100755
index 6dd05dc02adb..000000000000
--- a/app-doc/gentoo-web/files/images/gridtest.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gtop-new.jpg b/app-doc/gentoo-web/files/images/gtop-new.jpg
deleted file mode 100755
index 5ff81546f4af..000000000000
--- a/app-doc/gentoo-web/files/images/gtop-new.jpg
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gtop-s.jpg b/app-doc/gentoo-web/files/images/gtop-s.jpg
deleted file mode 100644
index 191c375fca1e..000000000000
--- a/app-doc/gentoo-web/files/images/gtop-s.jpg
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/gtop.jpg b/app-doc/gentoo-web/files/images/gtop.jpg
deleted file mode 100755
index c5701f0591cd..000000000000
--- a/app-doc/gentoo-web/files/images/gtop.jpg
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/icon-clock.png b/app-doc/gentoo-web/files/images/icon-clock.png
deleted file mode 100644
index 068e7b2c97aa..000000000000
--- a/app-doc/gentoo-web/files/images/icon-clock.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/icon-linux.png b/app-doc/gentoo-web/files/images/icon-linux.png
deleted file mode 100644
index d200d31d7c08..000000000000
--- a/app-doc/gentoo-web/files/images/icon-linux.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/icon-stick1.png b/app-doc/gentoo-web/files/images/icon-stick1.png
deleted file mode 100644
index 3869728af943..000000000000
--- a/app-doc/gentoo-web/files/images/icon-stick1.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/index-projects.html b/app-doc/gentoo-web/files/images/index-projects.html
deleted file mode 100644
index f00c38a3d0d9..000000000000
--- a/app-doc/gentoo-web/files/images/index-projects.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE HTML PUBLIC "http://www.w3.org/TR/REC-html40/loose.dtd" "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<link title="new" rel="stylesheet" href="/main-new.css" type="text/css">
-<title>Gentoo Linux -- Gentoo Linux Projects</title>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff"><table border="0" width="100%" cellspacing="0" cellpadding="0">
-<tr>
-<td rowspan="2" 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 valign="middle" align="center" bgcolor="#000000"><table border="0" cellpadding="0" cellspacing="0"><tr><td align="center"></td></tr></table></td>
-</tr>
-<tr><td valign="bottom" align="left" bgcolor="#000000"><p class="menu">
-<a class="menulink" href="/index.html"> About Gentoo Linux</a> |
-					<a class="menulink" href="/index-download.html">Download/Install</a> | <a class="menulink" href="http://cvs.gentoo.org/wiki">Dev Wiki</a> |
-					<a class="menulink" href="/index-changelog.html">CVS Changelog</a> |
-					<a class="highlight" href="/index-projects.html">Projects</a>
-</p></td></tr>
-<tr>
-<td valign="top" align="right" width="1%" bgcolor="#dddaec"><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"><table 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://download.sourceforge.net/pub/mirrors/metalab/Linux/distributions/gentoo/">SourceForge (USA)</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>
-<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>
-<a class="altlink" href="/doc/build.html">Build CD Install Guide</a>
-<br>
-<a class="altlink" href="/index-download.html">Binary 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>	
-						Developer Docs:<br>
-<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 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 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>
-</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">
-<table class="infotab" width="50%" align="right" cellpadding="0" cellspacing="0" border="0">
-<tr><td class="infohead" align="center" bgcolor="#7a5ada">About these projects</td></tr>
-<tr valign="top" bgcolor="#ddddff"><td class="infotext">
-<p>
-	This page lists development projects that are not specifically Gentoo Linux-related.
-</p>
-</td></tr>
-</table>
-<img src="/images/gentoo-new.gif">
-<br>
-<p class="subhead">Gentoo Linux Projects</p>
-
-	<p>
-	<a href="/projects/dynfw.html">The dynfw firewall scripts</a> are a collection of netfilter-based
-	(<font class="code">iptables</font>) firewall scripts designed to allow for an immediate, measured response against pending
-	security threats.  These <font class="code">bash</font> scripts have been designed to work with nearly any netfilter-based firewall
-	(including both &quot;allow by default&quot; and &quot;deny by default&quot; configurations).
-	</p>
-
-	<p>
-	<a href="/projects/xml.html">The XML projects page</a> contains the complete <font class="code">guide</font> XSLT engine that
-	is used to create this entire site, including the main pages and online documentation.  On this page, you
-	can find a tarball that contains the complete sources that were used to generate the latest version of 
-	the <a href="http://www.gentoo.org">http://www.gentoo.org</a> Web site -- the one you are viewing now.
-	</p>
-
-<br>
-<br>
-</td></tr></table></td>
-</tr>
-<tr><td align="right" class="infohead" width="100%" colspan="2" 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>
diff --git a/app-doc/gentoo-web/files/images/inittab.png b/app-doc/gentoo-web/files/images/inittab.png
deleted file mode 100644
index 8639362aa3a8..000000000000
--- a/app-doc/gentoo-web/files/images/inittab.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/install-boot.gif b/app-doc/gentoo-web/files/images/install-boot.gif
deleted file mode 100755
index c7cacf0066c6..000000000000
--- a/app-doc/gentoo-web/files/images/install-boot.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/install-fdisk.gif b/app-doc/gentoo-web/files/images/install-fdisk.gif
deleted file mode 100755
index 207af99171e0..000000000000
--- a/app-doc/gentoo-web/files/images/install-fdisk.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/keychain-2.gif b/app-doc/gentoo-web/files/images/keychain-2.gif
deleted file mode 100644
index 49f0788aa642..000000000000
--- a/app-doc/gentoo-web/files/images/keychain-2.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/kmod.png b/app-doc/gentoo-web/files/images/kmod.png
deleted file mode 100644
index fb1f0c5311db..000000000000
--- a/app-doc/gentoo-web/files/images/kmod.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/line.gif b/app-doc/gentoo-web/files/images/line.gif
deleted file mode 100644
index 50a4497dbf88..000000000000
--- a/app-doc/gentoo-web/files/images/line.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/modules.png b/app-doc/gentoo-web/files/images/modules.png
deleted file mode 100644
index c0bb19c0c28a..000000000000
--- a/app-doc/gentoo-web/files/images/modules.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/paypal.png b/app-doc/gentoo-web/files/images/paypal.png
deleted file mode 100644
index c1c221d31294..000000000000
--- a/app-doc/gentoo-web/files/images/paypal.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/startkde.png b/app-doc/gentoo-web/files/images/startkde.png
deleted file mode 100644
index b540e13a1e0d..000000000000
--- a/app-doc/gentoo-web/files/images/startkde.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/xf86config.png b/app-doc/gentoo-web/files/images/xf86config.png
deleted file mode 100644
index 9a88de2e2236..000000000000
--- a/app-doc/gentoo-web/files/images/xf86config.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/znl_0.gif b/app-doc/gentoo-web/files/images/znl_0.gif
deleted file mode 100755
index 6982e027dfdb..000000000000
--- a/app-doc/gentoo-web/files/images/znl_0.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/znl_1.gif b/app-doc/gentoo-web/files/images/znl_1.gif
deleted file mode 100644
index 1d524203897b..000000000000
--- a/app-doc/gentoo-web/files/images/znl_1.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/znl_2.gif b/app-doc/gentoo-web/files/images/znl_2.gif
deleted file mode 100644
index 5c91f3c0bd8f..000000000000
--- a/app-doc/gentoo-web/files/images/znl_2.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/images/znr.gif b/app-doc/gentoo-web/files/images/znr.gif
deleted file mode 100755
index 4f5ccea5787c..000000000000
--- a/app-doc/gentoo-web/files/images/znr.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/pyhtml/index.pyhtml b/app-doc/gentoo-web/files/pyhtml/index.pyhtml
deleted file mode 100755
index 4a0fc658857e..000000000000
--- a/app-doc/gentoo-web/files/pyhtml/index.pyhtml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>Gentoo Technologies, Inc.</title>
-    <link title="new" rel="stylesheet" href="gentoo.css" type="text/css" >
-  </head>
-  
-<body bgcolor=ffffff topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
-<table width="100%" height="100%" border=0 cellspacing=0 cellpadding=0>
-	<tr>
-		<td valign="top">
-			<img src="gentoo-2.gif">
-			<!-- contents area -->
-			<table width="100%" border=0 cellpadding=4 cellspacing=5>
-				<tr class="tab">
-					<td valign="top" align="right">
-						<img src="gentoolinux.gif">
-					</td>
-					<td align="right" valign="top">
-						<b>Download:<br>
-						Alt. Download:<br>
-						CVSWeb:<br>
-						Mailing Lists:<br><br><br>
-						rsync:<br>
-						IRC channel</b>:
-					</td>
-					<td align="left" valign="top">
-						<a href="http://www.ibiblio.org/gentoo">http://www.ibiblio.org/gentoo</a><br>
-						<a href="http://download.sourceforge.net/pub/mirrors/metalab/Linux/distributions/gentoo/">SourceForge mirror</a><br>
-						<a href="http://cvs.gentoo.org/cgi-bin/cvsweb.cgi">http://cvs.gentoo.org/cgi-bin/cvsweb.cgi</a><br>
-						developer discussion (<a href="http://www.gentoo.org/mailman/listinfo/gentoo-dev">click to subscribe</a>)<br>
-						announcements (<a href="http://www.gentoo.org/mailman/listinfo/gentoo-announce">click to subscribe</a>)<br>
-						<b>NEW!</b> 1/day CVS-log (<a href="http://www.gentoo.org/mailman/listinfo/gentoo-cvs">click to subscribe</a>)<br>
-						rsync://cvs.gentoo.org<br>
-						<b>#gentoo on <a href="http://www.openprojects.net/">irc.openprojects.net (OPN)</a></b>
-					</td>
-					<td align="left" valign="top">
-						<b>
-						<a href="doc/faq.html">NEW! Gentoo Linux FAQ</a><br>
-						<a href="doc/xml-guide.html">Documentation Guide</a><br>
-						<a href="doc/install.html">Install Guide</a><br>
-						<a href="doc/portage-user.html">Portage User Guide</a><br>	
-						<a href="doc/gentoo-howto">Development HOWTO</a><br>
-						<a href="doc/nvidia_tsg.html">NVIDIA Troubleshooting Guide [Feb 2001]</a></b><br>
-						Latest release: 01 May 2001 system snapshot<br>
-						Next release: Gentoo Linux 1.0_rc5 (May 2001)<br>
-						Recommended kernel: Linux 2.4.4+
-					</td>
-				</tr>
-			</table>
-		</td>	
-	</tr>
-	<tr> 
-		<td valign="top">
-			<table border=0 cellpadding="8" width="100%">
-				<tr>
-					<td class="tab" valign="top"><br>
-						<p><font color="#ff0000"><b>Important News:</b><br>
-						We are working hard on a new release of Gentoo Linux, 
-						but right now, the 1.0_rc4_pre2 release on ibiblio.org
-						and its mirrors is a bit out of date.  If you're interested in installing Gentoo Linux,
-						we recommend you wait until the 1.0_rc5 release (a week or two away) or join the gentoo-dev
-						mailing list and visit us on the #gentoo IRC channel to find out how to install a <a
-						href="http://www.ibiblio.org/gentoo/gentoo-x86-distro/gentoo-1.0_rc4/packages/snapshots/">
-						system snapshot</a> rather than using the official 1.0_rc4_pre2 version.  Also, until
-						version 1.0 is released, Gentoo Linux is geared for developers only.  The distro is quite
-						refined at this point, but installing it requires some skill.</font></p>
-						<br><br>	
-
-
-						
-						<font size=+1><b>What is Gentoo Linux?</b></font><br>
-						<br>
-						<b>Gentoo Linux</b> is designed for the developer,
-						power user and enthusiast.  Incorporating the latest sources and
-						technologies (such as ReiserFS and the Portage system), Gentoo
-						Linux was created to provide the ultimate Linux experience.  If you've
-						tried all the other distros and you're still not satisfied, then you
-						need to experience Gentoo.<br><br>
-	
-						<font size=+1><b>Features</b></font><br>
-
-						<ul>
-							<li><b>Linux 2.4</b>, <b>glibc 2.2</b>, <b>gcc 2.95.3</b> and the latest development tools</li>
-							<li><b>ReiserFS</b> support built-in; in fact, we recommend a ReiserFS root filesystem</li>
-							<li><b>GRUB</b>, the Grand Unified Boot Loader replaces LILO (LILO is still available for those who need it)</li>
-							<li>Xfree86 4.0.3, <b>KDE 2.1.1</b> (with <b>anti-aliased</b> fonts) and <b>GNOME 1.4</b></li>
-							<li><b>Portage</b>, a next-generation ports system for Linux :) Finally, a Linux distro that BSD fans can use and enjoy</li>
-							<li>Simple, clean design -- <b>no red tape</b> to get in your way</li>
-							<li><b>Simplified SysV-style</b> initialization scripts</li>
-							<li>D.J. Bernstein's <b>supervise</b> used for Internet services by default -- to ensure availability (ssh, samba, xinetd, dcron, dnscache, and more being added all the time)</li>
-							<li>no more syslogd -- we use <b>multilog</b>, featuring 64-bit timestamps, auto-rotation and very high performance</li>
-							<li>Enhanced tools, like Jörg Schilling's <b>star</b> (world's fastest tar program), mt and rmt tools included in the base distro</li>
-							<li>Matt Dillon's simple, clean and secure <b>dcron</b>, rather than the standard vixie cron</li>
-							<li><b>tcp-wrappers</b> and DJB's <b>ucspi-tcp ("tcpserver")</b> part of the base distro</li>
-							<li><b>xinetd</b> is used by default, a secure replacement for inetd (which we don't use at all)</li>
-							<li><b>iptables</b>, the new <b>ip</b> command, and <b>tc</b> (QoS traffic control tools) are part of the base distribution</li>
-							<li><b>Postfix</b>, <b>qmail</b>, <b>qmail-mysql</b> and <b>exim</b> mail systems -- choose your favorite</li>
-							<li>The latest <b>ALSA</b> (Advanced Linux Sound Architecture) and <b>accelerated NVidia drivers</b> included by default</li>
-							<li>Up-to-date, production-ready packages like <b>OpenSSH</b> and <b>Apache with SSL</b> -- not some lame 1 year-old version :)</li>
-							<li>We're not at version 1.0 yet; you can expect this list to grow :)</li>
-						</ul>
-					</td>
-					<td rowspan=2 width="40%" valign="top">
-<!--code
-import string
-import portage
-import sys
-import os
-
-portdir=portage.cfgtree["/"]["PORTDIR"]
-if not os.path.exists(portdir+"/ChangeLog"):
-	sys.stderr.write("!!! Error: Can't find ChangeLog.  Exiting.\n\n")
-	sys.exit(1)
-entry=0
-a=open(portdir+"/ChangeLog")
-mylines=a.readlines()
-pos=0
-while (pos<len(mylines)) and (entry<30):
-	curline=mylines[pos][:-1]
-	if len(curline)==0:
-		pos=pos+1
-		continue
-	splitline=string.split(curline)
-	print '<p class="itemdesc">'
-	if not len(splitline):
-		sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-		sys.exit(1)
-	if splitline[0]=="date":
-		if len(splitline)<=1:
-			sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-			sys.exit(1)
-		print '<table width="100%" border=0 cellspacing=0 cellpadding=0><tr><td align="center" class="infobox"><b>'+string.join(splitline[1:]," ")+"</b></td></tr></table>"
-		pos=pos+1
-		continue
-	elif splitline[0]=="new":
-		if len(splitline)<=1:
-			sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-			sys.exit(1)
-		pkgsplit=string.split(splitline[1],"/")
-		print "<b>New package",splitline[1]+"</b>"
-	elif splitline[0]=="upd":
-		if len(splitline)<=3:
-			sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-			sys.exit(1)
-		pkgsplit=string.split(splitline[1],"/")
-		print "<b>Updated package",splitline[1],"to",splitline[3]+"</b>"
-	elif splitline[0]=="rel":
-		if len(splitline)<=1:
-			sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-			sys.exit(1)
-		print "<h2>New Release! Gentoo Linux",splitline[1]+"</h2>"
-		desc=""
-	elif splitline[0]=="del":
-		if len(splitline)<=1:
-			sys.stderr.write("!!! Error on line "+`pos+1`+"\n")
-			sys.exit(1)
-		print "<b>Removed package",splitline[1]+"</b>"
-		desc=""
-	pos=pos+2
-	desc=""
-	while mylines[pos][:-1]!="":
-		desc=desc+" "+string.strip(mylines[pos][:-1])
-		pos=pos+1
-	if desc:
-		print "<br>"+desc
-	print "</p>"
-	pos=pos+1
-	entry=entry+1
--->
-					</td>
-				</tr> 
-			</table>
-			<!-- end contents area -->
-		</td>
-	</tr>
-	<tr height="1%">
-		<td class="infobox">
-			<p class="info">
-				&copy; 2000-2001 <a href="http://www.gentoo.org">Gentoo Technologies, Inc.</a>  All rights reserved. Linux is a 
-				registered trademark of Linus Torvalds. Contact: 
-				<a href="mailto:www@gentoo.org">www@gentoo.org</a>
-			</p>
-		</td>
-	</tr>
-</table>
-<!-- end main page area -->
-</body>
-</html>
diff --git a/app-doc/gentoo-web/files/scripts/snddevices b/app-doc/gentoo-web/files/scripts/snddevices
deleted file mode 100644
index 11b346a6d7fc..000000000000
--- a/app-doc/gentoo-web/files/scripts/snddevices
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-
-MAJOR=116
-OSSMAJOR=14
-MAX_CARDS=4
-PERM=666
-STATIC=1
-OWNER=root.root
-
-if [ "`grep -w -E "^audio" /etc/group`x" != x ]; then
-  PERM=660
-  OWNER=root.audio
-fi
-
-function create_odevice () {
-  rm -f $1
-  echo -n "Creating $1..."
-  mknod -m $PERM $1 c $OSSMAJOR $2
-  chown $OWNER $1
-  echo " done"
-}
-
-function create_odevices () {
-  tmp=0
-  tmp1=0
-  rm -f $1 $1?
-  echo -n "Creating $1?..."
-  while [ $tmp1 -lt $MAX_CARDS ]; do
-    minor=$[ $2 + $tmp ]
-    mknod -m $PERM $1$tmp1 c $OSSMAJOR $minor
-    chown $OWNER $1$tmp1
-    tmp=$[ $tmp + 16 ]
-    tmp1=$[ $tmp1 + 1 ]
-  done
-  echo " done"
-}
-
-function create_device1 () {
-  rm -f $1
-  minor=$2
-  echo -n "Creating $1..."
-  mknod -m $PERM $1 c $MAJOR $minor
-  chown $OWNER $1
-  echo " done"
-}
-
-function create_devices () {
-  tmp=0
-  rm -f $1 $1?
-  echo -n "Creating $1?..."
-  while [ $tmp -lt $MAX_CARDS ]; do
-    minor=$[ $tmp * 32 ]
-    minor=$[ $2 + $minor ]
-    mknod -m $PERM "${1}C${tmp}" c $MAJOR $minor
-    chown $OWNER "${1}C${tmp}"
-    tmp=$[ $tmp + 1 ]
-  done
-  echo " done"
-}
-
-function create_devices2 () {
-  tmp=0
-  rm -f $1 $1?
-  echo -n "Creating $1??..."
-  while [ $tmp -lt $MAX_CARDS ]; do
-    tmp1=0
-    while [ $tmp1 -lt $3 ]; do
-      minor=$[ $tmp * 32 ]
-      minor=$[ $2 + $minor + $tmp1 ]
-      mknod -m $PERM "${1}C${tmp}D${tmp1}" c $MAJOR $minor
-      chown $OWNER "${1}C${tmp}D${tmp1}"
-      tmp1=$[ $tmp1 + 1 ]
-    done
-    tmp=$[ $tmp + 1 ]
-  done
-  echo " done"
-}
-
-if test "$1" = "-?" || test "$1" = "-h" || test "$1" = "--help"; then
-  echo "Usage: snddevices [max]"
-  exit
-fi
-
-if test "$1" = "max"; then
-  DSP_MINOR=19
-fi
-
-# OSS (Lite) compatible devices...
-
-if test $OSSMAJOR -eq 14; then
-  create_odevices /dev/mixer		0
-  create_odevice /dev/sequencer		1
-  create_odevices /dev/midi		2
-  create_odevices /dev/dsp		3
-  create_odevices /dev/audio		4
-  create_odevice /dev/sndstat		6
-  create_odevice /dev/music		8
-  create_odevices /dev/dmmidi		9
-  create_odevices /dev/dmfm		10
-  create_odevices /dev/amixer		11	# alternate mixer
-  create_odevices /dev/adsp		12	# alternate dsp
-  create_odevices /dev/amidi		13	# alternate midi
-  create_odevices /dev/admmidi		14	# alternate direct midi
-  # create symlinks
-  ln -svf /dev/mixer0 /dev/mixer
-  ln -svf /dev/midi0 /dev/midi
-  ln -svf /dev/dsp0 /dev/dsp
-  ln -svf /dev/audio0 /dev/audio
-  ln -svf /dev/music /dev/sequencer2
-  ln -svf /dev/adsp0 /dev/adsp
-  ln -svf /dev/amidi0 /dev/amidi
-fi
-
-# New devices (obsolete now)...
-
-mv -f /dev/sndstat /dev/1sndstat
-rm -f /dev/snd*
-mv -f /dev/1sndstat /dev/sndstat
-if [ -d /dev/snd ]; then
-  rm -f /dev/snd/*
-  rmdir /dev/snd
-fi
-if [ $STATIC -gt 0 ]; then
-  mkdir -p /dev/snd
-  create_devices  /dev/snd/control	0
-  create_device1  /dev/snd/seq		1
-  create_devices2 /dev/snd/hw		2	4
-  create_devices2 /dev/snd/mixer	6	2
-  create_devices2 /dev/snd/pcm		16	16
-  create_devices2 /dev/snd/midi		8	4
-fi
-
-# New dynamic sound device filesystem
-
-if [ $STATIC -le 0 ]; then
-  echo "ALSA dynamic sound device filesystem"
-  ln -sfv /proc/asound/dev /dev/snd
-fi
-
-# Loader devices
-
-echo "ALSA loader devices"
-rm -f /dev/aload*
-create_devices  /dev/aload		0
-create_device1  /dev/aloadSEQ		1
diff --git a/app-doc/gentoo-web/files/security/advisory-html-light.xsl b/app-doc/gentoo-web/files/security/advisory-html-light.xsl
deleted file mode 100644
index 4050f679bfb6..000000000000
--- a/app-doc/gentoo-web/files/security/advisory-html-light.xsl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/advisory">
-
-<html>
-<body>
-
-<center>
-------------------------------<br/>
-Gentoo Linux Security Advisory<br/>
-------------------------------<br/>
-</center>
-
-<p>
-Gentoo Linux is a free x86-based community developed Linux distribution
-with an advanced package management system (called Portage).  Since it may
-be possible for users to use different versions of the same package, it is
-important that users carefully read this announcement to assess the impact
-of the problem on their systems and choose a workaround or solution that
-matches their situation.
-</p>
-
-<dl>
-<dt>Advisory ID</dt>
-<dd><xsl:value-of select="date/year"/>-<xsl:value-of select="id"/></dd>
-
-<dt>Packages</dt>
-<xsl:for-each select="packages/package">
-	<dd><xsl:value-of select="name"/> (<xsl:value-of select="version"/>)</dd>
-</xsl:for-each>
-
-<dt>Date</dt>
-<dd><xsl:value-of select="date/year"/>-<xsl:value-of select="date/month"/>-<xsl:value-of select="date/day"/></dd>
-
-<dt>Status</dt>
-<dd><xsl:value-of select="status"/></dd>
-
-<dt>Author(s)</dt>
-<xsl:for-each select="authors/author">
-	<dd><xsl:value-of select="name"/> (<xsl:value-of select="email"/>)</dd>
-</xsl:for-each>
-
-<dt>Description</dt> 
-<dd><xsl:value-of select="description"/></dd>
-
-<dt>Impact</dt>
-<dd><xsl:value-of select="impact"/></dd>
-
-<dt>Solution</dt>
-<dd><xsl:value-of select="solution"/></dd>
-
-<xsl:if test="procedure">
-<dt>Procedure</dt>
-	<ul>
-	<xsl:for-each select="procedure/step">
-		<li><xsl:value-of select="text"/></li>
-		<ul>
-		<xsl:for-each select="example">	
-			<li><i><xsl:value-of select="."/></i></li>
-		</xsl:for-each>
-		</ul>
-	</xsl:for-each>
-	</ul>
-</xsl:if>		
-
-</dl>
-
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/security/advisory-html.xsl b/app-doc/gentoo-web/files/security/advisory-html.xsl
deleted file mode 100644
index e3abc54dda34..000000000000
--- a/app-doc/gentoo-web/files/security/advisory-html.xsl
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/advisory">
-
-<html>
-<head>
-<title>Gentoo Linux Security Advisory: 
-<xsl:value-of select="date/year"/>-<xsl:value-of select="id"/>
-</title>
-</head>
-<body topmargin="0" leftmargin="0" bgcolor="#dddaec">
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-<tr><td>
-
-<center>
-------------------------------<br/>
-Gentoo Linux Security Advisory<br/>
-------------------------------<br/>
-</center>
-
-</td></tr>
-<tr><td>
-
-<!-- inner table -->
-<table width="100%" cellspacing="0" cellpadding="5" border="0"
-bgcolor="#FFFFFF">
-<tr>
-<td bgcolor="#7a5ada" colspan="2" width="100%"> 
-<center>
-<font color="#FFFFFF">Gentoo Linux Security Advisory: <xsl:value-of
-select="date/year"/>-<xsl:value-of select="id"/></font>
-</center>
-</td>
-</tr>
-
-<tr>
-<td>Packages</td>
-<td>
-<xsl:for-each select="packages/package">
-	<xsl:value-of select="name"/> (<xsl:value-of select="version"/>)<br/>
-</xsl:for-each>
-</td>
-</tr>
-
-<tr>
-<td>Date</td>
-<td><xsl:value-of select="date/year"/>-<xsl:value-of select="date/month"/>-<xsl:value-of select="date/day"/></td>
-</tr>
-
-<tr>
-<td>Status</td>
-<td><xsl:value-of select="status"/></td>
-</tr>
-
-<tr>
-<td>Author(s)</td>
-<td>
-<xsl:for-each select="authors/author">
-	<xsl:value-of select="name"/> (<xsl:value-of select="email"/>)<br/>
-</xsl:for-each>
-</td>
-</tr>
-
-<tr>
-<td>Description</td> 
-<td><xsl:value-of select="description"/></td>
-</tr>
-
-<tr>
-<td>Impact</td>
-<td><xsl:value-of select="impact"/></td>
-</tr>
-
-<tr>
-<td>Solution</td>
-<td><xsl:value-of select="solution"/></td>
-</tr>
-
-<xsl:if test="procedure">
-<tr>
-<td bgcolor="#7a5ada" colspan="2">
-<font color="#FFFFFF">Procedure</font>
-</td>
-</tr>
-<tr>
-<td colspan="2">
-	<ul>
-	<xsl:for-each select="procedure/step">
-		<li><xsl:value-of select="text"/></li>
-		<ul>
-		<xsl:for-each select="example">	
-			<li><i><xsl:value-of select="."/></i></li>
-		</xsl:for-each>
-		</ul>
-	</xsl:for-each>
-	</ul>
-</td>
-</tr>
-</xsl:if>		
-
-</table>
-<!-- end of inner table -->
-
-</td></tr>
-</table>
-
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/security/advisory-template.xml b/app-doc/gentoo-web/files/security/advisory-template.xml
deleted file mode 100644
index adccf0ae16be..000000000000
--- a/app-doc/gentoo-web/files/security/advisory-template.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-<advisory>
-
-<!-- packages affected -->
-<packages>
-	<package>
-		<name>net-www/squid</name>
-		<version>all prior to 2.3.4s-r4</version>
-	</package>
-</packages>
-
-<!-- three digit advisory id (resets to 1 at start of every new year) -->
-<id>001</id>
-
-<!-- date in numeric form (no spaces!) -->
-<date>
-	<month>07</month>
-	<day>30</day>
-	<year>2001</year>
-</date>
-
-<!-- advisory status (Unresolved, Resolved, Revised) -->
-<status>Resolved</status>
-
-<!-- advisory authors -->
-<authors>
-	<author>
-		<name>Bruce A. Locke</name>
-		<email>blocke@gentoo.org</email>
-	</author>
-</authors>
-
-<!-- description of reason for advisory -->
-<description>
-Squid has a serious security flaw which may allow access to an internal
-network and local services if Squid is configured for http_accel while 
-http_accel_with_proxy is set to "off". 
-</description>
-
-<!-- impact on users (why users should be worried) -->
-<impact>
-May allow unauthorized access to internal networks and may be used as
-a way to get around IP based security rules, etc.
-</impact>
-
-<!-- how users should respond to the problem -->
-<solution>
-All users are recommended to upgrade to the latest version available
-in portage (2.3.4s-r4).  Those unable to upgrade to this version can
-disable http_accel mode in Squid's configuration to disable the affected
-parts of Squid.
-</solution>
-
-<!-- step by step example of what users should do (optional but desired) -->
-<procedure>
-	<step>
-		<text>Login or SU into root</text>
-	</step>
-
-	<step>
-		<text>Merge new version of Squid</text>
-		<example>cd /usr/portage/net-www/squid</example>
-		<example>emerge squid-2.3.4s-r4.ebuild (or newer version)</example>
-	</step>
-
-	<step>
-		<text>Restart the Squid service</text>
-		<example>/etc/rc.d/init.d/squid stop</example>
-		<example>/etc/rc.d/init.d/squid start</example>
-	</step>
-
-	<step>
-		<text>Unmerge old version(s)</text>
-		<example>ebuild /var/db/pkg/net-www/squid/squid-2.3.4s-r3.ebuild unmerge</example>
-	</step>
-
-</procedure>
-
-</advisory>
diff --git a/app-doc/gentoo-web/files/txt/gentoo-ebuild-policy.txt b/app-doc/gentoo-web/files/txt/gentoo-ebuild-policy.txt
deleted file mode 100644
index 5e2ff51327d4..000000000000
--- a/app-doc/gentoo-web/files/txt/gentoo-ebuild-policy.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Intro
-The gentoo-ebuild mailing list is for submissions of new ebuilds and ebuild
-updates by authors without developer accounts. It is also the place for
-'newbie' ebuild-creation related questions. Bug reports which do not suggest
-a fix and all other questions and discussions should go on the
-general-purpose gentoo-dev mailing list.
-
-Posting rules
-The submission posts should include short descriptions of the ebuild/update
-etc. and any other relevant information. The ebuilds should be attached to
-the posts; updates should be posted as unified-format diffs. Updates
-affecting multiple files can be posted in one diff to be applied in
-/usr/portage or in a category dir. If the diff becomes as large as the ebuild
-itself, you can post the new version of the ebuild instead of the diff, but
-it's still deprecated.
-
-What happens to submissions
-A developer (currently myself) routinely adds submissions posted on
-gentoo-ebuild to incoming. This is the directory /usr/portage/incoming. The
-developer also adds a public item to dev-wiki (cvs.gentoo.org/wiki) for the
-appropriate team, low priority, unstable branch for new ebuilds and all
-branches for updates. A developer from that team will eventually 'grab' the
-todo item, check the ebuild, and put it in the appropriate category.
-
-Note: The files in incoming can be accessed via cvs/rsync, but users
-shouldn't merge files from incoming, as they haven't been checked by
-developers.
-
---
-Dan Armak
diff --git a/app-doc/gentoo-web/files/txt/newweb.txt b/app-doc/gentoo-web/files/txt/newweb.txt
deleted file mode 100644
index 12718bdf7b91..000000000000
--- a/app-doc/gentoo-web/files/txt/newweb.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-Gentoo Linux Development Status
-
-Latest system snapshot: 25 Apr 2001
-Latest build snapshot: 01 May 2001
-Current Release: None
-Next Release: 1.0_rc5 (May 2001)
-
-[ download/install ]
-
-
-About Gentoo Linux
-
-Linux is a fast, modern x86-based Linux distribution with a clean and flexible
-design -- in this respect, Gentoo Linux may appeal to Slackware, Linux From
-Scratch or BSD users. Unlike other Linux distros, Gentoo Linux has an advanced
-package management system called Portage, similar in functionality to BSD
-ports.  However, unlike ports, Portage is written in Python and is a good deal
-more powerful and flexible than the BSD variant.
-
-The latest Gentoo Linux packages are made available in the form of "ebuild"
-autobuild scripts, which are integrated into the official Gentoo Linux Portage
-tree by Gentoo Linux developers.  Users can update their local copy of the
-Portage tree and gain access to the latest and greatest ebuilds, allowing them
-to install the latest Linux software on their systems.
-
-Here's how ebuilds work.  An ebuild script contains all the information needed
-to download, patch, compile and install a particular package using the user's
-preferred optimization settings, and with optional compile-time extensions
-(like GNOME support) enabled or disabled as desired.  The user simply specifies
-which package he or she would like built, and the sources are automatically
-downloaded, unpacked, patched, compiled locally and the binaries are installed.
-The user ends up with a package set up to his or her exact specifications.  
-
-
-Related Resources:
-	
-	Gentoo Linux User Guide
-	
-	Portage User Guide
-	
-	Subscribe to the gentoo-announce
-	mailing list ( release announcements)
-	
-	Subscribe to the gentoo-dev mailing list
-	( user & developer list)
-	
-	Visit us at #gentoo at irc.openprojects.net
-
-Alt:
-
-	Linux 2.4.4+, glibc-2.2, gcc 2.95.3 and the latest development tools
-	ReiserFS, LVM, ALSA, PCMCIA-CS and lm_sensors support built-in; XFS and GFS will be added soon
-	Xfree86 4.0.3, OpenGL, KDE 2.1.1 and GNOME 1.4
-	tcp-wrappers, uscpi-tcp ("tcpserver"), xinetd, iptables and Linux QoS tools (tc) included
-	modern qmail (with optional mysql and LDAP support), postfix and exim MTAs
-	GRUB boot loader (LILO is still available if you need it)
-	D.J. Bernstein's supervise (daemontools) used to ensure availability for
-	important services
-	syslogd and klogd have been replaced with multilog (higher-performance, auto-rotation and
-	64-bit timestamps)
-	600+ up-to-date ebuild scripts for your favorite apps
-	
-Download/Install Gentoo Linux
-
-News:
-
-	We're currently recommending that people either wait for our next
-	official Gentoo Linux ISO CD release (1.0_rc5) or install using a
-	system or build snapshot for the time being.  We removed our previous
-	release (1.0_rc4_pre2) from the ibiblio.org mirror because our current
-	system snapshots and build images are much more robust, and include
-	2.4.4+ kernels which no longer have ReiserFS filesystem corruption
-	problems.
-
-Impo:
-
-	Please remember that Gentoo Linux is in a prerelease state.  This means
-	that it should only be installed by developers or adventurous users, and
-	should not be used in a production capacity.  Gentoo Linux will be
-	production-ready by the 1.0 release.
-	
-
-
-Currently, we have three different methods of installing Gentoo Linux,
-depending on your needs: the install CD method, the system snapshot method and the
-build image method.
-
-For every official Gentoo Linux release, we create a bootable ISO image that
-can be used to install Gentoo Linux.  The process works as follows: you burn
-the ISO image using a CD-R, and then boot the CD and are presented with a
-minimal CD-based Gentoo Linux system.  You then use this system to create
-partitions and set up filesystems as needed.  Once your filesystems are
-created, you mount them and extract the system-image ("sys.tbz2") tarball
-included on the CD, which contains a basic Gentoo Linux system.  After a few
-more configuration steps, you can umount your Gentoo Linux partitions and
-install a boot manager; Gentoo Linux is now ready to run.  Since our CD releases
-include precompiled packages for most applications, they're generally around
-600Mb in size.
-
-In-between our official Gentoo Linux ISO CD releases, we create up-to-date
-sys.tbz2 files, called "system snapshots".  These sys.tbz2 files are identical
-in design to the sys.tbz2 image included on our official CDs, except that they
-are more up-to-date and are used by our developers as we are refining a Gentoo
-Linux for the next official CD release.  A lot of the time, we'll recommend
-that you install a system snapshot rather than our latest official Gentoo Linux
-CD release, because our system snapshots are often the most stable and
-up-to-date version of Gentoo Linux available.  However, since system snapshots
-are for developers only, we don't provide an ISO image; instead, we provide the
-sys.tbz2 tarball only -- it's up to you to get the tarball extracted to a spare
-partition.  However, we will often include bootdisks to make this process
-easier, depending on whether or not the system snapshot is truly ready for
-prime-time use.  System images average around 70Mb in size.
-
-Our third, and possibly most interesting install method uses a "build image",
-or build.tbz2 file.  This build.tbz2 file contains a minimal chrootable Gentoo
-Linux environment; you use it by extracting build.tbz2 to a spare partition and
-then chrooting to it from an existing Linux system.  Then, you can build a
-complete Gentoo Linux system from scratch using Portage -- as well as your
-desired optimization settings and compile-time extensions enabled.  Using the
-"build image" approach, you can create a complete Gentoo Linux system from
-scratch that's set up just the way you want it.
-
-However, build image installation is a bit more labor intensive than the other
-approaches.  First, you must download the build.tbz2 file (typically about 17Mb
-in size), extract it to a spare partition, chroot to the build environment, configure
-networking, and use emerge to grab the latest version of our Portage tree using
-rsync.  Then, you can configure your /etc/make.conf with your desired system-wide
-compilation settings, and use a special bootstrap script to automatically rebuild
-the system to the point where it's the equivalent to a sys.tbz2 file.  At this
-point, your Gentoo Linux system is ready to boot on its own.
-
-Resources:
-
-	Gentoo Linux Installation Guide: how to install Gentoo Linux via CD
-	
-	Gentoo Linux Portage User Guide
-	
-	Gentoo Linux System Snapshot README
-
-	Primary Download Site at www.ibiblio.org:
-		Gentoo Linux CD ISO images
-		Gentoo Linux system snapshots and build images
-		
-	Secondary Download Site at www.sourceforge.net:
-		Gentoo Linux CD ISO images
-		Gentoo Linux system snapshots and build images
-	
-The team
-
-Daniel Robbins
-
-
-
-<p>Daniel Robbins is the President/CEO of Gentoo Technologies, Inc., the
-creator of <a href="http://www.gentoo.org">Gentoo Linux</a> and the developer
-of the <b>Portage</b> system.  In addition to his Gentoo Linux-related
-responsibilities, he is also a regular columnist for the <a
-href="http://www.ibm.com/developerworks/linux">IBM developerWorks</a> Linux
-Zone and Usability special topic, and a frequent author of IBM developerWorks
-Linux tutorials.  In the past, Daniel has also contributed to the Macmillan
-books <i>Caldera OpenLinux Unleashed</i>, <i>SuSE Linux Unleased</i> and
-<i>Samba Unleashed</i> and served as a Lead Graphic Artist for Psygnosis, now a
-part of <a href="http://www.scea.com">SONY Computer Entertainment</a>.
-
diff --git a/app-doc/gentoo-web/files/wiki/bios/0.png b/app-doc/gentoo-web/files/wiki/bios/0.png
deleted file mode 100644
index 27bdaab254e6..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/0.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/10.png b/app-doc/gentoo-web/files/wiki/bios/10.png
deleted file mode 100644
index aa6963350736..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/10.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/14.png b/app-doc/gentoo-web/files/wiki/bios/14.png
deleted file mode 100644
index ce7ccda02a8a..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/14.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/15.png b/app-doc/gentoo-web/files/wiki/bios/15.png
deleted file mode 100644
index cc75064b4c4e..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/15.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/16.png b/app-doc/gentoo-web/files/wiki/bios/16.png
deleted file mode 100644
index e0e4e29e5b07..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/16.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/17.png b/app-doc/gentoo-web/files/wiki/bios/17.png
deleted file mode 100644
index 0e3d893e8974..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/17.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/2.png b/app-doc/gentoo-web/files/wiki/bios/2.png
deleted file mode 100644
index c343282f2a61..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/2.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/21.png b/app-doc/gentoo-web/files/wiki/bios/21.png
deleted file mode 100644
index bcc1b25e1763..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/21.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/3.png b/app-doc/gentoo-web/files/wiki/bios/3.png
deleted file mode 100644
index e6f6fbf703b9..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/3.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/4.png b/app-doc/gentoo-web/files/wiki/bios/4.png
deleted file mode 100644
index dbb21ad89e2b..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/4.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/bios/6.png b/app-doc/gentoo-web/files/wiki/bios/6.png
deleted file mode 100644
index c1cd18d26ab1..000000000000
--- a/app-doc/gentoo-web/files/wiki/bios/6.png
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/completed.php b/app-doc/gentoo-web/files/wiki/completed.php
deleted file mode 100644
index b9b950473dd6..000000000000
--- a/app-doc/gentoo-web/files/wiki/completed.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-	include "functions.php";
-	main_header( 'Completed todo listing' );
-?>
-<p style="font-size:medium;font-weight:bold;">Completed todos</p>
-<table width="95%" border=0 cellpadding=2 cellspacing=2>
-<tr>
-	<td bgcolor="#dddaec"><b>Developer</b></td>
-	<td bgcolor="#dddaec"><b>Title</b></td>
-	<td bgcolor="#dddaec"><b>Section</b></td>
-	<td bgcolor="#dddaec"><b>Followups</b></td>
-	<td bgcolor="#dddaec"><b>Existed</b></td>
-</tr>
-<?php
-		$result = mysql_query( "select * from todos where priority=0 order by date desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			$fupcount = mysql_query( 'select fid from followups where tid='.$todo['tid'] );
-			$fupcount = mysql_num_rows( $fupcount );
-
-			$ownername = mysql_query( 'select username from users where uid='.$todo['owner'] );
-			list( $ownername ) = mysql_fetch_row( $ownername );
-
-			$team = team_num_name( $todo['team'] );
-			$branch = branch_num_name( $todo['branch'] );
-?>
-<tr>
-	<td><?=$ownername;?></td>
-	<td><a href="single.php?tid=<?=$todo['tid'];?>"><?=$todo['title'];?></a></td>
-	<td><?=$team.'-'.$branch;?>
-	<td><?=$fupcount;?></td>
-	<td><?=date( "n/j/y", $todo['date'] );?>-<?=date( "n/j/y", $todo['datecompleted'] );?></td>
-</tr>
-<?php
-		}
-?>
-</table>
-
-<?php main_footer(); ?>
diff --git a/app-doc/gentoo-web/files/wiki/devtodo.php b/app-doc/gentoo-web/files/wiki/devtodo.php
deleted file mode 100644
index 458aa358e79f..000000000000
--- a/app-doc/gentoo-web/files/wiki/devtodo.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-	include "functions.php";
-
-	main_header( 'Todo by developer' );
-
-	if ( !$devid ) $devid = $uid;
-	$dude = mysql_query( "select * from users where uid=$devid" );
-	$dude = mysql_fetch_array( $dude );
-?>
-<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s Bio</p>
-<table width="95%" border=0 cellpadding=5 cellspacing=0>
-<tr>
-	<td width=150 valign="top"><table border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td><img src="bios/<?php if (file_exists('bios/'.$dude['uid'].'.png')) print $dude['uid'].'.png'; else print '0.png'; ?>" width=150 height=150 alt="<?=$dude['username'];?>"></td></tr></table></td>
-
-	<td valign="top">
-	<table border=0 cellpadding=2 cellspacing=0>
-	<tr>
-		<td><b>Real Name:</b></td>
-		<td><?=$dude['realname'];?></td>
-	</tr>
-	<tr>
-		<td><b>Title:</b></td>
-		<td><?=$dude['title'];?></td>
-	</tr>
-	<tr>
-		<td><b>Location:</b></td>
-		<td><?=$dude['location'];?></td>
-	</tr>
-	<tr>
-		<td><b>Email:</b></td>
-		<td><a href="mailto:<?=$dude['email'];?>"><?=$dude['email'];?></a></td>
-	</tr>
-	<tr>
-		<td valign="top"><b>Teams:</b></td>
-		<td>
-		<table border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
-		<table border=0 cellpadding=2 cellspacing=0 bgcolor="#bdbacc">
-		<tr>
-			<td>&nbsp;</td>
-			<td align="center"><b>Regular&nbsp;&nbsp;</b></td>
-			<td align="center"><b>Leader</b></td>
-		</tr>
-		<?php
-		// get team info
-		$xteams = $dude['team'];
-		$xteams = explode( ',', $xteams );
-		while ( $each = each($teams) ) {
-			if ( $each['key'] == 0 || $each['key'] == 1 ) continue; // skip 'none' and 'all'
-			$tm = 'u'; // set the default
-			if ( $devid != 'new' ) {
-				// are they a simple member? ...
-				reset( $xteams );
-				while ( $cur = each($xteams) ) {
-					if ( $cur['value'] == $each['key'] ) { $tm = 'r'; break; }
-				}
-				// are they the team LEADER?!?! :)
-				$ldr = mysql_query( 'select leader,gid from teams where gid='.$each['key'] );
-				list( $ldr, $thegid ) = mysql_fetch_row( $ldr );
-				$ldr = explode( ',', $ldr );
-				reset( $ldr );
-				while ( $pair = each($ldr) ) {
-					if ( $pair['value'] == $devid ) {
-						$tm = 'l';
-						$oldlead[] = $thegid;
-						break;
-					}
-				}
-			}
-			if ($tm!='u') {
-			?>
-		<tr>
-			<td><b><?=$each['value'];?></b></td>
-			<td align="center"><?php if ($tm=='r') print '<img src="images/dot.gif" width=10 height=10 alt="">'; else print '&nbsp;'; ?></td>
-			<td align="center"><?php if ($tm=='l') print '<img src="images/dot.gif" width=10 height=10 alt="">'; else print '&nbsp;'; ?></td>
-		</tr>
-			<?php
-			}
-		}
-		?>
-		</table>
-		</td></tr></table>
-		</td>
-	</tr>
-	</table>
-	</td>
-
-</tr>
-</table>
-
-<p>&nbsp;</p>
-
-<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s uncompleted todos</p>
-<table width="95%" border=0 cellpadding=2 cellspacing=2>
-<?php if ( $uid == $devid ) { ?>
-<tr>
-	<td colspan=5 align="right">You're logged in. Clicking on a todo will take you to an edit page.<br>
-	or... <a href="single.php?action=new_todo">Create a new todo</a>.</td>
-</tr>
-<?php } ?>
-<tr>
-	<td>&nbsp;</td>
-	<td bgcolor="#dddaec"><b>Date</b></td>
-	<td bgcolor="#dddaec"><b>Title</b></td>
-	<td bgcolor="#dddaec"><b>Section</b></td>
-	<td bgcolor="#dddaec"><b>Followups</b></td>
-</tr>
-<?php
-		$result = mysql_query( "select * from todos where owner=$devid and priority!=0 and public=0 order by priority desc, date" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			if ( $todo['priority'] == 1 ) {
-				$priority = 'low';
-			} elseif ( $todo['priority'] == 2 ) {
-				$priority = 'med';
-			} elseif ( $todo['priority'] == 3 ) {
-				$priority = 'hi';
-			}
-			$fupcount = mysql_query( 'select fid from followups where tid='.$todo['tid'] );
-			$fupcount = mysql_num_rows( $fupcount );
-
-			$team = team_num_name( $todo['team'] );
-			$branch = '';
-			if ( $team != 'Infrastructure' ) {
-				$branch = '/'.branch_num_name( $todo['branch'] );
-			}
-?>
-<tr>
-	<td><img src="images/<?=$priority;?>.gif" alt="<?=$priority;?>"></td>
-	<td><?=date( "n/j/y", $todo['date'] );?></td>
-	<td><a href="single.php?tid=<?=$todo['tid'];?>"><?=$todo['title'];?></a></td>
-	<td><?=$team.$branch;?></td>
-	<td><?=$fupcount;?></td>
-</tr>
-<?php 
-		}
-?>
-</table>
-
-<p>&nbsp;</p>
-
-<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?>'s completed todos</p>
-<table width="95%" border=0 cellpadding=2 cellspacing=2>
-<tr>
-	<td bgcolor="#dddaec"><b>Title</b></td>
-	<td bgcolor="#dddaec"><b>Section</b></td>
-	<td bgcolor="#dddaec"><b>Followups</b></td>
-	<td bgcolor="#dddaec"><b>Existed</b></td>
-</tr>
-<?php
-		$result = mysql_query( "select * from todos where owner=$devid and priority=0 order by datecompleted" );
-		while ( $todo = mysql_fetch_array($result) ) {
-
-			$fupcount = mysql_query( 'select fid from followups where tid='.$todo['tid'] );
-			$fupcount = mysql_num_rows( $fupcount );
-
-			$team = team_num_name( $todo['team'] );
-			$branch = '';
-			if ( $team != 'Infrastructure' ) {
-				$branch = '/'.branch_num_name( $todo['branch'] );
-			}
-?>
-<tr>
-	<td><a href="single.php?tid=<?=$todo['tid'];?>"><?=$todo['title'];?></a></td>
-	<td><?=$team.$branch;?></td>
-	<td><?=$fupcount;?></td>
-	<td><?=date( "n/j/y", $todo['date'] );?>-<?=date( "n/j/y", $todo['datecompleted'] );?></td>
-</tr>
-<?php 
-		}
-?>
-</table>
-
-<?php main_footer(); ?>
diff --git a/app-doc/gentoo-web/files/wiki/functions.php b/app-doc/gentoo-web/files/wiki/functions.php
deleted file mode 100644
index 5f93fee69823..000000000000
--- a/app-doc/gentoo-web/files/wiki/functions.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-	session_start();
-	mysql_connect( 'localhost', '##USER##', '##PASS##' );
-	mysql_select_db( '##DB##' );
-
-	// tags to allow for output
-	$allow_tags = "<a>,<br>,<b>,<u>";
-
-	// init the team/branch arrays
-	$teams = array(
-		0 => 'None',
-		1 => 'All',
-		2 => 'System',
-		3 => 'Desktop',
-		4 => 'Server',
-		5 => 'Tools',
-		6 => 'Infrastructure',
-		7 => 'Security',
-	);
-	$branches = array(
-		0 => 'none',
-		1 => 'all',
-		2 => 'stable',
-		3 => 'unstable',
-	);
-
-	// make sure our uid, which dictates whether they're logged in or not, is all straight
-	if ( !isset($uid) ) {
-		$uid = 0;
-		session_register( 'uid' );
-	} else {
-		$uid = auth( $dbusername, $dbpassword );
-	}
-?>
-
-<?php function main_header ( $title = 'Unknown' ) {
-global $uid, $dbusername; ?>
-<!DOCTYPE HTML PUBLIC "http://www.w3.org/TR/REC-html40/loose.dtd" "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Gentoo Linux Dev-Wiki - <?=$title;?></title>
-<style type="text/css">
-<!--
-	a:link		{font-weight: bold; font-size: x-small; color: blue; }
-	a:visited	{font-weight: bold; font-size: x-small; color: blue; }
-	a:hover		{font-weight: bold; font-size: x-small; color: red; }
-	a:active	{font-weight: bold; font-size: x-small; color: red; }
-
-	body		{background-color: #dddaec; color: black; font-size: x-small;
-			font-family: Verdana, Helvetica, Sans-serif; margin:0;
-			padding:0; font-size: xx-small; }
-
-	p		{font-size: x-small; }
-	td		{font-size: x-small; }
--->
-</style>
-</head>
-<body topmargin=0 leftmargin=0 bgcolor="#dddaec">
-
-<table width="100%" height=96 border=0 cellpadding=0 cellspacing=0>
-<tr>
-	<td align="left"><a href="http://cvs.gentoo.org/wiki/"><img src="images/title.gif" width=292 height=96 alt="gentoo linux dev-wiki" border=0></a></td>
-	<td align="right" background="images/titlebg.gif" width="100%" valign="top"><?php
-		if ( $uid ) { print "<p style=\"margin:0;padding:5px 5px 0 0;color:#e0e0e0;\">Logged in as $dbusername.<br><a href=\"index.php?action=logout\"><img src=\"images/logout.gif\" border=0></a></p>"; } else { print '&nbsp;'; }
-	?></td>
-</tr>
-</table>
-
-<table width="95%" border=0 cellpadding=10 cellspacing=0 align="center">
-<tr>
-	<td bgcolor="#dddaec" valign="top">
-<?php } # main header ?>
-
-<?php function main_footer () {
-global $uid, $dbusername, $show_privates, $list, $teams; ?>
-	</td>
-	<td width="175" valign="top">
-
-<?php if ( !$uid ) { ?>
-
-		<table width="100%" border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
-		<table width="100%" border=0 cellpadding=3 cellspacing=0>
-		<tr>
-			<td bgcolor="#7bc1f7"><b>Login</b></td>
-		</tr>
-		<tr>
-			<td bgcolor="white">
-			<form method="post" action="index.php?action=login">
-			<table width="100%" border=0 cellpadding=2 cellspacing=0>
-			<tr>
-			       	<td><p>Username:</p></td>
-			        <td><input type="text" name="username" size=10></td>
-			</tr>
-			<tr>
-				<td><p>Password:</p></td>
-			        <td><input type="password" name="password" size=10></td>
-			</tr>
-			<tr>
-			        <td align="center" colspan=2><input type="submit" value="login"></td>
-			</tr>
-			</table>
-			</form>
-			</td>
-		</tr>
-		</table>
-		</td></tr></table>
-
-		<img src="images/spacer.gif" height=10 alt="">
-<?php } ?>
-
-		<table width="100%" border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
-		<table width="100%" border=0 cellpadding=3 cellspacing=0>
-		<tr>
-			<td bgcolor="#7bc1f7"><b>Gentoo Linux Dev-Wiki</b></td>
-		</tr>
-		<tr>
-			<td bgcolor="white">
-			<ul>
-				<li><a href="index.php?list=by_priority">List by priority</a>
-				<li><a href="index.php?list=by_date">List by date</a>
-				<li><a href="index.php?list=by_developer">List by developer</a>
-				<li><a href="completed.php">List completed</a>
-			</ul>
-				<?php if ( $uid ) { ?>
-			<ul>
-					<li><a href="single.php?action=new_todo">Create a new todo</a>
-					<li><a href="profileedit.php">Edit user profile</a>
-					<?php
-					// are we an admin?
-					$query = mysql_query( "select admin from users where uid=$uid" );
-					list( $admin ) = mysql_fetch_row( $query );
-
-					if ( $admin ) { ?>
-						<li><a href="useredit.php">Edit Users</a>
-					<?php } ?>
-			</ul>
-				<?php } ?>
-
-			<p style="font-size:x-small;font-weight:bold;">Teams</p>
-			<ul>
-				<?php
-				reset( $teams );
-				while ( $each = each($teams) ) {
-					if ($each['key']==0||$each['key']==1) continue; ?>
-				<li><a href="teams.php?team=<?=$each['key'];?>"><?=$each['value'];?></a>
-				<?php } ?>
-			</ul>
-
-
-			<p style="font-size:x-small;font-weight:bold;">Developers</p>
-			<ul>
-<?php
-			$result = mysql_query( "select uid,username from users order by username" );
-			while ( $dev = mysql_fetch_row( $result ) ) {
-				print "\t\t\t<li><a href=\"devtodo.php?devid=$dev[0]\">$dev[1]</a>\n";
-			}
-?>
-			</ul>
-
-			<p style="font-size:x-small;font-weight:bold;">Go</p>
-			<ul>
-				<li><a href="http://www.gentoo.org">Gentoo Linux</a>
-			</ul>
-			</td>
-		</tr>
-		</table>
-		</td></tr></table>
-	</td>
-</tr>
-</table>
-
-<table width="100%" border=0 cellpadding=3 cellspacing=0><tr><td bgcolor="#7a5ada">
-	<p style="margin:0;padding:0;color:#e0e0e0;font-weight:bold;text-align:right;">Copyright 2001 Gentoo Technologies, Inc. / coding by <a href="http://www.threadbox.net">Thread</a></p>
-</td></tr></table>
-
-</body>
-</html>
-<?php } #main_footer ?>
-
-<?php function print_todo( $title, $tid, $owner, $date, $public, $priority, $longdesc, $team, $branch, $illdoitlink ) {
-	// all args should be passed hot off the database
-	global $list, $uid, $allow_tags;
-
-	// strop unacceptable tags
-	$title = strip_tags( $title, $allow_tags );
-	$longdesc = strip_tags( $longdesc, $allow_tags );
-
-	$date = date( "j M Y", $date );
-
-	$developer = mysql_query( "select username from users where uid=$owner" );
-	list( $developer ) = mysql_fetch_row( $developer );
-
-	if ( $public == 1 )
-		$pubwords = "public task";
-	else
-		$pubwords = "private task";
-
-	if ( $public == 0 ) {
-		$tabcolor = '#c0c0c0';
-	} elseif ( $priority == 0 ) {
-		$priority = 'completed';
-		$tabcolor = 'white';
-	} elseif ( $priority == 1 ) {
-		$priority = 'low';
-		$tabcolor = '#7bf77b';
-	} elseif ( $priority == 2 ) {
-		$priority = 'medium';
-		$tabcolor = '#f7ef7b';
-	} elseif ( $priority == 3 ) {
-		$priority = 'hi';
-		$tabcolor = '#fa9779';
-	}
-
-	$followups = mysql_query( "select fid from followups where tid=$tid" );
-	$followups = mysql_num_rows( $followups );
-	if ( $followups == 1 )
-		$word = 'follow-up';
-	else
-		$word = 'follow-ups';
-	$followups = "$followups $word";
-
-	$team = team_num_name( $team );
-	if ( $team != 'Infrastructure' ) {
-		$branch = '/'.branch_num_name( $branch );
-	} else {
-		$branch = '';
-	}
-		
-	?>
-	<table width="100%" border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
-	<table width="100%" border=0 cellpadding=3 cellspacing=0>
-	<tr>
-		<td bgcolor="<?=$tabcolor;?>" align="left"><b><?=$title;?></b></td>
-		<td bgcolor="<?=$tabcolor;?>" align="right"><b><?=$pubwords;?></b> / <?=$date;?></td>
-	</tr>
-	<tr>
-		<td bgcolor="white" colspan=2>
-			<p style="padding:0;margin:0;"><?=$longdesc;?></p>
-		</td>
-	</tr>
-	<tr>
-		<td bgcolor="#e0e0e0" align="left"><p><?php if ( $public ) print 'Posted'; else print 'Owned'; ?> by <a href="devtodo.php?devid=<?=$owner;?>"><b><?=$developer;?></b></a> (team: <?=$team.$branch;?>)</p></td>
-		<td bgcolor="#e0e0e0" align="right"><p><?php if ($uid && $public == 1) { print '<a href="'.$illdoitlink."\">I'll do it</a> | "; } ?><a href="single.php?tid=<?=$tid;?>">details</a> (<?=$followups;?>)</td>
-	</tr>
-	</table>
-	</td></tr></table>
-
-	<img src="images/spacer.gif" height=7 alt="">
-	<?php
-} ?>
-
-<?php function auth ( $user, $pass ) {
-	// takes a username and a password and returns the uid if it's valid. 0 if it's not.
-	$result = mysql_query( "select uid from users where username='$user' and password='$pass'" );
-	if ( mysql_num_rows($result) ) {
-		list($uid) = mysql_fetch_row($result);
-		return $uid;
-	} else {
-		return 0;
-	}
-} ?>
-
-<?php function team_num_name ( $num ) {
-	// take a team number, return a team name.
-	// The following three functions are similar in spirit.
-	global $teams;
-	return $teams[$num];
-} ?>
-
-<?php function team_name_num ( $name ) {
-	global $teams;
-	while ( $each = each($teams) ) {
-		if ( $each['value'] == $name ) return $each['key'];
-	}
-	// we found nothing; we should never get here.
-	return 0;
-} ?>
-
-<?php function branch_num_name ( $num ) {
-	global $branches;
-	return $branches[$num];
-} ?>
-
-<?php function branch_name_num ( $name ) {
-	global $branches;
-	while ( $each = each($branches) ) {
-		if ( $each['value'] == $name ) return $each['key'];
-	}
-	// we found nothing; we should never get here.
-	return 0;
-} ?>
-
-<?php function grabtodo ( $tid ) {
-	global $uid;
-	$public = mysql_query( "select owner,public from todos where tid=$tid" );
-	list( $todo_uid, $todo_public ) = mysql_fetch_row( $public );
-	if ( $public == 0 ) {
-		print '<p style="color:red;">That todo, if it even exists, isn\'t public.</p>';
-	} else {
-		if ( $uid == $todo_uid ) {
-			// it's already theirs! let's just make it private
-			$result = mysql_query( "update todos set public=0 where tid=$tid" );
-		} else {
-			// it's someone elses, let's move it over and make it private
-			$result = mysql_query( "update todos set public=0 where tid=$tid" );
-			$result = mysql_query( "update todos set owner=$uid where tid=$tid" );
-		}
-	}
-} ?>
-
diff --git a/app-doc/gentoo-web/files/wiki/images/complete.gif b/app-doc/gentoo-web/files/wiki/images/complete.gif
deleted file mode 100644
index 6522462647ef..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/complete.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/dot.gif b/app-doc/gentoo-web/files/wiki/images/dot.gif
deleted file mode 100644
index 8b1691cfc9aa..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/dot.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/grab.gif b/app-doc/gentoo-web/files/wiki/images/grab.gif
deleted file mode 100644
index e38914b63a3b..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/grab.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/hi.gif b/app-doc/gentoo-web/files/wiki/images/hi.gif
deleted file mode 100644
index 1ffcb6676d95..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/hi.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/logout.gif b/app-doc/gentoo-web/files/wiki/images/logout.gif
deleted file mode 100644
index bd0c28461bdc..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/logout.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/low.gif b/app-doc/gentoo-web/files/wiki/images/low.gif
deleted file mode 100644
index ddf79ab81b1e..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/low.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/med.gif b/app-doc/gentoo-web/files/wiki/images/med.gif
deleted file mode 100644
index 3d5657d657eb..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/med.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/postfollowup.gif b/app-doc/gentoo-web/files/wiki/images/postfollowup.gif
deleted file mode 100644
index c711b3604e4e..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/postfollowup.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/private.gif b/app-doc/gentoo-web/files/wiki/images/private.gif
deleted file mode 100644
index 8d9358a73891..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/private.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/public.gif b/app-doc/gentoo-web/files/wiki/images/public.gif
deleted file mode 100644
index 3c7d4a4509a1..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/public.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/spacer.gif b/app-doc/gentoo-web/files/wiki/images/spacer.gif
deleted file mode 100644
index 63fceb74f535..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/spacer.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/title.gif b/app-doc/gentoo-web/files/wiki/images/title.gif
deleted file mode 100644
index e5913483dd5d..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/title.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/images/titlebg.gif b/app-doc/gentoo-web/files/wiki/images/titlebg.gif
deleted file mode 100644
index a8c49565318c..000000000000
--- a/app-doc/gentoo-web/files/wiki/images/titlebg.gif
+++ /dev/null
diff --git a/app-doc/gentoo-web/files/wiki/index.php b/app-doc/gentoo-web/files/wiki/index.php
deleted file mode 100644
index fd1d11dde055..000000000000
--- a/app-doc/gentoo-web/files/wiki/index.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-	include "functions.php";
-
-	if ( !$uid && $action == 'login' ) {
-		$result = mysql_query( "select * from users where username='$username'" );
-		list( $uid, $dbusername, $dbpassword ) = mysql_fetch_row( $result );
-		if ( $password == $dbpassword ) {
-			// login successful
-			session_register( 'uid' );
-			session_register( 'dbusername' );
-			session_register( 'dbpassword' );
-		} else {
-			unset( $uid );
-		}
-	} elseif ( $action == 'logout' && $uid ) {
-		session_unregister( 'uid' );
-		session_unregister( 'dbusername' );
-		session_unregister( 'dbpassword' );
-		unset( $uid, $dbusername, $dbpassword );
-	} elseif ( $action == 'grab_todo' && $uid ) {
-		grabtodo( $tid );
-	}
-
-	#if ( !isset($show_privates) ) $show_privates = 1;    // default
-	if ( !isset($list) )          $list = 'by_priority';
-	if ( isset($ch_show_privates) ) {
-		$show_privates = $ch_show_privates;
-		session_register( 'show_privates' );
-	}
-	if ( isset($ch_list) ) {
-		$list = $ch_list;
-		session_register( 'list' );
-	}
-
-	main_header( 'Home' );
-
-	if ( $action == 'login' && !$uid ) {
-		// they tried to log in, but the uid wasn't
-		// stashed into the session, so it was unsuccessful.
-		print '<p style="color:red;">Alas, your login attempt was unsuccessful.</p>';
-	}
-
-	// show/hide privates
-	if ( $show_privates == 1 ) {
-		$query_where = '';
-		$disptxt = " <a href=\"index.php?ch_show_privates=0\">(private todos shown; click to hide)</a>";
-	} else {
-		$query_where = ' and public!=0';
-		$disptxt = " <a href=\"index.php?ch_show_privates=1\">(private todos hidden; click to show)</a>";
-	}
-
-	// ooh, now real content...
-	if ( $list == 'by_priority' ) {
-		print "<p style=\"font-size:medium;font-weight:bold;\">Sorted by priority/date$disptxt</p>";
-		$result = mysql_query( "select * from todos where priority!=0$query_where order by priority desc,date desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'index.php?action=grab_todo&tid='.$todo['tid'] );
-		}
-	} elseif ( $list == 'by_date' ) {
-		print "<p style=\"font-size:medium;font-weight:bold;\">Sorted by date$disptxt</p>";
-		$result = mysql_query( "select * from todos where priority!=0$query_where order by date desc,priority desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'index.php?action=grab_todo&tid='.$todo['tid'] );
-		}
-	} elseif ( $list == 'by_developer' && !$uid ) {
-		print "<p style=\"font-size:medium;font-weight:bold;\">Sorted by developer/priority/date$disptxt</p>";
-		$result = mysql_query( "select * from todos where priority!=0$query_where order by owner,priority desc,date desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'index.php?action=grab_todo&tid='.$todo['tid'] );
-		}
-	} elseif ( $list == 'by_developer' && $uid ) {
-		print "<p style=\"font-size:medium;font-weight:bold;\">Sorted by developer/priority/date$disptxt</p>";
-		$result = mysql_query( "select * from todos where priority!=0 and owner=$uid$query_where order by priority desc,date desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'index.php?action=grab_todo&tid='.$todo['tid'] );
-		}
-		$result = mysql_query( "select * from todos where owner!=$uid and priority!=0$query_where order by owner,priority desc,date desc" );
-		while ( $todo = mysql_fetch_array($result) ) {
-			print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'index.php?action=grab_todo&tid='.$todo['tid'] );
-		}
-	}
-	main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/wiki/profileedit.php b/app-doc/gentoo-web/files/wiki/profileedit.php
deleted file mode 100644
index 13b75fd3e877..000000000000
--- a/app-doc/gentoo-web/files/wiki/profileedit.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-include "functions.php";
-main_header( 'Edit User Profile' );
-
-if ( !$uid ) {
-	print '<p style="color:red;">You don\'t appear to be logged in.</p>';
-	main_footer();
-	exit;
-}
-
-if ( $submitted ) {
-	if ( $pass1 != $pass2 ) {
-		print '<p style="color:red;">Your password fields did not match.</p>';
-	} else {
-		$query = "update users set email='$email',location='$location'";
-		if ( $pass1 ) $query .= ",password='$pass1'";
-		$query .= " where uid=$uid";
-		$result = mysql_query( $query );
-		print '<p style="color:red;">Change(s) committed.</p>';
-	}
-}
-
-$dude = mysql_query( "select * from users where uid=$uid" );
-$dude = mysql_fetch_array( $dude );
-
-?>
-
-<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?> Profile</p>
-
-<form action="profileedit.php" method="post">
-<table border=0 cellpadding=2 cellspacing=0>
-<tr>
-	<td align="right"><b>Username:</b></td>
-	<td><?=$dude['username'];?></td>
-</tr>
-<tr>
-	<td align="right"><b>Password:</b></td>
-	<td><input type="password" name="pass1" maxlength=10><br><input type="password" name="pass2" maxlength=10></td>
-	<td><p>Type in a password twice to change</p></td>
-</tr>
-<tr>
-	<td align="right"><b>Title:</b></td>
-	<td><?=$dude['title'];?></td>
-</tr>
-<tr>
-	<td align="right"><b>Email:</b></td>
-	<td><input type="input" name="email" value="<?=$dude['email'];?>" maxlength=200></td>
-</tr>
-<tr>
-	<td align="right"><b>Location:</b></td>
-	<td><input type="input" name="location" value="<?=$dude['location'];?>" maxlength=200></td>
-</tr>
-</table>
-<input type="hidden" name="submitted" value="1">
-<p><input type="submit" value="Submit Changes"></p>
-</form>
-
-<?php
-main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/wiki/single.php b/app-doc/gentoo-web/files/wiki/single.php
deleted file mode 100644
index 49d0033b527b..000000000000
--- a/app-doc/gentoo-web/files/wiki/single.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-	include "functions.php";
-	main_header( 'Todo' );
-
-	if ( $committed && $uid ) {
-		// okay, they just submitted an update. Let's validate and commit it.
-		if ( !$title || !$longdesc ) {
-			print '<p style="color:red;">You left out vital info. (title and/or todo description.) Please back up and try again.</p>';
-		} else {
-			if     ( $priority == "low" ) $priority = 1;
-			elseif ( $priority == "med" ) $priority = 2;
-			elseif ( $priority == "hi" )  $priority = 3;
-			else                          $priority = 0;
-
-			$branch = branch_name_num( $branch );
-
-			$team = team_name_num( $team );
-			
-			if   ( $sharing == 'public' ) $sharing = 1;
-			else                          $sharing = 0;
-
-			if ( $action == 'new_todo' ) {
-				$already = mysql_query( "select tid from todos where longdesc='$longdesc' and title='$title'" );
-				list( $already ) = mysql_fetch_array( $already );
-				if ( !$already ) {
-					$query = "insert into todos set owner=$uid,title='$title',public=$sharing,priority=$priority,branch=$branch,team=$team,date=".time().",longdesc='$longdesc'";
-					if ( $priority == 0 ) $query .= ",datecompleted=".time();
-					$result = mysql_query( $query );
-					$tid = mysql_insert_id();
-					print '<p style="color:red;">Todo added.</p>';
-					$new_todo_post_success = 1;
-				}
-			} else {
-				$query = "update todos set title='$title',public=$sharing,priority=$priority,branch=$branch,team=$team,longdesc='$longdesc'";
-				if ( $priority == 0 ) $query .= ",datecompleted=".time();
-				$query .= " where tid=$tid";
-				$result = mysql_query( $query );
-				print '<p style="color:red;">Change(s) committed.</p>';
-			}
-			// now we'll do the query that we skipped at the beginning
-			$todo = mysql_query( "select * from todos where tid=$tid" );
-			$todo = mysql_fetch_array( $todo );
-		}
-	}
-
-	if ( $action == 'post_followup' && $uid && $followup ) {
-		// if they just hit refresh after posting, the post will be resubmitted.
-		// now, i'm going to make sure the same followup doesn't get posted twice.
-		$already = mysql_query( "select fid from followups where followup='$followup' and tid='$tid'" );
-		list( $already ) = mysql_fetch_array( $already );
-		if ( !$already ) {
-			// okay, it's not in there. let's submit.
-			$result = mysql_query ( "insert into followups set tid=$tid,uid=$uid,date=".time().",followup='$followup'" );
-		}
-	}
-
-	if ( $action != 'new_todo' ) {
-		$todo = mysql_query( "select * from todos where tid=$tid" );
-		$todo = mysql_fetch_array( $todo );
-	}
-	if ( $action != 'new_todo' && !$todo['title'] ) {
-		// tid wasn't in the database
-		print '<p style="color:red;">The specified todo doesn\'t seem to be available.</p>';
-		main_footer();
-		exit;
-	}
-
-	if ( $action == 'new_todo' ) { $theirs = 1; unset( $tid ); }
-	if ( $todo['owner'] == $uid ) $theirs = 1;
-
-	if ( $uid ) {
-		$admin = mysql_query( "select admin from users where uid=$uid" );
-		list( $admin ) = mysql_fetch_row( $admin );
-		if ( $admin ) $theirs = 1;
-	}
-
-
-	if     ( $todo['priority'] == 0 ) $priority = 'complete';
-	elseif ( $todo['priority'] == 1 ) $priority = 'low';
-	elseif ( $todo['priority'] == 2 ) $priority = 'med';
-	elseif ( $todo['priority'] == 3 ) $priority = 'hi';
-
-	if   ( $todo['public'] == 1 ) $public = 'public';
-	else                          $public = 'private';
-
-	$branch = branch_num_name( $todo['branch'] );
-
-	if ( $action == 'new_todo' ) {
-		$priority = 'low';
-		$public = 'private';
-		$team = mysql_query( "select team from users where uid=$uid" );
-		list( $team ) = mysql_fetch_row( $team );
-	}
-
-	$team = team_num_name( $todo['team'] );
-
-	if ( $action != 'new_todo' ) {
-		$developer = mysql_query( 'select username from users where uid='.$todo['owner'] );
-		list( $developer ) = mysql_fetch_row( $developer );
-	}
-
-	$todo['title'] = strip_tags( $todo['title'], $allow_tags );
-	$todo['longdesc'] = strip_tags( $todo['longdesc'], $allow_tags );
-
-?>
-<p>&nbsp;</p>
-<?php if ( $theirs ) { ?><form method="post" action="single.php?action=<?php if ( $action == 'new_todo' ) print 'new_todo'; else print 'update'; ?>"> <?php } ?>
-<table width="90%" border=0 cellpadding=3 cellspacing=0 align="center" bgcolor="#46357c"><tr><td>
-<table width="100%" border=0 cellpadding=3 cellspacing=0>
-<tr>
-	<td align="center" bgcolor="#46357c"><p style="padding:0;margin:0;color:white;font-weight:bold;">
-	<?php if ( $theirs ) { ?>
-		<input type="text" name="title" maxlength=100 size=50 value="<?=$todo['title'];?>">
-	<?php } else {
-		print $todo['title'];
-	} ?>
-	</p></td>
-</tr>
-<tr>
-	<td bgcolor="#dddaec">
-		<table width="100%" border=0 cellpadding=5 cellspacing=0>
-		<tr>
-			<td width="50%" valign="top">
-			<p>
-				<b>Developer:</b> <?=$developer;?><br>
-				<?php if ( $action == 'new_todo' ) { ?>
-					<b>Todo (will be) posted:</b> <?=date( "n/j/y", time() );?><br>
-				<?php } else { ?>
-					<b>Todo posted:</b> <?=date( "n/j/y", $todo['date'] );?><br>
-				<?php } ?>
-				<b>Team:</b>
-				<?php if ( $theirs ) {
-					if (!$team) $team = 'None'; ?> 
-					<select name="team"><option><?=$team;?></option><?php
-					while ( $each = each($teams) ) {
-						if ( $each['value'] == $team ) continue;
-						print '<option>'.$each['value'].'</option>';
-					}
-				?></select>
-				<?php } else {
-					print $team;
-				} ?><br>
-			</p>
-			</td>
-			<td>
-			<p>
-				<b>Priority:</b> 
-				<?php if ( $theirs ) { ?>
-					<select name="priority"><?php
-					if ( $priority == 'hi' ) {
-						print '<option>hi</option><option>med</option><option>low</option><option>complete</option>';
-					} elseif ( $priority == 'med' ) {
-						print '<option>med</option><option>hi</option><option>low</option><option>complete</option>';
-					} elseif ( $priority == 'complete' ) {
-						print '<option>complete</option><option>low</option><option>med</option><option>hi</option>';
-					} else {
-						print '<option>low</option><option>med</option><option>hi</option><option>complete</option>';
-					}
-				?></select>
-				<?php } else {
-					print "$priority - <img src=\"images/$priority.gif\" width=16 height=16>";
-				} ?><br>
-				<b>Sharing:</b>
-				<?php if ( $theirs ) { ?>
-					<select name="sharing"><?php
-					if ( $public == 'public' ) {
-						print '<option>public</option><option>private</option>';
-					} else {
-						print '<option>private</option><option>public</option>';
-					}
-				?></select>
-				<?php } else {
-					print "$public - <img src=\"images/$public.gif\" width=16 height=16>";
-				}
-				if ( $team != 'Infrastructure' ) { ?><br>
-				<b>Branch:</b>
-				<?php if ( $theirs ) {
-					if (!$branch) $branch = 'none'; ?>
-					<select name="branch"><option><?=$branch;?></option><?php
-					while ( $each = each($branches) ) {
-						if ( $each['value'] == $branch ) continue;
-						print '<option>'.$each['value'].'</option>';
-					}
-				?></select>
-				<?php } else {
-					print $branch;
-				}
-				} # if ( $team != 'Infrastructure' )
-
-				if ( $uid && $uid != $todo['owner'] && $public == 'public' ) { ?>
-					<br><a href="index.php?action=grab_todo&tid=<?=$tid;?>"><img src="images/grab.gif" border=0 width=109 height=15></a>
-				<?php } ?>
-			</p>
-		</tr>
-		</table>
-	</td>
-</tr>
-<tr>
-	<?php if ( $theirs ) { ?>
-		<td bgcolor="white" align="center"><textarea name='longdesc' rows=7 cols=55><?=$todo['longdesc'];?></textarea><br>
-		<input type="hidden" name="committed" value="1">
-		<input type="hidden" name="tid" value="<?=$tid;?>">
-		<input type="submit" value="Commit"></td>
-	<?php } else { ?>
-		<td bgcolor="white"><?=$todo['longdesc'];?><br>
-	<?php } ?>
-</tr>
-</table>
-</td></tr></table>
-<?php if ( $theirs ) print '</form>'; ?>
-
-<table width="90%" border=0 cellpadding=0 cellspacing=0 align="center"><tr><td>
-
-<?php if ( $uid && ($action != 'new_todo' || $new_todo_post_success) ) { ?>
-<div style="float:right;padding:10px 0 5px 5px;">
-	<table width=250 border=0 cellpadding=3 cellspacing=0 bgcolor="#46357c"><tr><td>
-	<table width="100%" border=0 cellpadding=5 cellspacing=0 bgcolor="white"><tr><td>
-		<form method="post" action="single.php?action=post_followup&tid=<?=$tid;?>">
-		<p style="font-weight:bold;">Post a Followup!</p>
-		<p>
-			<textarea cols=40 rows=7 name="followup"></textarea><br>
-			<input type="submit" value="Post">
-		</p>
-		</form>
-	</td></tr></table>
-	</td></tr></table>
-</div>
-<?php } ?>
-
-<?php
-	if ( $action != 'new_todo' ) {
-		// okay, now we get to spit out all the followups.
-		$result = mysql_query( "select * from followups where tid=$tid order by date" );
-		while ( $fup = mysql_fetch_array( $result ) ) {
-			$fuser = mysql_query( 'select username from users where uid='.$fup['uid'] );
-			list( $fuser ) = mysql_fetch_row( $fuser );
-?>	
-			<p style="margin:15px 5px 5px 5px;">Posted by <b><?=$fuser;?></b> on <b><?=date( "n/j/y", $fup['date'] );?></b></p>
-			<p style="margin:0 5px 5px 15px"><?=$fup['followup'];?></p>
-			<?php
-		}
-	}
-
-?>
-
-</tr></td></table>
-
-<?php main_footer(); ?>
diff --git a/app-doc/gentoo-web/files/wiki/singleuseredit.php b/app-doc/gentoo-web/files/wiki/singleuseredit.php
deleted file mode 100644
index 881fd774e1bd..000000000000
--- a/app-doc/gentoo-web/files/wiki/singleuseredit.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-include "functions.php";
-main_header( 'Edit User Listing' );
-
-if ( !$uid ) {
-	print '<p style="color:red;">You don\'t appear to be logged in.</p>';
-	main_footer();
-	exit;
-}
-
-if ( $submitted ) {
-	if ( $pass1 != $pass2 ) {
-		print '<p style="color:red;">Your password fields did not match.</p>';
-	} else {
-		$query = "update users set email='$email'";
-		if ( $pass1 ) $query .= ",password='$pass1'";
-		$query .= " where uid=$uid";
-		$result = mysql_query( $query );
-		print '<p style="color:red;">Change(s) committed.</p>';
-	}
-}
-
-$dude = mysql_query( "select * from users where uid=$uid" );
-$dude = mysql_fetch_array( $dude );
-?>
-
-<p style="font-size:medium;font-weight:bold;"><?=$dude['username'];?> Profile</p>
-
-<form action="profileedit.php" method="post">
-<table border=0 cellpadding=2 cellspacing=0>
-<tr>
-	<td align="right"><b>Username:</b></td>
-	<td><?=$dude['username'];?></td>
-</tr>
-<tr>
-	<td align="right"><b>Password:</b></td>
-	<td><input type="password" name="pass1"><br><input type="password" name="pass2"></td>
-	<td><p>Type in a password twice to change</p></td>
-</tr>
-<tr>
-	<td align="right"><b>Title:</b></td>
-	<td><?=$dude['title'];?></td>
-</tr>
-<tr>
-	<td align="right"><b>Email:</b></td>
-	<td><input type="input" name="email" value="<?=$dude['email'];?>"></td>
-</tr>
-<tr>
-	<td align="right"><b>Team:</b></td>
-	<td><?=team_num_name( $dude['team'] );?></td>
-</tr>
-</table>
-<input type="hidden" name="submitted" value="1">
-<p><input type="submit" value="Submit Changes"></p>
-</form>
-
-<?php
-main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/wiki/teamedit.php b/app-doc/gentoo-web/files/wiki/teamedit.php
deleted file mode 100644
index 7c7c5ce0d049..000000000000
--- a/app-doc/gentoo-web/files/wiki/teamedit.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-include "functions.php";
-main_header( 'Edit Team' );
-
-if ( !$gid || !$uid ) {
-	print '<p style="color:red;">You aren\'t logged in or you didn\t come to this page from the right link.</p>';
-	main_footer();
-	exit;
-}
-
-// check to make sure they're a leader.
-$query = mysql_query( "select leader,gid from teams where gid=$gid" );
-$row = mysql_fetch_array($query);
-$leaders = explode( ',', $row['leader'] );
-while ( $each = each($leaders) ) {
-	if ( $each['value'] == $uid ) {
-		$num = $row['gid'];
-		$name = team_num_name( $row['gid'] );
-		break;
-	}
-}
-$admin = mysql_query( "select admin from users where uid=$uid" );
-list( $admin ) = mysql_fetch_row( $admin );
-if ( !($name || $admin) ) {
-	print '<p style="color:red;">You aren\'t the leader of that team!</p>';
-	main_footer();
-	exit;
-}
-
-if ( $summary || $status ) {
-	// they submitted
-	$result = mysql_query( "update teams set summary='$summary',status='$status' where gid=$num" );
-	print '<p style="color:red;">Change(s) committed.</p>';
-}
-
-$info = mysql_query( "select summary,status from teams where gid=$gid" );
-list( $summary, $status ) = mysql_fetch_row( $info );
-?>
-
-<p style="font-size:medium;font-weight:bold;"><?=$name;?> Team Edit</p>
-
-<form action="teamedit.php" method="post">
-<p>
-	<b>Summary:</b><br>
-	<textarea name="summary" rows=10 cols=60><?=$summary;?></textarea>
-</p>
-<p>
-	<b>Status:</b><br>
-	<textarea name="status" rows=10 cols=60><?=$status;?></textarea>
-</p>
-<p><input type="hidden" name="gid" value="<?=$gid;?>"><input type="submit" value="Submit Changes"></p>
-</form>
-
-<?php
-main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/wiki/teams.php b/app-doc/gentoo-web/files/wiki/teams.php
deleted file mode 100644
index 42996baf6fb9..000000000000
--- a/app-doc/gentoo-web/files/wiki/teams.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php	include "functions.php";
-	main_header();
-	$team_num = $team;
-	$team = $teams[$team];
-	if (!$team) {
-		print '<p style="color:red;">Unknown team.</p>';
-		main_footer();
-		exit;
-	}
-
-	$result = mysql_query( "select summary,status,leader from teams where gid=$team_num" );
-	list( $summary, $status, $leader ) = mysql_fetch_array( $result );
-
-	// are we a leader?
-	$leaders = explode( ',', $leader );
-	$leader = 0;
-	while ( $each = each($leaders) ) {
-		if ( $each['value'] == $uid && $uid ) {
-			$leader = 1;
-			break;
-		}
-	}
-
-	// query for stats
-	$unassigned = mysql_query( "select tid from todos where public=1 and team=$team_num and priority!=0" );
-	$unassigned = mysql_num_rows( $unassigned );
-
-	$outstanding = mysql_query( "select tid from todos where priority!=0 and team=$team_num" );
-	$outstanding = mysql_num_rows( $outstanding );
-
-	if ( $team_num != 6 ) {
-	   $us = mysql_query( "select tid from todos where public=1 and branch=2 and team=$team_num and priority!=0" );
-	   $us = mysql_num_rows( $us );
-
-	   $os = mysql_query( "select tid from todos where branch=2 and team=$team_num and priority!=0" );
-	   $os = mysql_num_rows( $os );
-
-	   $uu = mysql_query( "select tid from todos where public=1 and branch=3 and team=$team_num and priority!=0" );
-	   $uu = mysql_num_rows( $uu );
-      
-	   $ou = mysql_query( "select tid from todos where branch=3 and team=$team_num and priority!=0" );
-	   $ou = mysql_num_rows( $ou );
-
-	   $un = mysql_query( "select tid from todos where public=1 and branch=0 and team=$team_num and priority!=0" );
-	   $un = mysql_num_rows( $un );
-
-	   $on = mysql_query( "select tid from todos where branch=0 and team=$team_num and priority!= 0" );
-	   $on = mysql_num_rows( $on );
-	}
-?>
-
-<div style="float:right;margin:5px;" width=175>
-	<table border=0 cellpadding=1 cellspacing=0 width=175 bgcolor="black"><tr><td>
-	<table border=0 cellpadding=3 cellspacing=0 width="100%" bgcolor="white">
-	<tr>
-		<td colspan=2 bgcolor="black"><p style="font-weight:bold;color:white">Current Stats</p></td>
-	</tr>
-<?php if ( $team_num != 6 ) { ?>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=us">Unassigned Stable:</a></td>
-		<td><?=$us;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=os">Outstanding Stable:</a></td>
-		<td><?=$os;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=uu">Unassigned Unstable:</a></td>
-		<td><?=$uu;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=ou">Outstanding Unstable:</a></td>
-		<td><?=$ou;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=un">Unassigned Neither:</a></td>
-		<td><?=$un;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=on">Outstanding Neither:</a></td>
-		<td><?=$on;?></td>
-	</tr>
-	<tr>
-		<td colspan=2>&nbsp;</td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=u">Total Unassigned:</a></td>
-		<td><?=$unassigned;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=o">Total Outstanding:</a></td>
-		<td><?=$outstanding;?></td>
-	</tr>
-	<?php } else { ?>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=u">Total Unassigned:</a></td>
-		<td><?=$unassigned;?></td>
-	</tr>
-	<tr>
-		<td><a href="teamtasks.php?team=<?=$team_num;?>&q=o">Total Outstanding:</a></td>
-		<td><?=$outstanding;?></td>
-	</tr>
-	<?php } ?>
-	</table>
-	</td></tr></table>
-	<br>
-	<table border=0 cellpadding=1 cellspacing=0 width=175 bgcolor="black"><tr><td>
-	<table border=0 cellpadding=3 cellspacing=0 width="100%" bgcolor="white">
-	<tr>
-		<td colspan=2 bgcolor="black"><p style="font-weight:bold;color:white">Group Leaders</p></td>
-	</tr>
-	<tr>
-		<td>
-	<?php
-	reset( $leaders );
-	$tmp = 0;
-	while ( $each = each($leaders) ) {
-		if (!$each['value']) break; //seems to want to always loop at least once. *shrug*
-		$handle = mysql_query( 'select username,email from users where uid='.$each['value'] );
-		list( $handle, $email ) = mysql_fetch_row( $handle );
-		if (!$tmp) {
-			print '<ul style="margin:0;">';
-			$tmp = 1;
-		}
-		print "<li> <a href=\"mailto:$email\">$handle</a>\n";
-	}
-	if ($tmp) print '</ul>';
-	else print "<p>The $team team doesn't have a leader.</p>";
-	?>
-		</td>
-	</tr>
-	</table>
-	</td></tr></table>
-
-	<?php
-	$admin = mysql_query( "select admin from users where uid=$uid" );
-	list( $admin ) = mysql_fetch_row( $admin );
-	if ( $leader || $admin ) { ?>
-	<br>
-	<table border=0 cellpadding=1 cellspacing=0 width=175 bgcolor="black"><tr><td>
-	<table border=0 cellpadding=3 cellspacing=0 width="100%" bgcolor="white">
-	<tr>
-		<?php if ( $leader ) { ?>
-		<td><p>You're a leader of the <?=$team;?> team! Click <a href="teamedit.php?gid=<?=$team_num;?>">here</a> to edit the team info.</p></td>
-		<?php } else { ?>
-		<td><p>You're an admin! Click <a href="teamedit.php?gid=<?=$team_num;?>">here</a> to edit the <?=$team;?> team info.</p></td>
-		<?php } ?>
-	</tr>
-	</table>
-	</td></tr></table>
-	<?php } ?>
-</div>
-
-<p style="font-size:medium;font-weight:bold;">The <?=$team;?> Team</p>
-<p><b>Summary</b></p>
-<p style="margin:0 5px 10px 10px;"><?=$summary;?></p>
-<p><b>Status</b></p>
-<p style="margin:0 5px 10px 10px;"><?=$status;?></p>
-
-<p><b>Team Members</b></p>
-<ul>
-<?php
-	$result = mysql_query( "select username,team,title,email,realname,location from users where team like '%$team_num%'" );
-	while ( $dude = mysql_fetch_array($result) ) {
-		$dude['team'] = explode( ',', $dude['team'] );
-		$tmp = 0;
-		while ($each = each($dude['team']) ) {
-			if ($each['value'] == $team_num) { $tmp=1; break; }
-		}
-		if (!$tmp) continue;
-?>
-		<li> <a href="mailto:<?=$dude['email'];?>"><?=$dude['realname'];?></a> (aka <?=$dude['username'];?>) - <?=$dude['title'];?><?php if ($dude['location']) print ' from '.$dude['location']; ?>
-<?php
-	}
-?>
-</ul>
-</p>
-
-<?php main_footer(); ?>
-
diff --git a/app-doc/gentoo-web/files/wiki/teamtasks.php b/app-doc/gentoo-web/files/wiki/teamtasks.php
deleted file mode 100644
index 4d2c4e822b1a..000000000000
--- a/app-doc/gentoo-web/files/wiki/teamtasks.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-	include "functions.php";
-
-	main_header( "Team Tasks" );
-
-	$teamname = team_num_name( $team );
-
-if ( !$q || !$team ) {
-	print '<p style="font-color:red;">You must access this page from a teams page.</p>';
-	main_footer();
-	exit;
-}
-
-if ( $action == 'grab_todo' && $tid ) { grabtodo( $tid ); }
-
-if ( $team == 6 ) {
-	if ( $q == 'u' ) {
-		$result = mysql_query( "select * from todos where priority!=0 and public=1 and team=$team" );
-		?><p style="font-size:medium;font-weight:bold;">Unassigned Tasks for <?=$teamname;?> Team</p><?php
-	} elseif ( $q == 'o' ) {
-		$result = mysql_query( "select * from todos where priority!=0 and team=$team" );
-		?><p style="font-size:medium;font-weight:bold;">Outstanding Tasks for <?=$teamname;?> Team</p><?php
-	}
-} elseif ( $q == 'u' ) {
-	$result = mysql_query( "select * from todos where public=1 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Unassigned Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'o' ) {
-	$result = mysql_query( "select * from todos where team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Outstanding Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'us' ) {
-	$result = mysql_query( "select * from todos where public=1 and branch=2 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Unassigned Stable Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'os' ) {
-	$result = mysql_query( "select * from todos where branch=2 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Outstanding Stable Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'uu' ) {
-	$result = mysql_query( "select * from todos where public=1 and branch=3 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Unassigned Unstable Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'ou' ) {
-	$result = mysql_query( "select * from todos where branch=3 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Outstanding Unstable Tasks for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'un' ) {
-	$result = mysql_query( "select * from todos where public=1 and branch=0 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Unassigned Tasks on Neither Branch for <?=$teamname;?> Team</p><?php
-} elseif ( $q == 'on' ) {
-	$result = mysql_query( "select * from todos where branch=0 and team=$team and priority!=0 order by priority desc" );
-	?><p style="font-size:medium;font-weight:bold;">Outstanding Tasks on Neither Branch for <?=$teamname;?> Team</p><?php
-} else {
-	print '<p style="font-color:red;">You must access this page from a teams page.</p>';
-	main_footer();
-	exit;
-}
-
-
-while ( $todo = mysql_fetch_array($result) ) {
-	print_todo( $todo['title'], $todo['tid'], $todo['owner'], $todo['date'], $todo['public'], $todo['priority'], $todo['longdesc'], $todo['team'], $todo['branch'], 'teamtasks.php?action=grab_todo&tid='.$todo['tid']."&team=$team&q=$q" );
-}
-	main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/wiki/useredit.php b/app-doc/gentoo-web/files/wiki/useredit.php
deleted file mode 100644
index 3b549bb9ccd6..000000000000
--- a/app-doc/gentoo-web/files/wiki/useredit.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-include "functions.php";
-main_header( 'Edit User Listing' );
-
-// are we an admin?
-$query = mysql_query( "select admin from users where uid=$uid" );
-list( $priv ) = mysql_fetch_row( $query );
-
-if ( !$priv ) {
-	print '<p style="color:red;">You don\'t appear to be an admin.</p>';
-	main_footer();
-	exit;
-}
-
-if ( $submitted ) {
-	if ( $pass1 != $pass2 ) {
-		print '<p style="color:red;">Your password fields did not match.</p>';
-	} else {
-		// stuff that needs to be done for both
-		$team = team_name_num( $team );
-		if ( $admin ) $admin = '1'; else $admin = '0';
-		reset( $teams );
-		while ( $cur = each($teams) ) { // construct special teams value
-			if ( $$cur['value'] == 'r' || $$cur['value'] == 'l' ) $tms[] = $cur['key'];
-			if ( $$cur['value'] == 'l' ) $leads[] = $cur['key'];
-		}
-		if ( $tms ) {
-			$team = implode( ',', $tms );
-		} else {
-			$team = '';
-		}
-
-
-		// grant leaderships
-		if ( $leads ) {
-			while ( $cur = each($leads) ) {
-				if (!$cur['value']) break;
-				$leaders = mysql_query( 'select leader from teams where gid='.$cur['value'] );
-				list( $leaders ) = mysql_fetch_row( $leaders );
-				$leaders = explode( ',', $leaders );
-				$tmp = 0;
-
-				// make sure they're not already a leader; skip this group if so.
-				unset( $newlead );
-				reset( $leaders );
-				while ( $each = each($leaders) ) {
-					if ( $each['value'] == $xuid ) {
-						// whoops! this guy's already a lead of the group
-						$tmp = 1;
-						break;
-					}
-					if ( $each['value'] != '0' ) $newlead[] = $each['value'];
-				}
-				if ($tmp) continue; // next group
-
-				// add 'em
-				if ( sizeof($newlead) == 0 ) {
-					$newlead = $xuid;
-				} else {
-					$newlead[] = $xuid;
-					$newlead = implode( ',', $newlead );
-				}
-				mysql_query( "update teams set leader='$newlead' where gid=".$cur['value'] );
-			}
-		}
-
-		// revoke leaderships
-		$oldleads = explode( ',', $oldleads );
-		if ($leads) reset( $leads );
-		reset( $oldleads );
-		while ( $ol = each($oldleads) ) {
-			if (!$ol['value']) break;
-			$tmp = 1;
-			if ( $leads ) {
-				reset( $leads );
-				while ( $g = each($leads) ) {
-					if ( $g['value'] == $ol['value'] ) { $tmp = 0; break; }
-				}
-			}
-			if ( $tmp ) {
-				// kill 'em. :(
-				$leaders = mysql_query( 'select leader from teams where gid='.$ol['value'] );
-				list( $leaders ) = mysql_fetch_row( $leaders );
-				$leaders = explode( ',', $leaders );
-				unset( $newl );
-				reset( $leaders );
-				while ( $each = each($leaders) ) {
-					// we're removing the user. if we hit the xuid, skip 'em,
-					// otherwise, pile 'em onto the new array
-					if ( $each['value'] == $xuid ) continue;
-					$newl[] = $each['value'];
-				}
-
-				if ( sizeof($newl) == 0 ) {
-					$newl = '';
-				} else {
-					$newl = implode( ',', $newl ); // compile the new var
-				}
-				mysql_query( "update teams set leader='$newl' where gid=".$ol['value'] );
-			}
-		}
-
-		// whew - now changing simple user info seems like a breeze :)
-		if ( $xuid == 'new' ) {
-			// new user
-			mysql_query( "insert into users set username='$username',password='$pass1',admin=$admin,title='$title',email='$email',realname='$realname',location='$location',team='$team'" );
-			$xuid = mysql_insert_id();
-			print '<p style="color:red;">User added to database.</p>';
-		} else {
-			// change existing
-			$query = "update users set username='$username'";
-			if ( $pass1 ) $query .= ",password='$pass1'";
-			$query .= ",admin=$admin,title='$title',email='$email',realname='$realname',location='$location',team='$team' where uid=$xuid";
-			mysql_query( $query );
-
-			print '<p style="color:red;">User information updated.</p>';
-		}
-	}
-}
-
-if ( !$xuid ) {
-	?>
-
-	<p style="font-size:medium;font-weight:bold;">User Listing</p>
-
-	<ul>
-		<li> <a href="useredit.php?xuid=new">Create new user</a>
-	<?php
-
-	$result = mysql_query( "select uid,username from users order by username" );
-
-	while ( list($xuid,$dude) = mysql_fetch_row($result) ) {
-		?>
-		<li> <a href="useredit.php?xuid=<?=$xuid;?>"><?=$dude;?></a>
-		<?php
-	}
-	?>
-	</ul>
-	<?php
-} else {
-	if ( $xuid != 'new' ) {
-		// otherwise, we'll just keep all values empty
-		$dude = mysql_query( "select * from users where uid=$xuid" );
-		$dude = mysql_fetch_array( $dude );
-
-		$xteams = explode( ",", $dude['team'] );
-	}
-	?>
-	<form action="useredit.php" method="post">
-	<table border=0 cellpadding=2 cellspacing=0>
-	<tr>
-		<td align="right"><b>uid:</b></td>
-		<td><?=$dude['uid'];?></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Real Name:</b></td>
-		<td><input type="text" name="realname" maxlength=200 value="<?=$dude['realname'];?>"></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Username:</b></td>
-		<td><input type="text" name="username" maxlength=10 value="<?=$dude['username'];?>"></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Password:</b><br>(Type in a<br>password twice<br>to change.)</td>
-		<td><input type="password" name="pass1" maxlength=10><br><input type="password" name="pass2" maxlength=10></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Title:</b></td>
-		<td><input type="text" name="title" maxlength=100 value="<?=$dude['title'];?>"></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Email:</b></td>
-		<td><input type="input" name="email" value="<?=$dude['email'];?>" maxlength=200></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Location:</b></td>
-		<td><input type="input" name="location" value="<?=$dude['location'];?>" maxlength=200></td>
-	</tr>
-	<tr>
-		<td align="right"><b>Admin:</b></td>
-		<td><input type="checkbox" name="admin"<?php if ( $dude['admin'] ) print ' checked'; ?>></td>
-	</tr>
-	<tr>
-		<td align="right" valign="top"><b>Team Memberships:</b></td>
-		<td>
-		<table border=0 cellpadding=1 cellspacing=0 bgcolor="black"><tr><td>
-		<table width=300 border=0 cellpadding=5 cellspacing=0 bgcolor="#bdbacc">
-		<tr>
-			<td>&nbsp;</td>
-			<td align="center"><b>Unaffiliated</b></td>
-			<td align="center"><b>Regular</b></td>
-			<td align="center"><b>Leader</b></td>
-		</tr>
-		<?php
-		// get team info
-		reset( $teams );
-		while ( $each = each($teams) ) {
-			if ( $each['key'] == 0 || $each['key'] == 1 ) continue; // skip 'none' and 'all'
-			$tm = 'u'; // set the default
-			if ( $xuid != 'new' ) {
-				// are they a simple member? ...
-				reset( $xteams );
-				while ( $cur = each($xteams) ) {
-					if ( $cur['value'] == $each['key'] ) $tm = 'r';
-				}
-				// are they the team LEADER?!?! :)
-				$ldr = mysql_query( 'select leader,gid from teams where gid='.$each['key'] );
-				list( $ldr, $thegid ) = mysql_fetch_row( $ldr );
-				$ldr = explode( ',', $ldr );
-				reset( $ldr );
-				while ( $pair = each($ldr) ) {
-					if ( $pair['value'] == $xuid ) {
-						$tm = 'l';
-						$oldlead[] = $thegid;
-						break;
-					}
-				}
-			}
-			?>
-		<tr>
-			<td><b><?=$each['value'];?></b></td>
-			<td align="center"><input type="radio" name="<?=$each['value'];?>" value="u"<?php if ($tm=='u') print ' checked'; ?>></td>
-			<td align="center"><input type="radio" name="<?=$each['value'];?>" value="r"<?php if ($tm=='r') print ' checked'; ?>></td>
-			<td align="center"><input type="radio" name="<?=$each['value'];?>" value="l"<?php if ($tm=='l') print ' checked'; ?>></td>
-		</tr>
-			<?php
-		}
-		?>
-		</table>
-		</td></tr></table>
-		</td>
-	</tr>
-	<tr>
-		<input type="hidden" name="submitted" value="1">
-		<input type="hidden" name="oldleads" value="<?php if ($oldlead) print implode( ',', $oldlead );?>">
-		<input type="hidden" name="xuid" value="<?=$xuid;?>">
-		<td align="center" colspan=2><input type="submit" value="Submit"></td>
-	<tr>
-	</table>
-	</form>
-	<?php
-}
-
-main_footer();
-?>
diff --git a/app-doc/gentoo-web/files/xml/build.xml b/app-doc/gentoo-web/files/xml/build.xml
deleted file mode 100644
index f187863d3762..000000000000
--- a/app-doc/gentoo-web/files/xml/build.xml
+++ /dev/null
@@ -1,742 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/build.html">
-<title>Gentoo Linux 1.0_rc6 "from source" (build) CD Installation</title>
-<author title="Chief Architect"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-<author title="Author">Chris Houser</author>
-<author title="Author"><mail link="jerry@gentoo.org">Jerry Alexandratos</mail></author>
-<author title="Ghost"><mail link="g2boojum@gentoo.org">Grant Goodyear</mail></author>
-<abstract>
-These instructions step you through the process of installing Gentoo Linux 1.0_rc6 using
-our minimal build CD.  Using this method, the complete system is built from scratch using
-sources that are automatically downloaded from the Internet.  This build CD install method
-will work with any x86-compatible system.
-</abstract>
-
-<version>1.4.3</version>
-<date>13 Dec 2001</date>
-
-<chapter>
-<title>About the Install</title>
-<section>
-<body>
-
-<p>The Gentoo Linux 1.0_rc6 ISO release is based upon a new <c>isolinux/zdisk</c>-based
-boot process.  This new boot CD will boot from nearly any modern IDE CD-ROM drive,
-as well as almost any modern SCSI CD-ROM.  Included on the CD-ROM is Linux support for
-IDE (built-in to the kernel) as well as support for all SCSI devices (available as 
-modules).  In addition, we provide modules for literally every kind of network card
-that Linux supports.  The installation works by using a small included build image as
-a base to download and install packages whose sources are downloaded from the Internet.</p>
-
-<p>To install from the build CD, you will need to have a 486+ processor, and ideally at
-least 64 Megabytes of RAM.  
-(Gentoo linux has been successfully built with 64MB of RAM + 64MB of swap space,
-but the build process is awfully slow under those conditions.)
-To begin the install process, first grab the latest 16Mb
-build CD ISO image (<path>build-ix86-1.0_rc6-r11.iso</path> is the latest at the time this
-article was written) from
-<uri>http://www.ibiblio.org/gentoo/snapshots/build/ix86-linux-gnu/</uri>.  Then, create
-your own CD-ROM using this image and your preferred CD burning software.
-</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Booting</title>
-<section>
-<body>
-<p>Now go ahead and boot the CD; you'll be greeted with a bunch of text and a <c>boot:</c>
-prompt at the bottom of the screen.  At this prompt, hit enter, and Linux will begin to load
-from the CD.</p>
-<p>Next, you'll be greeted with a small list of commands available on the boot CD, including
-<c>nano</c> (a pico editor clone) and instructions for setting up the network.  Then, you'll be
-prompted to select your preferred keymap. After this, you can hit enter to enter 
-the minimal boot CD Linux environment.  You should have a root ("<c>#</c>") prompt on the current
-console, and can also open new consoles by typing alt-f2, alt-f3, 
-etc and then hitting enter.</p>
-
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Load kernel modules</title>
-<section>
-<body>
-
-<p>We're almost ready to begin installing Gentoo Linux, but first we need take the necessary steps
-so that the kernel recognizes our network cards, and optionally any SCSI hardware that is in our
-system.  To view a list of all available network card modules, type <c>ls /lib/modules/*/kernel/drivers/net/*</c>.
-To load a particular module, type:</p>
-
-<pre>
-# <i>modprobe pcnet32</i>
-	<comment>(replace pcnet32 with your NIC module)</comment>
-</pre>
-
-<impo><path>build-1.0_rc6-r10.iso</path> and later include <c>modprobe</c>; all earlier CDs include <c>insmod</c>.</impo>
-
-<p>Now, if you want to be able to access any SCSI hardware, you will need to load the appropriate
-modules from /lib/modules, again using <c>modprobe</c>:</p>
-<pre>
-# <i>modprobe aic7xxx</i>
-# <i>modprobe sr_mod</i>
-# <i>modprobe sd_mod</i>
-</pre>
-<p>Above, we modprobe the <c>aic7xxx</c> SCSI driver and then make sure that SCSI CD-ROM (<c>sr_mod</c>)
-and disk (<c>sd_mod</c>) support is loaded.</p>
-<note><c>hdparm</c> is now included on -r10 and later of the iso.  If any of your drives require tweaking, now
-would be a good time to do so.</note>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Configure installation networking</title>
-<section>
-<body>
-<p>The new -r11+ boot CDs allow you to configure a working network, allowing you to use <c>ssh</c>, <c>scp</c> or <c>wget</c>
-as needed before even beginning the installation process.  Even if you don't need to do these things now,
-you should go ahead and set up networking now.  Once set up, Portage will be able to use your network
-once you are in the chroot environment (required for bootstrapping Gentoo Linux).</p>
-</body>
-</section>
-
-<section>
-<title>DHCP</title>
-<body>
-<p>
-Network configuration is simple with DHCP; If your ISP is not using
-DHCP, skip down to the static configuration section below.
-</p>
-<pre caption="Network configuration with DHCP">
-# <i>dhcpcd eth0</i> 
-</pre>
-<note>
-Some ISPs require you to provide a hostname.  To do that,
-add a <c>-h myhostname</c> flag to the dhcpcd command line above.
-</note>
-</body>
-</section>
-<section>
-<title>Static configuration</title>
-<body>
-<p>
-We need to setup just enough networking so that we can download
-sources for the system build, as well as the required localhost interface.  Type in the following commands, replacing
-$IFACE with your network interface (typically <c>eth0</c>), $IPNUM
-with your IP address, $BCAST with your broadcast address, and $NMASK
-with your network mask.  For the <c>route</c> command, replace 
-$GTWAY with your default gateway.
-</p>
-<pre>
-# <i>/sbin/ifconfig $IFACE $IPNUM broadcast $BCAST netmask $NMASK</i>
-# <i>/sbin/route add -net default gw $GTWAY netmask 0.0.0.0 metric 1</i>
-</pre>
-<p>Now, it's time to create the <path>/etc/resolv.conf</path>
-file so that name resolution (finding Web/FTP sites by name, rather than just by IP address) will work.</p>
-
-<note>At the moment the only editor installed by default is <c>nano</c>, a
-small and very easy-to-use visual editor. 
-</note>
-
-<p>Here's a template to follow for creating your /etc/resolv.conf file:
-</p>
-<pre caption="/etc/resolv.conf template">
-domain mydomain.com
-nameserver 10.0.0.1
-nameserver 10.0.0.2
-</pre>
-<p>Replace <c>10.0.0.1</c> and <c>10.0.0.2</c> with the IP addresses of your
-primary and secondary DNS servers respectively.</p>
-<p>Now that your network has been configured, the <c>/sbin/ifconfig -a</c> command should show (hopefully!) 
-that your network card is working
-(look for <e>UP</e> and <e>RUNNING</e> in the output).
-</p>
-<pre caption="/sbin/ifconfig for a working network card">
-eth0      Link encap:Ethernet  HWaddr 00:50:BA:8F:61:7A
-          inet addr:192.168.0.2  Bcast:192.168.0.255  Mask:255.255.255.0
-          inet6 addr: fe80::50:ba8f:617a/10 Scope:Link
-          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-          RX packets:1498792 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:1284980 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:1984 txqueuelen:100
-          RX bytes:485691215 (463.1 Mb)  TX bytes:123951388 (118.2 Mb)
-          Interrupt:11
-</pre>
-<!--
-<note>
-If you have a static ppp link, you can !!! do this...!!!
-</note>
--->
-</body>
-</section>
-<section>
-<title>Networking is go!</title>
-<body>
-<p>Networking should now be configured an useable.  You should be able to use the included
-<c>ssh</c>, <c>scp</c> and <c>wget</c> commands to connect to other machines on your LAN or the Internet.</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Set up partitions</title>
-<section>
-<body>
-
-<p>Now that the kernel can see our network card and disk controllers, it's time
-to set up disk partitions for Gentoo Linux.</p>
-
-<p>Here's a quick overview of the standard Gentoo Linux partition layout.
-We're going to create at least three partitions: a swap partition, a root
-partition (to hold the bulk of Gentoo Linux), and a special boot partition.
-The boot partition is designed to hold GRUB boot loader information as well as
-your Linux kernel(s).  The boot partition gives us a safe place to store
-everything related to booting Linux. During normal day-to-day Gentoo Linux use,
-your boot partition should remain <e>unmounted</e>.  This prevents your kernel
-from being made unavailable to GRUB (due to filesystem corruption) in the event
-of a system crash, preventing the chicken-and-egg problem where GRUB can't read
-your kernel (since your filesystem isn't consistent) but you can't bring your
-filesystem back to a consistent state (since you can't boot!)      </p>
-
-<warn>If you are using the -r11 ISO image, do <i>not</i> create any ext3
-filesystems.  The ext3 patch included with that kernel has some problems with
-Linux's (at that time) brand new VM implementation.  Ext3 itself is solid,
-it's just that 2.4.10's ext3 and VM clashed.  If you want to use ext3 filesystems,
-just install on ext2 filesystems.  Specify a type of <c>auto</c> in your <path>/etc/fstab</path>
-and be sure to compile ext3 support into your kernel (we'll compile a kernel in just
-a bit).  Then, before your reboot, type <c>tune2fs -j /dev/hdXX</c> for all your
-ext3 filesystems -- your filesystems can be mounted or unmounted when you type
-this; it doesn't matter, and the <c>tune2fs</c> command will be available after
-you <c>emerge system</c>.  Then, when you reboot into your newly bootstrapped
-Gentoo Linux system, you will have working and rock-solid ext3 filesystems!
-This problem will be fixed as soon as I have enough time to roll up a new ISO
-image. --Daniel</warn>
-
-<p>Now, on to filesystem types.  Right now, you have three filesystem options:
-ext2, ext3 (journaling) and ReiserFS.  ext2 is the tried and true Linux
-filesystem but doesn't have metadata journaling.  ext3 is the new version of
-ext2 with both metadata journaling and ordered data writes, effectively
-providing data journaling as well.  ReiserFS is a B*-tree based filesystem
-with very good small file performance, and greatly outperforms both ext2 and
-ext3 when dealing with small files (files less than 4k), often by a factor of
-10x-15x.  ReiserFS has metadata journaling, but no data journaling.  If
-you're looking for the most standard filesystem, use ext2.  If you're looking
-for the most rugged journalled filesystem, use ext3.  If you're looking for a
-high-performance filesystem with journaling support, use ReiserFS.  Both ext3
-and ReiserFS are production-ready.  Here are our basic recommended filesystem
-sizes and types:</p>
-
-  <table>
-  <tr>
-  	<th>Partition</th>
-	<th>Size</th>
-	<th>Type</th>
-  	<th>example device</th>
-  </tr>
-  <tr>
-  	<ti>boot partition, containing kernel(s) and boot information</ti>
-	<ti>&gt;10 Megabytes</ti>
-	<ti>ext2/3 highly recommended (easiest) or ReiserFS, if reiserfs then mount with <c>-o notail</c></ti>
-  	<ti>/dev/hda1</ti>
-  </tr>
-   <tr>
-  	<ti>swap partition (no longer a 128 Megabyte limit)</ti>
-	<ti>&gt;=2*Amount of RAM in this system is recommended but no longer (as of kernel 2.4.10) required</ti>
-	<ti>Linux swap</ti>
-  	<ti>/dev/hda2</ti>
-  </tr>
-  <tr>
-  	<ti>root partition, containing main filesystem (/usr, /home, etc)</ti>
-	<ti>&gt;=1.5 Gigabytes</ti>
-	<ti>ReiserFS, ext3 recommended; ext2 ok</ti>
-  	<ti>/dev/hda3</ti>
-  </tr>
- </table>
-
-<note>At this point, create your partitions using fdisk.  Note that your partitions
-should be of type 0x82 if swap and 0x83 for regular filesystems (whether ReiserFS <e>or</e> ext2).
-</note>
-
-<p>Once you've created your partitions using <c>fdisk</c>, it's time to initialize
-the filesystems that will be used to house our data.  Initialize swap as follows:</p>
-<pre>
-# <i>mkswap /dev/hda2</i>
-</pre>
-<p>You can use the <c>mke2fs</c> command to create ext2 filesystems:</p>
-<pre>
-# <i>mke2fs /dev/hda1</i>
-</pre>
-<p>To create ReiserFS filesystems, use the <c>mkreiserfs</c> command:</p>
-<pre>
-# <i>mkreiserfs /dev/hda3</i>
-</pre>
-<p>If you'd like to use ext3, you can create ext3 filesystems using <c>mke2fs -j</c>:</p>
-<pre>
-# <i>mke2fs -j /dev/hda3</i>
-</pre>
-
-<note>You can find out more about using ext3 under Linux 2.4 at <uri>http://www.zip.com.au/~akpm/linux/ext3/ext3-usage.html</uri>.</note>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Mount partitions</title>
-<section>
-<body>
-<p>
-Now, we'll activate our new swap, since we may need the additional virtual memory that
-provides later:
-</p>
-<pre>
-# <i>swapon /dev/hda2</i>
-</pre>
-<p>Next, we'll create the <path>/mnt/gentoo</path> and <path>/mnt/gentoo/boot</path> mountpoints,
-and we'll mount our filesystems to these mountpoints.  Note that we use the special <c>-o notail</c>
-option when we mount our ReiserFS boot partition.</p>
-<pre>
-# <i>mkdir /mnt/gentoo</i>
-# <i>mount /dev/hda3 /mnt/gentoo</i>
-# <i>mkdir /mnt/gentoo/boot</i>
-# <i>mount -o notail /dev/hda1 /mnt/gentoo/boot</i>
-</pre>
-<p>If you are setting up Gentoo
-   Linux with a separate <path>/usr</path> or <path>/var</path>, these would get mounted to
-   <path>/mnt/gentoo/usr</path> and <path>/mnt/gentoo/var</path>, respectively.
-</p>
-   <impo>If your <e>boot</e> partition (the one holding the kernel) is ReiserFS, be sure to mount it
-   with the <c>-o notail</c> option so GRUB gets properly installed.  Make sure 
-   that <c>notail</c> ends up in your new <path>/etc/fstab</path> boot partition entry, too.
-   We'll get to that in a bit.</impo>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Mounting the CD-ROM</title>
-<section>
-<body>
-<p>Even though we've booted from the CD-ROM, the CD-ROM itself is not mounted under our minimal
-Linux boot CD environment.  We'll need to mount it so that we can access the compressed build image
-tarball contained on the CD-ROM.  To mount the CD-ROM, one typically types:
-</p>
-<pre>
-# <i>mount /dev/cdroms/cdrom0 /mnt/cdrom -o ro -t iso9660</i>
-</pre>
-<p>With the CD-ROM mounted, you should be able to see the <c>build-???.tbz2</c> file by typing
-<c>ls /mnt/cdrom</c>.</p>
-</body>
-</section>
-</chapter>
-
-<chapter>
-    <title>Unpack the build archive and chroot</title>
-<section>
-<body>
-
-<p>Now it's time to extract the compressed build image tarball to <path>/mnt/gentoo</path>.  Then, we'll <c>chroot</c> over to the new Gentoo Linux build installation. 
-</p>
-
-<pre>
-# <i>cd /mnt/gentoo</i>
-# <i>tar -xvjpf /mnt/cdrom/build-*.tbz2</i>
-# <i>mount -o bind /proc /mnt/gentoo/proc</i>
-# <i>cp /etc/resolv.conf /mnt/gentoo/etc/resolv.conf</i>
-# <i>chroot /mnt/gentoo /bin/bash</i>
-# <i>env-update</i>
-Regenerating /etc/ld.so.cache...
-# <i>source /etc/profile</i>
-(none) / # <comment>ooh!  A new prompt!</comment>
-</pre>
-<p>
-We make the <path>/proc</path> filesystem accessible inside the 
-soon-to-be-established chroot by binding it to <path>/mnt/gentoo/proc</path>
-(it's always good to ensure that <path>/proc</path> is available).
-</p>
-<p>After you execute these commands, you'll be "inside" your new Gentoo Linux environment,
-and the last step before we can grab the Portage tree and bootstrap is to configure your network settings.
-</p>
-
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Rsync</title>
-<section>
-<body>
-<p>Now that you have networking properly configured, we need to complete the all-important <c>emerge rsync</c> step,
-which will download an up-to-the-minute copy of the Gentoo Linux Portage tree from gentoo.org.  Simply type:
-</p>
-<pre>
-# <i>emerge rsync</i>
-</pre>
-<p>The Portage tree will begin to be transferred; it's about 20Mb in size.</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Bootstrap</title>
-<section>
-<body>
-<p>Now that you have a working copy of the Portage tree, it's time to bootstrap the system build tools.
-First, you need to edit the file <path>/etc/make.conf</path>.  In this file, you
-should set your <c>USE</c> flags, which specify optional functionality that you
-would like built into packages; the commented-out defaults are recommended.  You also should set appropriate <c>CHOST</c>, <c>
-CFLAGS</c> and <c>CXXFLAGS</c> settings for the kind of system that you are creating:
-</p>
-<pre>
-# <i>nano -w /etc/make.conf</i> <comment>(Adjust these settings)</comment>
-</pre>
-<p>Now, it's time to start the "bootstrap" process.  This process will last 1-2 hours depending on 
-how zippy your machine is; it takes about 45 minutes on my 900Mhz AMD Athlon system.  During this
-time, the extracted build image will be prepped for compiling the rest of the system.  The GNU
-compiler suite will be built, as well as the GNU C library.  These are time consuming builds and
-make up the bulk of the bootstrap process:</p>
-<pre>
-# <i>cd /usr/portage</i>
-# <i>scripts/bootstrap.sh</i>
-</pre>
-<p>The "bootstrap" process will now begin.</p>
-<note>
-Portage by default uses <c>/var/tmp</c> during package building, often
-using several hundred megabytes of temporary storage. If you would like to
-change where Portage stores these temporary files, set a new PORTAGE_TMPDIR <e>before</e>
-starting the bootstrap process, as follows:
-</note>
-<pre>
-# <i>export PORTAGE_TMPDIR="/otherdir/tmp"</i>
-</pre>
-<p>
-The 
-<c>bootstrap.sh</c> will build <c>binutils</c>, <c>gcc</c>, <c>gettext</c>,
-and <c>glibc</c>, rebuilding <c>binutils</c>, <c>gcc</c>, and <c>gettext</c>
-after <c>glibc</c> is built.  Needless to say, this process takes a while.
-Have a nice nap.
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Building the base system</title>
-<section>
-<body>
-<p>Now that the build tools have been built with the proper
-optimizations for your system, it's time to build the rest
-of the base system:</p>
-<pre>
-# <i>export CONFIG_PROTECT=""</i>
-# <i>emerge --pretend system</i>
-	<comment>[lists the packages to be installed]</comment>
-# <i>emerge system</i>
-</pre>
-<note>The <c>export CONFIG_PROTECT=""</c> line ensures that any new scripts installed to <path>/etc</path> will
-overwrite the old scripts (stored in <path>sys-apps/baselayout</path>), bypassing 
-Portage's new config file management support.  Type <c>emerge --help config</c>
-for more details.</note>
-<p>
-It's going to take a while to finish building the entire base
-system.  Your reward is that it will be thoroughly optimized for
-your system.  The drawback is that you have to find a way to keep
-yourself occupied for some time to come.  The author suggests "Star Wars -
-Super Bombad Racing" for the PS2.
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Installing the kernel and system logger</title>
-<section>
-<body>
-<p>
-At the moment the Gentoo Linux default system does not include a kernel;
-you have to install it yourself.  Here are the steps to compile and configure
-your own custom kernel:
-</p>
-<pre>
-# <i>emerge sys-kernel/linux-sources</i>
-# <i>cd /usr/src/linux</i>
-# <i>make menuconfig</i>
-# <i>make dep; make clean; make bzImage; make modules; make modules_install</i>
-# <i>mv bzImage bzImage.orig</i> <comment>[if bzImage already exists]</comment>
-# <i>cp /usr/src/linux/arch/i386/boot/bzImage /boot</i>
-</pre>
-<impo>For your kernel to function properly, there are several options that you will
-need to ensure are in the kernel proper -- that is, they should <e>be enabled but not
-compiled as modules</e>.
-Under the "File systems" section, be sure to enable the "Device File System". You'll also
-need to enable the "Virtual Memory Filesystem".  Be sure to enable "ReiserFS" if you have
-any ReiserFS partitions; the same goes for "Ext3".  It's always a good idea to leave ext2
-enabled whether you are using it or not.  You will need to enable the "Experimental Features"
-options to see several of these selections.  Also, most people using IDE hard drives will
-want to enable the "USE DMA by default" option; otherwise, your IDE drives may perform
-very poorly.
-</impo>
-
-<p>
-Your new custom kernel (and modules) are now installed.  Now you need to choose a system
-logger that you would like to install.  We offer sysklogd, which is the traditional set
-of system logging daemons.  We also have syslog-ng as well as metalog.  Power users seem
-to gravitate away from sysklogd (not very good performance) and towards syslog-ng and 
-metalog.  If in doubt, you may want to try metalog, since it seems to be quite popular.
-To merge your logger of choice, type <e>one</e> of the next three lines:
-</p>
-
-<pre>
-# <i>emerge sys-apps/sysklogd</i>
-# <i>rc-update add sysklogd default</i>
-<comment>or</comment>
-# <i>emerge app-admin/syslog-ng</i>
-# <i>rc-update add syslog-ng default</i>
-<comment>or</comment>
-# <i>emerge app-admin/metalog</i>
-# <i>rc-update add metalog default</i>
-</pre>
-<warn>
-In the case of syslog-ng and metalog, you need to create 
-<path>/etc/syslog-ng/syslog-ng.conf</path> or
-<path>/etc/metalog/metalog.conf</path>, respectively.
-See <path>/etc/syslog-ng</path> or <path>/etc/metalog</path>
-for sample configuration files.
-</warn>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Install miscellaneous stuff</title>
-<section>
-<body>
-<p>
-To install any additional packages in the Portage tree
-you can just <c>emerge</c> any packages in <path>/usr/portage/</path> 
-that you'd
-like to install, for example:</p>
-<pre>
-# <i>cd /usr/portage/x11-base/xfree</i>
-# <i>emerge --pretend xfree-4.1.0.ebuild</i>
-# <i>emerge xfree-4.1.0.ebuild</i>
-</pre>
-<p>
-It is always a good idea to use the <c>--pretend</c> flag first, just to
-get a feeling for what is going to be installed.  Of course, you have a
-basic Gentoo Linux system installed now, so any additional packages could
-wait until you have the rest of the system configured.  It's generally best
-to get your base system booting before merging X. :)
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Final configuration</title>
-<section>
-<body>
-<p>Your Gentoo Linux system is almost ready for use.  All we need to do now is configure
-a few important system files and install the GRUB boot loader. 
-The first file we need to
-configure is <path>/etc/fstab</path>.  Remember that you should use
-the <c>notail</c> option for your boot partition if you chose to create a ReiserFS filesystem on it.
-Remember to specify <c>ext2</c>, <c>ext3</c> or <c>reiserfs</c> filesystem types as appropriate.</p>
-<pre>
-<comment>
-# /etc/fstab: static file system information.
-#
-# noatime turns of atimes for increased performance (atimes normally aren't
-# needed; notail increases performance of ReiserFS (at the expense of storage
-# efficiency).  It's safe to drop the noatime options if you want and to 
-# switch between notail and tail freely.
-
-# &lt;fs&gt;          	&lt;mountpoint&gt;    &lt;type&gt;  	&lt;opts&gt;      		&lt;dump/pass&gt;
-
-# NOTE: If your BOOT partition is ReiserFS, add the notail option to opts.
-</comment>
-/dev/hda1		/mnt/boot	ext2		noauto,noatime		1 1
-/dev/hda3		/		reiserfs	notail,noatime		0 0
-/dev/hda2		none            swap		sw			0 0
-/dev/cdroms/cdrom0	/mnt/cdrom	iso9660		noauto,ro		0 0
-proc			/proc           proc		defaults		0 0
-</pre>
-
-</body>
-</section>
-<section>
-<title>Set the root password</title>
-<body>
-<p>Before you forget, set the root password by typing:</p>
-<pre>
-# <i>passwd</i>
-</pre>
-</body>
-</section>
-<section>
-<title>/etc/localtime</title>
-<body>
-<p>Look for your timezone (or GMT if you using Greenwich Mean Time) in <path>/usr/share/zoneinfo</path>.  Then, make a symbolic link by typing:
-</p><pre>
-# <i>ln -sf /usr/share/zoneinfo/path/to/timezonefile /etc/localtime</i>
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/hostname</title>
-<body>
-<p>Edit this file so that it contains your fully-qualified domain name on a single line, i.e. <c>mymachine.mydomain.com</c>.
-</p>
-</body>
-</section>
-
-<section>
-<title>/etc/hosts</title>
-<body>
-<p>This file contains a list of ip addresses and their associated hostnames.  It's used by the system to resolve the IP addresses
-of any hostnames that may not be in your nameservers.  Here's a template for this file:
-</p><pre>
-127.0.0.1      localhost
-<comment># the next line contains your IP for your local LAN, and your associated machine name</comment>
-192.168.1.1    mymachine.mydomain.com	mymachine
-</pre>
-</body>
-</section>
-
-<section>
-<title>Final network configuration</title>
-<body>
-<p>
-Add the names of any modules that are necessary for the proper functioning of your system to 
-<path>/etc/modules.autoload</path> file (you can also add any options you
-need to the same line.) When Gentoo Linux boots, these modules will be automatically
-loaded.  Of particular importance is your ethernet card module, if you happened to compile
-it as a module:
-</p>
-<pre caption="/etc/modules.autoload">
-3c59x
-</pre>
-<p>If you have a static IP, use the <c>net.eth0</c> script to get your network
-configured for your first boot:</p>
-<pre>
-# <i>nano -w /etc/init.d/net.eth0</i>
-# <i>rc-update add net.eth0 default</i>
-</pre>
-<p>However, if you have a dynamic IP, do the same thing with <c>net.eth0-dhcp</c>:</p>
-<pre>
-# <i>nano -w /etc/init.d/net.eth0-dhcp</i>
-# <i>rc-update add net.eth0-dhcp default</i>
-</pre>
-<p>If you need to set up any additional network interfaces, copy <c>net.eth0</c>
-or <c>net.eth0-dhcp</c> to <c>net.eth1</c> or <c>net.eth1-dhcp</c> and repeat.</p>
-<impo>Once you've set up all your network interfaces, type the following so that
-they are automatically enabled when entering the default runlevel:</impo>
-<pre>
-# <i>rc-update add net.eth0 default</i>
-</pre>
-</body>
-</section>
-
-<section>
-<title>Configure basic settings</title>
-<body>
-<pre caption="basic configuration">
-# <i>nano -w /etc/rc.conf</i>
-</pre>
-<p>
-Follow the directions in the file to configure the basic settings.
-</p>
-</body>
-</section>
-
-<section>
-<title>Configure GRUB</title>
-<body>
-<p>
-The most critical part of understanding GRUB is getting comfortable with how GRUB refers to hard drives and partitions.
-Your Linux partition <path>/dev/hda1</path> is called <path>(hd0,0)</path> under GRUB.  Notice the parenthesis around the hd0,0 - they are required.  
-Hard drives count from zero rather than "a", and partitions start at zero rather than one.  So, <path>/dev/hdb3</path> gets translated to <path>(hd1,2)</path>, and <path>/dev/hdd7</path> gets translated to <path>(hd3,6)</path>.  After you've gotten the feel for that, convert your boot and root partition names to the GRUB format and write them down.  Now, it's time to install GRUB.
-</p>
-
-<p>The easiest way to install grub is to simply type <c>grub</c> at your chrooted shell prompt:
-</p><pre>
-# <i>grub</i>
-</pre><p>You'll be presented with the <c>grub&gt;</c> grub command-line prompt.  Now, you need to type in the
-right commands to install the GRUB boot record onto your hard drive.  In my example configuration,
-I want to install the GRUB boot record on my hard drive's MBR (master boot record), so that 
-the first thing I see when I turn on the computer is the GRUB prompt.  In my case, the commands
-I want to type are:</p>
-<pre>grub&gt; <i>root (hd0,0)</i>
-grub&gt; <i>setup (hd0)</i>
-</pre>
-
-<p>Here's how the two commands work.  The first <c>root ( )</c> command tells GRUB
-the location of your boot partition (in our example, <path>/dev/hda1</path> or 
-<path>(hd0,0)</path> in GRUB terminology.  Then, the second <c>setup ( )</c> command tells GRUB where to install the
-boot record - it will be configure to look for its special files at the <c>root
-( )</c> location that you specified.  In my case, I want the boot record on the
-MBR of the hard drive, so I simply specify <path>/dev/hda</path> (also known as <path>(hd0)</path>).  If I were using
-another boot loader and wanted to set up GRUB as a secondary boot-loader, I
-could install GRUB to the boot record of a particular partition.  In that case,
-I'd specify a particular partition rather than the entire disk.  Once the GRUB
-boot record has been 
-successfully installed, you can type <c>quit</c> to quit GRUB.  Gentoo Linux is
-installed, but we need to create the <path>/boot/grub/menu.lst</path> file so that
-we get a nice GRUB boot menu when the system reboots.  Here's how to do it.</p>
-
-<p>Now, create the menu.lst file (<c>nano -w /boot/grub/menu.lst</c>), and add the following to it:</p>
-<pre>
-default 0
-timeout 30
-splashimage=(hd0,0)/boot/grub/splash.xpm.gz
-
-title=My example Gentoo Linux
-root (hd0,0) 
-kernel /boot/bzImage root=/dev/hda3 
-
-title=Windows NT Workstation
-root (hd0,5) 
-chainloader +1
-</pre><p>After saving this file, Gentoo Linux installation is complete.  Selecting the first option will
-tell GRUB to boot Gentoo Linux without a fuss.  The second part of the menu.lst file is optional, and shows you how to
-use GRUB to boot a bootable Windows partition.</p>
-
-<note>Above, <path>(hd0,0)</path> should point to your "boot" partition
-(<path>/dev/hda1</path> in our example config) and <path>/dev/hda3</path> should point to
-your root filesystem.  <path>(hd0,5)</path> contains the NT boot
-loader.</note> <p>Also, if you need to pass any options to the kernel, simply
-add them to the end of the <c>kernel</c> command.  We're already passing one option
-(<c>root=/dev/hda3</c>), but you can pass others as well.  In particular, you can
-turn off devfs by default (not recommended unless you know what you're doing) by
-adding the <c>gentoo=nodevfs</c> option to the <c>kernel</c> command.
-
-<note>Unlike in earlier versions of Gentoo Linux, you no longer have to add 
-<c>devfs=mount</c> to the end of the <c>kernel</c> line to enable devfs.  In rc6
-devfs is enabled by default.
-</note>
-</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Installation complete!</title>
-<section>
-<body>
-<p>Now, Gentoo Linux is installed.  The only remaining step is to exit the chrooted shell, safely unmount your partitions
-and reboot the system:</p>
-<pre>
-# <i>exit</i> 
-<codenote>This exits the chrooted shell; you can also type <c>^D</c></codenote>
-# <i>umount /mnt/gentoo/boot</i>
-# <i>umount /mnt/gentoo/proc</i>
-# <i>umount /mnt/gentoo</i>
-# <i>reboot</i>
-</pre>
-<note>
-After rebooting, it is a good idea to run the <c>update-modules</c> command to create
-the <path>/etc/modules.conf</path> file.  Instead of modifying this file directly, you should
-generally make changes to the files in <path>/etc/modules.d</path>.
-</note>
-<p>If you have any questions or would like to get involved with Gentoo Linux development, 
-consider joining our gentoo-dev mailing list (there's a "click to subscribe" link on our <uri link="http://www.gentoo.org">main page</uri>).
-</p>
-</body>
-</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/cvs-tutorial.xml b/app-doc/gentoo-web/files/xml/cvs-tutorial.xml
deleted file mode 100644
index 55f4cf48ab4f..000000000000
--- a/app-doc/gentoo-web/files/xml/cvs-tutorial.xml
+++ /dev/null
@@ -1,975 +0,0 @@
-<?xml version="1.0"?>
-<guide>
-<title>Gentoo Linux CVS Tutorial</title>
-<author title="Chief Architect" email="drobbins@gentoo.org">Daniel Robbins</author>
-
-<version>1.1</version>
-<date>10 Aug 2001</date>
-
-<abstract>
-This tutorial introduces readers to CVS, the Concurrent Versions System, used
-by developers around the world to develop software in a flexible and
-collaborative manner.  Intended for those new to CVS, this tutorial will get
-both general users and new developers up to speed quickly.  Whether you'd like
-to use CVS to "check out" the latest sources of a particular software package,
-or whether you'd like to begin using CVS as a full-fledged developer, this
-tutorial is for you.
-</abstract>
-
-<chapter>
-<title>Introduction</title>
-
-<section>
-<title>Tutorial layout</title>
-<body>
-<p>
-This tutorial has two parts.  The first shows you how to use CVS as a
-non-developer, i.e. how to get sources from CVS and keep them updated.  The
-second part introduces you to using CVS as a developer, showing you how to
-modify, add and remove files on CVS and perform other developer-related tasks.
-If you are new to CVS, it's recommended that you begin in the first section and
-proceed to the second section; if you have some basic CVS experience but are
-going to be using CVS as a full-fledged developer for the first time, you
-should find everything you need in the second section, but you may want to go
-through the first section as a review.
-</p>
-</body>
-</section>
-
-<section>
-<title>What is CVS and what does it do?</title>
-<body>
-<p>
-CVS is a client/server system allowing developers to store their projects in a
-central location, called a repository.  Using the cvs client tools, developers
-can make changes to the contents of the repository.  In turn, the cvs repository
-tracks every change made to every file, creating a complete
-history of the evolution of the development project.  Developers can request
-older versions of a particular source file, view a log of changes, and perform
-other useful tasks as needed.
-</p>
-</body>
-</section>
-
-<section>
-<title>The role of CVS</title>
-<body>
-
-<p>A lot of open software projects have their own CVS servers, which are used by
-the project developers as a central repository for all their work.  Developers
-often make improvements to the sources in the CVS repository on a daily basis;
-and often, these developers are scattered around the world, yet CVS provides
-the necessary mechanism to unite their project into a centralized, cohesive
-whole.  CVS creates the "organizational glue" that allows these developers to
-make improvements to the code without stepping on each other's toes, losing
-important data or missing each other's critical updates to particular source
-files.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>CVS -- the latest developer sources</title>
-<body>
-<p>
-When the developers are ready, they'll roll some their current work on CVS into
-a .tar.gz file and release it as a new official version of their software
-package.  However, the latest official release sometimes isn't recent enough,
-for a variety of possible reasons.  In the first section of this tutorial, I'll
-show you how to use CVS for this purpose -- acquiring the latest and greatest
-developer version of the sources for your own personal use.
-</p>
-</body>
-</section>
-
-<section>
-<title>CVS -- do you have it?</title>
-<body>
-<p>
-Before you can actually use CVS, you need to get it installed on your system.
-The easiest way to test to see if it's installed is to type:
-</p>
-<pre>
-# <i>cvs</i>
-</pre>
-<p>
-If a cvs command is found, then you've got it!  Otherwise, you'll need to either
-track down a binary package for your particular distribution, or install it
-from sources.  Installing CVS from sources is actually quite simple, and I'll
-show you how in the next panel.
-</p>
-</body>
-</section>
-
-
-<section>
-<title>Installing CVS from sources</title>
-<body>
-
-<p>
-Installing CVS from sources is easy.  First, grab the cvs-1.11.tar.gz tarball
-from <uri>ftp://ftp.cvshome.org/pub/cvs-1.11/cvs-1.11.tar.gz</uri>
-(if there's a newer version listed <uri link="ftp://ftp.cvshome.org/pub/">here</uri>, you might as well grab the new one
-instead.)  Then perform the following steps (command output has been omitted
-for brevity):
-</p>
-<pre>
-# <i>tar xzvf cvs-1.11.tar.gz</i>
-# <i>cd cvs-1.11</i>
-# <i>./configure</i>
-# <i>make</i>
-# <i>make install</i>
-</pre>
-<p>
-Now you should be ready to go.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>The CVSROOT</title>
-<body>
-
-<p>
-Before we begin, there are a few CVS fundamentals that you need to know.  The
-first is that in order to connect to a CVS repository, you first need to know a
-path called the "CVSROOT".  The CVSROOT is a string, like a URL, that tells
-the cvs command where the remote repository is and how we'd like to connect to
-it.  Just to make things interesting, CVS has a number of CVSROOT formats, depending
-on whether the CVS repository is local or remote and what method you're going
-to use to connect to it.  Here are some example CVSROOTs, along with explanations...
-</p>
-</body>
-</section>
-
-<section>
-<title>A local CVSROOT</title>
-<body>
-
-<pre>CVSROOT=/home/cvsroot</pre>
-<p>
-This is an example of a local CVSROOT path; you'd use a CVSROOT like this if
-you wanted to connect to a local repository that exists at /home/cvsroot; or
-maybe you have a repository mounted via NFS at /home/cvsroot.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>A remote password server CVSROOT</title>
-<body>
-
-<pre>CVSROOT=:pserver:cvs@foo.bar.com:/home/cvsroot</pre>
-<p>
-Here's an example of a CVSROOT for a remote repository that exists on the
-foo.bar.com host and lives in the /home/cvsroot directory on that machine.  The
-leading ":pserver:" part tells our client to connect to this remote machine
-using the CVS password server protocol, a protocol that's built-in to CVS.
-Typically, public CVS repositories use the password server protocol to allow
-access to anonymous users.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>A remote rsh/ssh CVSROOT</title>
-<body>
-
-<pre>CVSROOT=drobbins@foo.bar.com:/data/cvs
-</pre><p>
-Here's an example of a CVSROOT that uses the RSH or SSH protocol; in this
-example, the CVS server will attempt to access the repository on foo.bar.com
-using the drobbins account.  If the CVS_RSH environment variable is set to
-"ssh", then our cvs client will attempt to use ssh to connect; otherwise rsh
-will be used.  The ssh access method is popular with those who are concerned
-about security; however, neither the RSH or SSH method provides a way for
-anonymous users to get the sources.  In order to use this method, you must have
-a login account at foo.bar.com.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>A few more things...</title>
-<body>
-
-<p>In addition to the CVSROOT, you'll also need to know the name of the module
-(collection of sources) that you'd like to check out, as well as an anonymous
-password that you'll need to log in to the CVS password server.  Unlike
-anonymous ftp, there is no "standard" format for the anonymous password, so
-you'll need to get the specific password from the developer web site or the
-developers themselves.  Once you have all this info, you're ready to begin.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Interacting with CVS, part 1</title>
-<body>
-
-<p>Grabbing the sources is a two-stage process.  First, we log in to the password
-server.  Then, we grab the sources with a <c>checkout</c> command.  Here's an
-example set of commands that can be used to check out the latest Samba sources,
-a popular UNIX/Windows integration project:
-</p><pre>
-# <i>export CVSROOT=:pserver:cvs@pserver.samba.org:/cvsroot</i>
-</pre><p>
-This first command sets the CVSROOT environment variable.  If you don't set
-this variable, the following two commands will require an additional <c>-d
-:pserver:cvs@pserver.samba.org:/cvsroot</c> following the <c>cvs</c> command.
-Exporting the CVSROOT saves a us bit of typing.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Interacting with CVS, part 2</title>
-<body>
-
-<p>
-Here are the commands needed to get a current copy of the developer sources.
-You may want to jump forward to the next panel to read the explanation of 
-these commands, and then jump back here:
-</p>
-<pre>
-# <i>cvs login</i>
-(Logging in to cvs@pserver.samba.org)
-CVS password: <comment>(enter password here)</comment>
-
-# <i>cvs -z5 co samba</i>
-U samba/COPYING
-U samba/Manifest
-U samba/README
-U samba/Read-Manifest-Now
-U samba/Roadmap
-U samba/WHATSNEW.txt
-<comment>(this is just a snippet of the complete cvs co output)</comment>
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Interacting with CVS -- the explanation</title>
-<body>
-
-<p>
-The first cvs command above logs us in to the pserver, and the second tells our
-CVS client to check out ("co") the samba module using a gzip compression level
-of 5 ("-z5") to speed up the transfer over a slow link.  For every new file
-that is created locally, cvs prints out a "U [path]" indicating that this
-particular file has been updated on disk.  
-</p>
-</body>
-</section>
-
-<section>
-<title>Checkout complete</title>
-<body>
-
-<p>
-Once the checkout command completes,
-you'll see a "samba" directory in your current working directory that contains
-the latest sources.  You'll also notice that all the directories have a "CVS"
-directory inside them -- CVS stores accounting information inside these
-direcotries, and they can safely be ignored.  From this point forward, we don't
-need to worry about having the CVSROOT environment variable set nor do we need
-to specify it on the command line because it's now cached inside all those
-extra "CVS" directories.  Remember -- you only need to have the CVSROOT set
-for the initial login and checkout.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Updating the sources</title>
-<body>
-
-
-<p>
-Well, there you are -- fresh sources!  Now that you have the sources, you can
-go ahead and compile and install them, inspect them, or do whatever you like
-with them.
-</p>
-<p>
-Every now and then, you may want to bring your checked-out source directory
-in-sync with the current version on CVS.  To do this, you don't need to log in
-to the pserver again; your authentication info is also cached by cvs inside
-those "CVS" accounting directories.  First, enter the main checked-out
-directory (in this case "samba"), and type:
-</p><pre>
-# <i>cvs update -dP</i>
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Looking at "cvs update", part 1</title>
-<body>
-
-<p>If there are any new files, cvs will output "U [path]" lines for each one as it
-updates them.  Also, if you compiled the sources, you will probably see a lot
-of "? [path]" lines; these are object files that cvs notices are not from the
-remote repository.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Looking at "cvs update", part 2</title>
-<body>
-
-<p>
-Also, notice the two command-line options we used for "cvs update".  "-d" tells cvs
-to create any new directories that may have been added to the repository (this
-doesn't happen by default), and "-P" tells cvs to remove any empty directories
-from your locally checked-out copy of the sources.  "-P" is a good idea,
-because cvs has a tendency to collect a lot of empty (once used, but now
-abandoned) directory trees over time.
-</p><p>
-When it comes to simply grabbing the latest sources, that's about all you need
-to know.  Now, we take a look at how to interact with CVS as a developer.
-</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>CVS for developers</title>
-
-<section>
-<title>Modifying files</title>
-<body>
-
-<p>As a developer, you'll need to modify files on CVS.  To do this, simply make
-the appropriate changes to your local copy of the repository.  The changes you
-make to the sources are not applied to the remote repository until you
-explictly tell cvs to "commit" your changes.  When you've tested all your
-modifications to ensure that they work properly and you're ready to apply your
-changes to the repository, follow this two-step process.  First, update your
-sources by typing the following command in your main source directory:
-</p><pre>
-# <i>cvs update -dP</i>
-</pre>
-</body>
-</section>
-
-<section>
-<title>CVS merges others' changes</title>
-<body>
-
-<p>As we've seen earlier, "cvs update" will bring your sources up-to-date with the
-current version in the repository -- but what happens to the changes you've
-made?  Don't worry, they aren't thrown away.  If another developer made changes
-to a file that you haven't touched, your local file will be updated so that
-it's in-sync with the version on the repository.  
-</p>
-<p>And, if you modified lines
-1-10 of a local file, and another developer deleted lines 40-50, added 12 new
-lines at the end of the file, modified lines 30-40 and then committed his
-changes to the repository before you, cvs will intelligently merge these
-changes into your locally modified copy so that none of your changes are lost.
-This allows two or more developers to work on different parts of the same file
-at the same time.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Merging isn't perfect</title>
-<body>
-
-
-<p>
-However, if two or more developers have made changes to the <i>same region of
-the same file</i>, then things get a bit more complicated.  If that happens,
-then cvs will tell you that there's been a conflict.  No work will be lost, but
-a bit of manual intervention will be required, since cvs now requires your
-input on how to merge the conflicting changes.
-</p>
-
-
-</body>
-</section>
-
-
-
-<section>
-<title>The commit</title>
-<body>
-
-
-<p>
-We'll look at exactly how conflicts can be resolved in just a little bit, but
-for now, let's assume that there are no conflicts after you typed "cvs update
--dP" -- there usually aren't.  With no conflicts, your local sources are
-up-to-date, and you're ready to commit your changes to the repository by typing
-the following command in your main source directory:
-</p>
-
-<pre>
-# <i>cvs commit</i>
-</pre>
-
-
-</body>
-</section>
-
-<section>
-<title>What commit does</title>
-<body>
-
-
-<p>"cvs commit" doesn't <i>just</i> apply your changes to the repository.
-Before actually committing your changes to the remote repository, cvs will fire
-up your default editor so that you can type in a description of your
-modifications.  Once you've entered your comments, saved the file and exited
-the editor, your changes (and comments) will be applied to the remote
-repository and will be available to the other developers in your team.
-</p>
-
-
-</body>
-</section>
-
-<section>
-<title>Viewing the log</title>
-<body>
-
-<p>It's really easy to view the complete history of a particular file, along
-with any comments that the developers (including you) may have made when committing.
-To view this information, type:</p>
-
-<pre>
-# <i>cvs log myfile.c</i>
-</pre>
-
-<p>The "cvs log" command is recursive, so if you want to see the complete log for
-an entire directory tree, just enter the directory and type:
-</p>
-<pre>
-# <i>cvs log | less</i>
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Commit options</title>
-<body>
-
-
-<p>
-You may want to use another editor that the one cvs starts by default when you type "cvs commit".
-If so, simply set the EDITOR environment variable to the name of the editor you
-want to use.  Putting a setting such as this one in your ~/.bashrc would be a
-good idea:
-</p>
-
-<pre>
-export EDITOR=jpico
-</pre>
-
-<p>
-Alternatively, you can also specify a log message as a command line option so that
-cvs doesn't need to load up an editor in the first place:
-</p>
-
-<pre>
-# <i>cvs commit -m 'I fixed a few silly bugs in portage.py'</i>
-</pre>
-
-
-</body>
-</section>
-
-<section>
-<title>The .cvsrc file</title>
-<body>
-
-
-<p>
-Before we continue looking at more cvs commands, I recommend setting up a
-~/.cvsrc file.  By creating a .cvsrc file in your home directory, you can tell
-cvs to use preferred command-line options by default so that you don't have to
-remember to type them in each time.  Here's a recommended default .cvsrc file:
-</p>
-
-<pre>
-cvs -q  
-diff -u -b -B
-checkout -P
-update -d -P
-</pre>
-
-
-</body>
-</section>
-
-<section>
-<title>The .cvsrc file, continued</title>
-<body>
-
-
-<p>
-In addition to setting useful options for a bunch of cvs commands, the first
-line of the .cvsrc puts cvs into quiet mode, which has the primary benefit of
-making the "cvs update" output more consise and readable.  Also, once you have
-this .cvsrc in place, you can type "cvs update" instead of typing "cvs update
--dP".
-</p>
-
-
-
-</body>
-</section>
-
-<section>
-<title>Adding a file to the repository</title>
-<body>
-
-<p>
-It's really easy to add a source file to CVS.  First, create the file with your 
-favorite text editor.  Then, type the following:
-</p><pre>
-# <i>cvs add myfile.c</i>
-cvs server: use 'cvs commit' to add this file permanently
-</pre><p>
-This will tell cvs to add this file to the repository the next time you do a
-"cvs commit".  Until then, other developers won't be able to see it.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Adding a directory to the repository</title>
-<body>
-
-
-<p>
-The process of adding a directory to CVS is similar:
-</p>
-
-<pre>
-# <i>mkdir foo</i>
-# <i>cvs add foo</i>
-Directory /home/cvsroot/mycode/foo added to the repository   
-</pre>
-
-<p>
-Unlike adding a file, when you add a directory it appears on the repository
-immediately; a cvs commit isn't required.  Once you add a local directory to
-cvs, you'll notice that a "CVS" directory will be created inside it to serve as
-a container for cvs accounting data.  Thus, you can easily tell if a particluar
-directory has been added to cvs by looking inside it for a "CVS" directory.
-</p>
-
-
-</body>
-</section>
-
-<section>
-<title>"cvs add" notes</title>
-<body>
-
-<p>
-Oh, and as you might guess, before you add a file or directory to the
-repository, you must make sure that its parent directory has already been added
-to CVS.  Otherwise, you'll get an error that looks like this:
-</p>
-
-<pre>
-# <i>cvs add myfile.c</i>
-cvs add: cannot open CVS/Entries for reading: No such file or directory
-cvs [add aborted]: no repository  
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Getting familiar with "cvs update", part 1</title>
-<body>
-
-<p>Before we take a look at how to resolve conflicts, let's get familiar with the
-output of the "cvs update" command.  If you created a ~/.cvsrc file that contains
-a "cvs -q" line, you'll find "cvs update" output a lot easier to read.  "cvs update"
-informs you of what it does and sees by printing out a single character, a space, and
-a filename; as an example:
-</p><pre>
-# <i>cvs update -dP</i>
-? distfiles
-? packages
-? profiles 
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Getting familiar with "cvs update", part 2</title>
-<body>
-
-
-<p>
-"cvs update" uses the "?" character to tell you that it doesn't know anything about
-these particular files that it finds in the local copy of your repository.  They're
-not officially part of the repository, nor have they been scheduled for addition.
-Here's a list of all the other single-character informational messages that CVS uses:
-</p>
-<pre>
-U [path]
-</pre>
-<p>
-Used when a new file is created in your local repository, or an untouched (by you) file
-has been updated.
-</p>
-<pre>
-A [path]
-</pre>
-<p>
-This file is scheduled for addition and will be officially added to the repository when
-you do a "cvs commit".
-</p>
-
-
-</body>
-</section>
-
-
-<section>
-<title>Getting familiar with "cvs update", part 3</title>
-<body>
-
-<pre>
-R [path]
-</pre>
-<p>
-Like "A", an "R" lets you know that this file is scheduled for removal.  The file will
-be removed from the repository as soon as you "cvs commit".
-</p>
-<pre>
-M [path]
-</pre>
-<p>
-This means that this file has been modified by you; additionally, it's possible that 
-new changes from the repository were merged into this file successfully.
-</p>
-<pre>
-C [path]
-</pre><p>
-The "C" character indicates that this file has a conflict and requires manual fixing
-before you can "cvs commit" your changes.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Resolving conflicts intro</title>
-<body>
-
-<p>
-Now, let's take a look at how to resolve a conflict.  I'm very involved in the
-Gentoo Linux project, and we have our own cvs server set up at cvs.gentoo.org.
-We developers spend most of our time hacking away at the sources inside the
-"gentoo-x86" module.  Inside the gentoo-x86 module, we have a file called
-"ChangeLog" that houses (you guessed it) a description of the major changes we
-make to the files in the repository. 
-</p>
-
-
-
-</body>
-</section>
-
-<section>
-<title>An example conflict</title>
-<body>
-
-<p>
-Because this file is modified nearly
-every time a developer makes a major change to CVS, it's a primary source of
-conflicts -- here's an example conflict.  Let's say I add the following lines
-to the top of the ChangeLog:
-</p>
-
-
-<pre>
-date 25 Feb 2001
- 
-This is the thing I added myself
-</pre>
-
-<p>
-However, let's say that before I'm able to commit these three new lines, another
-developer adds these lines to the top of the ChangeLog and commits his changes:
-</p>
-
-<pre>
-date 25 Feb 2001
- 
-This is the part added by another developer
-</pre> 
-
-
-</body>
-</section>
-
-<section>
-<title>An example conflict, continued</title>
-<body>
-
-
-<p>
-Now, when I run "cvs update -dP" (as you should before every commit), cvs isn't
-able to merge his changes into my local copy of ChangeLog because we've both added
-lines to the exact same part of the file -- how is cvs to know which version to use?
-So, I get the following error from CVS:
-</p>
-
-
-<pre>
-RCS file: /home/cvsroot/gentoo-x86/ChangeLog,v
-retrieving revision 1.362
-retrieving revision 1.363
-Merging differences between 1.362 and 1.363 into ChangeLog
-rcsmerge: warning: conflicts during merge
-cvs server: conflicts found in ChangeLog
-C ChangeLog
-</pre>
-
-
-</body>
-</section>
-
-<section>
-<title>Conflict resolution, part 1</title>
-<body>
-
-
-<p>
-Argh -- a conflict!  Fortunately, fixing conflicts is easy.  If I fire up my
-favorite text editor, I see the following text at the top of the ChangeLog
-file:
-</p>
-
-<pre>
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; ChangeLog
-date 25 Feb 2001
- 
-This is the thing I added myself
- 
-=======
-date 25 Feb 2001
- 
-This is the part added by another developer
- 
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.363
-</pre>
-
-
-</body>
-</section>
-
-
-<section>
-<title>Conflict resolution, part 2</title>
-<body>
-
-
-<p>
-Instead of choosing one version over the other, cvs has added both versions to
-the ChangeLog file, and surrounded them with special separators to clearly mark
-the conflict in question.  Now, it's up to me to replace this region with the
-text that <i>should</i> appear in ChangeLog; in this case, the replacement text
-is neither one or the other version but a combination of both:
-</p>
-
-<pre>
-date 25 Feb 2001
-
-This is the thing I added myself
-
-This is the part added by another developer
-</pre>
-
-<p>
-Now that I've replaced the conflicting region of the file with the appropriate text
-(and removed the "=======", etc markers), I can now commit my changes to cvs without
-any problems.
-</p>
-
-
-</body>
-</section>
-
-<section>
-<title>Conflict resolution tips</title>
-<body>
-
-
-<p>
-Whenever you need to edit a file for conflicts, make sure that you scan the
-entire file so that you catch all of them; if you forget to address a
-particular conflict, cvs won't allow you to commit until it's resolved!  It's
-also obviously very important to remove the special markers that cvs added to
-the conflicting file.  Another tip -- if you make a mistake while fixing the
-conflict and then ("D'oh!") accidentally save your changes, you can find an
-original copy of your version in the file ".#filename.version".  
-</p>
-
-
-
-
-</body>
-</section>
-
-<section>
-<title>Removing a file</title>
-<body>
-
-
-<p>
-Now, it's time to learn our final CVS skill -- removing files from the repository.  Removing a
-file is a two-stage process.  First, delete the file from your local copy of
-the sources, and then execute the appropriate "cvs remove" command:
-</p>
-
-<pre>
-# <i>rm myoldfile.c</i>
-# <i>cvs remove myoldfile.c</i>
-</pre>
-
-
-</body>
-</section>
-
-<section>
-<title>Removing a file, continued</title>
-<body>
-
-<p>
-The file will then be scheduled for removal from the repository the next time
-you do a commit.  Once committed, the file will be officially deleted from the
-current version of the repository.  However, cvs won't throw this file away,
-and will still keep a complete record of its contents and its history, just
-in case you need it back in the future.  This is just one of the many ways that
-cvs protects your valuable source code.
-</p>
-
-<p>
-"cvs remove" is recursive, which means that you can delete a bunch of files, and
-then run the "cvs remove" command with no other arguments from a parent directory.
-Doing this will cause all of the deleted files to be tagged for removal at the 
-next commit.
-</p>
-
-
-</body>
-</section>
-
-<section>
-<title>Removing a directory</title>
-<body>
-
-<p>
-If you'd like to remove an entire directory, I recommend the following process.
-First, physically delete and "cvs remove" all files in the directory:
-</p>
-<pre>
-# <i>rm *.c</i>
-# <i>cvs remove</i>
-</pre>
-
-</body>
-</section>
-
-<section>
-<title>Removing a directory, continued</title>
-<body>
-
-<p>
-Then, perform a commit:
-</p>
-
-<pre>
-# cvs commit
-</pre>
-
-<p>
-Here comes the trick.  Perform the following steps to delete the directory:
-</p>
-
-<pre>
-# <i>cd ..</i>
-# <i>cvs remove mydir</i>
-# <i>rm -rf mydir</i>
-</pre>
-
-<p>
-Notice that removing the directory didn't require another commit -- directories are
-added to and removed from the repository in real-time.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Complete!</title>
-<body>
-
-<p>
-Your introduction to CVS is complete -- I hope that this tutorial has been helpful.
-There's much more to CVS than I've been able to cover in this introductory tutorial, but thankfully
-there are a bunch of great CVS resources you can use to further expand your CVS knowledge: 
-</p>
-<p>
-<ul>
-<li><uri>http://www.cvshome.org</uri> is the home of CVS development,
-	and offers a bunch of documentation on CVS, including the <uri link="http://www.cvshome.org/docs/manual/cvs.html">official CVS documentation online</uri>.
-</li>
-<li>
-	The <uri link="http://www.durak.org/cvswebsites/">CVS Version Control for Web Site Projects site</uri> has good info on how to use CVS for developing
-	web sites.
-</li>
-<li>
-	Karl Fogel has written a book called <uri link="http://cvsbook.red-bean.com/">Open Source Development with CVS</uri>.  A number of chapters are available
-	for free from the website.
-</li>
-<li>
-	<uri link="http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/">cvsweb</uri> is a really great CGI script that provides a web interface to your CVS
-	repository; excellent for browsing.
-</li>
-<li>
-	The <uri link="http://www.loria.fr/~molli/cvs-index.html">CVS Bubbles</uri> site has a bunch of good resources including a CVS FAQ-o-matic.
-</li>	
-
-</ul>
-</p>
-
-</body>
-</section>
-<section>
-<body>
-<note>
-This tutorial first appeared in the <uri link="http://www.ibm.com/developerworks/linux">IBM developerWorks Linux Zone</uri>, entitled <uri link="http://www-105.ibm.com/developerworks/education.nsf/linux-onlinecourse-bytitle/A5C4A0AF4296C66886256A0E005DE112?OpenDocument">CVS for the developer or amateur</uri>.  This article is property of Tenco Media Corporation.
-</note>
-</body>
-</section>
-
-</chapter>
-</guide>
-	
diff --git a/app-doc/gentoo-web/files/xml/desktop.xml b/app-doc/gentoo-web/files/xml/desktop.xml
deleted file mode 100644
index c3e45dc80a10..000000000000
--- a/app-doc/gentoo-web/files/xml/desktop.xml
+++ /dev/null
@@ -1,1041 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/desktop.html">
-<title>Gentoo Linux Desktop Configuration Guide</title>
-<author title="Editor"><mail link="g2boojum@gentoo.org">Grant Goodyear</mail></author>
-
-<abstract>
-   This guide shows you configure Gentoo Linux to be a full-purpose
-   desktop system.  Specifically, we walk through installing and 
-   configuring X, KDE, OSS and alsa (sound), postfix (electronic mail), 
-   cups (printing),
-   and samba (unix/windows interoperability).
-</abstract>
-
-<version>0.23</version>
-<date>18 Oct 2001</date>
-
-<chapter>
-<title>Preliminaries</title>
-<section>
-<body>
-<p>Needless to say, you first need to have Gentoo Linux installed
-(<uri>http://www.gentoo.org/index-download.html</uri>).  Having finished
-that rather enjoyable process, you also need to download the <e>Portage</e>
-tree.  You really should read the Portage User Guide 
-(<uri>http://www.gentoo.org/doc/portage-user.html</uri>), but if you're
-in a hurry you just need to type:
-</p>
-<pre># <i>emerge rsync</i></pre>
-<p>A quick note is in order about the packages that I have chosen to 
-discuss here.  Gentoo Linux has a considerable wealth of window managers,
-mail transport agents, etcetera that can easily be installed.  The specific
-packages that I have chosen to cover are not preferred by Gentoo Linux, they
-are simply packages that the author likes and/or knows how to configure.
-In other words, they're the packages on the author's own desktop.</p>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>X and KDE</title>
-
-<section>
-<title>Installation</title>
-<body>
-<p>
-Having installed Gentoo Linux and updated Portage, 
-my first task is generally to install X
-and KDE.  X takes forever to compile, and KDE takes even longer,
-so I highly recommend doing this right before going to bed.
-</p>
-<p>
-It's always useful to use the <c>--pretend</c> flag before doing
-an <c>emerge</c> to see what dependencies are going to be installed, and in our
-case it's quite a lot.
-</p>
-<pre>
-# <i>emerge --pretend kde-base/kdebase</i>
-
-These are the packages that I would merge, in order.
-
-Calculating dependencies............... done!
-[ebuild N  ] media-sound/cdparanoia-3.9.8 to /
-[ebuild N  ] media-libs/jpeg-6b-r2 to /
-[ebuild N  ] media-libs/tiff-3.5.6_beta to /
-[ebuild N  ] x11-base/xfree-4.1.0 to /
-[ebuild N  ] x11-libs/openmotif-2.1.30-r1 to /
-[ebuild N  ] media-libs/alsa-lib-0.5.10-r1 to /
-[ebuild N  ] media-libs/mesa-glu-3.4.2 to /
-[ebuild N  ] kde-base/kde-env-2.1 to /
-[ebuild N  ] media-libs/lcms-1.06 to /
-[ebuild N  ] media-libs/libmng-1.0.1 to /
-[ebuild N  ] media-libs/audiofile-0.2.1 to /
-[ebuild N  ] media-libs/libpng-1.0.11 to /
-[ebuild N  ] x11-libs/qt-x11-2.3.0 to /
-[ebuild N  ] app-text/sgml-common-0.6.1 to /
-[ebuild N  ] kde-base/kdelibs-2.1.2 to /
-[ebuild N  ] kde-base/kdebase-2.1.1-r1 to /
-<comment>Your dependencies will probably be different</comment>
-
-# <i>emerge kde-base/kdebase</i>
-</pre>
-<p>Have a nice nap!</p>
-<note>If you have a Gentoo Linux binary CD, then you can install
-the packages directly off of the CD.</note>
-<pre caption="Installing binary packages from the CD">
-# <c>export PKGDIR=/mnt/cdrom/gentoo/packages</c>
-<comment>Normally Portage expects packages to be in /usr/portage/packages
-</comment>
-# <c>emerge --usepkg /mnt/cdrom/gentoo/packages/All/kdebase-x.y.z.tbz2</c>
-<comment>The <c>--usepkg</c> flag makes sure that binary packages are used
-for the dependencies (if available).</comment>
-</pre>
-</body>
-</section>
-
-<section>
-<title>Configuring</title>
-<body>
-<p>
-I like using the console-based <c>xf86config</c> program to configure X.
-Before you start, you'll need to know the horizontal and vertical refresh
-rates of your monitor (my viewsonic G773 has Horizontal: 30-69 KHz, 
-Vertical: 55-90 KHz), the type and amount of ram (in KB) of your video card
-(a 32768 KB GeForce card, in my case), and the type and device of your
-mouse (an intellimouse plugged into the ps/2 port <path>/dev/psaux</path>).
-</p>
-<pre># <c>/usr/X11R6/bin/xf86config</c></pre>
-<p>Because I have a three-button mouse I choose not to enable 
-3-button emulation.  I don't add any additional XKB keyboard options
-because I don't know what any of them do.  You'll have to guess at
-a screen resolution and pixel depth that you'll like.  I happen
-to like 1280x1024 at 24bpp on my viewsonic, but that's only because it
-doesn't work at a higher resolution.  If you've never done this before,
-don't be surprised if you end up running <c>xf86config</c> multiple
-times.</p>
-
-<note>If you don't know the refresh rates of your monitor, try doing a 
-google search, <uri>http://www.google.com</uri>, on the model number and
-manufacturer of your monitor.  The refresh rates are generally given as
-part of the monitor specs.</note>
-
-<warn>If you're an X-configuring veteran, you may be used to making
-a symbolic link from your mouse device to <path>/dev/mouse</path>.  If
-you are using <c>devfs</c> you may be unpleasantly surprised to discover
-that your link is not preserved upon rebooting.  Instructions for registering
-<path>/dev/mouse</path> with devfs can be found in the Gentoo faq,
-<uri>http://www.gentoo.org/doc/faq.html</uri>. </warn>
-
-<pre># <i>startx</i></pre>
-<p>If you configured X properly, running <c>startx</c> should start an
-amazingly ugly X window manager (twm, to be specific).  If X comes up,
-you're good to go.  Hit <c>&lt;ctrl&gt;&lt;alt&gt;&lt;backspace&gt;</c>
-to kill the X server.</p>
-
-<p>If you have a wheel mouse you'll want to edit the XF86Config file
-by hand:</p>
-<pre>
-# <i>cp /etc/X11/XF86Config /etc/X11/XF86Config.working</i>
-# <i>nano /etc/X11/XF86Config</i></pre>
-<pre caption="Pointer section of XF86Config">
-Section "InputDevice"
-
-# Identifier and driver
-
-    Identifier	"Mouse1"
-    Driver	"mouse"
-    <i>Option "Protocol"    "IMPS/2" </i>
-    Option "Device"      "/dev/psaux"
-    <i>Option "ZAxisMapping"	"4 5"</i>
-
-</pre>
-<p>Because I have an intellimouse I changed the "Protocol" from 
-"PS/2" to "IMPS/2".  Getting the wheel to scroll just requires
-adding the 'Option "ZAxisMapping" "4 5"' line, where '4' and '5'
-correspond to mouse wheel up and mouse wheel down.
-</p>
-<note>Netscape 4.x won't scroll with the wheel by default; you'll need
-to create an .Xdefaults file first.  See 
-<uri>http://www-sop.inria.fr/koala/colas/mouse-wheel-scroll/</uri>
-for instructions.  Better yet, use <c>konqueror</c>, <c>opera</c>,
-<c>mozilla</c>, <c>galeon</c>, or some other real browser.</note>
-
-<p>Run <c>startx</c> again just to make sure that X still comes up.
-Assuming that it does, kill X and we'll start a real window manager
-instead.  
-Thanks to Achim, Danarmak and Verwilst, Gentoo's KDE packagers, the
-KDE ebuild configures KDE quite well all by itself.  The KDM display
-manager should work just by starting it.</p>
-<pre># <i>kdm</i></pre>
-<p>You should be able to log in and see KDE in full working order.
-Of course sound shouldn't be working yet, so you'll miss the annoying
-KDE start-up sound, but we'll fix that in a moment.  Open a 
-konsole, type <c>ls /usr/bin</c> (or anything else that more than fills 
-the konsole window), and see if the mouse wheel lets
-you scroll up and down in the konsole window.  It really should
-work!</p>
-
-<p>All that's left is to make sure that X comes up when Gentoo boots.
-Edit <path>/etc/rc.conf</path> so that 
-<e>DISPLAYMANAGER="kdm"</e>.  
-</p>
-<pre>
-# <i>nano /etc/rc.conf</i>
-</pre>
-<pre caption="/etc/rc.conf -- setting DISPLAYMANAGER">
-<!-- gpm not yet in rc.conf
-MOUSE="ms"				# Set to the mouse type as used by gpm (auto, ps2, ms, etc.)
-
--->
-DISPLAYMANAGER="<comment>kdm</comment>"			# Enter your display manager here (xdm,kdm,gdm)
-</pre>
-<note>Pre-rc6 users need to edit <path>/etc/rc.d/config/basic</path> instead.</note>
-<p>
-Now we just need to make sure that the
-<e>xdm</e> start-up script is read when booting.
-</p>
-<pre caption="rc6+ users">
-# <i>rc-update add xdm default</i>
-</pre>
-<pre caption="Only for pre-rc6 users">
-# <i>rc-update add xdm</i>
-# <i>nano /etc/inittab</i>
-</pre>
-<pre caption="the initdefault line, configured to start kdm (runlevel 4), only for pre-rc6 users">
-# Default runlevel.
-
-id:<comment>4</comment>:initdefault:
-</pre>
-<p>Reboot, and see if X comes up!</p>
-<impo>The <c>rc-update</c> command is Gentoo Linux's improved version of
-the venerable <c>chkconfig</c> command for managing init scripts.  Type
-<c>rc-update</c> by itself for a list of options.
-</impo>
-
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Sound</title>
-<section>
-<title>Alsa</title>
-<body>
-
-<p>Gentoo Linux supports Alsa for sound using the default kernel.  Alsa can
-be run with or without <e>devfs</e>.  One note; if you've installed a new
-<path>sys-kernel/linux-sources</path> package, make sure that your Linux kernel
-has sound support enabled.</p>
-
-<pre>
-# <i>emerge media-sound/alsa-driver</i>
-<comment>the Alsa modules will now be installed</comment>
-# <i>depmod -a</i>
-</pre>
-<p>
-I am going to assume
-here that you have <e>devfs</e> enabled; if you don't then please
-see the Gentoo FAQ:
-<uri>http://www.gentoo.org/doc/faq.html</uri>.
-</p>
-<pre>
-# <i>nano /etc/modules.autoload</i>
-</pre>
-<pre caption="modules.autoload with Alsa modules">
-# Put modules to be loaded, with arguments, one per line
-# The following lines will be called with "modprobe"
-  
-snd-card-emu10k1
-snd-pcm-oss
-
-</pre>
-<note>Pre-rc6 users will need to edit <path>/etc/rc.d/config/modules</path>
-instead.</note>
-<p>
-You'll want to replace <e>snd-card-emu10k1</e> with the
-appropriate sound card for your system.  Look in
-<path>/lib/modules/[kernel version]/misc/</path>
-for a list of modules.  If you'd like to have OSS compatibility, it's
-a very good idea to make sure the <e>snd-pcm-oss</e> line is also in there.
-</p>
-<warn>
-Whatever you do, don't add kernel modules to 
-<path>/etc/modules.conf</path> (if it exists).  The <path>/etc/modules.conf</path>
-file is autogenerated at boot time, so any changes made there will 
-be lost.
-</warn>
-<!--
-<p>Now we set up the <e>kerneld</e> aliases.</p>
-<pre>
-# <i>nano /etc/modules/2.4.4-ac9</i>
-</pre>
-<pre caption="end of /etc/modules/2.4.4-ac9 with Alsa additions">
-depfile=/lib/modules/2.4.4-ac9/modules.dep
-persistdir=/var/lib/modules/persist
- 
-<i># Alsa</i>
-<i>alias char-major-116 snd</i>
- 
-<i># OSS stuff</i>
-<i>alias snd-card-0 snd-card-emu10k1</i>
-<i>alias char-major-14 soundcore</i>
-<i>alias sound-slot-0 snd-card-0</i>
-<i>alias sound-service-0-0 snd-mixer-oss</i>
-<i>alias sound-service-0-1 snd-seq-oss</i>
-<i>alias sound-service-0-3 snd-pcm-oss</i>
-<i>alias sound-service-0-12 snd-pcm-oss</i>
-</pre>
-<p>
-Again, you'll want to replace <e>snd-card-emu10k1</e> with
-your sound card and kernel version <e>2.4.4-ac9</e> with your kernel
-version.
-</p>
--->
-<p>You should also verify that <path>/etc/devfsd.conf</path>
-has the alsa devices and permissions correctly registered.</p>
-<pre>
-# <i>nano /etc/devfsd.conf</i>
-</pre>
-<pre caption="end of devfsd.conf file with Alsa additions">
-CHANGE          .*              COPY    $devpath /dev-state/$devname
-CREATE          .*              COPY    $devpath /dev-state/$devname
- 
-<i># Alsa stuff</i>
-<i>LOOKUP          snd             MODLOAD ACTION snd</i>
-<i>REGISTER        sound/.*        PERMISSIONS root.audio 660</i>
-<i>REGISTER        snd/.*          PERMISSIONS root.audio 660</i>
-</pre>
-<note>Notice that devfsd.conf sets <path>/dev/sound</path>
-permissions to be <c>root.audio</c>.  Thus, for non-root users to
-use audio they will have to be part of the <c>audio</c> group.
-</note>
-<p>
-Reboot, and all of the sound stuff should be loaded.  You won't
-hear any sound yet, though, because alsa keeps all sound channels
-muted by default.
-</p>
-<pre>
-# <i>emerge media-sound/alsa-utils</i>
-# <i>amixer</i>
-
-Group 'Input Gain',0
-  Capabilities: volume mute jointly-mute
-  Channels: Front-Left Front-Right
-  Limits: min = 0, max = 15
-  Front-Left: 11 [73%] [mute] [---]
-  Front-Right: 11 [73%] [mute] [---]
-Group 'Master Mono',0
-  Capabilities: volume mute capture exclusive-capture
-  Capture exclusive group: 1
-  Channels: Front-Left Front-Right
-  Limits: min = 0, max = 31
-  Front-Left: 23 [74%] [mute] [---]
-  Front-Right: 23 [74%] [mute] [---]
-Group 'Headphone',0
-  Capabilities: volume mute jointly-mute
-  Channels: Front-Left Front-Right
-  Limits: min = 0, max = 31
-  Front-Left: 0 [0%] [mute] [---]
-  Front-Right: 0 [0%] [mute] [---]
-Group 'Master',0
-  Capabilities: volume mute jointly-mute capture exclusive-capture
-  Capture exclusive group: 1
-  Channels: Front-Left Front-Right
-  Limits: min = 0, max = 63
-  Front-Left: 50 [79%] [mute] [---]
-  Front-Right: 50 [79%] [mute] [---]
-<comment>[chopped for brevity]</comment>
-
-# <i>amixer set Master 100 unmute</i>
-# <i>amixer set PCM 100 unmute</i>
-# <i>aplay /usr/share/sounds/pop.wav</i> <comment>(pop.wav is part of KDE)</comment>
-</pre>
-<p>
-After installing the alsa utilities we use <c>amixer</c> to 
-unmute the Master and PCM sound channels and to set their volume
-to 100%.  We check to see if sound is working by using the 
-<c>aplay</c> (alsa play) command.  If you hear a pop, then sound
-is indeed working.  Then, adjust the volume settings to your liking;
-the ncurses-based <c>alsamixer</c> is a great way to get them "just so".
-</p>
-<pre caption="rc6+ users only">
-# <i>rc-update add alsa default</i>
-</pre>
-<note>For pre-rc6 users the alsa-utils ebuild automatically adds the
-<e>alsa</e> init script to runlevels 3, 4, and 5.</note>
-<p>
-When you reboot your system, the <e>alsa</e> init
-script will properly save and restore your volume settings.
-</p>
-</body>
-</section>
-<section>
-<title>Standard Kernel Sound Modules</title>
-<body>
-<p>Out of the box, Gentoo Linux doesn't support the standard
-kernel modules.  You'll have to recompile the kernel. (Generally,
-we prefer Alsa over the standard modules since they perform
-better and have niftier features, see above.)
-For standard kernel sound, install the <path>linux-sources</path>
-ebuild:</p>
-<pre>
-# <i>cd /usr/portage/sys-kernel/linux-sources</i>
-# <i>emerge linux-sources-x.y.z.ebuild</i>
-</pre>
-<p>The linux-sources ebuild installs the sources into /usr/src,
-and you can then compile the kernel (and your sound module)
-in the usual manner 
-(<uri>http://www.linuxdoc.org/HOWTO/Kernel-HOWTO.html</uri>).
-If you choose to compile the sound driver as a module (not
-compile it directly into the kernel), they you need to add
-the module name (without the .o extension) to <path>/etc/modules.autoload</path>
-(rc6+ users) or
-<path>/etc/rc.d/config/modules</path> (pre-rc6 users).</p>
-<p>
-Reboot the machine.  With any luck the appropriate sound driver 
-should now be loaded.  To actually produce sound, a few more steps
-are required.
-</p>
-<pre>
-# <i>cd /dev</i>
-# <i>/usr/sbin/MAKEDEV audio</i>
-#
-# <i>cat /usr/share/sounds/pop.wav &gt; /dev/dsp</i>
-# <i>emerge media-sound/sox</i>
-# <i>play /usr/share/sounds/pop.wav</i>
-</pre>
-<p>
-If any sound at all results from cat'ing the .wav file to 
-<path>/dev/dsp</path>, then sound is probably working.
-By emerge'ing sox one can use the <c>play</c> command to 
-play .wav files (and, unlike using <c>cat</c>, the .wav file
-should sound good when using <c>play</c>).
-</p>
-<!-- 
-found that when running <e>devfs</e> the /dev/MAKEDEV script
-would be missing.  Help? Well, you shouldn't need to run MAKEDEV if you're
-using devfs (maybe to get /dev/dsp created?), but if you need it, its real home is in /usr/sbin (/dev/MAKEDEV is
-a symlink.  I changed the text to reflect this. [drobbins]
--->
-</body>
-</section>
-<section>
-<title>Sound and KDE</title>
-<body>
-<p>
-KDE has some nice sound utilities, including the KDE sound mixer 
-<c>kmix</c>.  
-</p>
-<pre>
-# <i>emerge --pretend kde-base/kdemultimedia</i>
- 
-These are the packages that I would merge, in order.
- 
-Calculating dependencies...... done!
-[ebuild N  ] media-sound/esound-0.2.22-r2 to /
-[ebuild N  ] media-libs/libogg-1.0_beta4 to /
-[ebuild N  ] media-libs/libvorbis-1.0_beta4 to /
-[ebuild N  ] dev-libs/glib-1.2.10 to /
-[ebuild N  ] x11-libs/gtk+-1.2.10-r1 to /
-[ebuild N  ] kde-base/kdemultimedia-2.1.1 to /
-
-# <i>emerge kde-base/kdemultimedia</i>
-# <i>kmix</i>
-</pre>
-<note>If kmix cannot find a mixer, then it probably thinks you don't
-have sound support.  Log out and remove ~/.kde and ~/Desktop (the latter
-may not be necessary), then log in again.  This time it should find 
-the sound mixer properly.
-</note>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Mail</title>
-<section>
-<title>Postfix -- Install and Configure</title>
-<body>
-<p>
-I happen to like the <c>postfix</c> mail system because it emulates
-<c>sendmail</c> without the considerable nightmare of having to 
-configure <c>sendmail</c>.  While we're at it we'll also install 
-<c>mutt</c>, a mail reader, so that we can test out our 
-<c>postfix</c> configuration.
-</p>
-<pre>
-# <i>emerge --pretend net-mail/postfix net-mail/mutt</i>
-
-These are the packages that I would merge, in order.
- 
-Calculating dependencies... done!
-[ebuild N  ] dev-libs/libpcre-3.4-r1 to /
-[ebuild N  ] net-mail/mailbase-0.00-r1 to /
-[ebuild N  ] net-mail/postfix-20010228.2 to /
-[ebuild N  ] net-mail/mutt-1.3.22.1 to /
-
-# <i>emerge net-mail/postfix net-mail/mutt</i>
-</pre>
-<p>
-If you only intend to use your mail server for sending mail,
-then postfix is already set up for you.  Otherwise, you'll 
-want to edit <path>/etc/postfix/main.cf</path>.  The 
-<path>main.cf</path> file is reasonably well documented, and
-the defaults are reasonable for a standalone machine.  If
-your workstation is directly on the internet (i.e., having
-its own non-private IP address and DNS name) then the only
-change you will probably have to make is enabling postfix to receive
-mail.
-</p>
-<pre caption="turning on mail reception in main.cf">
-# RECEIVING MAIL
-
-# The inet_interfaces parameter specifies the network interface
-# addresses that this mail system receives mail on.  By default,
-# the software claims all active interfaces on the machine. The
-# parameter also controls delivery of mail to user@[ip.address].
-#
-#inet_interfaces = all
-#inet_interfaces = $myhostname
-#inet_interfaces = $myhostname, localhost
-<i>inet_interfaces = $myhostname, localhost</i>
-<i>mydestination = $myhostname, localhost.$mydomain</i>
-</pre>
-
-
-</body>
-</section>
-<section>
-<title>Postfix Testing (with Mutt)</title>
-<body>
-<p>
-Let's see if it works.
-</p>
-<pre>
-# <i>postfix check</i>
-postfix-script: warning: creating missing Postfix pid directory
-postfix-script: warning: creating missing Postfix incoming directory
-postfix-script: warning: creating missing Postfix active directory
-postfix-script: warning: creating missing Postfix bounce directory
-postfix-script: warning: creating missing Postfix defer directory
-postfix-script: warning: creating missing Postfix deferred directory
-postfix-script: warning: creating missing Postfix flush directory
-postfix-script: warning: creating missing Postfix saved directory
-postfix-script: warning: creating missing Postfix corrupt directory
-postfix-script: warning: creating missing Postfix public directory
-postfix-script: warning: creating missing Postfix private directory
-# <i>postfix start</i>
-postfix-script: starting the Postfix mail system
-# <i>newaliases</i>
-# <i>mutt -x root</i>
-/root/.maildir does not exist. Create it? ([y]/n): <comment>[answer y]</comment>
-To:  &lt;root&gt;
-Subject: test
-(End message with a . on a line by itself)
-test
-.
-
-# <i>mutt</i>
-<comment>[You should see your message]</comment>
-</pre>
-<p>
-By using <c>postfix check</c> we make sure that <path>main.cf</path>
-parses properly and a number of important directories are created.
-Running <c>postfix start</c> then starts the mailer, and 
-<c>newaliases</c> sets up the system mail aliases.  I then used
-<c>mutt</c> (in <c>mailx</c>, or old-fashioned <c>mail</c>, mode)
-to send a message to myself on the local machine.  Along the way
-<c>mutt</c> creates the user's (root's, in this case) mail spool
-directory, <path>~/.maildir</path>.  Running <c>mutt</c> in
-full interactive mode then showed me my message, so at least local
-sending and delivery is working.  I then sent mail to one of my
-non-local email addresses (not shown) and verified that the mail
-did, indeed, get there.
-</p>
-<warn>If you send mail to an account using the default 
-<path>main.cf</path> from a machine on a private network, then
-it is possible you will never see it.  Many mail servers automatically
-reject mail coming from a source that can't be reached by reverse-DNS.
-</warn>
-<p>
-Assuming everything is working, then it's time to set up postfix
-so that it starts at boot time (unless you're running rc6+, in which
-case it is already set up for you).
-</p>
-<pre caption="Pre-rc6 users only!">
-# <i>postfix stop</i>
-postfix-script: starting the Postfix mail system
-# <i>rc-update add postfix</i>
-Adding postfix to runlevel 2 3 4
-# <i>/etc/rc.d/init.d/postfix start</i>
-Starting postfix......     [  ok  ]
-</pre>
-<note>Veteran <c>sendmail</c> or <c>postfix</c> junkies may
-be more used to storing mail in 
-<path>/var/spool/mail</path> instead of in the user directories,
-and that mail is then stored in <e>mbox</e> format instead of
-in <e>maildir</e> format.  It is not all that hard to reconfigure
-<c>postfix</c> and <c>mutt</c> to use the standard unix mailbox
-system (<e>mbox</e>) format instead.  Edit <path>/etc/postfix/main.cf</path>
-to comment out <i>home_mailbox</i> and uncomment
-<i>mail_spool_directory = /var/spool/mail</i>.
-Make the mail spool directory with 
-<c>mkdir -p /var/spool/mail</c> and restart <c>postfix</c>.
-That will take care of the mailer, for <c>mutt</c> you just
-have to edit <path>/etc/mutt/Muttrc</path> to use <e>mbox</e>
-with <i>set mbox_type = mbox</i> 
-and the <path>/var/spool/mail</path> directory
-with <i>set spoolfile=/var/spool/mail</i>.
-</note>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Printing</title>
-<section>
-<title>Simple printing -- PDQ</title>
-<body>
-<p>
-For simple systems where you don't need <c>samba</c>
-support the PDQ printing system is nice and simple.
-</p>
-<pre>
-# <i>emerge net-print/pdq</i>
-# <i>xpdq</i>
-</pre>
-<p>
-Just click on <path>Printer/Add printer</path> and add your
-printer.  If your type of printer isn't listed, see
-<uri>http://www.linuxprinting.org</uri>, and you can
-generate the required files from their web site.  You will
-want to click on "Driver options" to further finish configuring
-the printer in <c>xpdq</c>.  Any printers set up by running
-<c>xpdq</c> as root will be available to all users.  That's all
-it takes!
-</p>
-</body>
-</section>
-<section>
-<title>Full-fledged printing -- CUPS</title>
-<body>
-<p>
-CUPS is a much larger print spooler that is fully suitable for
-use as a large-scale print server.  Fortunately it is pretty easy
-to set up, since most of the configuration can be done using CUPS'
-built-in web server.  Although CUPS is nominally a System V
-print spooler (meaning that it uses the <c>lp</c> series of
-commands) it emulates all of the <c>lpr</c> commands as
-well.
-</p>
-<pre>
-# emerge --pretend net-print/gimp-print-cups
-These are the packages that I would merge, in order.
- 
-Calculating dependencies.. done!
-[ebuild N  ] net-print/cups-1.1.10-r6 to /
-[binary N  ] net-print/gimp-print-cups-4.1.1 to /
-# emerge gimp-print-cups-4.1.1.ebuild
-# rc-update add cupsd default
- * cupsd added to runlevel default...
- * Caching service dependencies...                                        [ ok ] 
- * rc-update complete.
-# /etc/init.d/cupsd start
-Starting Common Unix Printing System...... [  ok  ]
-# konqueror localhost:631
-</pre>
-<note>Pre-rc6 users need to use <c>rc-update add cupsd</c> and
-<c>/etc/rc.d/init.d/cupsd start</c> instead of what is given above.</note>
-<p>
-The <c>gimp-print-cups</c> package is a set of printer drivers for cups,
-which is useful because the cups package itself includes drivers only
-for HP and Epson printers.
-Building <c>gimp-print-cups</c>
-builds cups as a dependency.  Once cups is built
-we add its init scripts to the default runlevel using 
-<c>rc-update</c>, and then we turn on the cups daemon by starting
-the init script.
-</p>
-<p>
-Configuring cups simply requires using a web browser to connect to the
-web server that cups runs on the localhost network on port 631.
-[Note that because the cups web server runs on localhost and <e>not</e>
-on any of the ethx interfaces, it is reasonably secure.  Of course, that
-also means that it is difficult to administer cups remotely in any
-sort of nice fashion (the command-line <c>lpadmin</c> command
-would be an option, but it is also a considerable nightmare).  Fortunately,
-the cups web server renders quite well in <c>lynx</c>, so it can be 
-administered from a terminal window.]  Once you connect to the web
-interface, click (or its equivalent if using <c>lynx</c>) on "Do
-Administrative Tasks".  You will be asked for the cups account name
-(use "root") as well as for the root password.  Again, since the web server
-exists only on localhost, you don't have to worry about that information 
-being transmitted on the internet.  To add a printer click on "Add Printer",
-and follow the directions.  Help may be obtained by clicking on "Help", and
-then reading the Software Administrator's Manual.  If you find that you
-lack the appropriate printer driver then you can create one by heading
-to the rather impressive <uri>http://www.linuxprinting.org</uri> site.
-</p>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Samba</title>
-<section>
-<body>
-<p>
-Samba is a remarkable package that lets your linux box share files
-and printers with MS Windows machines.  For more detailed information read
-the Samba articles by Daniel Robbins at 
-<uri>http://www.ibm.com/developerworks</uri>.
-</p>
-<pre>
-# <i>emerge net-fs/samba</i>
-# <i>rc-update add samba default</i>
-# <i>cd /etc/smb</i>
-# <i>cp /etc/smb/smb.conf.eg /etc/smb/smb.conf</i>
-# <i>nano /etc/smb/smb.conf</i>
-</pre>
-<note>Pre-rc6 users will need to use <c>rc-update add samba</c> (without the "default").</note>
-<pre caption="smb.conf -- workgroup">
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
-   workgroup = MYGROUP <comment>[change to match your workgroup]</comment>
-</pre>
-<pre caption="smb.conf -- printing with cups">
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
-;   printing = bsd
-    printing = cups
-</pre>
-<pre caption="smb.conf -- encryption">
-# You may wish to use password encryption. Please read
-# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
-# Do not enable this option unless you have read those documents
-  encrypt passwords = yes
-</pre>
-<p>
-I have fairly minimal Samba needs.  I just want to be able to share
-files between my linux and windows machines, and I want to use my
-linux box as a print server (using <c>cups</c>).  After installing,
-it suffices to make a few minor edits to the <path>/etc/smb/smb.conf</path>
-file.  Specifically, the <e>workgroup</e> variable needs to match the
-workgroup for the windows network (I usually use "OLYMPUS", but "WORKGROUP"
-is the default on windows if I
-remember correctly), <e>printing</e> needs to be <e>cups</e>
-instead of <e>bsd</e>, and the <e>encrypt passwords = yes</e> line needs
-to be uncommented.  Windows machines use encrypted passwords by default,
-so that last change is essential unless you want to hack the Windows 
-registry on all of your windows machines <comment>[not recommended]</comment>.
-Unfortunately, Windows uses a different encryption method for passwords than
-does Linux, so you have to maintain a separate password file for samba.
-</p>
-<pre>
-# <i>smbpasswd -a grant</i> <comment>[Replace "grant" with your user name]</comment>
-New SMB password:
-Retype new SMB password:
-startsmbfilepwent_internal: unable to open file /etc/smb/private/smbpasswd. Error was No such file or directory
-Added user grant.
-</pre>
-<note>
-Before adding a user to samba's password list that user must first be
-listed in <path>/etc/passwd</path>.
-</note>
-<p>
-For each user that you want to be able to use samba from a windows machine
-you need to run the <c>smbpasswd</c> command.  Samba stores passwords in
-<path>/etc/smb/private/smbpasswd</path>, which will be created for you 
-the first time you run the <c>smbpasswd</c> command, albeit with the 
-cosmetic "error" seen above.
-</p>
-<pre>
-# <i>/etc/init.d/samba start</i>
-Starting samba...        [  ok  ]
-</pre>
-<note>Pre-rc6 users will use <c>/etc/rc.d/init.d/samba start</c> instead.</note>
-<p>
-Start samba, and you should be able to connect to your Gentoo Linux
-box from any of your windows machines and see the home directory for
-whatever user you connect as and also whatever printers you have set up.
-If you can't connect, take a look at 
-<path>/usr/share/doc/samba-2.2.0a/textdocs/DIAGNOSIS.txt.gz</path>
-for additional help.
-</p>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Apache and Squirrelmail webmail</title>
-<section>
-<title>Apache with SSL and PHP</title>
-<body>
-<p>Assuming that you have a static IP address (or you use a service 
-such as dyndns with your dynamic IP address), then you might want an
-effective way to check your e-mail when you're out of town.  The
-solution that I have chosen is to set up a webmail server,
-Squirrelmail, that I can access remotely using any web browser.</p>
-<p>The first step is to install a web server.  Most of the
-rest of the world uses Apache; we will too.  We will also
-install PHP (PHP4, actually) at the same time, since Squirrelmail
-is a PHP program.</p>
-<pre>
-# <i>emerge net-www/apache dev-lang/php</i>
-# <i>nano /etc/httpd/httpd.conf</i>
-</pre>
-<impo>You want to make sure that "ssl" is in your USE
-variables if you want Apache to have SSL support.  If 
-you want to check your e-mail remotely without sending
-your password across the internet unencrypted, then you
-<e>do</e> want SSL!.</impo>
-<p>You should take a good look at <path>/etc/httpd/httpd.conf</path>,
-since Apache is very customizable.  By default the Apache server
-root (where the Apache server first looks for html files when
-you connect to http://www.servername.foo or http://localhost) 
-is <path>/usr/local/httpd</path>;
-feel free to relocate it if you wish.</p>
-<pre caption="/etc/httpd/httpd.conf">
-# Do NOT add a slash at the end of the directory path.
-#
-ServerRoot "/usr/local/httpd" <comment>(edit this line if desired)</comment>
-
-</pre>
-<pre>
-# <i>rc-update add httpd default</i>
- * httpd added to runlevel default...
- * Caching service dependencies...               [ ok ]
- * rc-update complete.
-# <i>nano /etc/rc.conf</i>
-</pre>
-<p>Use <c>rc-update</c> to add Apache to the default runlevel,
-and then edit <path>/etc/rc.conf</path> to add 
-the following lines so that Apache 
-automatically loads the SSL and PHP modules at start-up.</p>
-<pre caption="/etc/rc.conf -- add to the end for Apache SSL and PHP">
-#Apache options
-HTTPD_OPTS="-D SSL -D PHP4"
-</pre>
-<note>Pre-rc6 users should use <c>rc-update add httpd</c>
-and edit the <path>/etc/rc.d/init.d/httpd</path> init script
-by hand to add the -D options.</note>
-<pre>
-# <i>/etc/init.d/httpd start</i>
- * Starting Apache...                            [ OK ]
-# <i>lynx localhost</i>
-</pre>
-<pre caption="working Apache server">
-      Test Page for the SSL/TLS-aware Apache Installation on Web Site (p1 of 2)
-                               Hey, it worked !
-                    The SSL/TLS-aware Apache webserver was
-                    successfully installed on this website.
-</pre>
-<p>You can check to make sure your Apache web server is working
-by using any browser to connect to localhost, and you should see
-results similar to that above.  To make sure that SSL support
-is functional, use a browser to connect to <uri>http<comment>s</comment>://localhost</uri>.
-The <c>https</c> prefix tells the browser to make a <e>secure</e> connection
-to the server using SSL.  The result is a page that should look the same as
-the one above, but graphical browsers will have a padlock icon somewhere indicating
-the secure connection.</p>
-<note>When making a secure connection to your server, you will most likely receive
-a warning that the site's security certificate is not recognized.  The Apache ebuild
-installs a self-signed security certificate.  See the <c>mod_ssl</c> manual: 
-<uri>http://localhost/manual/mod/mod_ssl/ssl_intro.html#ToC5</uri>.  For personal
-use a self-signed certificate is just fine.</note>
-<p>Now we need to make sure that PHP is working correctly.  The first step
-is to create a simple PHP file and put it in the Apache server root directory.</p>
-<pre>
-# <i>echo "&lt;? phpinfo(); ?&gt;" > /usr/local/httpd/htdocs/test.php</i>
-# <i>lynx http://localhost/test.php</i>
-</pre>
-<pre caption="working Apache + PHP">
-                                                           phpinfo() (p1 of 26)
-                                  PHP Logo
- 
-                             PHP Version 4.0.6
- 
-     System Linux my.server.edu 2.4.10 #1 Tue Oct 9 16:33:50 Local
-           time zone must be set--see zic manuali686 i686 unknown
-                           Build Date Oct 16 2001
-</pre>
-<p>If you see something like the above, then Apache is successfully
-processing PHP code.</p>
-<warn>If you look at the full output of the above, you'll find out that
-the <path>test.php</path> script gives out a <e>lot</e> of information 
-about your system.  You should probably get rid of it once you know that
-php is working.  (Or you can do what I do, and just <c>mv test.php test.phps</c>.
-Apache will display <path>test.phps</path> as a PHP source file instead
-of executing the script.)</warn>
-</body>
-</section>
-<section>
-<title>Courier IMAP</title>
-<body>
-<p>Squirrelmail is a PHP application, but it relies on an IMAP server
-as the glue between the web server and e-mail.  Since Gentoo linux
-uses Maildir mail folders by default, Courier IMAP is a good choice.</p>
-<pre>
-# <i>emerge net-mail/courier-imap</i>
-# <i>rc-update add courier-imap default</i>
- * courier-imap added to runlevel default...
- * Caching service dependencies...                        [ ok ]
- * rc-update complete.
-# <i>/etc/init.d/courier-imap start</i>
-# <i>telnet localhost 143</i>
-Trying 127.0.0.1...
-Connected to localhost.localdomain.
-Escape character is '^]'.
-* OK Courier-IMAP ready. Copyright 1998-2001 Double Precision, Inc.  
-See COPYING for distribution information.
-<comment>(Hit &lt;ctrl&gt;-"]" and type "quit" to exit)</comment>
-</pre>
-<note>Pre-rc6 users need to use <c>rc-update add courier-imap</c>
-and <c>/etc/rc.d/init.d/courier-imap start</c>, respectively.</note>
-<impo>Courier IMAP usually hardwires the name of the user's Maildir-type
-inbox directory that is used in its rc start-up script,
-<path>/usr/lib/courier-imap/imapd.rc</path>, to be <path>$HOME/Maildir</path>.  
-Gentoo linux, however, uses $HOME/.maildir instead, so the courier-imap ebuild
-modifies the <path>imapd.rc</path> script to use <e>$MAILDIR</e>, which it obtains
-from the Gentoo init script <path>/etc/init.d/courier-imap</path>.  If you choose
-to use a home user's mailbox other than <path>.maildir</path>, you'll need to modify
-the <e>MAILDIR=.maildir</e> entry in courier-imap's init script.
-(Pre-rc6 users need not worry about this issue.  The pre-rc6 init script included
-a reworked version of the Courier <path>imapd.rc</path> file that replaced
-"Maildir" with ".maildir", which seemed like overkill.)</impo>
-<p>
-If you want Courier IMAP to have SSL support you just need to make
-the IMAP SSL certificate (and tell courier-imap where to find it),
-</p>
-<pre>
-# <i>/usr/sbin/mkimapdcert</i> 
-# <i>nano /etc/courier-imap/imapd-ssl</i>
-</pre>
-<pre caption="/etc/courier-imap/imapd-ssl -- SSL certificate location">
-##NAME: TLS_CERTFILE:0
-#
-# TLS_CERTFILE - certificate to use.  TLS_CERTFILE is required for SSL/TLS
-# servers, and is optional for SSL/TLS clients.  TLS_CERTFILE is usually
-# treated as confidential, and must not be world-readable.
-#
-#TLS_CERTFILE=/usr/share/imapd.pem
-TLS_CERTFILE=/etc/courier-imap/imapd.pem
-
-</pre>
-<p>and then start up imap-ssl.</p>
-<pre>
-# <i>rc-update add courier-imap-ssl default</i>
-# <i>/etc/init.d/courier-imap-ssl start</i>
-</pre>
-<note>Pre-rc6 users should see the note above.</note>
-<p>You can verify that imap is working by using any
-IMAP-enabled mail client, such as netscape, kmail,
-or mutt.</p>
-<pre>
-# <i>mutt -f imap://localhost</i>
-</pre>
-</body>
-</section>
-<section>
-<title>Squirrelmail</title>
-<body>
-<p>Fortunately, installing and configuring
-Squirrelmail, once all of the components are in
-place, is straightforward.</p>
-<pre>
-# <i>emerge net-mail/squirrelmail</i>
-# <i>cd /usr/local/httpd/htdocs</i>
-# <i>chown -R nobody.nobody squirrelmail</i>
-# <i>cd squirrelmail</i>
-# <i>./configure</i>
-</pre>
-<note>If your Apache server root is not <path>/usr/local/httpd</path>,
-you will want to edit the <path>net-mail/squirrelmail</path> ebuild
-to point to your httpd root.</note>
-<p>For squirrelmail to work correctly, you need to make sure that
-all of the files are owned by "nobody" -- the user that Apache runs
-as.  Use <c>./configure</c> to select option <e>2</e>.</p>
-<pre caption="Squirrelmail configuration -- Server settings">
-SquirrelMail Configuration : Read: config.php
----------------------------------------------------------
-Server Settings
-1.  Domain               : my.server.edu
-2.  IMAP Server          : localhost
-3.  IMAP Port            : 143
-4.  Use Sendmail/SMTP    : SMTP
-6.    SMTP Server        : localhost
-7.    SMTP Port          : 25
-8.    Authenticated SMTP : false
-9.  Server               : courier
-10. Invert Time          : false
-11. Delimiter            : detect
- 
-R   Return to Main Menu
-C.  Turn color off
-S   Save data
-Q   Quit
- 
-Command >>
-</pre>
-<p>Make sure that <e>Server</e> is set to <e>courier</e>.
-Return to the main menu and select option <e>4</e>, General
-Options.</p>
-<pre caption="Squirrelmail configuration -- General options">
-SquirrelMail Configuration : Read: config.php
----------------------------------------------------------
-General Options
-1.  Default Charset        : iso-8859-1
-2.  Data Directory         : ../data/
-3.  Attachment Directory   : /tmp/
-4.  Default Left Size      : 150
-5.  Usernames in Lowercase : false
- 
-R   Return to Main Menu
-C.  Turn color off
-S   Save data
-Q   Quit
- 
-Command >>
-</pre>
-<p>I use the data directory in the package, although it would be
-better security to use one outside the Apache document tree.  I
-also use <path>/tmp</path> as my directory to store attachments.</p>
-<p>You also need to make a minor change to the Apache's configuration
-so that it knows that <path>index.php</path> should be executed upon
-entering a directory that has such a file in it.</p>
-<pre>
-# <i>nano /etc/httpd/httpd.conf</i>
-</pre>
-<pre caption="/etc/httpd/httpd.conf">
-#
-# DirectoryIndex: Name of the file or files to use as a pre-written HTML
-# directory index.  Separate multiple entries with spaces.
-#
-&lt;IfModule mod_dir.c&gt;
-    DirectoryIndex index.html index.htm <comment>index.php</comment>
-&lt;/IfModule&gt;
-
-</pre>
-<p>Browse to <uri>https://localhost/squirrelmail/</uri>, and it should work!</p>
-<pre>
-# <i>lynx https://localhost/squirrelmail/</i>
-</pre>
-<pre caption="Squirrelmail login page">
-                                                           SquirrelMail - Login
-                               [sm_logo.jpg]
- 
-                      SquirrelMail version 1.2.0 [rc2]
-                    By the SquirrelMail Development Team
- 
-                             SquirrelMail Login
- 
-       Name: ____________________
-   Password: ____________________
- 
-                                   Login
-</pre>
-<p>(I don't really suggest using lynx with Squirrelmail, but you could!)</p>
-</body>
-</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/dynfw.xml b/app-doc/gentoo-web/files/xml/dynfw.xml
deleted file mode 100644
index bbc4575dc4f1..000000000000
--- a/app-doc/gentoo-web/files/xml/dynfw.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version='1.0'?>
-<guide type="project" link="/projects/dynfw.html">
-<title>dynfw Dynamic Firewall Tools, v1.0</title>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<version>1.0.1</version>
-<date>30 Jul 2001</date>
-
-<chapter>
-<title>dynfw</title>
-
-<section>
-<title>Introduction</title>
-<body>
-
-<p>Firewalls all good and fun, but what do you do when you need to make rapid,
-complex changes to your netfilter-based firewall?  Instead of feverishly
-hacking away at a complex master firewall script, use the dynfw Dynamic
-Firewall Tools.  This collection of robust bash scripts have been designed to
-work with nearly any existing netfilter-based firewall configuration.  By using
-these scripts, you'll be able to make near-immediate changes to your firewall
-configuration without risk of misconfiguration, resulting in vastly improved
-network security and responsiveness.  The dynfw firewall scripts were
-originally featured in <uri
-link="http://www-106.ibm.com/developerworks/linux/library/l-fw/?n-l-4191">this
-IBM developerWorks article</uri>.</p>
-
-<p>You can download the current version of dynfw here:
-<uri>dynfw-1.0.1.tar.gz</uri>.</p> 
-
-<note>The dynfw Dynamic Firewall Tools are
-Copyright 2001 Gentoo Technologies, Inc. and distributed under the GNU General Public
-License.  You are encouraged to send any bug fixes or improvements to these
-tools to <mail link="drobbins@gentoo.org">Daniel Robbins</mail> so that they
-can be rolled into the official release.</note>
-
-
-<p>The following scripts are included in <path>dynfw-1.0.1.tar.gz</path>:
-</p>
-<p>
-<table>
-<tr><th>Script</th><th>Description</th></tr>
-<tr><ti><path>install.sh</path></ti><ti>the install script -- run this first</ti></tr>
-<tr><ti><path>dynfw.sh</path></ti><ti>the dynfw global support script -- used by all dynfw tools</ti></tr>
-<tr><ti><path>ipdrop</path></ti><ti>discard packets coming from a specific IP</ti></tr>
-<tr><ti><path>ipblock</path></ti><ti>discard as above, but send an TCP reset if applicable</ti></tr>
-<tr><ti><path>tcplimit</path></ti><ti>ratelimit new connections to a local TCP port</ti></tr>
-<tr><ti><path>host-tcplimit</path></ti><ti>ratelimit new connections from a specific host</ti></tr>
-<tr><ti><path>user-outblock</path></ti><ti>prevents a specific UID (user) from establishing outbound connections</ti></tr>
-</table>
-</p>
-
-</body>
-</section>
-<section>
-<title>Changelog</title>
-<body>
-
-<p><e>1.0.1</e>: sh-compatibility fixes; <c>==</c> changed to <c>=</c> (oops!)</p>
-<p><e>1.0</e>: Initial release.</p>
-
-</body>
-</section>
-</chapter>
-</guide>
-
diff --git a/app-doc/gentoo-web/files/xml/faq.xml b/app-doc/gentoo-web/files/xml/faq.xml
deleted file mode 100644
index f713ae0482cb..000000000000
--- a/app-doc/gentoo-web/files/xml/faq.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/faq.html">
-<title>Gentoo Linux Frequently Asked Questions</title>
-<author title="Editor"><mail link="thomasfl@gentoo.org">Thomas Flavel</mail></author>
-<author title="Chief Architect"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<abstract>This FAQ is a collection of questions and answers collected from the gentoo-dev mailing list and from IRC -- if you have any questions (or answers!) to add, please contact an author.</abstract>
-
-<version>1.0.6</version>
-<date>17 Oct 2001</date>
-
-<chapter>
-	<title>Getting Started</title>
-
-	<section>
-		<title>How is Gentoo pronounced, and what does it mean?</title>
-		<body><p>Gentoo is a species of small fast penguin, pronounced "jen-two".</p></body>
-	</section>
-
-	<section>
-		<title>What makes Gentoo different?</title>
-		<body>
-			<p>Gentoo Linux is a fast, modern distribution with a clean and flexible design -- in this respect, Gentoo may appeal to <uri link="http://www.slackware.com/">Slackware</uri>, <uri link="http://www.linuxfromscratch.org">Linux From Scratch</uri> or <uri link="http://www.bsd.org">BSD</uri> users. Unlike most Linux distros, Gentoo has a package system reminscient of BSD's ports, meaning the packages are continually updated to the lastest versions.</p></body> 
-	</section>
-</chapter>
-
-<chapter>
-	<title>Installation</title>
-
-	<section>
-		<title>What is the differenence between the sys and build tarballs?</title>
-		<body><p>The <e>build</e> tarball is a minimal system capable of connecting to the internet and rebuilding itself, whereas <e>sys</e> is a complete comfortable system.</p>
-	</body>
-	</section>
-
-	<section>
-		<title>How do I install with no ISO image?</title>
-		<body><p>We are working out a solution for 1.0_rc6+ systems as we speak.  Stay tuned and visit the <uri
-link="/index-download.html">Download/Install page</uri> for updates.</p> 
-	</body>
-	</section>
-
-	<section>
-		<title>I have a Sony Super-Slim VAIO laptop, and the Gentoo Linux CD is having problems finding my PCMCIA ATAPI CD-ROM.</title>
-		<body>
-		<p>Make sure the second IDE port is set to CDROM (it unsets itself if the device isn't attached on boot) then do the following at the isolinux <c>boot:</c> prompt:</p>
-<pre>
-boot: <i>rescue ide2=0x180,0x386</i>
-</pre>
-<p>If you are using a 1.0_rc5 or earlier boot CD, type <c>gentoo</c> instead of <c>rescue</c>, above.</p>
-</body>
-</section>
-	<section>
-		<title>I'm finding things to be really unstable and I'm using "-O9 -ffast-math -fomit-frame-pointer" optimizations.  What gives?</title>
-		<body>
-		<p>When you use any optimizations beyond <c>-O3</c>, you're really taking the risk of having broken packages.
-		Very aggressive optimizations sometimes cause the compiler to streamline the assembly code to the point where
-		it doesn't quite do the same thing anymore.  <e>Loc-Dog</e> (on IRC) uses <c>-O3 -mcpu=1686 -march=i686 -fforce-addr -fomit-frame-pointer -funroll-loops -frerun-cse-after-loop -frerun-loop-opt -malign-functions=4</c>, which is about
-		as much as I'd want to push global optimization settings.  Beyond this, it's best to use ultra-high optimizations
-		only with specific packages where you really need that extra 2%, and where you can easily test the package 
-		to ensure that it hasn't been optimized into oblivion.</p>
-		</body>
-	</section>
-
-	<section>
-		<title>What's the default root password after installation?</title>
-		<body><p>The default password is blank; hit enter.</p></body>
-	</section>
-
-	<section>
-		<title>Why can't a user su to root?</title>
-		<body><p>For security reasons, users may only <c>su</c> to root if they belong to the <e>wheel</e> group. To add a <i>username</i> to the <e>wheel</e> group, issue the following command as root:</p>
-		<pre># <i>usermod -G users,wheel username</i></pre>
-</body>
-	</section>
-	<section>
-		<title>How do I enable devfs?</title>
-		<body>
-<p>
-<e>devfs</e> support is compiled-in to our standard kernels, and is enabled by default on Gentoo Linux 1.0_rc5 and above.  If you're using 1.0_rc5 or greater, you don't need to do anything special to get devfs working; it's already active.  However, if you are using a version of Gentoo Linux <e>prior</e> to version 1.0_rc5, add <c>devfs=mount</c> to your <c>GRUB</c> kernel boot options so that the line looks something like <c>kernel /boot/boot/bzImage devfs=mount foo=bar</c>  The kernel will then mount the <path>/dev</path> <e>devfs</e> filesystem automatically at boot-time.
-</p>
-	</body>
-	</section>
-	<section>
-		<title>How to I disable devfs?</title>
-		<body>
-<p>Under Gentoo Linux 1.0_rc6 and later, you can disable devfs by passing the <c>gentoo=nodevfs</c> to the kernel.  Please
-note that this works even if you are using "non-official" Linux kernel that you compiled yourself.</p>
-		</body>
-	</section>
-<section>
-		<title>How do I get <path>/dev/dsp</path>?</title>
-		<body><p>You can create it by typing the following as root:</p>
-		<pre># <i>cd /dev</i>
-# <i>./MAKEDEV audio</i></pre></body>
-	</section>
-	<section>
-		<title>How do I get a <path>/dev/mouse </path> that
-		doesn't go away when I reboot?</title>
-		<body>
-		<p>You need to edit <path>/etc/devfsd.conf</path>
-		and add these lines:</p>
-<pre>
-REGISTER        ^misc/psaux$    CFUNCTION GLOBAL symlink misc/psaux mouse
-UNREGISTER      ^misc/psaux$    CFUNCTION GLOBAL unlink mouse
-</pre>
-<p>If you are not using the devfs PS/2 mouse <path>/dev/misc/psaux</path> device,
-adjust the <c>misc/psaux</c> strings above accoringly.  You'll then want to <c>killall -HUP devfsd</c>
-		to get devfsd to reread <path>/etc/devfsd.conf</path>.</p>
-		</body>
-	</section>
-	<section>
-		<title>Grub can't find stage x.y?</title>
-		<body><p>
-		During installation the grub boot files are copied
-		to <path>/boot/grub</path> (<path>/boot/boot/grub</path> in Gentoo Linux 1.0_rc5 and earlier.) Grub automatically
-		looks in the <path>/boot/grub</path> directory on the
-		boot partition.  (We strongly recommend having a separate
-		no-auto boot partition mounted at <path>/boot</path>,
-		since that way it is much more difficult to clobber your
-		kernel and boot info by accident.)  The above error generally
-		arises from (a) not using a separate boot partition, (b)
-		forgetting to mount the boot partition at <path>/boot</path>
-		before either unpacking the build snapshot or running
-		<c>emerge --usepkg system</c>, or (c) forgetting the
-		<c>notail</c> option when mounting <path>/boot</path>.
-		You can get more information on grub, including how to
-		debug grub from the grub prompt, by reading the 
-		<uri link="http://www-105.ibm.com/developerworks/education.nsf/linux-onlinecourse-bytitle/0F1731DC664023B7862569D0005C44AF?OpenDocument">IBM developerWorks Grub tutorial</uri>.
-		</p>
-                </body>
-	</section>
-	<section>
-		<title>I'm getting ALSA errors -- "mixer #/# not found", etc.</title>
-		<body>
-		<p>Your ALSA sound devices need to be set up correctly.  To do this, grab <uri link="/scripts/snddevices">our updated snddevices script</uri> and execute it by typing <c>bash snddevices</c>.  This will configure the ALSA devices correctly, and these errors should go away and ALSA should now work.</p>
-		</body>
-	</section>
-</chapter>
-
-<chapter>
-	<title>Package Management</title>
-	<section>
-		<title>In what format are the packages stored?</title>
-		<body><p>They exist in our portage tree as <e>ebuild</e> autobuild scripts; we are primarily a ports-based distribution, meaning that we provide scripts (<c>.ebuild</c> files) and a special system (Portage) so
-that you can build apps from sources. We generally only build binaries for releases and snapshots. The <uri link="/doc/gentoo-howto.html">Development HOWTO</uri> covers the contents of an ebuild script in detail.  For full binary ISO releases, we create a full suite of binary packages in an enhanced <c>.tbz2</c> format (<c>.tar.bz2</c> compatible with meta-information attached to the end of the file.)</p>
-		</body>
-	</section>
-
-	<section>
-		<title>Why write a new port system (Portage) instead of using BSD's version?</title>
-		<body>
-
-<p>In one sentence, because Portage is much better in so many ways.  One of the design philosophies of the <c>.ebuild</c> syntax was to make it
-an analog of what you'd type to install the program manually, thus making
-Portage very easy to learn and modify to your needs.  We also have OpenBSD-style "fake" installs, safe unmerging,
-system profiles, package masking, a real dependency system, and lots of other good stuff.</p>
-
-		</body>
-	</section>
-
-	<section>
-		<title>How does this differ from Debian's apt or BSD's ports?</title>
-		<body><p>Portage features the best of apt and ports; for example, USE options, a full dependency system, safe installs and uninstalls, and a true package database.  Think of Portage as the best of both worlds; a ports system with the sensibilities and safety of a Linux package management system built-in.</p></body>
-	</section>
-
-	<section>
-	        <title>How do I install and uninstall packages?</title>
-	        <body>
-	                <p>The <uri link="/doc/portage-user.html">Portage User Guide</uri> details how to install and uninstall packages, and update Portage.</p>
-	        </body>
-	</section>
-
-	<section>
-		<title>How can I set a global configuration for compiling packages?</title>
-		<body><p><path>/etc/make.conf</path> should be modified to override global and profile-specific default options used to compile and merge packages. The most common options are as follows:</p>
-		<table>
-		<tr>
-			<th>Flag</th>
-			<th>Description</th>
-		</tr>
-		<tr>
-			<ti>CHOST</ti>
-			<ti>This sets the HOST variable for compiles, e.g. <c>i686-pc-linux-gnu</c></ti>
-		</tr>
-		<tr>
-			<ti>CFLAGS</ti>
-			<ti>The options for <c>gcc</c> when compiling programs written in C (*.c files)</ti>
-		</tr>
-		<tr>
-			<ti>CXXFLAGS</ti>
-			<ti>The options for <c>gcc</c> when compiling programs written in C++ (*.c files)</ti>
-		</tr>
-		<tr>
-			<ti>USE</ti>
-			<ti>This allows you to set what optional components you'd like compiled-in, if available.  For example, if you have <c>gnome</c> inside the USE string, then when you compile <c>xchat</c>, it will include GNOME support.  All our dependencies are also USE-aware.</ti>
-
-		</tr>
-		<tr>
-			<ti>GENTOO_MIRRORS</ti>
-			<ti>A space separated list of URIs currently mirroring the Gentoo packages.  Portage will attempt download from a <c>GENTOO_MIRROR</c> first before trying the official <c>SRC_URI</c>.  To force Portage to skip mirrors, set this variable to "".</ti>
-		</tr>
-		</table>
-		</body>
-	</section>
-
-	<section>
-		<title>What happened to <path>/etc/make.defaults</path>?</title>
-		<body>
-
-<p>As of Portage 1.5 onwards, <path>/etc/make.defaults</path> is antiquated; 
-if you have portage-1.5-r1 or above installed then you can safely delete it.
-This file has been replaced by <path>/etc/make.profile/make.defaults</path> (<path>/etc/make.profile</path> should actually be a symlink to <path>/usr/portage/profiles/default</path>),
-which contains system profile-specific default settings. The priority order of
-the various configuration files is as follows (highest first):
-
-		
-		<ol>
-			<li>Environment variables</li>
-			<li><path>/etc/make.conf</path>, for your use</li>
-			<li><path>/etc/make.profile/make.defaults</path>, for profile-specific defaults</li>
-			<li><path>/etc/make.globals</path>, for global defaults (settings not specified in any other place come from here)</li>
-		</ol></p></body>
-	</section>
-	
-	<section>
-		<title>Is there a way to upgrade all installed packages
-		a la <e>apt-get upgrade</e> or <e>make World</e>?</title>
-		<body><p>Not yet; we will be adding this functionality
-		before the 1.0 release.  For the moment you can use
-		<c>emerge --pretend update</c> to list upgradable
-		packages, but the actual upgrading has to be done
-		package by package (using <c>ebuild</c> or 
-		<c>emerge</c>).  Otherwise, things may get merged in
-		an incorrect order.</p></body>
-	</section>
-
-
-	<section>
-		<title>When updating a package using <c>emerge</c> or <c>ebuild</c>, how do I avoid clobbering my config files?</title>
-		<body><p>
-		Portage now includes config file management support by default.  Type 
-		<c>emerge --help config</c> for more details.  The (overly) simple answer is that if
-		a package installs <path>foo</path> somewhere under <path>/etc</path>, and
-		another <path>foo</path> already exists there, then the new <path>foo</path> will
-		instead be renamed to <path>._cfgxxxx_foo</path> in that directory.
-		</p></body>
-	</section>
-
-	<section>
-		<title>I want to perform the <c>./configure</c> step myself.  Can I?</title>
-		<body><p>
-		Yes, but it is not trivial.  First do <c>man ebuild</c> followed by
-		<c>ebuild foo-x.y.z.ebuild unpack</c>.  Then <c>cd</c> to 
-		<path>/var/tmp/portage/foo-x.y.z/work</path>.  You can manually perform
-		the <c>./configure</c> and <c>make</c> steps yourself (you'll have to do
-		both, since Portage does not separate the configure and build steps).  To
-		have Portage finish the installation (so that you can easily remove it later,
-		should you desire to do so, and it will be registered in Portage as a possible
-		dependency) you first need to <c>touch /var/tmp/portage/foo-x.y.z/.compiled</c>
-		(tricking Portage into thinking that <c>ebuild foo-x.y.z.ebuild compile</c> has
-		completed), followed by <c>ebuild foo-x.y.z.ebuild merge</c>.
-		</p></body>
-	</section>
-
-	<section>
-		<title>What if rsync doesn't work for me?</title>
-		<body><p>If you're behind a firewall that doesn't permit
-		rsync traffic, then you can instead download the daily
-		/usr/portage snapshot from 
-		<uri>http://cvs.gentoo.org/snapshots</uri>.  Just unpack
-		the tarball (using <c>tar xvjf portage-foo.tbz2</c>) in
-		the <path>/usr</path> directory.
-		</p></body>
-	</section>
-
-	<section>
-		<title>Can I rsync from another operating system?</title>
-		<body><p>There's a program called unison that works under both UNIX and Win32, available from <uri>http://www.cis.upenn.edu/~bcpierce/unison/</uri>.</p></body>
-	</section>
-</chapter>
-
-<chapter>
-	<title>Usage</title>
-	<section>
-		<title>I can start X applications as root only.</title>
-		<body><p>Your <path>/tmp</path> directory has the wrong permissions (it needs the sticky bit set). Type the following as root:</p>
-		<pre># <i>chmod 1777 /tmp</i></pre>
-		</body>
-	</section>
-
-	<section>
-		<title>DNS name resolution works for root only.</title>
-		<body><p><path>/etc/resolv.conf</path> has the wrong permissions; <c>chmod</c> it as follows:</p>
-		<pre># <i>chmod 0644 /etc/resolv.conf</i></pre>
-		</body>
-	</section>
-
-	<section>
-		<title>Why is KDE not reading <path>/etc/profile</path>?</title>
-		<body><p>You need to add <c>--login</c> to the first line in <path>/opt/kde2.1/bin/startkde</path>, so that it reads as follows:</p>
-		<pre>#!/bin/sh --login</pre>
-		<p>This fix has been added to recent versions of KDE.</p>
-		</body>
-	</section>
-</chapter>
-
-<chapter>
-	<title>Maintenance</title>
-	<section>
-		<title>ReiserFS and filesystem corruption issues -- how to fix'em, etc</title>
-		<body>
-
-
-		<p>Since kernel 2.4.4, ReiserFS has been very stable and ready for
-		production environments.  However, if you have been using ReiserFS
-		since before kernel 2.4.4, then it's recommended that you back up all
-		your important data and recreate your ReiserFS filesystems with a
-		2.4.4+ kernel and a recent version of <path>reiserfsutils</path>.  If
-		this isn't possible, try using a recent Gentoo Linux <uri
-		path="http://www.ibiblio.org/gentoo/snapshots/disks/">boot/rootdisk</uri>
-		to boot your system, and then run <c>reiserfsck --rebuild-tree</c> on
-		the corrupted filesystem.  This should make the filesystem consistent
-		again, although you may have lost some files or directories due to
-		corruption.</p>
-
-
-		</body>
-	</section>
-
-	<section>
-		<title>How to I view the timestamps in /var/log/syslog.d, etc.</title>
-		<body>
-
-<p>To view multilog (Gentoo Linux 1.0_rc5 and earlier) timestamps, you need to pipe the current log through the <c>tai64nlocal</c>
-command:</p>
-
-<pre>
-# <i>cat /var/log/syslog.d/current | tai64nlocal | less</i>
-</pre>
-
-<p>Or, alternatively, if you want to "tail" the log:</p>
-
-<pre>
-# <i>tail -f /var/log/syslog.d/current | tai64nlocal</i>
-</pre>
-
-</body>
-	</section>
-
-	<section>
-		<title> I am trying to emerge package foo.ebuild, and it aborts
-		with a compiler error, linker error, etc.  What can I
-		do?</title>
-
-	<body><p>You can file a bug report on <uri
-	link="http://bugs.gentoo.org"> bugs.gentoo.org</uri></p></body>
-	</section>
-
-	<section>
-		<title>How do I get my screen to clear after logging out at the
-		console?</title>
-
-	<body>
-	<p>There are a couple ways.</p>
-	<ul>
-   	<li>For an individual user, you can add the following command to the
-	<path>.logout</path> file:
-<pre>
-clear
-</pre>
-	</li>
-	<li>To make each console clear before displaying the Login message
-	(issue), add the following to the top of <path>/etc/issue</path>:
-<pre>
-^[[2J^[[f
-</pre>
-
-	<p>note: the "^" character is a literal ESC character.  In vi, you can
-	type &lt;ctrl&gt;-v, &lt;ctrl&gt;,&lt;esc&gt; to get it to print.
-	Another way to achieve the same effect but on a per-console basis is to
-	edit <path>/etc/inittab</path> so that the getty lines look like the
-	following:</p>
-
-<pre>
-1:2345:respawn:/sbin/agetty -I'\033[2J\033[f' tty1 9600
-</pre>
-	</li>
-	</ul>
-	</body>
-	</section>
-
-	<section>
-		<title>Where did all my disk space go?</title>
-
-	<body>
-	<p>Here are a couple of places to check:</p>
-
-	<ul>
-
-	<li><path>/usr/portage/distfiles</path>: This is where portage stores
-	the source tarballs that are downloaded for installation.  If you don't
-	need to keep them around (either for another system or for
-	reinstallation), then you can delete these.</li>
-
-	<li><path>/var/tmp/portage</path>: This is where portage builds
-	packages, so various temporary files can build up here.  It is safe to
-	remove any files in this directory.
-
-	<p>WARNING: it should be obvious, but don't remove files from this
-	directory while portage is running.</p>
-
-	<p>Note: Depending on if/how you set your MAINTAINER variable,
-	you can use a good deal of space in <path>/var/tmp/portage</path>.</p>
-	</li>
-	</ul>
-	</body>
-	</section>
-
-</chapter>
-
-<chapter>
-	<title>Development</title>
-	<section>
-		<title>Where can I report bugs?</title>
-		<body><p>For bugs within a specific program, contact the program's author. Otherwise, contact the <uri link="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</uri> mailing list, or on <c>#gentoo</c> on the <uri link="http://www.openprojects.net">openprojects</uri> irc network.</p></body>
-	</section>
-
-	<section>
-		<title>How oftern are new releases made?</title>
-		<body><p>New releases are announced on the <uri link="http://cvs.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</uri> mailing list<!-- TODO: approximatley every X months -->.</p></body>
-	</section>
-
-	<section>
-		<title>I would like a package to be added to Portage; how would I go about this?</title>
-		<body><p>Send an email containing your ebuild to the <uri link="http://cvs.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</uri> mailing list, and it will be committed to cvs. </p></body>
-	</section>
-
-	<section>
-		<title>How can I add a question or answer to this FAQ?</title>
-		<body><p>You can email an author directly, email the <uri link="http://cvs.gentoo.org/mailman/listinfo/gentoo-dev">Developer Discussion</uri> mailing list, or drop by on <c>#gentoo</c> on the <uri link="http://www.openprojects.net">openprojects</uri> irc network.</p></body>
-	</section>
-</chapter>
-
-<chapter>
-<title>Resources</title>
-	<section>
-		<title>Where can I find more about supervise used by default in Gentoo Linux 1.0_rc5 and earlier?</title>
-		<body><p><!-- TODO: --><uri>http://cr.yp.to/daemontools.html</uri></p></body>
-	</section>
-
-	<section>
-		<title>Where can I find more information about Gentoo Linux?</title>
-		<body><p>The official Gentoo documentation can be found on <uri>http://www.gentoo.org</uri>; general Linux information is at <uri>http://www.linuxdoc.org</uri>.</p></body>
-	</section>
-
-	<section>
-		<title>Can I buy a CD of Gentoo Linux?</title>
-		<body><p>Not currently, although we will most likely be selling CDs in the future.  Stay tuned!
-		</p></body>
-	</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/gentoo-howto.xml b/app-doc/gentoo-web/files/xml/gentoo-howto.xml
deleted file mode 100755
index 861212ed7140..000000000000
--- a/app-doc/gentoo-web/files/xml/gentoo-howto.xml
+++ /dev/null
@@ -1,636 +0,0 @@
-<?xml version='1.0'?>
-<!-- gentoo-howto.xml,v 1.20 2001/08/17 21:52:07 drobbins Exp -->
-
-<guide link="/doc/gentoo-howto.html">
-<title>Gentoo Linux Developers HOWTO</title>
-<author title="Author"><mail link="woodchip@gentoo.org">Donny Davies</mail></author>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-<author title="Author"><mail link="pete@gentoo.org">Peter Gavin</mail></author>
-<abstract>This document describes the Gentoo Linux Portage system, how
-to create new packages for Gentoo, and is also meant to be somewhat of
-a standard for the Gentoo Developers. It is a work in progress, and is
-constantly being updated and changed. It is by no means
-complete.</abstract>
-<version>1.1</version>
-<date>21 Sep 2001</date>
-
-<!--
-
-Contents
-
-I. Introduction
-II. The Portage Tree
-  A. What (Not) to Put in the Portage Tree
-  B. Categories
-  C. The files Directory
-III. .ebuild Files
-  A. Naming .ebuild Files
-  B. Contents of an .ebuild File
-  C. Rules for Writing an .ebuild File
-IV. Filesystem Locations
-  A. Introduction to the FHS
-  B. How to Fit Your Packages into the Filesystem
-V. The Portage Scripts and Utilities
-  A. Public Scripts
-  B. Private Scripts
-VI. Package Dependencies
-    
--->
-
-
-<chapter>
-<title>The Portage tree</title>
-
-<section>
-<title>Introduction</title>
-<body><p>The Portage tree is typically found at <path>/usr/portage</path>
-and is organized in a heirarchical structure consisting of category directories,
-followed by specific package directories.  Here's an example; you can find
-the <path>util-linux-2.11g.ebuild</path> file in the <path>/usr/portage/sys-apps/util-linux</path>
-directory.  There may be several other versions of <c>util-linux</c> ebuilds alongside
-<path>util-linux-2.11g.ebuild</path>.  This is because <e>all ebuilds for a particular
-package (irregardless of version)</e>, share the same <path>mycat/mypkg</path> directory in 
-<path>/usr/portage</path>.
-</p></body>
-</section>
-
-<section>
-<title> What (not) to put in the Portage tree</title>
-
-<body><p>In general, the Portage tree should only be used for storing
-<path>.ebuild</path> files, as well as any relatively small companion files,
-such as patches or sample configuration files.  These types of files should be
-placed in the <path>/usr/portage/mycat/mypkg/files</path> directory to keep the
-main <path>mycat/mypkg</path> directory uncluttered.  Also, in general, it's
-not a good idea for developers to add binary (non-ASCII) files to CVS.
-However, if this is necessary (for example, if you need to add a small PNG
-graphic for whatever reason, be sure to add it to CVS by using the <c>-kb</c>
-option, like so: </p>
-
-<pre>
-# <i>cvs add -kb myphoto.png</i>
-</pre>
-
-<p>The <c>-kb</c> option tells CVS that <path>myphoto.png</path> is a binary
-file and should be treated specially.  For example, merging the differences
-between two different versions of this file should not be allowed to happen,
-for obvious reasons.  Also, speaking of merging changes, any patches you add to
-Portage should generally <e>not</e> be compressed.  This will allow CVS to
-merge changes and inform developers of conflicts correctly.  </p>
-
-</body>
-</section>
-<!--
-<section>
-<title>Categories</title>
-<body><p>The categories are defined as follows:</p>
-<table><tr><th>Category</th><th>Description</th></tr>
-<tr><ti><path>app-admin</path></ti><ti>non-critical system administration utilities</ti></tr>
-<tr><ti><path>app-arch</path></ti><ti>non-critical archival/compression utilities </ti></tr>
-<tr><ti><path>app-cdr</path></ti><ti> CD recording utilities </ti></tr>
-<tr><ti><path>app-crypt</path></ti><ti> Cryptography related apps </ti></tr>
-<tr><ti><path>app-doc</path></ti><ti>application documentation </ti></tr>
-<tr><ti><path>app-editors</path></ti><ti>non-critical text editors </ti></tr>
-<tr><ti><path>app-emulation</path></ti><ti>packages for emulating other systems/OSes </ti></tr>
-<tr><ti><path>app-games</path></ti><ti>Games!!! 'Nough said </ti></tr>
-<tr><ti><path>app-misc</path></ti><ti>applications that don't fit anywhere else </ti></tr>
-<tr><ti><path>app-office</path></ti><ti>office-type (word processing, spreadsheet, etc.) packages </ti></tr>
-<tr><ti><path>app-shells</path></ti><ti>non-critical shells and command interpreters </ti></tr>
-<tr><ti><path>app-text</path></ti><ti>text processing, spell checkers, and document formatting packages </ti></tr>
-<tr><ti><path>dev-db</path></ti><ti>database libraries </ti></tr>
-<tr><ti><path>dev-java</path></ti><ti>java classes/packages/etc.  </ti></tr>
-<tr><ti><path>dev-lang</path></ti><ti>compilers and interpreters for different languages </ti></tr>
-<tr><ti><path>dev-libs</path></ti><ti>miscellaneous developer's libraries </ti></tr>
-<tr><ti><path>dev-perl</path></ti><ti>perl modules </ti></tr>
-<tr><ti><path>dev-python</path></ti><ti>python modules </ti></tr>
-<tr><ti><path>dev-ruby</path></ti><ti>ruby modules </ti></tr>
-<tr><ti><path>dev-tcltk</path></ti><ti>Tcl-Tk modules </ti></tr>
-<tr><ti><path>dev-util</path></ti><ti>various developers utilities </ti></tr>
-<tr><ti><path>gnome-apps</path></ti><ti>applications for GNOME </ti></tr>
-<tr><ti><path>gnome-base</path></ti><ti>base GNOME packages </ti></tr>
-<tr><ti><path>gnome-libs</path></ti><ti>non-essential GNOME libraries </ti></tr>
-<tr><ti><path>gnome-office</path></ti><ti>office packages for gnome </ti></tr>
-<tr><ti><path>kde-base</path></ti><ti>main KDE distribution </ti></tr>
-<tr><ti><path>kde-i18n</path></ti><ti>KDE internationalization packages </ti></tr>
-<tr><ti><path>media-gfx</path></ti><ti>graphics-related programs </ti></tr>
-<tr><ti><path>media-libs</path></ti><ti>  libraries for manipulating different media, including accessing multimedia peripherals of your computer (sound card, video card, etc.) </ti></tr>
-<tr><ti><path>media-sound</path></ti><ti>programs related to sound, including cd-audio and sound encoding </ti></tr>
-<tr><ti><path>media-video</path></ti><ti>programs related to video, including video codecs and players </ti></tr>
-<tr><ti><path>net-analyzer</path></ti><ti>network usage statistics monitors/analyzers </ti></tr>
-<tr><ti><path>net-dialup</path></ti><ti>network dialup clients and servers such as pppd </ti></tr>
-<tr><ti><path>net-fs</path></ti><ti>network filesystems </ti></tr>
-<tr><ti><path>net-ftp</path></ti><ti>ftp servers and clients </ti></tr>
-<tr><ti><path>net-im</path></ti><ti>Instant Messaging servers and clients </ti></tr>
-<tr><ti><path>net-irc</path></ti><ti>irc servers and clients </ti></tr>
-<tr><ti><path>net-libs</path></ti><ti>networking-related libraries </ti></tr>
-<tr><ti><path>net-mail</path></ti><ti>MTAs and MUAs </ti></tr>
-<tr><ti><path>net-misc</path></ti><ti>miscellaneous servers, clients, firewalls, etc. </ti></tr>
-<tr><ti><path>net-nds</path></ti><ti>NIS/NIS+ and other network directory services </ti></tr>
-<tr><ti><path>net-news</path></ti><ti>Usenet servers and clients </ti></tr>
-<tr><ti><path>net-print</path></ti><ti>print servers and clients </ti></tr>
-<tr><ti><path>net-www</path></ti><ti>http/www servers and clients </ti></tr>
-<tr><ti><path>sys-apps</path></ti><ti>system-critical applications and utilities </ti></tr>
-<tr><ti><path>sys-devel</path></ti><ti>base development packages, such as gcc and make </ti></tr>
-<tr><ti><path>sys-kernel</path></ti><ti>Linux kernels and kernel source packages </ti></tr>
-<tr><ti><path>sys-libs</path></ti><ti>system-critical libraries such as glibc </ti></tr>
-<tr><ti><path>x11-base</path></ti><ti>base X packages, such as XFree86 and drivers for various video cards </ti></tr>
-<tr><ti><path>x11-libs</path></ti><ti>widget sets and other X-specific libraries</ti></tr>
-<tr><ti><path>x11-terms</path></ti><ti>X-based terminal emulators </ti></tr>
-<tr><ti><path>x11-wm</path></ti><ti>X window managers </ti></tr>
-</table>
-<note>If a new category is created (please get permission first!), 
-then the category needs to be added to 
-<path>/usr/lib/python2.0/portage.py</path>.
-</note>
-</body>
-</section>
--->
-<section>
-<title>The files Directory</title>
-<body>
-
-<p>As noted earlier, under each package subdirectory is a <path>files</path>
-directory.  Any  patches, configuration files, or other ancillary files your
-package might require should be added to this directory. You may want to
-consider naming patches you create yourself just to get your package to build
-with a version-specific name, such as <path>mypkg-1.0-gentoo.diff</path>.  Also
-note that the <path>gentoo</path> extension informs people that this patch was
-created by us, the Gentoo Linux developers, rather than having been grabbed
-from a mailing list or somewhere else.  Again, you should not compress these
-diffs because cvs does not play well with binary files.  </p>
-
-<p>Consider adding a suffix such as <path>mypkg-1.0</path> to the tail of every
-file you put into the <path>files</path> directory, so that the files used for
-each individual version of your ebuild scripts are distinguishable from one
-another, and so that the changes between different revisions are visible.  This
-is generally a really good idea. :)  You may want to use a different suffix if
-coarser or finer granularity is required.</p>
-
-<p>If you have many files that should go into the files directory, consider
-creating subdirectories such as <path>files/mypkg-1.0</path> and putting the
-relevant files in the appropriate subdirectory.  If you use this method, you do
-not need to add suffix the names of the files in this directory, which is often
-more convenient.</p>
-
-</body>
-</section>
-</chapter>
-	
-<chapter>
-<title>ebuild scripts</title>
-<section>
-<title>Introduction</title>
-<body>
-
-<p>ebuild scripts are the basis for the entire portage system. They contain all
-the information required to download, unpack, compile and install a set of
-sources, as well as how to perform any optional pre/post install/removal or
-configuration functions.  While most of Portage is written in Python, the ebuild
-scripts themselves are written in bash, since using bash allows us to call commands
-as we would from the command-line.  One of the important design principles behind
-ebuild scripts is to have the commands therein be analogs of those one would type
-on the command-line if installing the package manually.  For this purpose, having
-bash syntax is a good thing.</p>
-
-<p>
-Ebuild scripts are interpreted by the <c>ebuild</c> and <c>emerge</c> commands.
-Think of the <c>ebuild</c> command as a low-level building tool.  It can build
-and install a single ebuild, but no more.  It will check to see if dependencies
-are satisfied, but it will not attempt to auto-resolve them.  On the other hand
-<c>emerge</c> is a high level engine for <c>ebuild</c>, and has the ability to
-auto-merge dependencies if needed, perform "pretend" merges so that user can see
-what ebuilds <e>would</e> be merged, and more.  Generally, <c>emerge</c> blows
-<c>ebuild</c> out of the water except in one area.  With <c>ebuild</c>, you can
-incrementally step through the various parts of a package installation (fetching,
-unpacking, compiling, installing and merging) one at a time.  For developers,
-this is an invaluable debugging tool, because it allows you to isolate ebuild
-problems to a specific portion of the build process.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Naming ebuild Files</title>
-<body>
-
-<p>Ebuild file names consist of four logical sections:</p>
-
-<p>The first section is the package name, which should only contain lowercase
-letters, the digits 0-9, and any number of single hyphen ('-') characters.
-Some examples are <c>util-linux</c>, <c>sysklogd</c> and <c>glibc</c>.  </p>
-
-<p>The second section is the version of the package, which should normally be
-same as the version on the main source tarball. The version is normally made up
-of two or three numbers separated by periods, such as <c>1.2</c> or
-<c>4.5.2</c> (although very long period-separated number sequences <e>are</e>
-supported), and may have a single letter immediately following the last digit,
-e.g., <c>1.4b</c> or <c>2.6h</c>. The package version is joined to the package
-name with a hyphen; for example: <c>foo-1.0</c>, <c>bar-2.4.6</c>, etc.</p>
-
-<impo>If you're thinking of using a trailing letter in your version string,
-note that the trailing letter should <e>not</e> be used to signify alpha or beta
-status for the package, since alphas and betas are <e>prereleases</e> and 
-letter revisions are <e>newer versions</e>.  This is an important distinction
-because Portage uses an ebuild's version number to determine if it is newer
-or older than other packages with the same category and name.  It's very
-important that version numbers faithfully represent the version of the 
-package so that Portage properly performs its dependency checking duties.</impo>
-
-<p>The third (optional) section contains a special suffix; either
-<c>_alpha</c>, <c>_beta</c>, <c>_pre</c> or <c>_rc</c>. Any of these suffixes
-may be immediately followed my a number, e.g., <c>linux-2.4.0_pre10</c>;
-Assuming identical version parts, an <c>_alpha</c> package is older than
-<c>_beta</c>, <c>_beta</c> older than <c>_pre</c>, and <c>_pre</c> older than
-<c>_rc</c>.  
-</p>
-
-<note>An <c>_rc</c> package is older than a package without an underscore
-prefix (i.e. <c>linux-2.4.0</c>), and <c>linux-2.4.0</c> is older than a
-package with a single letter prefix, i.e. <c>linux-2.4.0b</c>.  As you would
-expect, the <c>linux-2.4.0b</c> package is considered older than
-<c>linux-2.4.0c</c>.  Again this versioning information is important, as
-Portage uses it internally to determine whether one package or ebuild is newer
-than another with the same category and name.</note>
-
-<p>The fourth (optional) section of the package name is the Gentoo Linux-specific <e>revision</e> number,
-which is specified by <c>-r#</c>, where <c>#</c> is an integer,
-e.g. <c>package-4.5.3-r3</c>. This revision number is independent of
-the version of the source tarball and is used to inform people that 
-a new and improved Gentoo Linux rev of a particular package is available.
-</p>
-
-<p>
-If you make non-trivial improvements to an existing ebuild file, you should
-copy the ebuild file to a new file with the revision number incremented by 1.
-Initial releases normally have no revision number, e.g.
-<path>package-4.5.3</path> and are considered by Portage to have a a revision
-number of zero.  This means that counting goes as follows: <c>1.0</c> (initial
-version), <c>1.0-r1</c>, <c>1.0-r2</c>, etc.
-</p>
-
-<p>And I suppose that we actually have a <e>fifth</e> section of the ebuild name -- the
-<c>.ebuild</c> extension itself.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Contents of an ebuild File</title>
-<body><p>1. Variable Settings:</p>
-<p>The first part of every ebuild file is made up of a number of
-variable settings. The variables you can set are:</p>
-<table>
-<tr><ti><c>P</c></ti><ti>the name name and version of the package; you should not need to set this, as it is determined from the name of the ebuild file</ti></tr>
-<tr><ti><c>A</c></ti><ti>the name (without the path) of the main archive file for your package</ti></tr>
-<tr><ti><c>S</c></ti><ti>the source directory for your package; normally ${WORKDIR}/${P}</ti></tr>
-<tr><ti><c>DESCRIPTION</c></ti><ti>a short, one line description of your package</ti></tr>
-<tr><ti><c>SRC_URI</c></ti><ti>the URIs for every source file in your package, separated by whitespace; normally the first one is something like &quot;ftp://ftp.company.com/pub/somepackage/${A}&quot;</ti></tr>
-<tr><ti><c>HOMEPAGE</c></ti><ti>your package's homepage</ti></tr>
-<tr><ti><c>DEPEND</c></ti><ti>build dependencies; see the section <uri link="#dependencies">Package Dependencies</uri></ti></tr>
-<tr><ti><c>RDEPEND</c></ti><ti>runtime dependencies; see the section <uri link="#dependencies">Package Dependencies</uri></ti></tr>
-</table>
-<p>2. ebuild Functions</p>
-<p>There are a number of different functions that you can define in ebuild files that control the building and installation process of your package.</p>
-<table>
-<tr><ti><c>src_unpack</c></ti><ti>Use this function to unpack your sources and apply patches, and run autoconf/automake/etc. if necessary. By default, unpacks the packages in <c>${A}</c> and applies <c>${PF}-gentoo.diff</c>. The default starting directory is <c>${WORKDIR}</c>.</ti></tr>
-<tr><ti><c>src_compile</c></ti><ti>Use this function to configure and build the package. Default starting directory is <c>${S}</c>.</ti></tr>
-<tr><ti><c>src_install</c></ti><ti>Use this function install the package to an image in <c>${D}</c>. If your package uses automake, you can do this simply with <c>make DESTDIR=${D} install</c>. <emph>Make sure your package installs all its files using <c>${D}</c> as the root!</emph></ti></tr>
-<tr><ti><c>pkg_preinst</c></ti><ti>The commands in this function are run just prior to merging a package image into the filesystem.</ti></tr>
-<tr><ti><c>pkg_postinst</c></ti><ti>The commands in this function are run just following merging a package image into the filesystem.</ti></tr>
-<tr><ti><c>pkg_prerm</c></ti><ti>The commands in this function are run just prior to unmerging a package image from the filesystem.</ti></tr>
-<tr><ti><c>pkg_postrm</c></ti><ti>The commands in this function are run just following unmerging a package image from the filesystem.</ti></tr>
-</table>
-</body>
-</section>
-
-<section>
-<title>Rules for writing an ebuild File</title>
-<body><p>Since ebuild files are really just shell scripts, you should
-use your editor's shell-script mode for editing them. You should use
-proper indentation, using only tab characters -- no spaces. Make sure
-you set up your editor to put tabstops at 4 spaces. Always make sure
-you use braces around your environment variables; e.g. <c>${P}</c>
-instead of just <c>$P</c>.</p>
-<p>If you're using Vim, you can put the following snippet at the bottom of your .vimrc to make sure you're using the right settings when editing anything Gentoo-related.</p>
-<pre>
-if (getcwd() =~ 'gentoo-x86\|gentoo-src\|portage')
-	set tabstop=4 shiftwidth=4 noexpandtab
-endif
-</pre>
-<p>TODO: add stuff about emacs.</p></body>
-</section>
-
-<section>
-<title><c>USE</c> Variables</title>
-
-<body>
-
-<p>The purpose of USE variables is to allow you to configure Portage to globally
-and automatically enable or disable certain <e>optional build-time</e>
-features.  Here's an example.  Let's say you're a GNOME fan, and you'd like any
-ebuild that has the option of compiling-in optional GNOME support to do
-so.  In this case, you'd add <c>gnome</c> to the <c>USE</c> variable in
-<path>/etc/make.conf</path>, and then Portage will automatically add optional
-GNOME functionality to packages if it is available.  Likewise, if you don't
-want optional GNOME features to be added to your ebuilds if they are available,
-simply edit <path>/etc/make.conf</path> and make sure that <c>gnome</c> is
-<e>not</e> set in the <c>USE</c> variable.  Gentoo Linux has an almost
-overwhelming number of USE options, allowing you to have your system configured
-exactly the way you want it.
-
-<note> If you unset a USE variable (for example, removing <c>gnome</c> from
-<c>USE</c>), this will only instruct Portage to disable <e>optional</e>
-build-time support for GNOME.  However, if you <c>emerge</c> an ebuild that
-<e>requires</e> GNOME, the package will obviously have GNOME support enabled, as you
-would expect.  This also means that
-GNOME will be automatically installed (as a dependency) if it hasn't been already.  That's why
-it's always a good idea to do an <c>emerge --pretend</c> before doing the
-"real" <c>emerge</c>; that way, you'll always know that you're going to get!
-</note>
-
-In your own ebuilds, you can check whether a USE variable is set by using the
-<c>use &lt;variable&gt;</c> command. The <c>use</c> command prints out the name
-of every variable that is present in both <c>USE</c> and its command line. You
-would normally use this command as follows:</p>
-
-<p><c>if [ &quot;`use X`&quot; ]; then commands; fi</c></p>
-
-
-<p>USE variables can also be used to set dependencies. For example, you may
-only want to require a package if a certain USE variable is set. This is done
-by using the syntax <c>variable? ( mycat/mypackage-1.0-r1 )</c> in the DEPEND
-variable for your ebuild. In this example, <c>mycat/mypackage-1.0-r1</c> will
-only be required if <c>variable</c> is present in <c>USE</c></p>
-
-<p>Here's an important tip about how to use <c>USE</c>.  Most of the time,
-a package will have a <c>./configure</c> script used to perform configuration
-steps.  Generally, if your ebuild uses <c>./configure</c>, any optional build-time
-functionality will be enabled or disabled by passing the appropriate arguments to
-the <c>./configure</c> command.  Here's the best way to handle this.  First, 
-find out whether the particular <c>./configure</c> option that you want to add
-<c>USE</c> support for is is <e>enabled</e> or <e>disabled</e> by default.  If 
-it's <e>enabled</e> by default, then do things as follows:</p>
-<pre>
-DEPEND="gnome? ( &gt;=gnome-base/gnome-1.4 )"
-
-src_compile() {
-	local myvar
-	myvar=""
-	if [ -z "`use gnome`" ]
-	then
-		myvar="--disable-gnome"
-	fi
-	try ./configure ${myvar} --prefix=/usr --host=${CHOST}
-	try emake
-}
-</pre>
-<p>
-Above, we only check to see if the <c>gnome</c> USE variable is disabled (<c>-z</c>
-is <c>bash</c>'s way of saying "if empty string").  There's no need to explicitly
-enable GNOME, since for this package, GNOME is enabled by default.  However, if a
-particular feature is <e>disabled</e> by default, you can use this approach:</p>
-<pre>
-DEPEND="gnome? ( &gt;=gnome-base/gnome-1.4 )"
-
-src_compile() {
-	local myvar
-	myvar=""
-	if [ -n "`use gnome`" ]
-	then
-		myvar="--enable-gnome"
-	fi
-	try ./configure ${myvar} --prefix=/usr --host=${CHOST}
-	try emake
-}
-</pre>
-<p>This time, we only explicitly enable GNOME if the <c>GNOME</c> USE variable is set.
-Note that in bash, <c>[ -n "`use gnome`" ]</c> is equivalent to <c>[ "`use gnome`" ]</c>,
-and will be true only if the <c>gnome</c> USE variable is set.</p>
-
-<p>The following USE variables are currently used in Gentoo Linux:</p>
-
-<table>
-<tr><th>Variable</th><th>Description</th></tr>
-<tr><ti>X</ti><ti>enable use of X.  Often used to enable "token X app" included in a mostly console-based ebuild.</ti></tr>
-<tr><ti>alsa</ti><ti>enable built-in support for the Advanced Linux Sound Architecture.</ti></tr>
-<tr><ti>berkdb</ti><ti>enable built-in support for the Berkeley DB library (any version, as needed)</ti></tr>
-
-
-<tr><ti>bonobo</ti><ti>enable Bonobo</ti><ti><c>gnome</c> packages and others</ti></tr>
-<tr><ti>esd</ti><ti>enable ESound</ti><ti><c>gnome</c> packages and others</ti></tr>
-<tr><ti>gdbm</ti><ti>use GNU dbm</ti><ti></ti></tr>
-<tr><ti>glibc22</ti><ti>use GNU libc 2.2</ti><ti></ti></tr>
-<tr><ti>gnome</ti><ti>use GNOME; also enables use of GNOME related packages such as gdk-pixbuf</ti><ti></ti></tr>
-<tr><ti>gpm</ti><ti>use gpm</ti><ti></ti></tr>
-<tr><ti>kde</ti><ti>enable features of the K Desktop Environment</ti><ti></ti></tr>
-<tr><ti>ldap</ti><ti>use ldap</ti><ti></ti></tr>
-<tr><ti>lm_sensors</ti><ti>enable lm_sensors</ti><ti><c>sys-kernel</c> packages</ti></tr>
-<tr><ti>lvm</ti><ti>enable the Linux Volume Manager</ti><ti><c>sys-kernel</c> packages</ti></tr>
-<tr><ti>motif</ti><ti>enable Motif</ti><ti></ti></tr>
-<tr><ti>mysql</ti><ti>enable MySQL</ti><ti></ti></tr>
-<tr><ti>odbc</ti><ti>enable odbc</ti><ti></ti></tr>
-<tr><ti>ogg</ti><ti>enable the Ogg multimedia libraries</ti><ti></ti></tr>
-<tr><ti>opengl</ti><ti>use OpenGL 3D graphics</ti><ti></ti></tr>
-<tr><ti>pcmcia-cs</ti><ti>enable PCMCIA</ti><ti><c>sys-kernel</c> packages</ti></tr>
-<tr><ti>postgres</ti><ti>use PostgreSQL</ti><ti></ti></tr>
-<tr><ti>qt</ti><ti>use the Qt widget set</ti><ti></ti></tr>
-<tr><ti>readline</ti><ti>use readline</ti><ti></ti></tr>
-<tr><ti>slang</ti><ti>use slang</ti><ti></ti></tr>
-<tr><ti>ssl</ti><ti>use SSL</ti><ti></ti></tr>
-<tr><ti>tcltk</ti><ti>use Tcl/TK</ti><ti></ti></tr>
-<tr><ti>tcpd</ti><ti>use tcpd/tcp_wrappers</ti><ti></ti></tr>
-<tr><ti>xfs</ti><ti>enable the SGI XFS journaling filesystem</ti><ti><c>sys-kernel</c> packages</ti></tr>
-</table>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Filesystem Locations</title>
-
-<section>
-<title>Introduction to the FHS</title>
-<body>
-<p>The filesystem layout standards used in Gentoo Linux closely follow the FHS,
-short for <e>Filesystem Hierarchy Standard</e>. A simplified
-description of the standard is given here; for a complete
-specification go to <uri>http://www.pathname.com/fhs/</uri>.</p>
-<note> The <path>/opt</path> hierarchy is addressed in section 3.12 of the FHS.
-Section 4.4 deals with the <path>/usr/X11R6</path> directory.  KDE and GNOME are
-not specifically addressed, and are in fact not even mentioned in the current
-version of the FHS.
-</note>
-</body>
-</section>
-
-<section>
-<title>How to fit your packages into the filesystem</title>
-<body><p>Usually, if the package uses autoconf and automake, the
-default installation destinations are mostly correct, with a few exceptions:</p>
-<ul>
-
-<li>If you're installing a program into <path>/bin</path>, <path>/sbin</path>,
-<path>/usr/bin</path> or <path>/usr/sbin</path>, then the program's
-corresponding man page should be installed into the <path>/usr/share/man</path>
-tree.  This can often be accomplished by specifying a  <c>./configure
---mandir=/usr/share/man</c> in the ebuild.</li>
-
-<li>GNU info files should always be installed to <path>/usr/share/info</path>,
-<e>even if the info files are about X11, GNOME or KDE-specific programs or
-tools</e>.  Make a note: <path>/usr/share/info</path> is the <e>only</e>
-official location for GNU info files.  Since most <c>./configure</c> scripts
-default to installing GNU info files in <c>/usr/info</c>, it's often necessary
-to call <c>./configure</c> with the <c>--infodir=/usr/share/info</c> argument.</li>
-
-<li>Documentation files are installed in <path>/usr/share/doc</path>, into a
-subdirectory reflecting the name, version and revision of the particular
-program. This applies to all programs: GNOME, KDE, X11 and console alike.
-However, some programs may install additional documentation and support files
-into a <path>/usr/share</path> hierarchy for their own purposes.
-</li>
-
-<li>X11-specific programs and libraries should always be installed into <path>/usr</path>, not
-directly into <path>/usr/X11R6</path>.  We reserve the <path>/usr/X11R6</path> hierarchy for
-the X Window System, Version 11 Release 6 <e>itself</e>.  This is perhaps a more to-the-letter
-interpretation of the FHS than some other distributions have made.</li>
-
-<li>GNOME and KDE programs, similarly, should always be installed into
-<path>/usr</path>.</li>
-
-</ul>
-<impo> Some distributions choose to install GNOME and KDE into <path>/opt</path>. There
-exists no standard for these desktop environments in terms of where to actually install
-their files. In the interests of simplicity and consistency, we elect to install all 
-KDE and GNOME packages into the <path>/usr</path> hierarchy.</impo>
-
-<p>In general, you should have ebuilds install their files into the <path>/usr</path>
-tree.  <e>Some</e> programs can be compiled and linked with or without GNOME, KDE and X11 libraries,
-which can cause confusion.  Our solution is to install everything into <path>/usr</path>
-which avoids ambiguity and needless complexity for ebuild authors.  The location in which to
-install a program's files should <e>not</e> depend on the presence or abscence of specific
-<c>USE</c> variables.  Therefore, the ebuilds in the portage tree <e>almost always</e>
-install into the <path>/usr</path> hierarchy exclusively.</p>
-
-<note>The <path>/opt</path> directory is reserved in Gentoo Linux for binary-only packages.
-Examples include mozilla-bin, acroread, netscape and realplayer.  Packages that get
-installed here will usually require a <path>/etc/env.d/foo</path> stub file.  This is
-so that paths and additional variables can be included into the environment.</note>
-
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>The Portage scripts and utilities</title>
-
-<section>
-<title>Public scripts</title>
-<body><p>These are scripts used by the system-administrator to install and remove packages, and maintain the package database.</p>
-<p><c>ebuild</c></p>
-<p><c>ebuild</c> is the main engine of the Portage system; it performs all major tasks such as unpacking, compiling, installing, merging, and unmerging packages. It is called using the command: <c>ebuild path/to/package.ebuild command</c>. The commands available are:</p>
-<table>
-<tr><th>Command</th><th>Description</th><th>Related <c>ebuild</c> Function</th></tr>
-<tr><ti><c>depend</c></ti><ti>displays the dependencies required to build the package</ti><ti>n/a</ti></tr>
-<tr><ti><c>check</c></ti><ti>checks that the package dependencies are fulfilled</ti><ti>n/a</ti></tr>
-<tr><ti><c>rcheck</c></ti><ti>checks that the package runtime dependencies are fulfilled</ti><ti>n/a</ti></tr>
-<tr><ti><c>merge</c></ti><ti>unpacks, compiles, installs, and merges the package into your filesystem</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>qmerge</c></ti><ti>merges the package into your filesystem, assuming that the the unpack, compile, and install stages have already been executed</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>unpack</c></ti><ti>unpacks the source tarballs into the work directory</ti><ti><c>src_unpack</c></ti></tr>
-<tr><ti>*<c>compile</c></ti><ti>compiles the package</ti><ti><c>src_compile</c></ti></tr>
-<tr><ti><c>rpm</c></ti><ti>creates an RPM from the package</ti><ti>n/a</ti></tr>
-<tr><ti><c>package</c></ti><ti>creates a Gentoo <c>tbz2</c> package</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>prerm</c></ti><ti>executes the pre-removal stage of the package</ti><ti><c>pkg_prerm</c></ti></tr>
-<tr><ti>*<c>postrm</c></ti><ti>executes the post-removal stage of the package</ti><ti><c>pkg_postrm</c></ti></tr>
-<tr><ti>*<c>preinst</c></ti><ti>executes the pre-installation stage of the package</ti><ti><c>pkg_preinst</c></ti></tr>
-<tr><ti>*<c>postinst</c></ti><ti>executes the post-installation stage of the package</ti><ti><c>pkg_postinst</c></ti></tr>
-<tr><ti><c>config</c></ti><ti>sets up a default configuration once the package is merged</ti><ti><c>src_config</c></ti></tr>
-<tr><ti>*<c>touch</c></ti><ti>updates the mtimes for each source archive in the package</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>clean</c></ti><ti>cleans the work directory for the package</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>fetch</c></ti><ti>fetches the package source tarballs</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>digest</c></ti><ti>creates a digest file for the package</ti><ti>n/a</ti></tr>
-<tr><ti>*<c>install</c></ti><ti>installs the package into the image directory</ti><ti><c>src_install</c></ti></tr>
-<tr><ti><c>unmerge</c></ti><ti>unmerges the package from your filesystem</ti><ti>n/a</ti></tr>
-</table>
-<p>Note: commands with an asterisk (*) are normally only used by the developer.</p>
-
-<p><c>emerge</c></p>
-<p><c>emerge</c> recursively merges a package and all of its dependencies into your filesystem.</p>
-
-<p><c>pkgmerge</c></p>
-<p><c>pkgmerge</c> merges a Gentoo <c>tbz2</c> package.</p>
-
-<p><c>env-update</c></p>
-<p><c>env-update</c> updates the configuration files (including, but not limited to <path>/etc/ld.so.conf</path> and <path>/etc/profile.env</path>) to include changes made by installed packages.</p>
-</body>
-</section>
-
-<section>
-<title>Private Scripts and Commands</title>
-<body><p>These are scripts you can use in your ebuild files to perform common tasks.</p>
-<table>
-<tr><ti>dobin</ti><ti>installs the specified binaries into <path>DESTTREE/bin</path></ti></tr>
-<tr><ti>into</ti><ti>sets the target prefix (<path>DESTTREE</path>) for <c>dobin</c>, <c>dolib</c>, <c>doman</c>, etc.</ti></tr>
-<tr><ti>dodoc</ti><ti>installs the specified files into the packages documentation directory (<path>/usr/share/doc/${PF}</path>)</ti></tr>
-<tr><ti>doexe</ti><ti></ti></tr>
-<tr><ti>dohard</ti><ti></ti></tr>
-<tr><ti>doinfo</ti><ti></ti></tr>
-<tr><ti>doins</ti><ti></ti></tr>
-<tr><ti>dolib</ti><ti></ti></tr>
-<tr><ti>dolib.a</ti><ti></ti></tr>
-<tr><ti>dolib.so</ti><ti></ti></tr>
-<tr><ti>doman</ti><ti></ti></tr>
-<tr><ti>domo</ti><ti></ti></tr>
-<tr><ti>donewins</ti><ti></ti></tr>
-<tr><ti>dopython</ti><ti></ti></tr>
-<tr><ti>dosbin</ti><ti></ti></tr>
-<tr><ti>dosed</ti><ti></ti></tr>
-<tr><ti>dosym</ti><ti></ti></tr>
-<tr><ti>find-packages</ti><ti></ti></tr>
-<tr><ti>find-requires</ti><ti></ti></tr>
-<tr><ti>fowners</ti><ti></ti></tr>
-<tr><ti>fperms</ti><ti></ti></tr>
-<tr><ti>import-configsettings</ti><ti></ti></tr>
-<tr><ti>import-settings</ti><ti></ti></tr>
-<tr><ti>megadigest</ti><ti></ti></tr>
-<tr><ti>megadownload</ti><ti></ti></tr>
-<tr><ti>megatouch</ti><ti></ti></tr>
-<tr><ti>newbin</ti><ti></ti></tr>
-<tr><ti>newdoc</ti><ti></ti></tr>
-<tr><ti>newexe</ti><ti></ti></tr>
-<tr><ti>newins</ti><ti></ti></tr>
-<tr><ti>newlib.a</ti><ti></ti></tr>
-<tr><ti>newlib.so</ti><ti></ti></tr>
-<tr><ti>newman</ti><ti></ti></tr>
-<tr><ti>newsbin</ti><ti></ti></tr>
-<tr><ti>pkgmerge</ti><ti></ti></tr>
-<tr><ti>pkgname</ti><ti></ti></tr>
-<tr><ti>pmake</ti><ti></ti></tr>
-<tr><ti>prepall</ti><ti></ti></tr>
-<tr><ti>prepalldocs</ti><ti></ti></tr>
-<tr><ti>prepallinfo</ti><ti></ti></tr>
-<tr><ti>prepallman</ti><ti></ti></tr>
-<tr><ti>try</ti><ti></ti></tr>
-</table>
-</body>
-</section>
-</chapter>
-
-<chapter>
-<title>Package Dependencies</title>
-
-<section>
-<title>Why dependencies are important</title>
-<body><p>(TODO)<!-- todo -->
-</p></body>
-</section>
-
-<section>
-<title>How to Specify Dependencies in Your ebuild Files</title>
-<body><p>(TODO)<!-- todo -->
-</p></body>
-</section>
-</chapter>
-
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/install-old.xml b/app-doc/gentoo-web/files/xml/install-old.xml
deleted file mode 100755
index 5b890fd8d0bc..000000000000
--- a/app-doc/gentoo-web/files/xml/install-old.xml
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE guide PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN"
-"/usr/share/sgml/gentoo/guide/guide.dtd">
-
-<guide>
-<title>Gentoo Linux Installation Guide</title>
-<author title="Chief Architect" email="drobbins@gentoo.org">Daniel Robbins</author>
-<author title="Editor" email="thomasfl@gentoo.org">Thomas Flavel</author>
-
-<abstract>This guide shows you how to install Gentoo Linux 1.0_rc4_pre2.  Right now,
-Gentoo Linux installation is geared towards intermediate to advanced developers
-and system administrators.  The process itself is not incredibly complex, but
-you must know how to set up partitions, manually create filesystems, and
-extract tarballs.  If you know how to do this, then you're ready to install the
-Gentoo Linux release candidate.</abstract>
-
-<version>1.0</version>
-<date>18 Feb 2001</date>
-
-<chapter link="chap1">
-<title>Getting started</title>
-
-<section>
-<title>Install Methods</title>
-<body>
-<p>Rather than provide a special system installer program, we've chosen to provide
-you with a real Linux shell prompt.  From this prompt, you can perform all the
-steps necessary to install Gentoo Linux, and get everything set up exactly as
-you need it.  People often ask whether we're going to provide a fancy install
-program in the future.  Yes, we'd like to do this, but there will always be a
-relatively simple "manual" install method for those who need it.  By having
-a manual install method, we not only cater to Linux experts, but also make it
-easy for people building a special-purpose product out of Gentoo Linux.  Because
-our install process is "out in the open", it's easy for others to customize,
-automate or beautify to their liking.
-</p></body>
-</section>
-
-<section>
-<title>Partition layout</title>
-<body>
-<p>Here's a quick overview of the standard Gentoo Linux partition layout.  We're going to create at
-least three partitions: a swap partition, a root partition (to hold the bulk of Gentoo Linux), and a special boot
-partition.  The boot partition is designed to hold GRUB boot loader information
-as well as your Linux kernel(s).  The boot partition gives us a safe place to
-store everything related to booting Linux. During normal day-to-day Gentoo
-Linux use, your boot partition should remain <i>unmounted</i>.  This prevents
-your kernel from being made unavailable to GRUB (due to filesystem corruption)
-in the event of a system crash, preventing the chicken-and-egg problem where
-GRUB can't read your kernel (since your filesystem is corrupted) but you can't
-run fsck to uncorrupt your filesystem (since you can't boot!)      
-</p>
-</body>
-</section>
-
-<section>
-<title>Partition Selection</title>
-<body>
-<p>Now, on to filesystem types.  We recommend that you install Gentoo Linux on a
-ReiserFS filesystem because they're much faster and generally more reliable
-than their ext2 counterparts.  We've been using ReiserFS for a long time now
-and we believe it's not only "stable enough", but perfect for use in production
-environments.  However, if you want to use ext2 for your root and boot
-filesystems, we support this as well.  Support will likely be added for JFS in
-the near future, as well as XFS - as soon as it's ready.  Here are our recommended
-filesystem sizes and types:</p>
-
-  <table border="1"><tr><td><b>Partition</b></td><td><b>Size</b></td><td><b>Type</b></td></tr>
-  <tr><td>boot partition, containing kernel(s) and boot information</td><td>~100 Megabytes</td><td>ReiserFS recommended, ext2 ok</td></tr>
-  <tr><td>root partition, containing main filesystem (/usr, /home, etc)</td><td>&gt;=1.5 Gigabytes</td><td>ReiserFS recommended, ext2 ok</td></tr>
-  <tr><td>swap partition (no longer a 128 Megabyte limit)</td><td>&gt;=128 Megabytes</td><td>Linux swap</td></tr>
-  </table>
-</body>
-</section>
-
-<section>
-<title>Getting What You Need</title>
-<body><p>
-In this install guide, I'm going to be stepping you through the Gentoo
-Linux CD-based installation process.  To perform the CD install, you'll
-need the Gentoo Linux 1.0_rc4_pre2 CD ISO image, available <a
-href="http://www.ibiblio.org/gentoo/gentoo-iso-images/">here</a> (~550Mb download.)
-It's also possible to install Gentoo Linux from an existing Linux
-installation.  If you'd like to do this instead, you'll need to
-download the 1.0_rc4_pre2 sys.tbz2 file, available from <a
-href="http://www.ibiblio.org/gentoo/gentoo-x86-distro/gentoo-1.0_rc4_pre2/packages">here</a> (~67Mb download.)
-If you choose to install Gentoo Linux from another Linux distribution, you'll
-need to have the tools to unpack a bzip'd tarball (nearly all distributions do.)  However,
-at this time, most distributions don't have the ability to create and mount ReiserFS
-partitions.  If you don't have this ability, you may need to ReiserFS-enable your
-current system if you'd like to use ReiserFS.  Another possibility is to use
-ext2 filesystems for Gentoo Linux, or alternatively just download and burn our
-CD image, which has all the tools you need for ReiserFS.    
-</p>
-</body>
-</section>
-
-</chapter>
-<chapter link="chap2">
-<title>Installation</title>
-
-<section>
-<title>Booting the CD</title>
-<body>
-<p>
-Once you've downloaded the ISO image and burned your own Gentoo Linux CD, go ahead
-and boot your system from the CD.  You'll be presented with a GRUB menu that looks
-like this:
-</p>
-<p>
-<img src="install-boot.gif"/>
-</p>
-<p>
-Go ahead and select the first option to continue the CD boot process.  Linux will boot and the Gentoo
-Linux CD detector will start up and detect and mount a minimal Gentoo Linux system included
-on the CD.  When the boot process is complete, you'll be presented with a login prompt.  To
-log in, go ahead and type "<code>root</code>" and hit Enter.  You won't be prompted for a password.  
-</p>
-</body>
-</section>
-
-<section>
-<title>Step 1: Create and Format Your Partitions</title>
-<body>
-<p>
-The first step is to create your boot, root (plus optional /home, /usr, /var)
-and swap partitions using fdisk (type "<code>fdisk /dev/hd?</code>" to start it up.)  Your
-boot and root partition should be tagged as a "Linux" partitions (type 83) even
-if you're using ReiserFS.  Your swap partition should be tagged as "Linux swap"
-(type 82).  Here's a screenshot of an example partition layout.  In this
-example, /dev/hda1 is the boot partition (256Mb), /dev/hda2 is the swap
-partition (256Mb), and /dev/hda3 is the root partition (1.5Mb).  Notice that
-/dev/hda1 has the bootable flag set (you can set this with the "a" option.)
-Once you've created your partitions, remember to write your changes with the
-"w" option.
-</p><p>
-<img src="install-fdisk.gif"/>
-</p>                     
-</body>
-</section>
-
-<section>
-<title>Step 2: Create and Mount Filesystems</title>
-<body>
-<p>
-The second step is to create your filesystems.  Use the commands <code>mke2fs</code>, <code>mkreiserfs</code> and <code>mkswap</code> for this.  For example, to create
-a new ReiserFS filesystem on the partition /dev/hda1, type:
-</p><pre>
-# mkreiserfs /dev/hda1</pre>
-
-<p>For my example partition layout above, I typed in the following commands:
-</p>
-
-<pre>
-# mkreiserfs /dev/hda1
-# mkswap /dev/hda2
-# mkreiserfs /dev/hda3
-</pre><p>
-Now that the filesystems have been created, it's time to get your boot and root (and optionally your /var, /usr and /home partitions) mounted.
-For my example partition layout, I typed in the following:
-</p><pre>
-# mount /dev/hda3 /mnt/gentoo
-# mkdir /mnt/gentoo/boot
-# mount /dev/hda1 /mnt/gentoo/boot -o notail
-</pre><p>(note: the "notail" option is required if you're installing GRUB as a secondary boot loader.  It also doesn't hurt to include it if you're not.)
-</p>
-
-<p>Notice that I had to create the /mnt/gentoo/boot filesystem before mounting /dev/hda1.  If you've created
-additional non-root filesystems (/var, /usr, /home, etc), you'll need to create the appropriate directories under /mnt/gentoo
-and then mount all your filesystems at the correct locations.  Once all your filesystems are mounted, we're ready to extract
-the sys.tbz2 tarball - the file that contains the Gentoo Linux base system.
-</p>
-
-<p><b>Note for those installing from an existing Linux distro:</b><br/>
-If you're installing from an existing Linux distribution, make sure that all your filesystems are mounted at the /mnt/gentoo
-mountpoint just like I described above.  From this point on, you should be able to follow our install instructions word for
-word.
-</p>     
-</body>
-</section>
-
-
-<section>
-<title>Step 3: Extract the sys.tbz2 Tarball</title>
-<body>
-<p>
-Now, it's time to extract the sys.tbz2 tarball to /mnt/gentoo.
-You'll find the tarball at /mnt/distcd/packages/sys.tbz2.
-Extract it by typing:</p>
-<pre>
-# tar xjvf /mnt/distcd/packages/sys.tbz2 -C /mnt/gentoo
-</pre><p>
-If you're installing from another Linux distribution and your version of tar doesn't have the -j (bzip2) option, the following
-pipeline should do the exact same thing:
-</p><pre>
-# cat /path/to/sys.tbz2 | bzip2 -d | tar -xvf - -C /mnt/gentoo
-</pre>                                                         
-</body>
-</section>
-</chapter>
-
-
-
-<chapter link="chap3">
-<title>Configuration</title>
-<section>
-<title>Configure the system</title>
-<body><p><font color="#FF0000">Note: If you want to compile a custom kernel during the install process, them before proceeding with the
-following instructions, copy the linux-sources tbz2 file from /mnt/distcd/packages/All/linux-sources-???.tbz2 to /mnt/gentoo/tmp.
-Then, proceed with these instructions.  I'll let you know when it's time to merge it.</font>
-</p>
-
-<p>Now that the base system tarball has been extracted, we need to get the system ready for booting.  Begin this process
-by typing:
-</p><pre>
-# chroot /mnt/gentoo
-</pre><p>The chroot command will start a new shell with the root filesystem set to /mnt/gentoo.  
-If you have a non-US keyboard, you've probably noticed that some keys aren't in the right place.  This can be fixed by
-typing:
-</p><pre>
-# loadkeys [keymap]
-</pre><p>
-Here are some popular non-English keymaps:</p>
-<table><tr><td><b>Language</b></td><td><b>Keymap</b></td></tr>
-<tr><td>German</td><td>de-latin1-nodeadkeys</td></tr>
-<tr><td>French</td><td>fr_latin1</td></tr>
-</table>
-<p>
-Please <a href="mailto:drobbins@gentoo.org">email me</a> the keymaps that you use for your
-preferred language so that I can add them to this document.  Now, type the following commands:
-</p><pre>
-# env-update
-# /etc/rc.d/init.d/initscripts-install
-</pre><p>The first command, env-update, is a special Gentoo Linux command that auto-generates the /etc/ld.so.conf file and configures
-the default shell environment variable and path settings.  The second script will configure Gentoo Linux initialization scripts,
-so that all the proper symlinks are in place in /etc/rc.d so that the system will boot.
-</p>
-
-<p>There are just a few files that need to be configured before we're ready to install the Gentoo Linux boot loader (GRUB) and
-start Gentoo Linux.  Right now, the only editor included with the base system is "vi".  In the next release, we're also going
-to include another text editor that's easier to use for those who don't know vi.  If you don't know how to use vi, here are
-some quick instructions.  To edit a file, type "<code>vi filename</code>".  Immediately after vi loads the file, press the "i" key to enter
-INSERT mode.  In this mode, you'll be able to move around in the file by using the arrow keys, and you'll be able to insert
-text just by typing it and delete text with the backspace or delete key.  If you need to delete an entire line, press escape
-to leave INSERT mode (you're now in command mode), and hit "dd".  Then, hit "i" again to go back to insert mode.  When you need
-to save your changes, hit escape to leave INSERT mode and type "<code>:x</code>".  If you want to throw away your changes, type "<code>:q!</code>".
-Vim, the version of vi that's included with Gentoo Linux, also includes extensive help.  You can type "<code>:help</code>" (in command mode)
-to access it.</p>
-</body>
-</section>
-
-<section>
-<title>/etc/fstab</title>
-<body>
-<p>Edit this file, making sure that the partition names and filesystem types are correct.  Here are the
-first three configuration lines for my example system configuration:
-</p><pre>
-/dev/hda3       /         reiserfs        defaults         1 1
-/dev/hda2       none      swap            sw               0 0
-/dev/hda1       /boot     reiserfs        noauto,notail    0 2
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/localtime</title>
-<body>
-<p>Look for your timezone (or GMT if you using Greenwich Mean Time) in /usr/share/zoneinfo.  Then, make a symbolic link by typing:
-</p><pre>
-# cd /etc; ln -sf /usr/share/zoneinfo/path/to/timezonefile localtime
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/hostname</title>
-<body>
-<p>Edit this file so that it contains your fully-qualified domain name on a single line, i.e. "mymachine.mydomain.com" (without the quotes).
-</p>
-</body>
-</section>
-
-<section>
-<title>/etc/resolve.conf</title>
-<body>
-<p>This file contains DNS server and domain information.  Here's a template to follow:
-</p><pre>
-domain mydomain.com
-nameserver 10.0.0.1
-nameserver 10.0.0.2
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/hosts</title>
-<body>
-<p>This file contains a list of ip addresses and their associated hostnames.  It's used by the system to resolve the IP addresses
-of any hostnames that may not be in your nameservers.  Here's a template for this file:
-</p><pre>
-127.0.0.1	localhost
-# the next line contains your IP for your local LAN, and your associated machine name
-192.168.1.1	mymachine.mydomain.com	mymachine
-</pre>
-</body>
-</section>
-
-<section>
-<title>Configure ethernet</title>
-<body>
-<p>Look in the /etc/rc.d/config directory; you'll see a file called OFF_inet.eth0.  Copy this file to inet.eth0, and edit
-the top part of it so that it contains the IP address settings you want to use on your first ethernet card.  Look in /lib/modules for the ethernet module specific to your particular ethernet card,
-and append it to the /etc/rc.d/config/modules file (you can also add any options you need to the same line.)  Then, when Gentoo Linux boots, this module will be automatically loaded from disk.  If you have multiple network cards, 
-copy inet.eth0 to inet.eth1 and edit this file so that it configures your second interface correctly.  Repeat for eth2, etc as necessary.  If you have a static ppp link, you can copy the inet.eth0 file to inet.ppp0, and insert the appropriate commands in the
-netup() and netdown() functions.  All /etc/rc.d/config/inet.* files will be started automatically at boot time by the /etc/rc.d/init.d/inet rc script.
-</p>
-</body>
-</section>
-
-<section>
-<title>Configure basic settings</title>
-<body>
-<p>Take a look at the /etc/rc.d/config/basic, and make sure that it's set up properly.  Important settings are GMT
-(set to "yes" if your system clock is set to GMT, otherwise "no" if it's set to your local time) and KEYMAP (look in 
-/usr/share/keymaps/i386/qwerty,dvorak,etc. for available keymaps.  To specify the keymap, set KEYMAP to the *prefix*
-of the keymap filename (i.e. drop the ".kmap.gz" extension from the end.)
-</p>
-</body>
-</section>
-
-<section>
-<title>Configure GRUB</title>
-<body>
-<p>
-The most critical part of understanding GRUB is getting comfortable with how GRUB refers to hard drives and partitions.
-Your Linux partition /dev/hda1 is called (hd0,0) under GRUB.  Notice the parenthesis around the hd0,0 - they are required.  
-Hard drives count from zero rather than "a", and partitions start at zero rather than one.  So, /dev/hdb3 gets translated to (hd1,2), and /dev/hdd7 gets translated to (hd3,6).  After you've gotten the feel for that, convert your boot and root partition names to the GRUB format and write them down.  Now, it's time to install GRUB.
-</p>
-
-<p>The easiest way to install grub is to simply type "<code>grub</code>" at your chrooted shell prompt:
-</p><pre>
-# grub
-</pre><p>You'll be presented with the "grub&gt; " grub command-line prompt.  Now, you need to type in the
-right commands to install the GRUB boot record onto your hard drive.  In my example configuration,
-I want to install the GRUB boot record on my hard drive's MBR (master boot record), so that 
-the first thing I see when I turn on the computer is the GRUB prompt.  In my case, the commands
-I want to type are:</p><pre>grub&gt; root (hd0,0)
-grub&gt; setup (hd0)
-</pre>
-
-<p>Here's how the two commands work.  The first "root ( )" command tells GRUB
-the location of your boot partition (in my case, hda1 or in GRUB terminology
-(hd0,0)).  Then, the second "setup ( )" command tells GRUB where to install the
-boot record - it will be configure to look for its special files at the "root
-( )" location that you specified.  In my case, I want the boot record on the
-MBR of the hard drive, so I simply specify hda ((hd0)).  If I were using
-another boot loader and wanted to set up GRUB as a secondary boot-loader, I
-could install GRUB to the boot record of a particular partition.  In that case,
-I'd specify a particular partition rather than the entire disk.  Once the GRUB
-boot record has been 
-successfully installed, you can type "quit" to quit GRUB.  Gentoo Linux is
-installed, but we need to create the /boot/boot/grub/menu.lst file so that
-we get a nice GRUB boot menu when the system reboots.  Here's how to do it.</p>
-
-<p>Now, create the menu.lst file ("<code>vi /boot/boot/grub/menu.lst</code>"), and add the following to it:</p>
-<pre>
-default 0
-timeout 30
-
-title=My example Gentoo Linux
-root (hd0,0) <font color="#FF0000">(note: (hd0,0) should point to your "boot" partition (hda1 in my case)</font>
-kernel /boot/bzImage root=/dev/hda3 <font color="#FF0000">(note: /dev/hda3 should point to your "root" filesystem)</font>
-
-title=Windows NT Workstation
-root (hd0,2) <font color="#FF0000">(note: (hd0,2) contains the NT boot loader)</font>
-</pre><p>After saving this file, Gentoo Linux installation is complete.  Selecting the first option will
-tell GRUB to boot Gentoo Linux without a fuss.  The second part of the menu.lst file is optional, and shows you how to
-use GRUB to boot a bootable Windows partition.</p>
-
-<p>Also, if you need to pass any options to the kernel, simply add them to the end of the "kernel" command.  We're already
-passing one option "root=/dev/hda3", but you can pass others as well.  There's one in particular that you may be interested
-in.  If you want to enable devfs (a special device filesystem), you can add the "devfs=mount" option at the end of the kernel
-line.
-</p>
-</body>
-</section>
-
-<section>
-<title>One Last Step</title>
-<body>
-<p>If you copied over the linux-sources-???.tbz2 file, you can now install the package and compile a fresh new
-kernel.  To merge the linux-sources, type "<code>pkgmerge /tmp/linux-sources-???.tbz2</code>".  After the merge completes,
-you can remove the .tbz2 from /tmp and continue with the kernel compile step.  If you didn't copy over the
-linux sources, you can skip the kernel compile step and proceed unmounting your filesystems below.</p>
-<p>To compile your own kernel, perform the following steps:</p><pre>
-# cd /usr/src/linux
-# make menuconfig <font color="#FF0000">(Note: make sure you compile-in support for ReiserFS as well as your boot drive controller)</font>
-# make bzImage
-# make modules
-# make modules_install
-# cp arch/i386/boot/bzImage /boot/boot <font color="#FF0000">(Note: the "/boot/boot" is intentional and should not simply be "/boot")</font>
-</pre>
-
-<p>Now, Gentoo Linux is installed.  The only remaining step is to exit the chrooted shell, safely unmount your partitions
-and reboot the system:</p>
-<pre>
-# exit <font color="#FF0000">(note: this exits the chrooted shell; you can also type <code>^D)</code></font>
-# umount /mnt/gentoo/boot
-# umount /mnt/gentoo
-# reboot
-</pre>
-</body>
-</section>
-
-</chapter>
-
-<chapter link="chap4">
-<title></title>
-<section>
-<title>Congratulations!</title>
-<body><p>If you have any questions or would like to get involved with Gentoo Linux development, 
-consider joining our gentoo-dev mailing list (there's a "click to subscribe" link on our <a href="http://www.gentoo.org">main page</a>).
-</p>
-</body>
-</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/install.txt b/app-doc/gentoo-web/files/xml/install.txt
deleted file mode 100644
index a261ac889081..000000000000
--- a/app-doc/gentoo-web/files/xml/install.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-<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/install.xml b/app-doc/gentoo-web/files/xml/install.xml
deleted file mode 100755
index c700f4f654c1..000000000000
--- a/app-doc/gentoo-web/files/xml/install.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/install.html">
-<title>Gentoo Linux Installation 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 install Gentoo Linux 1.0_rc4_pre2.  Right now,
-Gentoo Linux installation is geared towards intermediate to advanced developers
-and system administrators.  The process itself is not incredibly complex, but
-you must know how to set up partitions, manually create filesystems, and
-extract tarballs.  If you know how to do this, then you're ready to install the
-Gentoo Linux release candidate.</abstract>
-
-<version>1.0.1</version>
-<date>22 Apr 2001</date>
-
-<chapter>
-<title>Getting started</title>
-
-<section>
-<title>Install Methods</title>
-<body>
-<p>Rather than provide a special system installer program, we've chosen to provide
-you with a real Linux shell prompt.  From this prompt, you can perform all the
-steps necessary to install Gentoo Linux, and get everything set up exactly as
-you need it.  People often ask whether we're going to provide a fancy install
-program in the future.  Yes, we'd like to do this, but there will always be a
-relatively simple "manual" install method for those who need it.  By having
-a manual install method, we not only cater to Linux experts, but also make it
-easy for people building a special-purpose product out of Gentoo Linux.  Because
-our install process is "out in the open", it's easy for others to customize,
-automate or beautify to their liking.
-</p></body>
-</section>
-
-<section>
-<title>Partition layout</title>
-<body>
-<p>Here's a quick overview of the standard Gentoo Linux partition layout.  We're going to create at
-least three partitions: a swap partition, a root partition (to hold the bulk of Gentoo Linux), and a special boot
-partition.  The boot partition is designed to hold GRUB boot loader information
-as well as your Linux kernel(s).  The boot partition gives us a safe place to
-store everything related to booting Linux. During normal day-to-day Gentoo
-Linux use, your boot partition should remain <e>unmounted</e>.  This prevents
-your kernel from being made unavailable to GRUB (due to filesystem corruption)
-in the event of a system crash, preventing the chicken-and-egg problem where
-GRUB can't read your kernel (since your filesystem is corrupted) but you can't
-run fsck to uncorrupt your filesystem (since you can't boot!)      
-</p>
-</body>
-</section>
-
-<section>
-<title>Partition Selection</title>
-<body>
-<p>Now, on to filesystem types.  We recommend that you install Gentoo Linux on a
-ReiserFS filesystem because they're much faster and generally more reliable
-than their ext2 counterparts.  We've been using ReiserFS for a long time now
-and we believe it's not only "stable enough", but perfect for use in production
-environments.  However, if you want to use ext2 for your root and boot
-filesystems, we support this as well.  Support will likely be added for JFS in
-the near future, as well as XFS - as soon as it's ready.  Here are our recommended
-filesystem sizes and types:</p>
-
-  <table>
-  <tr>
-  	<th>Partition</th>
-	<th>Size</th>
-	<th>Type</th>
-  </tr>
-  <tr>
-  	<ti>boot partition, containing kernel(s) and boot information</ti>
-	<ti>~100 Megabytes</ti>
-	<ti>ReiserFS recommended, ext2 ok</ti>
-  </tr>
-  <tr>
-  	<ti>root partition, containing main filesystem (/usr, /home, etc)</ti>
-	<ti>&gt;=1.5 Gigabytes</ti>
-	<ti>ReiserFS recommended, ext2 ok</ti>
-  </tr>
-  <tr>
-  	<ti>swap partition (no longer a 128 Megabyte limit)</ti>
-	<ti>&gt;=128 Megabytes</ti>
-	<ti>Linux swap</ti>
-  </tr>
-  </table>
-</body>
-</section>
-
-<section>
-<title>Getting What You Need</title>
-<body><p>
-In this install guide, I'm going to be stepping you through the Gentoo
-Linux CD-based installation process.  To perform the CD install, you'll
-need the Gentoo Linux 1.0_rc4_pre2 CD ISO image, available at <uri>
-http://www.ibiblio.org/gentoo/gentoo-iso-images/</uri> (~550Mb download.)
-It's also possible to install Gentoo Linux from an existing Linux
-installation.  If you'd like to do this instead, you'll need to
-download the <path>1.0_rc4_pre2 sys.tbz2</path> file, available from <uri>
-http://www.ibiblio.org/gentoo/gentoo-x86-distro/gentoo-1.0_rc4_pre2/packages/</uri> (~67Mb download.)
-If you choose to install Gentoo Linux from another Linux distribution, you'll
-need to have the tools to unpack a bzip'd tarball (nearly all distributions do.)  However,
-at this time, most distributions don't have the ability to create and mount ReiserFS
-partitions.  If you don't have this ability, you may need to ReiserFS-enable your
-current system if you'd like to use ReiserFS.  Another possibility is to use
-ext2 filesystems for Gentoo Linux, or alternatively just download and burn our
-CD image, which has all the tools you need for ReiserFS.    
-</p>
-</body>
-</section>
-
-</chapter>
-<chapter>
-<title>Installation</title>
-
-<section>
-<title>Booting the CD</title>
-<body>
-<p>
-Once you've downloaded the ISO image and burned your own Gentoo Linux CD, go ahead
-and boot your system from the CD.  You'll be presented with a GRUB menu that looks
-like this:
-</p>
-<figure link="/images/install-boot.gif" short="The boot screen" caption="When the CD boots, you'll see this screen"/>
-<p>
-Go ahead and select the first option to continue the CD boot process.  Linux will boot and the Gentoo
-Linux CD detector will start up and detect and mount a minimal Gentoo Linux system included
-on the CD.  When the boot process is complete, you'll be presented with a login prompt.  To
-log in, go ahead and type <c>root</c> and hit Enter.  You won't be prompted for a password.  
-</p>
-</body>
-</section>
-
-<section>
-<title>Using boot floppies</title>
-<body>
-<p>In case you can't use a bootable cd for some reason (i.e. no burner, we
-haven't made isos, your cat ate all your blank cds etc.) you can use the boot
-floppies. You'll need  bootdisk.img and rescue.img. You can find them <uri
-link="http://www.ibiblio.org/gentoo/snapshots/disks/">here</uri> 
-(look in the latest
-rc dir).
-</p>
-<p>Once you've downloaded them you need to run <c>dd if=bootdisk.img of=/dev/fd0
-bs=1k</c> for both the bootdisk.img and rescue.img. Then you can boot from
-bootdisk.img, and insert rescue.img when it prompts you. If you have a
-currently running system you may want to download sys or build tarball and
-store it on a spare partition so you will have it available when you reboot.
-</p>
-</body>
-</section>
-
-<section>
-<title>Step 1: Create and Format Your Partitions</title>
-<body>
-<p>
-The first step is to create your boot, root (plus optional <path>/home</path>, <path>/usr</path>, <path>/var</path>)
-and swap partitions using fdisk (type <c>fdisk /dev/hd?</c> to start it up.)  Your
-boot and root partition should be tagged as a "Linux" partitions (type 83) even
-if you're using ReiserFS.  Your swap partition should be tagged as "Linux swap"
-(type 82).  Here's a screenshot of an example partition layout.  In this
-example, <path>/dev/hda1</path> is the boot partition (256Mb), <path>/dev/hda2</path> is the swap
-partition (256Mb), and <path>/dev/hda3</path> is the root partition (1.5Gb).  Notice that
-<path>/dev/hda1</path> has the bootable flag set (you can set this with the <c>a</c> option.)
-Once you've created your partitions, remember to write your changes using the
-<c>w</c> option.
-</p>
-<figure link="/images/install-fdisk.gif" short="Creating partitions" caption="Creating partitions using fdisk"/>
-</body>
-</section>
-
-<section>
-<title>Step 2: Create and Mount Filesystems</title>
-<body>
-<p>
-The second step is to create your filesystems.  Use the commands <c>mke2fs</c>, <c>mkreiserfs</c> and <c>mkswap</c> for this.  For example, to create
-a new ReiserFS filesystem on the partition /dev/hda1, type:
-</p><pre>
-# <i>mkreiserfs /dev/hda1</i></pre>
-
-<p>For my example partition layout above, I typed in the following commands:
-</p>
-
-<pre linkid="filesyscode" caption="Creating and mounting filesystems">
-# <i>mkreiserfs /dev/hda1</i>
-# <i>mkswap /dev/hda2</i>
-# <i>mkreiserfs /dev/hda3</i>
-</pre><p>
-Now that the filesystems have been created, it's time to get your boot and root (and optionally your /var, /usr and /home partitions) mounted.
-For my example partition layout, I typed in the following:
-</p><pre>
-# <i>mount /dev/hda3 /mnt/gentoo</i>
-# <i>mkdir /mnt/gentoo/boot</i>
-# <i>mount /dev/hda1 /mnt/gentoo/boot -o notail</i>
-</pre>
-
-<note title="The notail option">The "notail" option is required if you're
-installing GRUB as a secondary boot loader.  It also doesn't hurt to include it
-if you're not.</note>
-
-<p>Notice that I had to create the <path>/mnt/gentoo/boot</path> filesystem before mounting <path>/dev/hda1</path>.  If you've created
-additional non-root filesystems (<path>/var</path>, <path>/usr</path>, <path>/home</path>, etc), you'll need to create the appropriate directories under <path>/mnt/gentoo</path>
-and then mount all your filesystems at the correct locations.  Once all your filesystems are mounted, we're ready to extract
-the <path>sys.tbz2</path> tarball - the file that contains the Gentoo Linux base system.
-</p>
-
-<note>
-If you're installing Gentoo Linux direct from an existing Linux distribution, make sure that all your filesystems are mounted at the <path>/mnt/gentoo</path>
-mountpoint just like I described above.  From this point on, you should be able to follow our install instructions word for
-word.
-</note>     
-</body>
-</section>
-
-
-<section>
-<title>Step 3: Extract the sys.tbz2 Tarball</title>
-<body>
-<p>
-Now, it's time to extract the <path>sys.tbz2</path> tarball to <path>/mnt/gentoo</path>.
-You'll find the tarball at <path>/mnt/distcd/packages/sys.tbz2</path>.
-Extract it by typing:</p>
-<pre>
-# <i>tar xpjvf /mnt/distcd/packages/sys.tbz2 -C /mnt/gentoo</i>
-</pre>
-<impo>Please notice that we use the <c>p</c> option when extracting the
-sys tarball.  This is <e>extremely</e> important, since it ensures that
-the literal permissions in the tarball will be preserved on disk.  Without
-the <c>p</c>, directory perms are affected by the umask -- which is helpful
-when you're extracting a source tarball, but not so helpful when you're
-restoring a system image.</impo>
-
-<p>
-If you're installing from another Linux distribution and your version of tar doesn't have the <c>-j</c> (bzip2) option, the following
-pipeline should do the exact same thing:
-</p><pre>
-# <i>cat /path/to/sys.tbz2 | bzip2 -d | tar -xpvf - -C /mnt/gentoo</i>
-</pre>                                                         
-<impo>Again, notice that we use the extremely important <c>p</c> option to
-extract the tarball.</impo>
-
-</body>
-</section>
-</chapter>
-
-
-
-<chapter>
-<title>Configuration</title>
-<section>
-<title>Configure the system</title>
-<body><note>If you want to compile a custom kernel during the install process, them before proceeding with the
-following instructions, copy the linux-sources tbz2 file from <path>/mnt/distcd/packages/All/linux-sources-???.tbz2</path> to <path>/mnt/gentoo/tmp</path>.
-Then, proceed with these instructions.  I'll let you know when it's time to merge it.</note>
-
-<p>Now that the base system tarball has been extracted, we need to get the system ready for booting.  Begin this process
-by typing:
-</p><pre>
-# <i>chroot /mnt/gentoo</i>
-</pre><p>The chroot command will start a new shell with the root filesystem set to <path>/mnt/gentoo</path>.  
-If you have a non-US keyboard, you've probably noticed that some keys aren't in the right place.  This can be fixed by
-typing:
-</p><pre>
-# <i>loadkeys [keymap]</i>
-</pre><p>
-Here are some popular non-English keymaps:</p>
-<table><th>Language</th><th>Keymap</th>
-<tr><ti>German</ti><ti>de-latin1-nodeadkeys</ti></tr>
-<tr><ti>French</ti><ti>fr_latin1</ti></tr>
-<tr><ti>Swedish</ti><ti>se_latin1</ti></tr>
-</table>
-<p>
-Please <mail link="drobbins@gentoo.org">email me</mail> the keymaps that you use for your
-preferred language so that I can add them to this document.  Now, type the following commands:
-</p><pre>
-# <i>env-update</i>
-# <i>/etc/rc.d/init.d/initscripts-install</i>
-</pre><p>The first command, env-update, is a special Gentoo Linux command that auto-generates the <path>/etc/ld.so.conf</path> file and configures
-the default shell environment variable and path settings.  The second script will configure Gentoo Linux initialization scripts,
-so that all the proper symlinks are in place in <path>/etc/rc.d</path> so that the system will boot.
-</p>
-
-<p>There are just a few files that need to be configured before we're ready to install the Gentoo Linux boot loader (GRUB) and
-start Gentoo Linux.  Right now, the only editor included with the base system is <c>vi</c>.  In the next release, we're also going
-to include another text editor that's easier to use for those who don't know <c>vi</c>.  If you don't know how to use vi, here are
-some quick instructions.  To edit a file, type <c>vi filename</c>.  Immediately after <c>vi</c> loads the file, press the <c>i</c> key to enter
-INSERT mode.  In this mode, you'll be able to move around in the file by using the arrow keys, and you'll be able to insert
-text just by typing it and delete text with the backspace or delete key.  If you need to delete an entire line, press escape
-to leave INSERT mode (you're now in command mode), and hit <c>dd</c>.  Then, hit <c>i</c> again to go back to INSERT mode.  When you need
-to save your changes, hit escape to leave INSERT mode and type <c>:x</c>.  If you want to throw away your changes, type <c>:q!</c>.
-Vim, the version of vi that's included with Gentoo Linux, also includes extensive help.  You can type <c>:help</c> (in command mode)
-to access it.</p>
-</body>
-</section>
-
-<section>
-<title>/etc/fstab</title>
-<body>
-<p>Edit this file, making sure that the partition names and filesystem types are correct.  Here are the
-first three configuration lines for my example system configuration:
-</p><pre>
-/dev/hda3       /         reiserfs        defaults         1 1
-/dev/hda2       none      swap            sw               0 0
-/dev/hda1       /boot     reiserfs        noauto,notail    0 2
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/localtime</title>
-<body>
-<p>Look for your timezone (or GMT if you using Greenwich Mean Time) in <path>/usr/share/zoneinfo</path>.  Then, make a symbolic link by typing:
-</p><pre>
-# <i>cd /etc; ln -sf /usr/share/zoneinfo/path/to/timezonefile localtime</i>
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/hostname</title>
-<body>
-<p>Edit this file so that it contains your fully-qualified domain name on a single line, i.e. <c>mymachine.mydomain.com</c>.
-</p>
-</body>
-</section>
-
-<section>
-<title>/etc/resolv.conf</title>
-<body>
-<p>This file contains DNS server and domain information.  Here's a template to follow:
-</p><pre>
-domain mydomain.com
-nameserver 10.0.0.1
-nameserver 10.0.0.2
-</pre>
-</body>
-</section>
-
-<section>
-<title>/etc/hosts</title>
-<body>
-<p>This file contains a list of ip addresses and their associated hostnames.  It's used by the system to resolve the IP addresses
-of any hostnames that may not be in your nameservers.  Here's a template for this file:
-</p><pre>
-127.0.0.1      localhost
-<comment># the next line contains your IP for your local LAN, and your associated machine name</comment>
-192.168.1.1    mymachine.mydomain.com	mymachine
-</pre>
-</body>
-</section>
-
-<section>
-<title>Configure ethernet</title>
-<body>
-
-<p>Look in the <path>/etc/rc.d/config</path> directory; you'll see a file
-called <path>OFF_inet.eth0</path>.  Copy this file to <path>inet.eth0</path>, and edit the top part of it
-so that it contains the IP address settings you want to use on your first
-ethernet card.  Look in <path>/lib/modules</path> for the ethernet module
-specific to your particular ethernet card, and append it to the
-<path>/etc/rc.d/config/modules</path> file (you can also add any options you
-need to the same line.)  Then, when Gentoo Linux boots, this module will be
-automatically loaded from disk.  If you have multiple network cards, copy
-<path>inet.eth0</path> to <path>inet.eth1</path> and edit this file so that it
-configures your second interface correctly.  Repeat for eth2, etc as necessary.
-If you have a static ppp link, you can copy the <path>inet.eth0</path> file to
-<path>inet.ppp0</path>, and insert the appropriate commands in the
-<c>netup()</c> and <c>netdown()</c> functions.  All
-<path>/etc/rc.d/config/inet.*</path> files will be started automatically at
-boot time by the <path>/etc/rc.d/init.d/inet</path> rc script.  </p>
-
-</body>
-</section>
-
-<section>
-<title>Configure basic settings</title>
-<body>
-
-<p>Take a look at the <path>/etc/rc.d/config/basic</path>, and make sure that it's set up properly.  Important settings are GMT
-(set to <c>yes</c> if your system clock is set to GMT, otherwise <c>no</c> if it's set to your local time) and KEYMAP (look in 
-<path>/usr/share/keymaps/i386</path> for available keymaps.  To specify the keymap, set KEYMAP to the <e>prefix</e>
-of the keymap filename (i.e. drop the <path>.kmap.gz</path> extension from the end.)
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Configure GRUB</title>
-<body>
-<p>
-The most critical part of understanding GRUB is getting comfortable with how GRUB refers to hard drives and partitions.
-Your Linux partition <path>/dev/hda1</path> is called <path>(hd0,0)</path> under GRUB.  Notice the parenthesis around the hd0,0 - they are required.  
-Hard drives count from zero rather than "a", and partitions start at zero rather than one.  So, <path>/dev/hdb3</path> gets translated to <path>(hd1,2)</path>, and <path>/dev/hdd7</path> gets translated to <path>(hd3,6)</path>.  After you've gotten the feel for that, convert your boot and root partition names to the GRUB format and write them down.  Now, it's time to install GRUB.
-</p>
-
-<p>The easiest way to install grub is to simply type <c>grub</c> at your chrooted shell prompt:
-</p><pre>
-# <i>grub</i>
-</pre><p>You'll be presented with the <c>grub&gt;</c> grub command-line prompt.  Now, you need to type in the
-right commands to install the GRUB boot record onto your hard drive.  In my example configuration,
-I want to install the GRUB boot record on my hard drive's MBR (master boot record), so that 
-the first thing I see when I turn on the computer is the GRUB prompt.  In my case, the commands
-I want to type are:</p>
-<pre>grub&gt; <i>root (hd0,0)</i>
-grub&gt; <i>setup (hd0)</i>
-</pre>
-
-<p>Here's how the two commands work.  The first <c>root ( )</c> command tells GRUB
-the location of your boot partition (in my case, <path>/dev/hda1</path> or 
-<path>(hd0,0)</path> in GRUB terminology.  Then, the second <c>setup ( )</c> command tells GRUB where to install the
-boot record - it will be configure to look for its special files at the <c>root
-( )</c> location that you specified.  In my case, I want the boot record on the
-MBR of the hard drive, so I simply specify <path>/dev/hda</path> (also known as <path>(hd0)</path>).  If I were using
-another boot loader and wanted to set up GRUB as a secondary boot-loader, I
-could install GRUB to the boot record of a particular partition.  In that case,
-I'd specify a particular partition rather than the entire disk.  Once the GRUB
-boot record has been 
-successfully installed, you can type <c>quit</c> to quit GRUB.  Gentoo Linux is
-installed, but we need to create the <path>/boot/boot/grub/menu.lst</path> file so that
-we get a nice GRUB boot menu when the system reboots.  Here's how to do it.</p>
-
-<p>Now, create the menu.lst file (<c>vi /boot/boot/grub/menu.lst</c>), and add the following to it:</p>
-<pre>
-default 0
-timeout 30
-
-title=My example Gentoo Linux
-root (hd0,0) 
-kernel /boot/bzImage root=/dev/hda3 
-
-title=Windows NT Workstation
-root (hd0,2) 
-chainloader +1
-</pre><p>After saving this file, Gentoo Linux installation is complete.  Selecting the first option will
-tell GRUB to boot Gentoo Linux without a fuss.  The second part of the menu.lst file is optional, and shows you how to
-use GRUB to boot a bootable Windows partition.</p>
-
-<note>Above, <path>(hd0,0)</path> should point to your "boot" partition
-(<path>/dev/hda1</path> in my case) and <path>/dev/hda3</path> should point to
-your root filesystem.  <path>(hd0,2)</path> contains the NT boot
-loader.</note> <p>Also, if you need to pass any options to the kernel, simply
-add them to the end of the <c>kernel</c> command.  We're already passing one option
-(<c>root=/dev/hda3</c>), but you can pass others as well.  There's one in particular
-that you may be interested in.  If you want to enable devfs (a special device
-filesystem), you can add the <c>devfs=mount</c> option at the end of the <c>kernel</c>
-line.  </p>
-
-</body>
-</section>
-
-<section>
-<title>One Last Step</title>
-<body>
-<p>If you copied over the <path>linux-sources-???.tbz2</path> file, you can now install the package and compile a fresh new
-kernel.  To merge the linux-sources, type <c>pkgmerge /tmp/linux-sources-???.tbz2</c>.  After the merge completes,
-you can remove the .tbz2 from <path>/tmp</path> and continue with the kernel compile step.  If you didn't copy over the
-linux sources, you can skip the kernel compile step and proceed unmounting your filesystems below.</p>
-<p>To compile your own kernel, perform the following steps:</p><pre>
-# <i>cd /usr/src/linux</i>
-# <i>make menuconfig</i> 
-<codenote>make sure you compile-in support for ReiserFS as well as your boot drive controller</codenote>
-# <i>make bzImage</i>
-# <i>make modules</i>
-# <i>make modules_install</i>
-# <i>cp arch/i386/boot/bzImage /boot/boot</i> 
-<codenote>Above, "/boot/boot" is intentional and should not simply be "/boot"</codenote>
-</pre>
-
-<p>Now, Gentoo Linux is installed.  The only remaining step is to exit the chrooted shell, safely unmount your partitions
-and reboot the system:</p>
-<pre>
-# <i>exit</i> 
-<codenote>This exits the chrooted shell; you can also type <c>^D</c></codenote>
-# <i>umount /mnt/gentoo/boot</i>
-# <i>umount /mnt/gentoo</i>
-# <i>reboot</i>
-</pre>
-</body>
-</section>
-
-</chapter>
-
-<chapter>
-<title>You're done!</title>
-<section>
-<title>Congratulations!</title>
-<body><p>If you have any questions or would like to get involved with Gentoo Linux development, 
-consider joining our gentoo-dev mailing list (there's a "click to subscribe" link on our <uri link="http://www.gentoo.org">main page</uri>).
-</p>
-</body>
-</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/keychain.xml b/app-doc/gentoo-web/files/xml/keychain.xml
deleted file mode 100644
index 5a5ba46428e6..000000000000
--- a/app-doc/gentoo-web/files/xml/keychain.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version='1.0'?>
-<guide type="project" link="/projects/keychain.html">
-<title>Keychain</title>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<abstract>
-This page contains information about Keychain, an OpenSSH-compatible RSA/DSA key management
-application for bash.
-</abstract>
-
-<version>1.8</version>
-<date>29 Nov 2001</date>
-
-<chapter>
-<title>Keychain Intro</title>
-<section>
-<body>
-<p>
-Many of us use the excellent <uri
-link="http://www.openssh.com">OpenSSH</uri> as a secure, encrypted replacement
-for the venerable telnet and rsh commands.  One of OpenSSH's more intriguing
-features is its ability to authenticate users using the RSA and DSA
-authentication protocols, which are based upon a pair of complementary
-numerical "keys".  And one of the main appeals of RSA and DSA authentication is the
-promise of being able to establish connections to remote systems <e>without
-supplying a password</e>.  The <c>keychain</c> bash script makes handling RSA and
-DSA keys both convenient and secure.  It acts as a front-end to <c>ssh-agent</c>,
-allowing you to easily have one long-running <c>ssh-agent</c> process <e>per system</e>,
-rather than per login session.  This dramatically reduces the number of times you need
-to enter your passphrase from once per new login session to once <e>every time your local
-machine is rebooted.</e>
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>The screenshot</title>
-<section>
-<body>
-<figure link="/images/keychain-2.gif" caption="Keychain in action"/>
-
-<p>Above, <c>drobbins</c> logs in to <c>cvs.gentoo.org</c>, and <c>keychain</c>
-(called from <path>~/.bash_profile</path>) starts up.  <c>keychain</c> detects
-a long-running <c>ssh-agent</c> process that already holds <c>drobbins</c>'
-private keys and configures the shell environment appropriately.  Because
-<c>keychain</c> "hooks in" to an existing <c>ssh-agent</c> process,
-<c>drobbins</c> gains access to his keys without typing in his
-passphrases, even though he just opened a brand new login session.  He can now
-establish secure passwordless connections with any host configured to recognize
-these keys.  In fact, <c>drobbins</c> will only need to enter his
-passphrases again after <c>cvs.gentoo.org</c> is rebooted.  That's the only
-time you really need to reinitialize the long-running <c>ssh-agent</c> process.
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>The source</title>
-<section>
-<body>
-
-<p>
-The most recent release of <c>keychain</c> can be found here:<br/><br/>
-<uri>http://www.ibiblio.org/gentoo/distfiles/keychain-1.8.tar.bz2</uri>
-</p>
-<pre caption="md5sum">
-a37909a580644d384a21268824931103  keychain-1.8.tar.bz2
-</pre>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>The IBM developerWorks articles</title>
-<section>
-<body>
-
-<p><c>keychain</c> was first introduced in a series of <uri
-link="http://www.ibm.com/developerworks">IBM developerWorks</uri> articles.
-<b><uri link="http://www-106.ibm.com/developerworks/library/l-keyc.html">The first
-keychain article</uri></b> introduces the concepts behind RSA/DSA key
-authentication and shows you how to set up primitive (with passphrase) RSA/DSA
-authentication, while the <b><uri link="http://www-106.ibm.com/developerworks/linux/library/l-keyc2/">second article</uri></b> shows you how to
-use <c>keychain</c> to set up secure, <e>passwordless</e> <c>ssh</c> access in an
-extremely convenient way.  <c>keychain</c> also provides a clean, secure way for
-<c>cron</c> jobs to take advantage of RSA/DSA keys without having to use insecure
-unencrypted private keys.  <e>A third <c>keychain</c> article will be appearing
-shortly, which will cover <c>ssh-agent</c> authentication forwarding.</e>
-</p>
-</body>
-</section>
-</chapter>
-<chapter>
-<title>ChangeLog</title>
-<section>
-<body>
-<pre caption="ChangeLog for Keychain">
-# ChangeLog for Keychain; http://www.gentoo.org/projects/keychain
-# Copyright 2001 Gentoo Technologies, Inc.; Distributed under the GPL
-# Written by Daniel Robbins (drobbins@gentoo.org)
-
-* keychain 1.8 (29 Nov 2001)
-
-  29 Nov 2001; Philip Hallstrom (philip@adhesivemedia.com)
-  Added a "--local" option for removing the ${HOSTNAME} from the various
-  files that keychain creates.  Handy for non-NFS users.
-  
-  29 Nov 2001; Aron Griffis (agriffis@gentoo.org)
-  Using the Bourne shell "type" builtin rather than using the external
-  "which" command.  Should make things a lot more robust and slightly
-  faster.
-  
-  09 Nov 2001; Mike Briseno (mike@radik.com)
-  Solaris' "which" command outputs "no lockfile in..." to stdout rather
-  than stderr.  A one-line fix (test the error condition) has been
-  applied.
-
-  09 Nov 2001; lockfile settings tweak
-
-  09 Nov 2001; Rewrote how keychain detects failed passphrase attempts.
-  If you stop making progress providing valid passphrases, it's three
-  strikes and you're out.
-
-  09 Nov 2001; Constantine P. Sapuntzakis (csapuntz@stanford.edu)
-  Some private keys can't be "ssh-keygen -l -f"'d; this patch causes
-  keychain to look for the corresponding public key if the private
-  key doesn't work.  Thanks Constantine!
-
-  09 Nov 2001; Victor Leitman (vleitman@yahoo.com)
-  CYAN color misdefined; fixed.
-  
-  27 Oct 2001; Brian Wellington (bwelling@xbill.org)
-  A "quiet mode" (--quiet) fix; I missed an "echo".
-  
-  27 Oct 2001; J.A. Neitzel (jan@belvento.org)
-  Missed another "kill -9"; it's now gone.
-
-* keychain 1.7 (21 Oct 2001) 
- 
-  21 Oct 2001; Frederic Gobry (frederic.gobry@smartdata.ch)
-  Frederic suggested using procmail's lockfile to serialize the
-  execution of critical parts of keychain, thus avoiding multiple
-  ssh-agent processes being started if you happen to have multiple
-  xterms open automatically when you log in.  Initially, I didn't
-  think I could add this, since systems may not have the lockfile
-  command; however, keychain will now auto-detect whether lockfile
-  is installed; if it is, keychain will automatically use it, thus
-  preventing multiple ssh-agent processes from being spawned. 
-  
-  21 Oct 2001; Raymond Wu (ursus@usa.net):
-  --nocolor test is no longer inside the test for whether "echo -e"
-  works.  According to Raymond, this works optimally on his Solaris
-  box.
-  
-  21 Oct 2001; J.A. Neitzel (jan@belvento.org):
-  No longer "kill -9" our ssh-agent processes. SIGTERM should be 
-  sufficient and will allow ssh-agent to clean up after itself 
-  (this reverses a previously-applied patch).
-  
-  21 Oct 2001; Thomas Finneid (tfinneid@online.no):
-  Added argument "--quiet | -q" to make the program less 
-  intrusive to the user; with it, only error and interactive 
-  messages will appear.
-  
-  21 Oct 2001; Thomas Finneid (tfinneid@online.no):
-  Changed the format of some arguments to bring them more in
-  line with common *nix programs: added "-h" as alias for "--help";
-  added "-k" as alias for "--stop"
-
-  21 Oct 2001; Mark Stosberg (mark@summersault.com):
-  $pidf to "$pidf" fixes to allow keychain to work with paths that
-  include spaces (for Darwin and MacOS X in particular).
-  
-  21 Oct 2001; Jonathan Wakely (redi@redi.uklinux.net):
-  Small patch to convert "echo -n -e" to "echo -e "\c"" for FreeBSD
-  compatibility.
-
-* keychain 1.6 (15 Oct 2001)
-
-  13 Oct 2001; Ralf Horstmann (ralf.horstmann@webwasher.com):
-  Add /usr/ucb to path for Solaris systems.
-  
-  11 Oct 2001; Idea from Joe Reid (jreid@vnet.net):
-  Try to add multiple keys using ssh-add; avoid typing in identical
-  passphrases more than once.  Good idea!
-
-*keychain 1.5 (21 Sep 2001)
-
-  21 Sep 2001; David Hull (hull@paracel.com):
-  misc. compatibility, signal handling, cleanup fixes
-  
-  21 Sep 2001; 
-  "ps" test to find the right one for your OS.
-
-  20 Sep 2001; Marko Myllynen (myllynen@lut.fi):
-  "grep [s]sh-agent" to "grep [s]sh-agent" (zsh fix)
-
-*keychain 1.4 (20 Sep 2001)
-
-  20 Sep 2001; David Hull (hull@paracel.com):
-  "touch $foo" to ">$foo" optimization and other "don't fork" fixes.
-  Converted ${foo#--} to a case statement for Solaris sh compatibility.
-
-  20 Sep 2001;
-  Try an alternate "ps" syntax if our default one fails.  This should
-  give us Solaris and IRIX (sysV) compatibility without breaking BSD.
-
-  20 Sep 2001; Hans Peter Verne (h.p.verne@usit.uio.no);
-  "echo -e" to "echo $E" (for IRIX compatibility with --nocolor),
-  optimization of grep ("grep [s]sh-agent")
-  
-  17 Sep 2001; Marko Myllynen (myllynen@lut.fi):
-  Various fixes: trap signal 2 if signal INT not supported (NetBSD);
-  handle invalid keys correctly; ancient version of ash didn't support ~,
-  so using $HOME; correct zsh instruction; minor cleanups
-
-*keychain 1.3 (12 Sep 2001)
-  
-  12 Sep 2001;
-  Minor color changes; the cyan was hard to read on xterm-colored
-  terms so it was switched to bold.  Additional --help text added.
-  
-  10 Sep 2001;
-  We now use .ssh-agent-[hostname] instead of .ssh-agent.
-  We now create a .ssh-agent-csh-[hostname] file that can be sourced
-  by csh-compatible shells.  We also now kill all our existing 
-  ssh-agent processes before starting a new one.
-
-  10 Sep 2001; Robert R. Wal (rrw@hell.pl):
-  Very nice NFS fixes, colorization fixes, tcsh redirect -> grep -v
-  fix.  Thanks go out to others who sent me similar patches.
-
-  10 Sep 2001; Johann Visagie (johann@egenetics.com):
-  "source" to "." shell-compatibility fixes.  Thanks for the FreeBSD
-  port.
-
-  10 Sep 2001; Marko Myllynen (myllynen@lut.fi):
-  rm -f $pidf after stopping ssh-agent fix
-
-*keychain 1.2 
-
-  09 Sep 2001; README updates to reflect new changes.
-  
-  09 Sep 2001; Marko Myllynen (myllynen@lut.fi):
-  bash 1/zsh/sh compatibility; now only tries to kill *your*
-  ssh-agent processes, version fix, .ssh-agent file creation error 
-  detection.  Thanks! 
-
-*keychain 1.1; fixes for calling "pidof"; README; ChangeLog
-
-  07 Sep 2001;
-  Addition of README stating that keychain requires bash 2.0 or greater,
-  as well as quick install directions and web URL.
-
-  07 Sep 2001;
-  Explicitly added /sbin and /usr/sbin to path, and then called "pidof".
-  I think that this is a bit more robust.
-  
-  06 Sep 2001; from John Ellson (ellson@lucent.com): 
-  "pidof" changed to "/sbin/pidof", since it's probably not in $PATH
- 
-  06 Sep 2001;
-  New ChangeLog! :)
-
-*keychain 1.0; initial release (Aug 2001)
-</pre>
-</body>
-</section>
-</chapter>
-</guide>
-
diff --git a/app-doc/gentoo-web/files/xml/main-about.xml b/app-doc/gentoo-web/files/xml/main-about.xml
deleted file mode 100755
index 5598ac8b8097..000000000000
--- a/app-doc/gentoo-web/files/xml/main-about.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version='1.0'?>
-<mainpage id="about">
-<title>About Gentoo Linux</title>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<version>1.0.3</version>
-<date>09 Aug 2001</date>
-
-<chapter>
-<section>
-<body>
-		<fig link="/images/fishhead.gif"/><br/>
-</body>
-</section>
-<section>
-<title>Gentoo Linux in a paragraph</title>
-<body>
-		<p>
-		<b>Gentoo Linux is a versatile and fast, completely free x86-based Linux
-		distribution geared towards developers and network professionals.</b> 
-		Unlike other distros,
-		Gentoo Linux has an advanced package management system called <b>Portage</b>.
-		<b>Portage</b> is a true ports system in the tradition of BSD ports, but is
-		Python-based and sports a number of advanced features including
-		dependencies, fine-grained package management, "fake" (OpenBSD-style)
-		installs, safe unmerging, system profiles, virtual packages, config
-		file management, and more.
-		</p>
-</body>
-</section>
-<section>
-<title>Gentoo Linux 1.0_rc6 Features</title>
-<body>
-	<p>
-	<b>Gentoo Linux 1.0_rc6</b> (release candidate 6) features <b>Linux 2.4.10</b>+ and 
-	a modern <b>GNU</b> development environment (<b>glibc-2.2.4</b>, <b>gcc 2.95.3</b>),
-	<b>ReiserFS</b>, <b>ext3</b>, <b>LVM</b>, <b>ALSA</b>, 
-	<b>PCMCIA-CS</b> and <b>lm_sensors</b> 
-	support built-in to the kernel, <b>"vanilla"</b> (stock) kernel 
-	packages/compatibility for those who prefer unpatched kernels,
-	<b>Xfree86 4.1.0</b>, <b>OpenGL</b>, <b>KDE 2.2.2</b> and <b>GNOME 1.4</b>,
-	tcp-wrappers, xinetd, <b>iptables</b> and Linux <b>QoS</b> tools,
-	modern <b>qmail</b> (with optional <b>mysql</b> and <b>LDAP</b> support), 
-	<b>postfix</b> and <b>exim</b> MTAs,
-	<b>GRUB</b> boot loader (<b>LILO</b> is still available if you need it),
-	<b>800+ up-to-date ebuild scripts</b> for your favorite apps, 
-	a new <b>dependency- (or need-) based set of init scripts</b>, tons more, and
-	of course <b>Portage</b> and a completely open design.
-	</p>
-</body>
-</section>
-<section>
-<title>More about Portage</title>
-<body>
-		<p><b>Portage allows you to set up Gentoo Linux the way <e>you</e> like
-		it</b> -- with the optimization settings that you want, and with optional
-		build-time functionality (like <b>GNOME</b>, <b>KDE</b>, <b>mysql</b>, 
-		<b>ALSA</b>, <b>LDAP</b> support,
-		etc.) enabled or disabled as you desire.  If you don't want <b>GNOME</b> on
-		your system, your apps won't have optional <b>GNOME</b> support enabled, and
-		if you do, then they will.  That's why we prefer thinking of Gentoo
-		Linux as a <e>meta</e>-distribution or Linux <e>technology engine</e>.
-		You decide what kind of system you want, and <b>Portage</b> will create it for
-		you.</p>
-		
-		<p>We maintain an official Gentoo Linux <b>Portage tree</b> that contains
-		the most recent versions of our ebuild autobuild scripts.  By updating
-		your Portage tree, you gain instant access to the latest and greatest
-		Linux technologies and applications.  Tell Portage what ebuild you'd
-		like to install, and Portage will auto-download, unpack, patch,
-		configure, compile and install the package.  Thanks to Portage
-		auto-dependency resolution, you can install <b>KDE 2.2.2</b> or <b>GNOME 1.4</b>
-		by typing in a single command, and the resultant installed binaries
-		will be optimized and customized to your exact specifications.</p>
-
-		<p><b>If this kind of power and flexibility appeals to you, then we
-		encourage you to try Gentoo Linux for yourself.</b>  You won't be
-		disappointed.</p>
-</body>
-</section>
-</chapter>
-</mainpage>
diff --git a/app-doc/gentoo-web/files/xml/main-download.xml b/app-doc/gentoo-web/files/xml/main-download.xml
deleted file mode 100755
index e86e11a22e1a..000000000000
--- a/app-doc/gentoo-web/files/xml/main-download.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version='1.0'?>
-<mainpage id="download">
-<title>Gentoo Linux -- download and installation!</title>
-<author title="Chief Architect"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<version>2.2</version>
-<date>19 Sep 2001</date>
-
-<chapter>
-<title>All about Gentoo Linux 1.0_rc6</title>
-<section>
-<title>Status</title>
-<body>
-
-<p> <b>We now have a very stable prerelease version of the Gentoo Linux build
-image available for download, in both .tbz2 and bootable ISO forms</b>.  Quite
-a few people have used this technique to create their own Gentoo Linux 1.0_rc6
-systems.  While our Portage tree hasn't been 100% updated to work with 1.0_rc6
-(we're working on getting all the initscripts converted over to our new
-format), most packages <e>will</e> work perfectly.  If you've been anxiously
-waiting to run 1.0_rc6, here's your opportunity!  </p>
-
-<p><b>You can find the 1.0_rc6 build images and ISOs at
-<uri>http://www.ibiblio.org/gentoo/snapshots/build/ix86-linux-gnu</uri>.</b>
-ISO images should work with any modern bootable CD-ROM, IDE or SCSI.
-You can find
-the most recent installation instructions for the ISO install <uri link="/doc/build.html">here,
-in the 1.0_rc6 "from source" Installation Guide</uri>.  Right now, we don't
-have instructions for the .tbz2 install, but the installation process is very
-similar to that of the ISO, and you should be able to use the ISO docs.  All
-you'll need to do is chroot from an existing Linux 2.4-based distribution
-rather than the boot CD.  Just perform all the "before chroot" steps from your
-existing Linux distro, such as using <c>fdisk</c> and creating and mounting
-filesystems.  In fact, if your network is already configured under your
-existing Linux distro, it should continue to work after the chroot, so you can
-skip most of the network configuration steps needed in order to get emerge
-rsync to work.  All you'll need to do is to update
-<path>/mnt/gentoo/etc/resolv.conf</path> (the chrooted
-<path>/etc/resolv.conf</path>) so that DNS name resolution works properly.
-</p>
-
-</body>
-</section>
-</chapter>
-</mainpage>
diff --git a/app-doc/gentoo-web/files/xml/main-news.xml b/app-doc/gentoo-web/files/xml/main-news.xml
deleted file mode 100644
index 62287797aa74..000000000000
--- a/app-doc/gentoo-web/files/xml/main-news.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version='1.0'?>
-<mainpage id="news">
-<title>Gentoo Linux News</title>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<version>1.0.3</version>
-<date>12 Oct 2001</date>
-
-<newsitems>
-	<news align="left" graphic="/images/icon-linux.png">
-		<poster>drobbins</poster>
-		<date>12 Oct 2001</date>
-		<title>October Gentoo Linux Update</title>
-		<body>
-		<p>
-		<b>We are currently putting the finishing touches on Gentoo Linux 1.0_rc6.</b>  In fact, things are looking so good that the release <i>after</i>
-		1.0_rc6 will likely be 1.0 final!  Until 1.0 final, we won't be building any binary packages except build images, and will only support the "build from scratch" install method.  This makes things a lot easier for us and allows us to focus our efforts on working towards the 1.0 final release.
-		</p>
-		<p>
-		<b>On another note, I'm currently looking for new and exciting contracts/employment.</b>  If you're working on a challenging 
-		Linux, Unix or Web development project and would like my help, please be sure to <uri link="/resume.html">check out my resume</uri>
-		and <mail link="drobbins@gentoo.org">email me</mail> directly.  Thanks!
-		</p>
-		<p>My new articles on <uri link="http://www.ibm.com/developerworks/linux">IBM developerWorks</uri>: Advanced Filesystem Implementor's Guide <uri link="http://www-106.ibm.com/developerworks/linux/library/l-fs3.html?dwzone=linux">part 3</uri> (tmpfs and bind mounts), <uri link="http://www-106.ibm.com/developerworks/linux/library/l-fs4.html?dwzone=linux">part 4</uri> (devfs, part 1) and <uri link="http://www-106.ibm.com/developerworks/linux/library/l-fs5.html?dwzone=linux">part 5</uri> (devfs, part 2).  Also be sure to check out my articles on OpenSSH RSA/DSA key management: <uri link="http://www-106.ibm.com/developerworks/linux/library/l-keyc.html?dwzone=linux">part 1</uri> and <uri link="http://www-106.ibm.com/developerworks/linux/library/l-keyc2/?dwzone=linux">part 2</uri>.  Part three (covering OpenSSH authentication agent forwarding) will be appearing shortly.  If you haven't done so already, try out <uri link="/projects/keychain">keychain</uri>, my OpenSSH RSA/DSA key management application.</p>
-		</body>
-	</news>
-<news align="right" graphic="/images/icon-clock.png">
-		<poster>drobbins</poster>
-		<date>29 Aug 2001</date>
-		<title>Gentoo Linux 1.0_rc6 status update redux</title>
-		<body>
-		<p><b>Gentoo Linux 1.0_rc6 is almost here.</b>  Right now -- this very moment -- I'm compiling our <e>sixth</e> 1.0_rc6 build image (chrootable environment); our build images are the heart of Gentoo Linux.  Tons of bugs have been fixed since last week, and our build images are now quite solid.  And even though the build images are only for Gentoo Linux build testers (at least right now), some of our more saavy users have already used them to build functional pre-1.0_rc6 systems.  However, I don't recommend you do this unless you have a lot of time on your hands, since nearly all packages with initscripts need to be updated to work with our new dependency-based init system.  While this isn't difficult work, it's probably best if you let us get to it first. :) 
-		</p>
-		<p>
-		<b>Also note that <uri link="http://www-106.ibm.com/developerworks/library/l-fs2.html">Part 2 of my Advanced Filesystem Implementor's Guide</uri> is now up on <uri link="http://www.ibm.com/developerworks/linux">IBM developerWorks</uri>.</b>  
-In it, I show you how to configure and use ReiserFS in a production environment.  I also show you how to <e>tweak ReiserFS for maximum performance</e>, and also cover potential application/ReiserFS interactions that you should know about.  You can also read the <uri link="http://www-106.ibm.com/developerworks/linux/library/l-fs.html">first Filesystem Guide article here</uri>; it contains a very good introduction to journalling filesystem technology and explains the design philosophy behind ReiserFS.
-		</p>
-		</body>
-	</news>
-	
-	<news align="left" graphic="/images/icon-linux.png">
-		<poster>drobbins</poster>
-		<date>21 Aug 2001</date>
-		<title>Keychain, Hackfest/Development update</title>
-		<body>
-		<p><b>I've now added a <uri link="/projects/keychain">Keychain</uri> project page to the site</b>.  For those who don't
-		know, <c>keychain</c> is a special <uri link="http://www.openssh.com">OpenSSH</uri>-compatible key management app
-		that interfaces with <c>ssh-agent</c> and makes it possible to set up secure connections easily and conveniently
-		-- without typing in a passphrase every time.  The second part of my RSA/DSA authentication article will appear soon
-		on <uri link="http://www.ibm.com/developerworks/linux">IBM developerWorks</uri>.  In the mean time, you may want to check out <uri link="http://www-106.ibm.com/developerworks/library/l-keyc.html">my first RSA/DSA article</uri>, which covers
-		OpenSSH RSA/DSA key-based authentication basics.</p>
-		<p><b>Also, the Hackfest was a big success!</b>  Tons of bugs were stomped, and we now have the second revision of
-		our experimental Gentoo Linux 1.0_rc6 build image (with <e>glibc 2.2.4</e>) so that developers can continue their testing.  Revision three should
-		be out in the next few days and should contain <e>kernel 2.4.8-rc6+</e>.  Along the way, we continue to wipe out huge numbers of bugs, and Gentoo Linux 1.0_rc6 certainly looks like it's going to be the most refined version of Gentoo Linux yet.
-		</p>
-		</body>
-	</news>
-	<news align="left" graphic="/images/icon-linux.png">
-		<poster>drobbins</poster>
-		<date>16 Aug 2001</date>
-		<title>New IBM dW tutorial, Hackfest, LWN</title>
-		<body>
-		<p><b>My new <uri link="http://www-105.ibm.com/developerworks/education.nsf/linux-onlinecourse-bytitle/0FB4D16BD2C3E83E86256AA2005244D1?OpenDocument">Linux Backup Tutorial</uri> is now online</b> in the <uri link="http://www.ibm.com/developerworks/linux/">IBM developerWorks Linux Zone</uri>.  In it, I show you how to create a set of automated tape backup scripts based upon <c>star</c>, a high-performance <c>tar</c> archiver that is especially well suited to tape backups.  I also unravel the mysteries behind the <c>mt</c> command and <e>tape block sizes</e>; so if you're curious, give it a read.  Registration is required, but worth it :)
-		</p>
-		<p><b>Lamer (also known as Ben Lutgens of <uri link="http://www.sistina.com">Sistina Software, Inc.</uri>) asked me to announce the semi-official Gentoo Linux Hackfest</b>, this weekend (Aug 17-19) in the <c>#gentoo</c> IRC channel on the <uri link="http://www.openprojects.net">Open Projects IRC Network</uri>.  The goal of this Hackfest is to allow Gentoo Linux users to report bugs and have Gentoo Linux developers fix them on CVS/rsync in real time!  Great idea, lamer!</p>
-		<p>And third, <b>a new issue of <uri link="http://www.lwn.net">the Linux Weekly News</uri> is now online</b>.  I'm a big fan of LWN, and if you want to keep up with what is going on in the Linux world, it's always a good idea to head over to <uri>http://www.lwn.net</uri> every Thursday and give it a read.</p>
-		</body>
-	</news>
-</newsitems>
-</mainpage>
diff --git a/app-doc/gentoo-web/files/xml/main-projects.xml b/app-doc/gentoo-web/files/xml/main-projects.xml
deleted file mode 100644
index 9e81110591b2..000000000000
--- a/app-doc/gentoo-web/files/xml/main-projects.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0'?>
-<mainpage id="projects">
-<title>Gentoo Linux Projects</title>
-<author title="Chief Architect"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<standout>
-<title>About these projects</title>
-<body>
-<p>
-	This page lists development projects that are not specifically Gentoo Linux-related.
-</p>
-</body>
-</standout>
-
-<version>1.0.2</version>
-<date>02 Sep 2001</date>
-
-<chapter>
-
-<section>
-<body>
-
-	<p>
-	<b><uri link="/projects/keychain">Keychain</uri> is an extremely handy OpenSSH-compatible RSA/DSA key management
-	application for bash.</b> It acts as a front-end to <c>ssh-agent</c>,
-allowing you to easily have one long-running <c>ssh-agent</c> process <e>per system</e>,
-rather than per login session.  This dramatically reduces the number of times you need
-to enter your passphrase from once per new login session to once <e>every time your local
-machine is rebooted.</e> 
-	</p>
-
-	<p>
-	<b><uri link="/projects/dynfw.html">The dynfw firewall scripts</uri> are a collection of netfilter-based
-	(<c>iptables</c>) firewall scripts designed to allow for an immediate, measured response against pending
-	security threats.</b>  These <c>bash</c> scripts have been designed to work with nearly any netfilter-based firewall
-	(including both "allow by default" and "deny by default" configurations).
-	</p>
-
-	<p>
-	<b><uri link="/projects/xml.html">The XML projects page</uri> contains the complete <c>guide</c> XSLT engine that
-	is used to create this entire site, including the main pages and online documentation.</b>  On this page, you
-	can find a tarball that contains the complete sources that were used to generate the latest version of 
-	the <uri>http://www.gentoo.org</uri> Web site -- the one you are viewing now.
-	</p>
-
-</body>
-</section>
-</chapter>
-</mainpage>
diff --git a/app-doc/gentoo-web/files/xml/nvidia_tsg.xml b/app-doc/gentoo-web/files/xml/nvidia_tsg.xml
deleted file mode 100644
index 0d159dac3d86..000000000000
--- a/app-doc/gentoo-web/files/xml/nvidia_tsg.xml
+++ /dev/null
@@ -1,914 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/nvidia_tsg.html">
-<title>nVidia Linux Driver Troubleshooting Guide</title>
-<author><mail link="phoenix@minion.de">Christian Zander</mail></author>
-<author><mail link="mthome@bbn.com">Michael Thome</mail></author>
-
-<abstract>This document is a guide to getting the nVidia drivers working with X in Linux; please note that it is not specific to Gentoo Linux.</abstract>
-
-<version>1.0.0</version>
-<date>Feb 13 2001</date>
-
-<chapter>
-	<title>Introduction</title>
-
-	<section>
-		<title>What now?</title>
-		<body>
-		<p>Allright, you've installed the nVidia Linux drivers and fired up X in anticipation of all the wonderful things it can do. For some reason however, things didn't quite
-work out as expected and now you're sitting looking at a blank screen or, if you were lucky, at a nice console. while you can't deny the beauty of a 80x40 terminal you wouldn't mind fraggin' the guy next door ... what to do?</p>
-		<p>Luckily, most problems you could have run into have already been encountered by
-other people. even better, there are fixes to most of those problems. but: where to look for (and get) answers? this document may just be what you want.
-		</p>
-		<p>Before going any further - most of the information herein is what I have seen in
-<c>#nvidia</c> (<uri link="http://www.openprojects.net">irc.openprojects.net</uri>) and my own experience with the drivers. I've also taken the liberty
-to take some information from the driver and its documentation. The IRC channel mentioned is a good place to look for both help and various files/patches.</p>
-		<p>You may want to check your system with the <c>nv_check.sh</c> script first. it can be
-downloaded (like all the patches i refer to) from <c>iCE-DCC</c>, a DCC offer bot at home in the above IRC channel.</p>
-		</body>
-	</section>
-
-	<section>
-		<title>Feedback</title>
-		<body>
-		<p>For suggestions, questions, etc, email <mail link="phoenix@minion.de">Christian Zander</mail></p>
-		</body>
-	</section>
-</chapter>
-
-<chapter>
-	<title>AGP/KERNEL</title>
-	<section>
-		<title>Overview</title>
-		<body>
-		<p>As you may have noticed already, the nVidia driver needs a kernel level resource
-manager to function properly. this resource manager is the NVdriver kernel module. among its responsibilities are access control to the device(s), locating and initializing certain aspects of the hardware, controlling the AGP driver, DMA to name some.</p>
-		<p>It is extremely important that the kernel module works properly, or you will never have the fun that you were promised in exchange for $$.</p>
-		</body>
-	</section>
-
-	<section>
-		<title>AGPGART vs. NVAGP</title>
-		<body>
-		<p>As far as linux is concerned, your nice AGP port is just another PCI slot and is
-detected as such. since you want to use what AGP has to offer beyond that, you need a proper driver.
-with the nVidia Linux drivers, you get to choose between nVidia's AGP driver that was ported from NT
-(NVAGP) and AGPGART, which was/is developed by Jeff Hartmann and a number of contributors. AGPGART
-is part of the official kernel (2.2.18+, 2.3.??+) and enabled in many distributions by default. Which one of the two you want to use largely depends on (1) your AGP chipset (2) your preferences.
-		</p>
-		<p>If everything worked out for you with whichever driver you chose to use, you need
-not worry about this. chances are however, that things didn't quite work out for you (you're reading this).
-		</p>
-		<p>One way of figuring out if it is your AGP setup that is causing problems (and sometimes the only way to get things going at all) is to completely disable AGP support in the driver. to do this, you add this option to the <e>Screen</e> setion of your <path>XF86Config</path> file:
-		</p>
-		<pre>Option "<i>NvAgp</i>" "<i>0</i>"</pre>
-		<p>Some combinations of drivers and AGP chipsets can make your system unstable or even unusable, so look out. these combinations should work (very incomplete, let me know about other configs):
-		</p>
-		<!--<p>Intel:</p>-->
-		<table>
-		<tr>
-			<th>Chipset</th>
-			<th>Driver</th>
-		</tr>
-		<tr>
-			<ti>Intel</ti>
-			<ti><pre>440BX   NVAGP   / AGPGART <comment># doesn't work for some people</comment>
-810     NVAGP   / AGPGART
-815(e)  NVAGP   / AGPGART <comment># w/ 815 patch</comment></pre></ti>
-                 </tr>
-		<tr>
-			<ti>VIA</ti>
-			<ti><!--<p>VIA:</p>--><pre>Apollo  AGPGART / NVAGP
-MVP3    AGPGART
-MVP4    AGPGART
-KX133   NVAGP
-KT133   NVAGP</pre></ti>
-		</tr>
-		<tr>
-			<ti>Ali</ti>
-			<ti><!--<p>Ali:</p>--><pre>...     AGPGART <comment># 2.4.0+,  2.2.18 w/ ALi patch</comment></pre>
-		</ti></tr>
-		<tr>
-			<ti>SiS</ti>
-			<ti><!--<p>SiS:</p>--><pre>...     AGPGART <comment># ?</comment></pre></ti>
-		</tr>
-		</table>
-		<p>In case you're wondering what AGP chipset your mainboard may be using - either
-consult your mainboard's documentation or try to retrieve the information from <path>/proc/pci</path>
-		</p>
-		<pre>$ <i>grep AGP /proc/pci</i></pre>
-		<p>Now that you know what driver you want, how do you actually go about setting the system up to use it?</p>
-        	<table>
-		<tr>
-			<th>Flag</th>
-			<th>Effect</th>
-		</tr>
-		<tr>
-			<ti>NVAGP</ti>
-			<ti><!--
-		<p>Compile the NVdriver kernel module with:</p>
-		<pre>$ <i>make clean</i>
-$ <i>make NVdriver BUILD_PARAMS=NOAGPGART</i>
-# <i>make install</i></pre>--><p>Enable NVAGP support</p></ti>
-		</tr>
-		<tr>
-			<ti>AGPGART</ti>
-			<ti>Enable support for AGPGART in your kernel. no special action must be
-taken thereafter, NVdriver will automagically be built with support for it. i strongly recomment
-that you use at least 2.2.18 or a recent development kernel with AGPGART.</ti>
-		</tr>
-		</table>
-		<p>When using NVAGP, compile the NVdriver kernel module with:</p>
-		<pre>$ <i>make clean</i>
-$ <i>make NVdriver BUILD_PARAMS=NOAGPGART</i>
-# <i>make install</i></pre>
-		<impo><p>Changes as of 0.9-6:</p>
-		<p>Starting with this version, the driver will load the AGP driver dynamically when
-X starts. Which driver it loads will be controlled by the NvAgp option in the Screen section of the
-<path>XF86Config</path> file:</p></impo>
-		<pre>Option "<i>NvAgp</i>" "<i>0</i>"  <comment># disable AGP support</comment>
-Option "<i>NvAgp</i>" "<i>1</i>"  <comment># use NVAGP</comment>
-Option "<i>NvAgp</i>" "<i>2</i>"  <comment># use AGPGART</comment></pre>
-		<p>Make sure you don't have the 'other' AGP driver loaded when instructing X to load
-e.g. NVAGP. some distributions load AGPGART by default - X will catch this case, but won't be able
-to switch the AGP driver on the fly (see below).</p>
-		<p>Bear in mind that switching AGP drivers or disabling them usually requires a
-system reboot before the changes really take effect. loading different AGP drivers w/o a reboot may
-cause lockups or general system instability.</p>
-		</body>
-	</section>
-
-	<section>
-		<title>AGP Aperture</title>
-		<body>
-		<p>Physically, this is the amount of RAM that you allow your card to
-use via the AGP interface (for textures, etc). while it is left
-to you to decide on the value for this setting, it is generally
-desirable to use no more than 1/2 of your RAM. 32M-64M seem to be
-reasonable values. don't set this to a value equal to the amount
-of RAM you have or even higher. AGPGART may lock your machine if
-you do. (set this in your BIOS)
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>AGP Fast Writes</title>
-		<body>
-		<p>Meant to increase performance, this setting usually locks up
-machines. in any case, the performance gains aren't worth the
-hazzle. (set this in your BIOS)</p>
-		<p>(alternatively, you can pass <c>NVreg_EnableAGPFW=0</c> to NVdriver)</p>
-		</body>
-	</section>
-
-	<section>
-		<title>AGP Speeds (1x, 2x, 4x)</title>
-		<body>
-		<p>This controls the bandwidth with which your AGP bus operates. while
-most of todays chipsets support 4x operation, this can cause lockups
-and strange behaviour with some of them. the driver knows about many
-such flaws and enables workarounds. Via chipsets are forced to 2x
-operation by default.
-</p>
-		<p>
-you can influence the AGP speed setting with an option passed to
-NVdriver:
-</p>
-           <pre># <i>modprobe NVdriver NVreg_ReqAGPRate=0x2</i> <codenote>0x1 | 0x2 | 0x4</codenote></pre>
-		<p>
-       or with an options entry in <path>modules.conf</path>:
-		</p>
-           <pre>alias char-major-195 NVdriver
-           options NVdriver NVreg_ReqAGPRate=<i>0x2</i></pre>
-		<p>
-       (if you want 4x operation with Via chipsets, use <c>NVreg_EnableVia4x=1</c>)
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>AGP Workarounds &amp;&amp; AGPGART</title>
-		<body>
-		<p>
-       as mentioned in the previous section, the driver enables a set of
-       workarounds for certain AGP chipsets. starting with version 0.9-5 of
-       the driver, these workarounds are applied to both NVAGP and AGPGART.
-       if you don't want to use them with AGPGART (for whatever reason), you
-       can disable the default behaviour with the <c>NVreg_UpdateKernelAGP=0</c>
-       option to NVdriver.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>
-      IRQ / Assigning an Interrupt to VGA
-		</title>
-		<body>
-		<p>
-       the nVidia driver needs an interrupt assigned to your graphics
-       adapter to work properly. make sure that you enable the '<c>assign
-       IRQ to vga</c>' option in your BIOS (or however your BIOS calls it).
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>
-Building NVdriver
-</title>
-		<body><p>
-building the NVdriver kernel module is straight forward in most
-cases:
-		</p>
-<pre>$ make clean
-$ <i>make NVdriver <codenote>optionally BUILD_PARAMS=NOAGPGART, see above</codenote></i>
-# <i>make install</i></pre>
-<p>
-there are situations, however when this won't work out. i already
-mentioned options that allow you to choose between AGPGART and NVAGP.
-</p>
-<p>
-the driver assumes that you have your kernel headers installed in
-<path>/usr/src/linux/include</path>. if that is not correct, use the <c>SYSINCLUDE</c>
-option:
-</p>
-<pre>$ <i>make clean</i>
-$ <i>make NVdriver SYSINCLUDE=/where/ever/your/headers/are</i>
-# <i>make install</i></pre>
-		</body>
-	</section>
-	<section>
-		<title>
-Character Special Files
-		</title>
-		<body><p>
-nVidia's XFree86 driver module communicates with the NVdriver kernel
-module through a set of character special files located in the <path>/dev</path>
-directory. if they weren't created or have improper permissions, X
-will fail.
-		</p>
-<pre>crw-rw----    1 root     video    195,   0 Jan  4 23:19 /dev/nvidia0
-crw-rw----    1 root     video    195,   1 Jan  4 23:19 /dev/nvidia1
-crw-rw----    1 root     video    195,   2 Jan  4 23:19 /dev/nvidia2
-crw-rw----    1 root     video    195,   3 Jan  4 23:19 /dev/nvidia3
-crw-rw----    1 root     video    195, 255 Jan  4 23:19 /dev/nvidiactl</pre>
-		<p>
-As you can see, I chose to make the files accessible only to root and
-members of the group <c>video</c>. your choice may be different - in any
-case, make sure that the user you're trying to run X as has access to
-these files (read and write access).
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>devFS</title>
-		<body><p>
-       As of version 2.3.?? of the linux kernel, an alternative method has
-       been introduced, the socalled <c>devFS</c>. while explaining the mechanism
-       itself is out of the scope of this document, i want to note that a
-       patch exists for NVdriver that makes it devFS aware.
-		</p></body>
-	</section>
-
-	<section>
-		<title>procFS</title>
-		<body><p>
-       starting with 0.9-6, the nVidia driver will provide information about
-       your setup in <path>/proc/nv/card[0-3]</path>. There's a patch to enable part of
-       that for 0.9-5.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>BIOS Repost</title>
-		<body><p>
-       the driver attempts to repost the card's bios when X starts to ensure
-       that the card is in a state known to the driver. unfortunately, this
-       causes problems with some cards. you can disable this behaviour with
-       yet another option to NVdriver:
-		</p>
-		<pre>
-           modprobe NVdriver NVreg_SkipBiosPost=<i>1</i>
-		</pre>
-		</body>
-	</section>
-
-	<section>
-		<title>TNT SGRAM vs. SDRAM</title>
-		<body><p>
-       the driver detects the type of memory used on TNT cards by reading
-       its embedded bios. unfortunately, some cards have been flashed with
-       improper bioses. if you feel that this may be the case with your
-       setup, you may want to try the <c>NVreg_VideoMemoryTypeOverride</c> option
-       to NVdriver (<c>SDRAM = 1, SGRAM = 2</c>). this doesn't always work, see
-       <path>os-registry.c</path> for details.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>Kernel 2.4.0</title>
-		<body><p>
-       quite some changed since 2.2.x and lots of these changes affected the
-       nVidia driver. you can get patches for this kernel series from <c>#nvidia</c>.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>	
-       "Ignoring changed section attributes for .modinfo"
-		</title>
-		<body><p>
-         If this message annoys you, you'll want to comment out the
-         offending line in <path>/usr/src/linux/include/linux/modules.h</path>. If you
-         don't mind it - leave it alone, its harmless.
-		</p></body>
-	</section>
-</chapter>
-
-<chapter>
-	<title>XFree86 / OpenGL</title>
-	<section>
-		<title>Introduction</title>
-		<body><p>
-    before i start describing some of the most common problems with this
-    part of the driver, i want to explain some things that are commonly
-    misunderstood and seem to confuse a fair amount of people:
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>nVidia's Driver Architecture vs. DRI and DRM</title>
-		<body><p>
-       nVidia's driver does not make use of the Direct Rendering Interface
-       that made its debut with XFree86 4.0.0. instead, nVidia chose to
-       implement its own mechanism. the architectures are quite similar:
-       both use a kernel level resource manager (NVdriver vs. DRM) and both
-       provide a mechanism by means of which high performance OpenGL
-       rendering can be achieved by allowing the OpenGL implementation to
-       talk directly to the hardware instead of using GLX when running
-       locally.
-		</p></body>
-	</section>
-
-	<section>
-		<title>nVidia's OpenGL Implementation vs. Mesa</title>
-		<body><p>
-       nVidia's driver comes with its own OpenGL implementation and does not
-       use Mesa, which is shipped with XFree86. nVidia's OpenGL libraries
-       are based on SGI's OpenGL 1.2 implementation and provide a set of
-       extensions that allow making use of advanced features such as using
-       S3TC compressed textures.
-		</p></body>
-	</section>
-
-	<section>
-		<title>nVidia's XFree86 Driver Module vs. XFree86's</title>
-		<body><p>
-       the <c>nv</c> driver module shipped with XFree86 has nothing in common
-       with the 'nvidia' driver module provided by nVidia. it does not
-       rely on a kernel module to operate, does not require an interrupt
-       and 'only' supports 2D operation. starting with 4.0.2 it works on
-       all of nVidia's graphics adapters, including GeForce 2 cards. if
-       you installed a distribution with XFree86 4.0.x, you are likely to
-       have this driver installed. it is a good idea to test your X
-       installation by attempting to start X with the <c>nv</c> driver module.
-		</p>
-    		<p>I will now list some of the most common problems that people encounter
-    with the nVidia drivers. many of the things listed here are covered in
-    the official documentation included with the driver package, but since
-    nobody seems to read it, i list them here anyway.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>libglx.a / libGLcore.a / libGL.so.1.2.303... (Mesa)</title>
-		<body><p>
-       my alltime favorites ... as mentioned above, nVidia's driver does
-       not make use of the Mesa libraries shipped with XFree86 - in fact,
-       it conflicts with them.
-		</p>
-       <warn>This is <e>the</e> most common error source</warn>
-		<p>
-       If your distribution installed and configured X for you, you are
-       likely to have a Module section in your <path>XF86Config</path> that looks like
-       this:
-		</p>
-<pre>Section "<i>Module</i>"
-	...
-	Load  "<i>glx</i>"
-	Load  "<i>GLcore</i>"
-	...
-EndSection</pre>
-	<p>
-       These two statements are what you need to pay particular attention
-       to:
-	</p>
-		</body>
-	</section>
-
-	<section>
-		<title>Load "glx"</title>
-		<body><p>
-          This instructs X to load the GLX extension module. with a default
-          XFree86 installation, this translates to <path>libglx.a</path>. the nVidia
-          driver provides its own GLX extension, <path>libglx.so</path>. this is where
-          the fun begins: if you didn't remove <path>libglx.a</path>, X will continue to
-          load <path>libglx.a</path>, which can't work with nVidia's driver.
-		</p>
-          <impo>Delete or rename <path>libglx.a</path> (<path>/usr/X11R6/lib/modules/extensions</path>)</impo>
-	</body></section>
-
-	<section>
-		<title>Load "GLcore"</title>
-		<body><p>
-          Not much to say here other than that you don't want this line in
-          your modules section. libGLcore.so as provided by nVidia will be
-          loaded dynamically - don't load it as an X extension, it won't
-          work.
-		</p>
-		<p>
-          You can easily find out if you're loading <path>libglx.a</path> and/or
-          libGLcore.a by looking at <path>/var/log/XFree86.0.log</path>:
-		</p>
-<pre>...
-(II) LoadModule: "glx"
-(II) Loading /usr/X11R6/lib/modules/extensions/libglx.a
-(II) Module glx: vendor="The XFree86 Project"
-	compiled for 4.0.1, module version = 1.0.0
-	ABI class: XFree86 Server Extension, version 0.1
-(II) Loading extension GLX
-(II) Loading sub module "GLcore"
-(II) LoadModule: "GLcore"
-(II) Reloading /usr/X11R6/lib/modules/extensions/libGLcore.a
-...</pre>
-		<p>
-          what you want to see here is something like:
-		</p>
-<pre>...
-(II) LoadModule: "glx"
-(II) Loading /usr/X11R6.4/lib/modules/extensions/libglx.so
-(II) Module glx: vendor="NVIDIA Corporation"
-	compiled for 4.0.1, module version = 1.0.5
-	Module class: XFree86 Server Extension
-	ABI class: XFree86 Server Extension, version 0.1
-(II) Loading extension GLX
-...</pre>
-    		<p>the last part of Mesa that can cause problems is the actual OpenGL
-    library, commonly called <path>libGL.so.1.2.303</path>... or similar. depending on
-    where it is installed, it will conflict with nVidia's OpenGL library
-    sooner or later. most games load <path>libGL.so</path> dynamically - they load it
-    when they first start and reload it when loading a map or when applying
-    new video settings. it happens quite often that a game loads the proper
-    libGL.so the first time around and Mesa later on.
-		</p>
-		<p>
-    symptoms of conflicts with Mesa (libraries and extensions) are crashes
-    with Segmentation Faults (Signal 11) - either instantaneously after you
-    start X or when you attempt to run an OpenGL application. another
-    indication of such a conflict is extremely poor performance (1-5 fps),
-    which happens when you get Mesa software rendering.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>nv_drv.o vs. nvidia_drv.o</title>
-		<body><p>
-       another common problem - after a default installation, XFree86's <c>nv</c>
-       driver module will be loaded. you want to load <c>nvidia</c>. make sure
-       your Device section in <path>XF86Config</path> looks somewhat like:
-		</p>
-<pre>Section "<i>Device</i>"
-	Identifier  "<i>nVidia GeForce 256 DDR</i>"
-	Driver      "<i>nvidia</i>"
-EndSection</pre>
-		</body>
-	</section>
-
-	<section>
-		<title>
-    X Instantaneously Crashes With Signal 11
-		</title>
-		<body><p>
-       check <path>/var/log/XFree86.0.log</path> for warnings like:
-		</p>
-		<pre>
-       (WW) module ABI minor version (2) is newer than the server's version (1)
-		</pre>
-		<p>
-       this commonly happens when you attempt to run 0.9-5 or later with
-       XFree86 4.0.0 or 0.9-4 or earlier with XFree86 4.0.1 or later. i
-       recommend you upgrade X to 4.0.2 and get whichever is the latest
-       driver when you read this document.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>
-
-    X Crashes Complaining about DMA
-		</title>
-		<body><p>
-       probably an improper kernel - use 2.2.18+ or 2.4.0+.
-		</p>
-	</body></section>
-
-	<section>
-		<title>
-
-    Monitor Looses Sync when staring X
-		</title>
-		<body><p>
-       this can have various reasons:
-       <ul>
-		<li><p>you specified improper modelines - either delete any explicit
-          modeline that may have been installed in your Monitor section or
-          correct them.</p>
-</li>
-		<li>
-
-
-       <p>the modelines are find, but the driver doesn't appear to like
-          them - try these options in your Screen section:</p>
-<pre>Option      "<i>IgnoreEdid</i>"       "<i>1</i>"
-Option      "<i>GenerateRTList</i>"   "<i>0</i>"</pre>
-		</li>
-	</ul>
-	</p>	</body>
-	</section>
-
-	<section>
-		<title>X &amp;&amp; MTRRs</title>
-		<body><p>
-       if you want support for MTRRs (you do), you'll have to enable support
-       for them in the kernel itself before the driver will be able to use
-       them. MTRRs greatly influence the speed of your setup.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>X Deletes Desired Modes (hsync out of range)</title>
-		<body><p>
-       X decided that your monitor is not capable of safely displaying the
-       mode you asked it for. make sure the values you specified for
-       HorizSync and VertRefresh match your monitor (look them up in your
-       monitor's manual). if no values are specified, X will use rather
-       conservative values.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>X Keeps Telling (Warning) You About a Polarity Option</title>
-		<body><p>
-       commonly happens when switching to console - usually harmless; if
-       you don't know that X is talking about and want to get rid of the
-       messages, use this in your Screen section:
-		</p>
-           <pre>Option      "<i>OverridePolarity</i>" "<i>1</i>"</pre>
-		<p>
-       This may speed up the console switches as well.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>DDC</title>
-		<body><p>
-       Yes, XFree86 4.0.x supports DDC - you can enable support for it by
-       loading the appropriate module:
-		</p>
-           <pre>Load "<i>ddc</i>"</pre>
-		<p>
-       this will only work if both your video card and monitor support DDC.
-       don't use explicit modelines alongside this option.
-		</p>
-		</body>
-	</section>
-
-	<section>
-		<title>
-    Game XY Doesn't Go Fullscreen
-		</title>
-		<body><p>
-       this is a config problem. two prerequisites must be met before a game
-       will be able to change resolutions using the X Vidmode Extenstion:
-		</p>
-		<p>
-
-       you must have this line in XF86Config's Module Section:
-		</p>
-           <pre>Load "<i>extmod</i>"    <comment># or alternatively, a SubSection for <e>extmod</e></comment></pre>
-		<p>
-       you must have a proper <c>Display SubSection</c> in your <c>Screen</c> section - it
-       must define the mode the game needs for the color depth you're
-       running X at. e.g.:
-		</p>
-<pre>Subsection "<i>Display</i>"
-	Depth  <i>24</i>
-	Modes  "<i>1152x864</i>" "<i>1024x768</i>" "<i>800x600</i>" "<i>640x480</i>"
-EndSubsection</pre>
-		</body>
-	</section>
-
-	<section>
-	<title>
-     X Goes 16bpp, You Want 32, But That Doesn't Work
-	</title>
-		<body><p>
-       24/32bpp in X 4.x is now labeled Depth 24. This is controlled by two
-       options in your Screen Section:
-		</p><pre>
-           DefaultDepth <i>24</i>
-           DefaultFbBpp <i>32</i>
-		</pre>
-		<p>
-       again, make sure you have a proper Display Subsection.
-		</p></body>
-	</section>
-
-	<section>
-		<title>Wheelmouse Doesn't Work</title>
-		<body><p>
-       Not nvidia related, but still asked quite often. you need to set
-       the protocol to IMPS/2 and map the 4th and 5th button to the Z
-       Axis. this is what my config looks like:
-		</p><pre>
-           Section "<i>InputDevice</i>"
-             Identifier  "<i>Mouse</i>"
-             Driver      "<i>mouse</i>"
-             Option      "<i>Device</i>"  "<i>/dev/mouse</i>"
-             Option      "<i>Protocol</i>"    "<i>IMPS/2</i>"
-             Option      "<i>ZAxisMapping</i>"   "<i>4 5</i>"
-           EndSection
-		</pre><p>
-       i'm using a USB mouse, <path>/dev/mouse</path> is a symling to <path>/dev/input/mice</path> in
-       my case.</p>
-		</body>
-	</section>
-
-	<section>
-		<title> Mouse SUCKS In Games (QuakeIII, FPS XY)</title>
-		<body><p>
-       many games use DGA mouse for mouse input in games. this is similar
-       to the directmouse thing in windows. all versions of XFree86 prior to
-       4.0.2 had a somewhat broken DGA 1 mouse handling. If you want decent
-       mouse performance upgrade to 4.0.2.
-</p>
-		<p>
-       in addition to that, you'll have to load the DGA extension. many
-       config tools disable that by default. use:
-</p>
-           <pre>Load "<i>extmod</i>"</pre>
-		<p>
-       instead of a SubSection if you want to make sure it gets loaded.
-       after that, you'll have to enable DGA mouse in the game itself. for
-       QuakeIII this comes down to
-		</p>
-           <pre>seta in_dgamouse "<i>1</i>"</pre>
-		<p>
-       in the QuakeIII config file (<path>~/.q3a/baseq3/q3config.cfg</path>).
-		</p>
-		<note>
-       XFree86 4.0.2 introduce DGA 2, which is said to work even better.
-       while QuakeIII doesn't support it yet, you can make pretty much all
-       Loki games use it by compiling SDL with support for it.
-		</note>
-		</body>
-	</section>
-
-	<section>
-		<title>Application XY misses GLUT or GLU (glut.h / glu.h)</title>
-		<body>
-       <p>GLUT is a windowing toolkit that provides programmers with an easy
-       way to setup windows with OpenGL contexts and allows some basic
-       event handling (OpenGL knows nothing about that). It is not
-       distributed as part of the nVidia driver. GLU is an utility library
-       that sits on top of OpenGL. It is also not part of nVidia's driver
-       distribution.
-	</p>
-	<p>
-       Both GLUT and GLU can be obtained from the Mesa Project homepage and
-       are likely to be available as packages from your Linux distribution.
-	</p>
-	<p>The following sections are Additions from <mail link="mthome@bbn.com">Michael Thome</mail></p>
-	<ul><li>
-      <p>Don't use the kernel nvidia FBdev driver, it conflicts with the
-       proprietary NVIDIA drivers and causes all kinds of unpleasant
-       effects (crashes, display problems, etc).</p>
-	</li>
-	<li>
-      <p>Aureal's closed source Vortex drivers don't seem to come along
-       with NVIDIA's binary drivers on some configuratins, possibly due
-       to IRQ conflicts.</p>
-	<warn>
-          IRQ sharing seems to be a problem with NVIDIA's driver. I was
-          unable to persuade a Fast Ethernet card (RTL8139) to work with 
-          the driver under similar circumstances. If you have problems
-          with hardware failing to operate properly or not at all, you
-          may want to double-check that its not sharing its interrupt
-          with your graphics adapter.
-	</warn>
-	</li>
-	</ul>
-	</body></section>
-<section><title>100dpi mode
-</title><body><p>
-       Unlike the XFree86 driver, the NVIDIA module does not use DDC to
-       figure out the screen resolution (dpi). I needed to add the
-       following to my monitor section in order to get into 100dpi mode:
-</p>
-
-<pre>Section "<i>Monitor</i>"
-	Identifier   "<i>Monitor0</i>"
-	VendorName   "<i>Dell</i>"
-	ModelName    "<i>Monitor Model</i>"
-	HorizSync    <i>30.0-107.0</i>
-	VertRefresh  <i>48.0-160.0</i>
-
-	<comment># for 100dpi</comment>
-	DisplaySize  <i>406 304</i>
-EndSection</pre>
-<p>
-       The parameters are the monitor's displayable width and height
-       in mm. I chose these values to result in 100x100dpi while in
-       1600x1200 mode.
-</p>
-</body></section></chapter>
-
-<chapter>
-	<title>Resources</title>
-	<section>
-		<title>
-    My <path>/etc/X11/XF86Config</path> [0.9-6] for those who are interested:
-</title><body>
-<pre>    Section "<i>Module</i>"
-      Load  "<i>bitmap</i>"
-      Load  "<i>dbe</i>"
-      Load  "<i>extmod</i>"
-      Load  "<i>freetype</i>"
-      Load  "<i>glx</i>"
-      Load  "<i>type1</i>"
-      Load  "<i>v4l</i>"
-    EndSection
-
-    Section "<i>Files</i>"
-      RgbPath   "<i>/usr/X11R6.4/lib/X11/rgb</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/misc/</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/75dpi/:unscaled</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/100dpi/:unscaled</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/75dpi/</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/100dpi/</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/TrueType/</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/local/</i>"
-      FontPath  "<i>/usr/X11R6.4/lib/X11/fonts/Type1/</i>"
-    EndSection
-
-    Section "<i>ServerFlags</i>"
-      Option  "<i>SuspendTime</i>"  "<i>0</i>"
-      Option  "<i>StandbyTime</i>"  "<i>0</i>"
-      Option  "<i>BlankTime</i>"    "<i>0</i>"
-      Option  "<i>OffTime</i>"      "<i>0</i>"
-    EndSection
-
-    Section "<i>InputDevice</i>"
-      Identifier  "<i>Keyboard</i>"
-      Driver      "<i>Keyboard</i>"
-      Option      "<i>XkbRules</i>"  "<i>xfree86</i>"
-      Option      "<i>XkbModel</i>"    "<i>pc102</i>"
-      Option      "<i>XkbLayout</i>"      "<i>us</i>"
-    EndSection
-
-    Section "<i>InputDevice</i>"
-      Identifier  "<i>Mouse</i>"
-      Driver      "<i>mouse</i>"
-      Option      "<i>Device</i>"  "<i>/dev/mouse</i>"
-      Option      "<i>Protocol</i>"    "<i>IMPS/2</i>"
-      Option      "<i>ZAxisMapping</i>"   "<i>4 5</i>"
-      Option      "<i>Buttons</i>"          "<i>5</i>"
-    EndSection
-
-    Section "<i>Monitor</i>"
-      Identifier  "<i>Vision Master Pro 17</i>"
-
-      HorizSync    <i>27.0-92.0</i>
-      VertRefresh  <i>50-160</i>
-
-      Mode "<i>1152x864</i>"
-        DotClock <i>137.65</i>
-        HTimings <i>1152 1184 1312 1536</i>
-        VTimings  <i>864  866  882  902</i>
-        Flags    "<i>-HSync</i>" "<i>-VSync</i>"
-      EndMode
-
-      Mode "<i>1024x768</i>"
-        DotClock <i>115.50</i>
-        HTimings <i>1024 1056 1248 1440</i>
-        VTimings  <i>768  771  781  802</i>
-        Flags    "<i>-HSync</i>" "<i>-VSync</i>"
-      EndMode
-
-      Mode "<i>800x600</i>"
-        DotClock <i>69.65</i>
-        HTimings <i>800 864 928 1088</i>
-        VTimings <i>600 604 610  640</i>
-        Flags    "<i>-HSync</i>" "<i>-VSync</i>"
-      EndMode
-
-      Mode "<i>640x480</i>"
-        DotClock <i>45.80</i>
-        HTimings <i>640 672 768 864</i>
-        VTimings <i>480 488 494 530</i>
-        Flags    "<i>-HSync</i>" "<i>-VSync</i>"
-      EndMode
-    EndSection
-
-    Section "<i>Device</i>"
-      Identifier  "<i>nVidia GeForce 256 DDR</i>"
-      Driver      "<i>nvidia</i>"
-    EndSection
-
-    Section "<i>Screen</i>"
-      Identifier  "<i>Screen</i>"
-      Device      "<i>nVidia GeForce 256 DDR</i>"
-      Monitor     "<i>Vision Master Pro 17</i>"
-      Option      "<i>NvAgp</i>" "<i>2</i>"
-
-      DefaultDepth <i>24</i>
-      DefaultFbBpp <i>32</i>
-
-      Subsection "<i>Display</i>"
-        Depth  <i>16</i>
-        Modes  "<i>1152x864</i>" "<i>1024x768</i>" "<i>800x600</i>" "<i>640x480</i>"
-      EndSubsection
-
-      Subsection "<i>Display</i>"
-        Depth  <i>24</i>
-        Modes  "<i>1152x864</i>" "<i>1024x768</i>" "<i>800x600</i>" "<i>640x480</i>"
-      EndSubsection
-    EndSection
-
-    Section "<i>ServerLayout</i>"
-      Identifier   "<i>Chronos</i>"
-      Screen       "<i>Screen</i>"
-      InputDevice  "<i>Keyboard</i>" "<i>CoreKeyboard</i>"
-      InputDevice  "<i>Mouse</i>"  "<i>CorePointer</i>"
-    EndSection</pre>
-</body>
-</section>
-
-<section>
-
-<title>My host.def</title>
-<body><p>
-    For those who compile X themselves, this is my <path>host.def</path> that gets
-    rid of some of the stuff you don't need anyway and adds some PPro 
-    optimization (copy to <path>xc/config/cf</path>):
-</p>
-<pre>    #define DefaultCCOptions     <i>-O3 -march=i686 -Wall -ansi -pedantic</i>
-    #define DefaultGcc2i386Opt   <i>-O3 -march=i686 -fno-strength-reduce</i>
-    #define LibraryCDebugFlags   <i>-O3 -march=i686 -fno-strength-reduce</i>
-    #define DefaultCDebugFlags   <i>-O3 -march=i686 -fno-strength-reduce</i>
-    #define OptimizedCDebugFlags <i>-O3 -march=i686 -fno-strength-reduce</i>
-
-    #define Freetype2Dir      <i>/usr/local</i>
-    #define ProjectRoot     <i>/usr/X11R6.4</i>
-
-    #define XF86CardDrivers       <i>nv v4l</i>
-    #define XInputDrivers          <i>mouse</i>
-
-    #define BuildServersOnly          <i>NO</i>
-    #define BuildXF86DRI              <i>NO</i>
-    #define XnestServer               <i>NO</i>
-    #define XprtServer                <i>NO</i>
-    #define XVirtualFramebufferServer <i>NO</i>
-    #define BuildFontServer           <i>NO</i>
-    #define BuildXinerama             <i>NO</i>
-    #define BuildXF86RushExt          <i>NO</i>
-    #define BuildPexExt               <i>NO</i>
-    #define BuildGlxExt               <i>NO</i>
-    #define LinuxFBDevSupport         <i>NO</i>
-    #define XF1Bpp                    <i>NO</i>
-    #define XF4Bpp                    <i>NO</i>
-    #define BuildXTrueType            <i>NO</i>
-
-    #define BuildSpeedo               <i>NO</i>
-    #define BuildCID                  <i>NO</i>
-
-    #define BuildCyrillicFonts        <i>NO</i>
-    #define BuildSpeedoFonts          <i>NO</i>
-    #define BuildCIDFonts             <i>NO</i>
-    #define MakeLocalFontDir          <i>NO</i></pre>
-</body>
-</section>
-</chapter></guide>
diff --git a/app-doc/gentoo-web/files/xml/openafs.xml b/app-doc/gentoo-web/files/xml/openafs.xml
deleted file mode 100644
index a5b1af78fc14..000000000000
--- a/app-doc/gentoo-web/files/xml/openafs.xml
+++ /dev/null
@@ -1,550 +0,0 @@
-<?xml version='1.0'?>
-<guide>
-<title>Gentoo Linux OpenAFS Guide</title>
-<author title="Editor">
-  <mail link="darks@gentoo.org">Holger Brueckner</mail>
-</author>
-
-<abstract>
-This guide shows you how to install a openafs server and client on gentoo linux 
-</abstract>
-
-<version>0.1</version>
-<date>05 June 2001</date>
-
-<chapter>
-  <title>Overview</title>
-  <section>
-    <title>About this Document</title>
-    <body>
-      This document provides you with all neccessary steps to install an openafs server on Gento Linux.
-      Parts of this document are taken from the AFS FAQ and IBM's Quick Beginnings guide on AFS. Well, never reinvent
-      the weel :)
-    </body>
-  </section>
-  <section>
-    <title>What is AFS ?</title>
-    <body>
-    
-    <p>
-    AFS is a distributed filesystem that enables co-operating hosts
-   (clients and servers) to efficiently share filesystem resources
-   across both local area and wide area networks. Clients hold a 
-   cache for often used objects (files), to get quicker
-   access to them.
-   </p>
-   <p>
-   AFS is based on a distributed file system originally developed
-   at the Information Technology Center at Carnegie-Mellon University
-   that was called the "Andrew File System". "Andrew" was the name of the research project at CMU - honouring the
-   founders of the University.  Once Transarc was formed and AFS became a
-   product, the "Andrew" was dropped to indicate that AFS had gone beyond
-   the Andrew research project and had become a supported, product quality
-   filesystem. However, there were a number of existing cells that rooted
-   their filesystem as /afs. At the time, changing the root of the filesystem
-   was a non-trivial undertaking. So, to save the early AFS sites from having
-   to rename their filesystem, AFS remained as the name and filesystem root.
-   </p> 
-   </body>
-  </section>  
-    <section>
-    <title>What is an AFS cell ?</title>
-    <body>
-    <p>An AFS cell is a collection of servers grouped together administratively
-    and presenting a single, cohesive filesystem.  Typically, an AFS cell is a set of 
-    hosts that use the same Internet domain name (like for example gentoo.org)
-    Users log into AFS client workstations which request information and files
-    from the cell's servers on behalf of the users. Users won't know on which server
-    a file which they are accessing, is located. They even won't notice if a server
-    will be located to another room, since every volume can be replicated and moved
-    to another server without user an user noticing. The files are always accessable.
-    Well it's like NFS on steroids :) 
-   </p>
-    </body>
-  </section>  
-  <section>
-    <title>What are the benefits of using AFS ?</title>
-    <body>
-    <p>The main strengths of AFS are its:
- 
-       caching facility (on client side, typically 100M to 1GB),
-       security features (Kerberos 4 based, access control lists),
-       simplicity of addressing (you just have one filesystem),
-       scalability (add further servers to your cell as needed),
-       communications protocol. 
-    </p>
-    </body>
-  </section>  
-  <section>
-    <title>Where can i get more information ?</title>
-    <body>
-    <p>
-    Read the <uri link="http://www.angelfire.com/hi/plutonic/afs-faq.html">AFS FAQ</uri>.
-    </p>
-    <p>
-    Openafs main page is at <uri link="http://www.openafs.com">www.openafs.org</uri>.
-    </p>
-    <p>
-    AFS was originally developed by Transarc which is now owned by IBM.
-    You can find some information about AFS on
-    <uri link="http://www.transarc.ibm.com/Product/EFS/AFS/index.html">Transarcs Webpage</uri>
-    </p>
-    </body>
-  </section>  
-
-</chapter>
-
-<chapter>
-<title>Documentation</title>
-  <section>
-    <title>Getting AFS Documentation</title>
-    <body>
-    <p>
-    You can get the original IBM AFS Documentation. It is very well written and you 
-    really want 
-    read it if it is up to you to administer a AFS Server.
-    </p>
-    <pre>
-    # <i>cd /usr/portage/app-doc/afsdoc/afsdoc-3.6-r1.ebuild</i>
-    # <i>emerge afsdoc-3.6-r1.ebuild</i>
-    </pre>
-    </body>   
-  </section>
-</chapter>
-
-<chapter>
-<title>Client Installation</title>
-   <section>
-     <title>Preliminary Work</title>
-     <body>
-       <note>
-         All commands should be written in on line !! In this document they are
-	 sometimes wrapped to two lines to make them easier to read.
-       </note>
-       <note>
-         Unfortunately the AFS Client needs a ext2 partiton for it's cache to run 
-	 correctly, because there are some locking issues with reiserfs. You need to 
-	 create a ext2 partition of approx. 200MB (more won't hurt) and mount it to 
-	 <path>/usr/vice/cache</path>
-       </note>
-       <p>
-       You should adjust the two files CellServDB ans ThisCell before you build the 
-       afs client. (These files are in <path>/usr/portage/net-fs/openafs/files</path>)
-       </p>
-       <pre>
-       CellServDB:
-       >netlabs        #Cell name
-       10.0.0.1        #storage
-       
-       ThisCell:
-       netlabs       
-       </pre>
-       <p>
-       CellServDB tells your client which server(s) he needs to contact for a 
-       specific cell. ThisCell should be quite obvious. Normally you use a name
-       which is unique for your organisation. Your (official) domain might be a
-       good choice. 
-       </p>
-     </body>
-   </section>
-   <section>
-     <title>Building the Client</title>
-     <body>
-       <pre>
-       # <i>cd /usr/portage/net-fs/openafs</i>
-       # <i>emerge openafs-xxx.ebuild</i>
-       </pre>
-       <p>
-       After successfull compilation you're ready to go.
-       </p>
-     </body>
-   </section>
-   <section>
-     <title>Starting afs on startup</title>
-     <body>
-       <p>
-       The following command will create the appropriate links to start your afs client
-       on system startup.
-       </p>
-       <warn>
-       You should always have a running afs server in your domain when trying to start the afs client. You're system won't boot
-       until it gets some timeout if your afs server is down. (and this is quite a long long time)
-       </warn>
-       <pre>
-       # <i>rc-update add afs</i>
-       Adding afs to runlevel 3 4
-       </pre>
-     </body>
-   </section>
-</chapter>
-
-<chapter>
-<title>Server Installation</title>
-   <section>
-     <title>Building the Server</title>
-     <body>
-       <p>
-       The follwing command will install all necessary binaries for setting up a AFS Server 
-       <i>and</i> Client
-       </p>
-       <pre>
-       # <i>cd /usr/portage/net-fs/openafs</i>
-       # <i>emerge openafs-xxx.ebuild</i>
-       </pre>
-     </body>
-   </section>
-  <section>
-    <title>Starting AFS Server</title>    
-    <body>
-      <p>
-      You need to remove the sample CellServDB and ThisCell file first.
-      </p>
-      <pre>
-      # <i>rm /usr/vice/etc/ThisCell</i>
-      # <i>rm /usr/vice/etc/CellServDB</i>
-      </pre>
-      <p>
-      Next you will run the <b>bosserver</b> command to initialize the Basic OverSeer (BOS) 
-      Server, which monitors and controls other AFS server processes on its server 
-      machine. Think of it as init for the system. Include the <b>-noauth</b>
-      flag to disable authorization checking, since you haven't added the admin user yet.
-      </p>
-      <p>
-      <warn>
-      Disabling authorization checking gravely compromises cell security. 
-      You must complete all subsequent steps in one uninterrupted pass 
-      and must not leave the machine unattended until you restart the BOS Server with
-      authorization checking enabled. Well this is what the AFS documentation says :)
-      </warn>
-      </p>
-      <pre>
-      # <i>/usr/afs/bin/bosserver -noauth &amp;</i>
-      </pre>
-      <p>
-      Verify that the BOS Server created <path>/usr/vice/etc/CellServDB</path> 
-      and <path>/usr/vice/etc/ThisCell</path>
-      </p>
-      <pre>
-      # <i>ls -al /usr/vice/etc/</i>
-      -rw-r--r--    1 root     root           41 Jun  4 22:21 CellServDB
-      -rw-r--r--    1 root     root            7 Jun  4 22:21 ThisCell
-      </pre>
-      
-    </body>    
-  </section>
-  <section>
-    <title>Defining Cell Name and Membership for Server Process</title>
-    <body>
-      <p>
-      Now assign your cells name. 
-      </p>
-      <p>      
-      <impo>There are some restrictions on the name format. 
-      Two of the most important restrictions are that the name
-      cannot include uppercase letters or more than 64 characters. Remember that
-      your cell name will show up under <path>/afs</path>, so you might want to choose
-      a short one.</impo>
-      </p>
-      <p>
-      <note>In the following and every instruction in this guide, for the <i>&lt;server name&gt;</i> 
-      argument substitute the full-qualified hostname 
-      (such as <b>afs.gentoo.org</b>) of the machine you are installing. 
-      For the <i>&lt;cell name&gt;</i>
-      argument substitute your cell's complete name (such as <b>gentoo</b>)</note>
-      </p>
-      <p>
-      Run the <b>bos setcellname</b> command to set the cell name:
-      </p>
-      <pre>
-        # <i>/usr/afs/bin/bos setcellname &lt;server name&gt; &lt;cell name&gt; -noauth</i>
-      </pre>      
-    </body>
-  </section>
-  <section>
-    <title>Starting the Database Server Process</title>
-    <body><p>
-       Next use the <b>bos create</b> command to create entries for the four database 
-       server processes in the
-       <path>/usr/afs/local/BosConfig</path> file. The four processes run on database 
-       server machines only.
-       </p>
-       <p>
-       <table>
-       <tr>
-         <ti>kaserver</ti>
-	 <ti>The Authentification Server maintains the Authentification Database.
-	     This can be replaced by a Kerberos 5 daemon. If anybody want's to try that
-	     feel free to update this document :)</ti>
-       </tr>
-       <tr>
-         <ti>buserver</ti>
-	 <ti>The Backup Server maintains the Backup Database</ti>
-       </tr>
-       <tr>
-         <ti>ptserver</ti>
-	 <ti>The Protection Server maintains the Protection Database</ti>
-       </tr>
-       <tr>
-         <ti>vlserver</ti>
-	 <ti>The Volume Location Server maintains the Volume Location Database (VLDB).
-	     Very important :)</ti>
-       </tr>
-       </table>    
-       </p>
-       <pre>
-        # <i>/usr/afs/bin/bos create &lt;server name&gt; kaserver simple 
-	                   /usr/afs/bin/kaserver -cell &lt;cell name&gt; -noauth</i>
-	# <i>/usr/afs/bin/bos create &lt;server name&gt; buserver simple 
-	                   /usr/afs/bin/buserver -cell &lt;cell name&gt; -noauth</i>
-	# <i>/usr/afs/bin/bos create &lt;server name&gt; ptserver simple 
-	                   /usr/afs/bin/ptserver -cell &lt;cell name&gt; -noauth</i>
-	# <i>/usr/afs/bin/bos create &lt;server name&gt; vlserver simple 
-	                   /usr/afs/bin/vlserver -cell &lt;cell name&gt; -noauth</i>
-       </pre>
-       <p>
-       You can verify that all servers are running with the <b>bos status</b> command:
-       </p>
-       <pre>
-        # <i>/usr/afs/bin/bos status &lt;server name&gt; -noauth</i>
-        Instance kaserver, currently running normally.
-        Instance buserver, currently running normally.
-        Instance ptserver, currently running normally.
-        Instance vlserver, currently running normally.
-       </pre>
-       
-    </body>
-  </section>
-  <section>
-    <title>Initializing Cell Security</title>
-    <body>
-      <p>
-      Now we'll initialize the cell's security mechanisms. We'll begin by creating the 
-      following two initial entries in the
-      Authentification Database: The main administrative account, called <b>admin</b> by 
-      convention and an entry for
-      the AFS server processes, called <b>afs</b>. No user logs in under the 
-      identity <b>afs</b>, but the Authentication
-      Server's Ticket Granting Service (TGS) module uses the account
-      to encrypt the server tickets that it grants to AFS clients. This sounds 
-      pretty much like Kerberos :)
-      </p>
-      <p>
-      Enter <b>kas</b> interactive mode
-      </p>
-      <pre>
-       # <i>/usr/afs/bin/kas -cell &lt;cell name&gt; -noauth</i>
-       ka&gt; <i>create afs</i>
-       initial_password:
-       Verifying, please re-enter initial_password:
-       ka&gt; <i>create admin</i>
-       initial_password:
-       Verifying, please re-enter initial_password:
-       ka&gt; <i>examine afs</i>
- 
-       User data for afs
-         key (0) cksum is 2651715259, last cpw: Mon Jun  4 20:49:30 2001
-         password will never expire.
-         An unlimited number of unsuccessful authentications is permitted.
-         entry never expires.  Max ticket lifetime 100.00 hours.
-         last mod on Mon Jun  4 20:49:30 2001 by $lt;none&gt;
-         permit password reuse
-       ka&gt; <i>setfields admin -flags admin</i>
-       ka&gt; <i>examine admin</i>
- 
-       User data for admin (ADMIN)
-         key (0) cksum is 2651715259, last cpw: Mon Jun  4 20:49:59 2001
-         password will never expire.
-         An unlimited number of unsuccessful authentications is permitted.
-         entry never expires.  Max ticket lifetime 25.00 hours.
-         last mod on Mon Jun  4 20:51:10 2001 by $lt;none&gt;
-         permit password reuse
-       ka&gt;
-      </pre>
-      <p>
-        Run the <b>bos adduser</b> command, to add the <b>admin</b> user to 
-	the <path>/usr/afs/etc/UserList</path>.
-      </p>
-      <pre>
-        # <i>/usr/afs/bin/bos adduser &lt;server name&gt; admin -cell &lt;cell name&gt; -noauth</i>
-      </pre>
-      <p>
-        Issue the <b>bos addkey</b> command to define the AFS Server 
-	encryption key in <path>/usr/afs/etc/KeyFile</path>
-      </p>
-      <note>
-        If asked for the input key, give the password you entered when creating 
-	the afs entry with <b>kas</b>
-      </note>
-      <pre>
-        # <i>/usr/afs/bin/bos addkey  &lt;server name&gt; -kvno 0 -cell &lt;cell name&gt; -noauth</i>
-            input key:
-            Retype input key:
-      </pre>
-      <p>
-        Issue the <b>pts createuser</b> command to create a Protection Database 
-	entry for the admin user
-      </p>
-      <note>
-        By default, the Protection Server assigns AFS UID 1 to the <b>admin</b> user, because 
-	it is the first user
-	entry you are creating. If the local password file (/etc/passwd or equivalent) 
-	already has an entry for
-	<b>admin</b> that assigns a different UID use the <b>-id</b> argument 
-	to create matching UID's
-       </note>
-      <pre>
-        # <i>/usr/afs/bin/pts createuser -name admin -cell &lt;cell name&gt; [-id &lt;AFS UID&gt;] -noauth</i>
-      </pre>
-      <p>
-        Issue the <b>pts adduser</b> command to make the <b>admin</b> user a member 
-	of the system:administrators group,
-	and the <b>pts membership</b> command to verify the new membership>
-      </p>
-      <pre>
-       # <i>/usr/afs/bin/pts adduser admin system:administrators -cell &lt;cell name&gt; -noauth</i>
-       # <i>/usr/afs/bin/pts membership admin -cell &lt;cell name&gt; -noauth</i>
-             Groups admin (id: 1) is a member of:
-               system:administrators
-      </pre>
-      <p>
-        Restart all AFS Server processes
-      </p>
-      <pre>
-         # <i>/usr/afs/bin/bos restart &lt;server name&gt; -all -cell &lt;cell name&gt; -noauth</i>
-      </pre>
-    </body>
-  </section>
-  <section>
-    <title>Starting the File Server, Volume Server and Salvager</title>
-    <body>
-    <p>
-      Start the <b>fs</b> process, which consists of the File Server, Volume Server and Salavager (fileserver,
-      volserver and salvager processes).
-    </p>
-    <pre>
-      # <i>/usr/afs/bin/bos create &lt;server name&gt; fs fs /usr/afs/bin/fileserver 
-			                            /usr/afs/bin/volserver 
-			                            /usr/afs/bin/salvager 
-			                            -cell &lt;cell name&gt; -noauth</i>
-    </pre>
-    <p>
-    Verify that all processes are running
-    </p>
-    <pre>
-     # <i>/usr/afs/bin/bos status &lt;server name&gt; -long -noauth</i>
-     Instance kaserver, (type is simple) currently running normally.
-         Process last started at Mon Jun  4 21:07:17 2001 (2 proc starts)
-         Last exit at Mon Jun  4 21:07:17 2001
-         Command 1 is '/usr/afs/bin/kaserver'
- 
-     Instance buserver, (type is simple) currently running normally.
-         Process last started at Mon Jun  4 21:07:17 2001 (2 proc starts)
-         Last exit at Mon Jun  4 21:07:17 2001
-         Command 1 is '/usr/afs/bin/buserver'
- 
-     Instance ptserver, (type is simple) currently running normally.
-         Process last started at Mon Jun  4 21:07:17 2001 (2 proc starts)
-         Last exit at Mon Jun  4 21:07:17 2001
-         Command 1 is '/usr/afs/bin/ptserver'
- 
-     Instance vlserver, (type is simple) currently running normally.
-         Process last started at Mon Jun  4 21:07:17 2001 (2 proc starts)
-         Last exit at Mon Jun  4 21:07:17 2001
-         Command 1 is '/usr/afs/bin/vlserver'
- 
-     Instance fs, (type is fs) currently running normally.
-         Auxiliary status is: file server running.
-         Process last started at Mon Jun  4 21:09:30 2001 (2 proc starts)
-         Command 1 is '/usr/afs/bin/fileserver'
-         Command 2 is '/usr/afs/bin/volserver'
-         Command 3 is '/usr/afs/bin/salvager'
-    </pre>
-    <p>
-      Your next action depends on whether you have ever run AFS file server machines 
-      in the cell:
-    </p>
-    <p>
-      If you are installing the first AFS Server ever in the cell create the 
-      first AFS volume, <b>root.afs</b>
-    </p>
-    <note>
-    For the partition name argument, substitute the name of one of the machine's 
-    AFS Server partitions. By convention
-    these partitions are named <path>/vicex</path>, where x is in the range of a-z.
-    </note>
-    <pre>
-      # <i>/usr/afs/bin/vos create &lt;server name&gt; 
-                                &lt;partition name&gt; root.afs 
-				-cell &lt;cell name&gt; -noauth</i>
-    </pre>
-    <p>
-      If there are existing AFS file server machines and volumes in the cell 
-      issue the <b>vos sncvldb</b> and <b>vos
-      syncserv</b> commands to synchronize the VLDB (Volume Location Database) with 
-      the actual state of volumes on the local machine. This will copy all necessary data to your
-      new server.
-    </p>
-    <pre>
-      # <i>/usr/afs/bin/vos syncvldb &lt;server name&gt; -cell &lt;cell name&gt; -verbose -noauth</i>
-      # <i>/usr/afs/bin/vos syncserv &lt;server name&gt; -cell &lt;cell name&gt; -verbose -noauth</i> 
-    </pre>
-    </body>
-  </section>
-  <section>
-    <title>Starting the Server Portion of the Update Server</title>
-    <body>
-      <pre>
-         # <i>/usr/afs/bin/bos create &lt;server name&gt; 
-	                    upserver simple "/usr/afs/bin/upserver 
-			    -crypt /usr/afs/etc -clear /usr/afs/bin" 
-			    -cell &lt;cell name&gt; -noauth</i>
-      </pre>
-    </body>
-  </section>
-  <section>
-    <title>Configuring the Top Level of the AFS filespace</title>
-    <body>
-      <p>
-        First you need to set some acl's, so that any user can lookup <path>/afs</path>.	
-      </p>
-      <pre>
-        # <i>/usr/afs/bin/fs setacl /afs system:anyuser rl</i>
-      </pre>
-      <p>
-       The you need to create the root volume, mount it readonly on <path>/afs/&lt;cell name&gt;</path> and read/write
-       on <path>/afs/.&lt;cell name&gt;</path>
-       <pre>
-         # <i>/usr/afs/bin/vos create &lt;server name&gt;&lt;partition name&gt; root.cell</i>
-         # <i>/usr/afs/bin/fs mkmount /afs/&lt;cell name&gt; root.cell </i>
-         # <i>/usr/afs/bin/fs setacl /afs/&lt;cell name&gt; system:anyuser rl</i>
-         # <i>/usr/afs/bin/fs mkmount /afs/.&lt;cell name&gt; root.cell -rw</i>     
-       </pre>
-      </p>
-      <p>
-        Finally you're done !!! You should now have a working AFS file server 
-	on your local network. Time to get a big
-	cup of coffee and print out the AFS documentation !!!
-      </p>
-      <note>
-        It is very important for the AFS server to function properly, that all system 
-	clock's are synchronized. 
-	This is best
-	accomplished by installing a ntp server on one machine (e.g. the AFS server) 
-	and synchronize all client clock's
-	with the ntp client. This can also be done by the afs client. 
-      </note>
-    </body>
-  </section>
-  
-</chapter>
-
-<chapter>
-  <title>Basic Administration</title>
-  <section>
-  <title></title>
-  <body>
-    To be done ... For now read the AFS Documentation :)
-  </body>
-  </section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/portage-user.xml b/app-doc/gentoo-web/files/xml/portage-user.xml
deleted file mode 100755
index 36fd52d7bc41..000000000000
--- a/app-doc/gentoo-web/files/xml/portage-user.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/portage-user.html">
-<title>Portage User 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 briefly covers how to keep your packages up to date, and how to maintain
-your system.</abstract>
-
-<version>1.2.1</version>
-<date>17 Oct 2001</date>
-
-<chapter>
-<title>Getting Started</title>
-
-<section>
-<title>Downloading the Portage tree</title>
-<body>
-
-<p>After you get Gentoo Linux installed and you play around a bit, you may find some bugs or
-quirks in some packages, or maybe you'd like to install the latest Gentoo Linux software 
-packages or update your current packages. To do this, you'll need to download our Portage
-ports tree. We have provided an anonymous rsync server that you can use to get our latest
-Portage tree. Here's how you use it.</p>
-
-<p>First, make a directory called <path>/usr/portage</path>. Then, make sure rsync is installed. If it
-isn't, download it from our ibiblio mirror and install it by typing <c>emerge
-rsync-x.y.z.tbz2</c>. Then, use the following command to synchronize your Portage
-directory:
-</p>
-<pre>
-# <i>emerge rsync</i>
-</pre>
-
-<p>Periodically, you'll want to run this next form of the rsync command, which will delete
-any old ebuild scripts:</p>
-
-<warn>Please note that <c>emerge --clean rsync </c> will delete any of your
-personal changes or additions to the <path>/usr/portage tree</path>, so use
-this command with caution.</warn>
-
-<pre>
-# <i>emerge --clean rsync </i>
-</pre>
-
-<p>If you are making regular changes to your <path>/usr/portage</path> tree,
-you may want to contact <mail link="drobbins@gentoo.org">Daniel</mail> for CVS
-access so that you can commit some or all of them to our official Portage CVS tree.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Updating Portage</title>
-<body>
-<p>Before using our Portage tree, it's important that you update Portage. To do this, do the 
-following:
-</p>
-
-<pre>
-# <i>cd /usr/portage/sys-apps/portage</i>
-# <i>emerge portage-x.y.z.ebuild</i>
-</pre>
-
-<p>Now you'll be using the most recent version of portage, and you can start to use our ebuild
-system to update your installed software.</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Introducing <c>emerge</c></title>
-<section>
-<title><c>emerge --pretend</c></title>
-<body><p> 
-To install a package, enter its directory in <path>/usr/portage</path>, i.e:
-</p>
-
-<pre>
-# <i>cd /usr/portage/net-irc/xchat</i> 
-</pre>
-
-<p>Then, run <c>emerge --pretend</c> to see what dependencies (if any) will be installed:</p>
-
-<pre>
-# <i>emerge --pretend xchat-1.4.3.ebuild</i>
-
-These are the packages that I would merge, in order.
-
-Calculating dependencies......... done!
-[ebuild   U] sys-libs/zlib-1.1.3-r2 to /
-[ebuild   U] dev-libs/glib-1.2.10 to /
-[ebuild N  ] media-libs/jpeg-6b-r2 to /
-[ebuild N  ] x11-base/xfree-4.0.3-r3 to /
-[ebuild N  ] x11-libs/gtk+-1.2.10-r1 to /
-[ebuild N  ] media-libs/giflib-4.1.0-r3 to /
-[ebuild N  ] media-libs/tiff-3.5.6_beta to /
-[ebuild N  ] media-libs/imlib-1.9.10 to /
-[ebuild N  ] net-irc/xchat-1.4.3 to /
-</pre>
-
-<p>In this particular case, we are attempting to merge <path>xchat</path> on a
-machine that does not have X installed.  Thus, <c>emerge --pretend</c>
-correctly identifies that several dependencies need to be satisfied first.
-Specifically, <path>sys-libs/zlib</path> and <path>dev-libs/glib</path> need to
-be updated, and then a bunch of ebuilds (including <path>x11-base/xfree</path>,
-of course) need to be merged.</p>
-</body>
-</section>
-<section>
-<title>USE and <c>emerge</c></title>
-<body>
-<p>Above, I executed <c>emerge --pretend</c> on a system that did not have
-<c>gnome</c> defined in the <c>USE</c> variable in <path>/etc/make.conf</path>.
-This means that optional GNOME support, if present, will not be enabled.
-However, <path>xchat</path> <e>does</e> have optional GNOME support, so let's
-take a look at the <c>emerge --pretend</c> output after I add <c>gnome</c> to
-the <c>USE</c> environment variable in <path>/etc/make.conf</path>:
-</p>
-
-<pre>
-# <i>emerge --pretend xchat-1.4.3.ebuild</i>
-
-These are the packages that I would merge, in order.
-
-Calculating dependencies............................ done!
-[ebuild N  ] media-libs/jpeg-6b-r2 to /
-[ebuild N  ] gnome-base/libghttp-1.0.9 to /
-[ebuild N  ] media-libs/audiofile-0.2.1 to /
-[ebuild N  ] media-sound/esound-0.2.22-r2 to /
-[ebuild N  ] gnome-base/gnome-env-1.0 to /
-[ebuild N  ] gnome-base/libxml-1.8.11 to /
-[ebuild N  ] gnome-base/ORBit-0.5.8 to /
-[ebuild N  ] gnome-base/oaf-0.6.5 to /
-[ebuild   U] dev-libs/glib-1.2.10 to /
-[ebuild N  ] net-libs/libwww-5.3.2-r1 to /
-[ebuild N  ] media-libs/giflib-4.1.0-r3 to /
-[ebuild N  ] dev-util/guile-1.4-r3 to /
-[ebuild   U] sys-libs/zlib-1.1.3-r2 to /
-[ebuild N  ] x11-base/xfree-4.0.3-r3 to /
-[ebuild N  ] x11-libs/gtk+-1.2.10-r1 to /
-[ebuild N  ] media-libs/tiff-3.5.6_beta to /
-[ebuild N  ] media-libs/imlib-1.9.10 to /
-[ebuild N  ] gnome-base/gnome-libs-1.2.13 to /
-[ebuild N  ] gnome-base/glibwww-0.2-r1 to /
-[ebuild N  ] gnome-base/gdk-pixbuf-0.11.0 to /
-[ebuild N  ] gnome-base/gconf-1.0.0 to /
-[ebuild N  ] gnome-base/gnome-vfs-1.0.1 to /
-[ebuild N  ] gnome-base/control-center-1.4.0.1 to /
-[ebuild N  ] gnome-base/scrollkeeper-0.2 to /
-[ebuild N  ] dev-util/xml-i18n-tools-0.8.1 to /
-[ebuild N  ] gnome-base/libglade-0.16-r1 to /
-[ebuild N  ] gnome-base/gnome-core-1.4.0.4 to /
-[ebuild N  ] net-irc/xchat-1.4.3 to /
-</pre>
-
-<p>As you can see, with <c>gnome</c> added to <c>USE</c>, emerge recognizes
-that xchat should include optional GNOME support.  And of course, in order for
-this optional GNOME support to compile and run correctly, GNOME must first be
-installed.  <c>emerge</c> figures this all out and adds various packages
-required by GNOME to its list of ebuilds to merge.  There may be times where
-your <c>USE</c> variable is not set correctly, causing <c>emerge</c> to
-unexpectedly include or exclude support for various optional extensions.
-That's why I recommended that you always perform an <c>emerge --pretend</c>
-before executing the actual <c>emerge</c>, especially for new, unfamiliar
-ebuilds.  That way, you'll know what to expect. :)  Once everything looks OK,
-you can go ahead with the actual <c>emerge</c> by dropping the <c>--pretend</c>
-option:</p>
-
-<pre>
-# <i>emerge xchat-1.4.3.ebuild</i>
-</pre>
-
-<p>After all dependencies are merged (if they exist; not all packages have
-them), the xchat sources will be downloaded (to
-<path>/usr/portage/distfiles</path>), verified, unpacked, compiled and
-installed to a temporary directory. Then, they will be merged into the local
-filesystem and a package database will be created at
-<path>/var/db/pkg/net-irc/xchat-1.4.3/CONTENTS</path>, containing the files
-installed and the md5sums for all files.</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Upgrading packages</title>
-<section>
-<body>
-
-<p>The standard way to upgrade packages under Gentoo Linux is to merge the new package,
-and then unmerge the old package. This is safe (and fun!) to do. First, merge the new package
-as per the above instructions. Then, uninstall the old package by typing something
-like:</p>
-
-<pre>
-# <i>ebuild /var/db/pkg/net-irc/xchat-1.0.0-r1/xchat-1.0.0-r1.ebuild unmerge</i>
-</pre>
-
-<p>For now, unmerging is performed using the lower-level <c>ebuild</c> command, rather
-than <c>emerge</c>.  This will likely change in the near future as we begin moving more
-and more functionality over to the high-level <c>emerge</c> tool.
-</p>
-
-<p>When using <c>ebuild</c>, it's important to specify the exact path to the ebuild
-file in <path>/var/db/pkg</path> that you'd like to unmerge.  
-Portage uses what is called a "safe" unmerge; it's only going to
-unlink original files. If a file has been overwritten or modified in some way,
-it will be left on the filesystem (presumably, you've installed a newer version
-of the package). So, if you unmerge an old version of xchat after merging a
-newer version, the xchat executable will not be deleted off your filesystem,
-since it has a newer timestamp and different md5sum. Safe unmerges are really
-great because they ensure that some version of the application is available at
-all times. If you had to unmerge first, then xchat wouldn't be available
-for a few minutes while the new version was being downloaded, compiled,
-installed and merged.</p>
-
-<impo>Portage now has a special feature called "config file protection".  The purpose of
-this feature is to prevent new package installs from clobbering existig
-configuration files.  By default, config file protection is turned on for /etc
-and the KDE configuration dirs; more may be added in the future.  Type 
-<c>emerge --help config</c> for more details.</impo>
-
-</body>
-</section>
-</chapter>
-</guide>
diff --git a/app-doc/gentoo-web/files/xml/project-xml.xml b/app-doc/gentoo-web/files/xml/project-xml.xml
deleted file mode 100644
index f4aee941eeed..000000000000
--- a/app-doc/gentoo-web/files/xml/project-xml.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0'?>
-<guide type="project" link="/projects/xml.html">
-<title>XML projects page</title>
-<author title="Author"><mail link="drobbins@gentoo.org">Daniel Robbins</mail></author>
-
-<abstract>
-This page contains information about the "guide" XML project, used for the
-Gentoo Linux documentation and Web site.
-</abstract>
-
-<version>1.1</version>
-<date>02 Sep 2001</date>
-
-<chapter>
-<title>Guide XML</title>
-
-<section>
-<body>
-
-<p>The Gentoo Linux team uses a special simple XML format called <c>guide
-XML</c> for all of its documentation and web pages.  If you're interested in
-learning more about this format, you may want to read the <e>A site reborn</e>
-series of <uri link="http://www.ibm.com/developerworks">IBM
-developerWorks</uri> articles, written by Daniel Robbins:</p>
-
-<ul>
-	<li>In <uri link="http://www-106.ibm.com/developerworks/usability/library/us-gentoo/index.html">Part 1</uri>, Daniel creates a user-centric action plan and introduces <c>pytext</c>, an embedded Python interpreter.</li>
-	<li>In <uri link="http://www-106.ibm.com/developerworks/usability/library/us-gent/">Part 2</uri>, Daniel shows off the new <c>guide XML</c> documentation system and sets up a daily CVS-log mailing list.</li>
-	<li>In <uri link="http://www-106.ibm.com/developerworks/usability/library/us-gentoo3/">Part 3</uri>, Daniel designs a new look for the site as a whole.</li>
-	<li>In <uri link="http://www-106.ibm.com/developerworks/usability/library/us-gentoo4/">Part 4</uri>, Daniel completes the conversion to XML/XSLT, fixes a host of Netscape 4.x browser compatibility bugs, and adds an auto-generated XML Changelog to the site.</li>
-</ul>
-
-<p>We also have a <uri link="/doc/xml-guide.html">Gentoo Linux Documentation
-Guide</uri> that explains how to use the <c>guide XML</c> format.  You can
-download the latest version of all our <c>guide XML</c> tools by grabbing this file, which actually contains a CVS snapshot of all the files used to create the website: <uri
-link="/projects/guide-xml-latest.tar.gz">xml-guide-latest.tar.gz</uri>.  This
-tarball is automatically regenerated every time the Gentoo Linux Web site
-is updated, so it will always be current.  Instructions on how to use the
-included files can be found in the <uri link="/doc/xml-guide.html">Gentoo Linux Documentation Guide</uri> (FYI, this
-tarball contains a snapshot of the <path>/usr/portage/app-doc/gentoo-web/files</path> directory).
-</p>
-
-</body>
-</section>
-</chapter>
-</guide>
-
diff --git a/app-doc/gentoo-web/files/xml/resume.xml b/app-doc/gentoo-web/files/xml/resume.xml
deleted file mode 100644
index 1439e6ec0a51..000000000000
--- a/app-doc/gentoo-web/files/xml/resume.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?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>Shell scripting (Bash, Bourne shell)</b> (4+ years)</li>
-				<li><b>XML, XSLT, XSL:FO, HTML, CSS, JavaScript</b></li>
-				<li><b>Familiarity with C++, Perl, PHP4, Rebol</b></li>
-				<li><b>Multithreading, socket programming</b></li>
-				<li><b>Past experience: Object Pascal, REXX, x86 assembly, Fortran, Scheme, 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-guide.xml b/app-doc/gentoo-web/files/xml/xml-guide.xml
deleted file mode 100644
index 50bd6f464748..000000000000
--- a/app-doc/gentoo-web/files/xml/xml-guide.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version='1.0'?>
-<guide link="/doc/xml-guide.html">
-<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>
-
-<section>
-<title>How to transform guide XML into HTML</title>
-<body>
-
-<p> Before we take a look at the guide syntax itself, it's helpful to know how
-guide XML is transformed into web-ready HTML.  To do this, we use a special
-file called <path>guide.xsl</path>, along with a command-line XSLT processing
-tool (also called an "engine").  The <path>guide.xsl</path> file describes
-exactly how to transform the contents of the source guide XML document to
-create the target HTML file.  Two popular XSLT processors are <c>sabcmd</c>
-(included in the <path>app-text/sablotron</path> package) and <c>xsltproc</c>
-(found in the <path>gnome-libs/libxslt</path> package).  From experience, we've
-found that <c>xsltproc</c> is the higher-quality and more feature-rich XSLT
-processor.  </p>
-
-<p> Once you have either <c>xsltproc</c> or <c>sabcmd</c> installed, you're
-ready to convert guide XML into web-ready HTML.  Here's how it works.  First,
-select a sample document from
-<path>/usr/portage/app-doc/gentoo-web/files/xml</path>, such as
-<path>install.xml</path> (The new user installation guide).  This will be our
-source XML guide document.  The easiest way to perform the transformation is to
-change directories to the location of the <path>guide.xsl</path> file.  Then,
-execute <c>xsltproc</c> as follows: </p>
-
-<pre>
-# <i>cd /usr/portage/app-doc/gentoo-web/files/xsl</i>
-# <i>xsltproc guide.xsl ../xml/install.xml &gt; /tmp/install.html</i>
-</pre>
-
-<p> If all went well, you should have a web-ready version of
-<path>install.xml</path> at <path>/tmp/install.html</path>.  For this document
-to display properly in a web browser, you may have to copy some files from
-<path>/usr/portage/app-doc/gentoo-web/files</path> to <path>/tmp</path>, such
-as <path>css/gentoo-dcc.css</path> and <path>images/gentoo-doc.gif</path>.
-</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-	<title>Guide XML</title>
-<section>
-<title>Basic structure</title>
-<body>
-
-<p>Now that you know how to transform guide XML, you're ready to start learning
-the guide XML syntax.  We'll start with the the initial tags used in a guide
-XML document: </p>
-
-<pre caption="The initial part of a guide XML document">
-&lt;?xml version='1.0'?&gt;
-&lt;guide&gt;
-&lt;title&gt;<i>Gentoo Linux Documentation Guide</i>&lt;/title&gt;
-&lt;author title="<i>Chief Architect</i>"&gt;&lt;mail link="<i>drobbins@gentoo.org</i>"&gt;
-	<i>Daniel Robbins</i>&lt;/mail&gt;
-&lt;/author&gt;
-&lt;author title="<i>Editor</i>"&gt;&lt;mail link="<i>thomasfl@gentoo.org</i>"&gt;
-	<i>Thomas Flavel</i>&lt;/mail&gt;
-&lt;/author&gt;
-
-&lt;abstract&gt;<i>This guide shows you how to compose web documentation using
-our new lightweight Gentoo guide XML syntax.  This syntax is the official
-format for Gentoo Linux web documentation, and this document itself was created
-using guide XML.</i> &lt;/abstract&gt;
-
-&lt;version&gt;<i>1.0</i>&lt;/version&gt;
-&lt;date&gt;<i>29 Mar 2001</i>&lt;/date&gt;
-</pre>
-
-<p>On the first, line, we see the requisite tag that identifies this as an XML
-document.  Following it, there's a <c>&lt;guide&gt;</c> tag  -- the entire
-guide document is enclosed within a <c>&lt;guide&gt; &lt;/guide&gt;</c> pair.
-Next, there's a <c>&lt;title&gt;</c> tag, used to set the title for the entire
-guide document.  </p>
-
-<p>Then, we come to the <c>&lt;author&gt;</c> tags, which contain information
-about the various authors of the document.  Each <c>&lt;author&gt;</c> tag
-allows for an optional <c>title=</c> element, used to specify the author's
-relationship to the document (author, co-author, editor, etc.).  In this
-particular example, the authors' names are enclosed in another tag -- a
-<c>&lt;mail&gt;</c> tag, used to specify an email address for this particular
-person.  The <c>&lt;mail&gt;</c> tag is optional and can be omitted, and no
-more than one <c>&lt;author&gt;</c> element is required per guide document.
-</p>
-
-<p>Next, we come to the <c>&lt;abstract&gt;</c>, <c>&lt;version&gt;</c> and
-<c>&lt;date&gt;</c> tags, used to specify a summary of the document, the
-current version number, and the current version date (in DD MMM YYYY format)
-respectively.  This rounds out the tags that should appear at the beginning of
-a guide document.  Besides the <c>&lt;title&gt;</c> and <c>&lt;mail&gt;</c>
-tags, these tags shouldn't appear anywhere else except immediately inside the
-<c>&lt;guide&gt;</c> tag, and for consistency it's recommended (but not
-required) that these tags appear before the content of the document.  </p>
-
-</body>
-</section>
-
-<section>
-<title>Chapters and sections</title>
-<body>
-<p>Once the initial tags have been specified, you're ready to start adding
-the structural elements of the document.  Guide documents are divided into
-chapters, and each chapter can hold one or more sections.  Every chapter
-and section has a title.  Here's an example chapter with a single section,
-consisting of a paragraph.  If you append this XML to the XML in the <uri link="#doc_pre2">previous
-excerpt</uri> and append a <c>&lt;/guide&gt;</c> to the end of the file, you'll have a valid
-(if minimal) guide document:
-</p>
-
-<pre>
-&lt;chapter&gt;
-&lt;title&gt;<i>This is my chapter</i>&lt;/title&gt;
-&lt;section&gt;
-	&lt;title&gt;<i>This is section one of my chapter</i>&lt;/title&gt;
-	&lt;body&gt;
-		&lt;p&gt;<i>This is the actual text content of my section.</i>&lt;/p&gt;
-	&lt;/body&gt;
-&lt;/section&gt;
-&lt;/chapter&gt;
-</pre>
-
-<p>Above, I set the chapter title by adding a child <c>&lt;title&gt;</c>
-element to the <c>&lt;chapter&gt;</c> element.  Then, I created a section by
-adding a <c>&lt;section&gt;</c> element.  If you look inside the
-<c>&lt;section&gt;</c> element, you'll see that it has two child elements -- a
-<c>&lt;title&gt;</c> and a <c>&lt;body&gt;</c>.  While the <c>&lt;title&gt;</c>
-is nothing new, the <c>&lt;body&gt;</c> is -- it contains the actual text
-content of this particular section.  We'll look at the tags that are allowed
-inside a <c>&lt;body&gt;</c> element in a bit.  </p>
-
-<note>A <c>&lt;guide&gt;</c> element can contain multiple
-<c>&lt;chapter&gt;</c> elements, and a <c>&lt;chapter&gt;</c> can contain
-multiple <c>&lt;section&gt;</c> elements.  However, a <c>&lt;section&gt;</c>
-element can only contain one <c>&lt;body&gt;</c> element.  </note>
-
-</body>
-</section>
-
-<section>
-<title>An example &lt;body&gt;</title>
-<body>
-<p>
-Now, it's time to learn how to mark up actual content.  Here's the XML code for an example <c>&lt;body&gt;</c> element:
-</p>
-<pre>
-&lt;p&gt;
-This is a paragraph.  &lt;path&gt;/etc/passwd&lt;/path&gt; is a file.
-&lt;uri&gt;http://www.gentoo.org&lt;/uri&gt; is my favorite website.
-Type &lt;c&gt;ls&lt;/c&gt; if you feel like it.  I &lt;e&gt;really&lt;/e&gt; want to go to sleep now.
-&lt;/p&gt;
-
-&lt;pre&gt;
-This is text output or code.
-# &lt;i&gt;this is user input&lt;/i&gt;
-
-Make HTML/XML easier to read by using selective emphasis:
-&lt;foo&gt;&lt;i&gt;bar&lt;/i&gt;&lt;/foo&gt;
-
-&lt;codenote&gt;This is how to insert an inline note into the code block&lt;/codenote&gt;
-&lt;/pre&gt;
-&lt;note&gt;This is a note.&lt;/note&gt;
-&lt;warn&gt;This is a warning.&lt;/warn&gt;
-&lt;impo&gt;This is important.&lt;/impo&gt;
-</pre>
-<p>Now, here's how this <c>&lt;body&gt;</c> element is rendered:</p>
-
-<p>
-This is a paragraph.  <path>/etc/passwd</path> is a file.
-<uri>http://www.gentoo.org</uri> is my favorite website.
-Type <c>ls</c> if you feel like it.  I <e>really</e> want to go to sleep now.
-</p>
-
-<pre>
-This is text output or code.
-# <i>this is user input</i>
-
-Make HTML/XML easier to read by using selective emphasis:
-&lt;foo&gt;<i>bar</i>&lt;/foo&gt;
-
-<codenote>This is how to insert an inline note into the code block</codenote>
-</pre>
-<note>This is a note.</note>
-<warn>This is a warning.</warn>
-<impo>This is important.</impo>
-</body>
-</section>
-
-<section>
-<title>The &lt;body&gt; tags</title>
-<body>
-
-<p> We introduced a lot of new tags in the previous section -- here's what you
-need to know.  The <c>&lt;p&gt;</c> (paragraph), <c>&lt;pre&gt;</c> (code
-block), <c>&lt;note&gt;</c>, <c>&lt;warn&gt;</c> (warning) and
-<c>&lt;impo&gt;</c> (important) tags all can contain one or more lines of text.
-Besides the <c>&lt;table&gt;</c> element (which we'll cover in just a bit),
-these are the only tags that should appear immediately inside a
-<c>&lt;body&gt;</c> element.  Another thing -- these tags <e>should not</e> be
-stacked -- in other words, don't put a <c>&lt;note&gt;</c> element inside a
-<c>&lt;p&gt;</c> element.  As you might guess, the <c>&lt;pre&gt;</c> element
-preserves its whitespace exactly, making it well-suited for code excerpts.</p>
-
-</body>
-</section>
-<section>
-<title>&lt;path&gt;, &lt;c&gt; and &lt;e&gt;</title>
-<body>
-
-<p>The <c>&lt;path&gt;</c>, <c>&lt;c&gt;</c> and <c>&lt;e&gt;</c> elements can
-be used inside any child <c>&lt;body&gt;</c> tag, except for
-<c>&lt;pre&gt;</c>.  </p>
-
-<p>The <c>&lt;path&gt;</c> element is used to mark text that refers to an
-<e>on-disk file</e> -- either an <e>absolute or relative path</e>, or a <e>simple filename</e>.
-This element is generally rendered with a monospaced font to offset it from the
-standard paragraph type.  </p>
-
-<p>The <c>&lt;c&gt;</c> element is used to mark up a <e>command</e> or <e>user
-input</e>.  Think of <c>&lt;c&gt;</c> as a way to alert the reader to something
-that they can type in that will perform some kind of action.  For example, all
-the XML tags displayed in this document are enclosed in a <c>&lt;c&gt;</c>
-element because they represent something that the user could type in that is
-not a path.  By using <c>&lt;c&gt;</c> elements, you'll help your readers
-quickly identify commands that they need to type in.  Also, because
-<c>&lt;c&gt;</c> elements are already offset from regular text, <e>it is rarely
-necessary to surround user input with double-quotes</e>. For example, don't
-refer to a "<c>&lt;c&gt;</c>" element like I did in this sentence.  Avoiding
-the use of unnecessary double-quotes makes a document more readable -- and adorable!</p>
-
-<p><c>&lt;e&gt;</c> is used to apply emphasis to a word or phrase; for example:
-I <e>really</e> should use semicolons more often.  As you can see, this text is
-offset from the regular paragraph type for emphasis.  This helps to give your
-prose more <e>punch</e>!</p>
-
-</body>
-</section>
-
-<section>
-<title>&lt;mail&gt; and &lt;uri&gt;</title>
-<body>
-
-<p>We've taken a look at the <c>&lt;mail&gt;</c> tag earlier; it's used to link some text
-with a particular email address, and takes the form <c>&lt;mail link="foo@bar.com"&gt;Mr. Foo Bar&lt;/mail&gt;</c>.</p>
-
-<p>The <c>&lt;uri&gt;</c> tag is used to point to files/locations on the
-Internet.  It has two forms -- the first can be used when you want to have the
-actual URI displayed in the body text, such as this link to
-<uri>http://www.gentoo.org</uri>.  To create this link, I typed
-<c>&lt;uri&gt;http://www.gentoo.org&lt;/uri&gt;</c>.  The alternate form is
-when you want to associate a URI with some other text -- for example, <uri
-link="http://www.gentoo.org">the Gentoo Linux website</uri>.  To create <e>this</e>
-link, I typed <c>&lt;uri link="http://www.gentoo.org"&gt;the Gentoo Linux website&lt;/uri&gt;</c>.
-</p>
-
-</body>
-</section>
-
-<section>
-<title>Figures</title>
-
-<body>
-
-<p>Here's how to insert a figure into a document -- <c>&lt;figure
-link="mygfx.png" short="my picture" caption="my favorite picture of all
-time"/&gt;</c>.  The <c>link=</c> attribute points to the actual graphic image,
-the <c>short=</c> attribute specifies a short description (currently used for
-the image's HTML <c>alt=</c> attribute), and a caption.  Not too difficult
-:)</p>
-
-</body>
-</section>
-<section>
-<title>Tables and lists</title>
-<body>
-
-<p>Guide supports a simplified table syntax similar to that of HTML.  To start
-a table, use a <c>&lt;table&gt;</c> tag.  Start a row with a <c>&lt;tr&gt;</c>
-tag.  However, for inserting actual table data, we <e>don't</e> support the
-HTML &lt;td&gt; tag; instead, use the <c>&lt;th&gt;</c> if you are inserting a
-header, and <c>&lt;ti&gt;</c> if you are inserting a normal informational
-block.  You can use a <c>&lt;th&gt;</c> anywhere you can use a <c>&lt;ti&gt;</c> --
-there's no requirement that <c>&lt;th&gt;</c> elements appear only in the 
-first row.  Currently, these tags don't support any attributes, but some will
-be added (such as a <c>caption=</c> attribute for <c>&lt;table&gt;</c>) soon.
-</p>
-
-<p> To create ordered or unordered lists, simply use the HTML-style
-<c>&lt;ol&gt;</c>, <c>&lt;ul&gt;</c> and <c>&lt;li&gt;</c> tags.  List tags
-should only appear inside a <c>&lt;p&gt;</c>, <c>&lt;ti&gt;</c>,
-<c>&lt;note&gt;</c>, <c>&lt;warn&gt;</c> or <c>&lt;impo&gt;</c> tag.  </p>
-
-</body>
-</section>
-
-<section>
-<title>Intra-document references</title>
-<body>
-
-<p>Guide makes it really easy to reference other parts of the document using
-hyperlinks.  You can create a link pointing to <uri link="#doc_chap1">Chapter
-One</uri> by typing <c>&lt;uri link="#doc_chap1"&gt;Chapter
-One&lt;/uri&gt;</c>.  To point to <uri link="#doc_chap1_sect2">section two of
-Chapter One</uri>, type <c>&lt;uri link="#doc_chap1_sect2"&gt;section two of
-Chapter One&lt;/uri&gt;</c>.  To refer to figure 3, type <c>&lt;uri
-link="doc_fig3"&gt;figure 3&lt;/uri&gt;</c>.  Or, to refer to <uri link="#doc_pre2">code listing 2</uri>,
-type <c>&lt;uri link="doc_pre2"&gt;code listing 2&lt;/uri&gt;</c>.  We'll be
-adding other auto-link abilities (such as table support) soon.</p>
-
-</body>
-</section>
-</chapter>
-<chapter>
-<title>Resources</title>
-<section>
-	<title>Start writing</title>
-	<body>
-		<p>Guide has been specially designed to be "lean and mean" so that developers
-		can spend more time writing documentation and less time learning the actual XML
-		syntax.  Hopefully, this will allow developers who aren't unusually "doc-savvy"
-		to start writing quality Gentoo Linux documentation.  If you'd like to help (or have any questions about guide), please
-		post a message to <mail link="gentoo-dev@gentoo.org">the gentoo-dev mailing list</mail>
-		stating what you'd like to tackle.</p>
-		<p>If you'd like to explore guide further, you can find the necessary files in our
-		Portage tree -- <path>/usr/portage/app-doc/gentoo-web/files</path>.  Have fun!</p>
-	</body>
-</section>
-</chapter>
-</guide>
-
diff --git a/app-doc/gentoo-web/files/xml/xml-test.xml b/app-doc/gentoo-web/files/xml/xml-test.xml
deleted file mode 100644
index e17d047f7a44..000000000000
--- a/app-doc/gentoo-web/files/xml/xml-test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/cvs.xsl b/app-doc/gentoo-web/files/xsl/cvs.xsl
deleted file mode 100755
index de0c2e0f40d1..000000000000
--- a/app-doc/gentoo-web/files/xsl/cvs.xsl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="xml" indent="yes"/>
-
-<xsl:template match="/changelog">
-	<mainpage id="changelog">
-	<title>Gentoo Linux Development Changelog for <xsl:value-of select="entry/date"/></title>
-	<author title="script">cvs-xml.xsl</author>
-
-	<standout>
-		<title>About the Development Changelog</title>
-		<body>
-			This page contains a daily Changelog, listing all modifications made to our
-			CVS tree on <xsl:value-of select="entry/date"/> (yesterday).
-		</body>
-	</standout>
-	<version>1.0.0</version>
-	<date><xsl:value-of select="entry/date"/></date>
-	<chapter>
-		<xsl:apply-templates select="entry"/>
-	</chapter>
-	</mainpage>
-</xsl:template>
-
-<xsl:template match="entry">
-	<section>
-		<title>Files modified by <xsl:value-of select="author"/> at <xsl:value-of select="time"/></title>
-		<body>
-			<note><xsl:value-of select="msg"/></note>
-			<ul>
-				<xsl:apply-templates select="file"/>
-			</ul>
-		</body>
-	</section>
-</xsl:template>
-
-<xsl:template match="file">
-	<li><path><xsl:value-of select="name"/></path>, <xsl:value-of select="revision"/></li>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/xsl/guide-fo.xsl b/app-doc/gentoo-web/files/xsl/guide-fo.xsl
deleted file mode 100755
index 36e008a7dc44..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide-fo.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="xml"/> 
-
-<xsl:template match="/guide">
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Times Roman" font-size="12pt" text-align="justify">
-  <fo:layout-master-set>
- 
-    <fo:simple-page-master master-name="simple1" page-width="8.5in" page-height="11in" margin-top="1in" margin-bottom="1in" margin-left="10pc" margin-right="1in">
-      <fo:region-body margin-bottom="24pt" margin-top="24pt"/>
-      <fo:region-before extent="0pt"/>
-      <fo:region-after extent="0pt"/>
-    </fo:simple-page-master>
-
-    <fo:page-sequence-master master-name="oneside1">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="simple1"/>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
- 
-  </fo:layout-master-set>
-
-  <fo:page-sequence hyphenate="true" master-name="oneside1" language="en">
-    <fo:flow flow-name="xsl-region-body">
-      <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-      <fo:block id="id2626599">
-        <fo:block background-color="black">
-          <fo:external-graphic src="file:gentoo-doc.eps" content-width="auto" content-height="auto" width="auto" height="auto"/>
-        </fo:block>
-        <fo:block background-color="green">
-        documentation :: <xsl:value-of select="title"/>
-        </fo:block>
-      </fo:block>
-    </fo:flow>
-  </fo:page-sequence>
-</fo:root>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/app-doc/gentoo-web/files/xsl/guide-ibm.xsl b/app-doc/gentoo-web/files/xsl/guide-ibm.xsl
deleted file mode 100755
index a3bc1a890618..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide-ibm.xsl
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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:preserve-space elements="pre"/>
-
-<xsl:template match="/guide">
-<html>
-<head>
-<title>developerWorks : Linux : <xsl:value-of select="title"/></title>
-<script type="text/javascript" language="JavaScript" src="style.js"></script>
-</head>
-<body>
-<table>
-<tr>
-<td><span class="atitle"><xsl:value-of select="title"/></span></td></tr>
-<tr>
-<td><span class="atitle2"><xsl:value-of select="subtitle"/></span></td></tr>
-</table>
-
-<!-- Start TOC (optional) -->
-
-<table width="150" border="0" cellspacing="0" cellpadding="0">
-<xsl:for-each select="chapter">
-<xsl:variable name="chapid"><xsl:number/></xsl:variable>
-<tr><td><a href="#{$chapid}"><xsl:value-of select="title"/></a></td></tr>
-</xsl:for-each>
-</table>
-
-<!--  AUTHOR -->
-
-<p><a href="#author1">Daniel Robbins</a> (<a href="drobbins@gentoo.org">drobbins@gentoo.org</a>)<br />
-President/CEO, Gentoo Technologies, Inc.<br />
-<xsl:value-of select="date"/></p>
-
-<!--  End AUTHOR -->
-
-<!-- ABSTRACT -->
-
-<p><blockquote>
-<xsl:apply-templates select="abstract"/>
-</blockquote></p>
-
-<!-- END ABSTRACT -->
-
-<xsl:apply-templates select="chapter"/>
-
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<tr><td>
-<a name="author1"><span class="atitle2">About the author</span></a>
-<p><img src="[author.jpg]" border="0" width="64" height="71" align="left" alt="author"/>
-Residing in Albuquerque, New Mexico, Daniel Robbins (<a HREF="mailto:drobbins@gentoo.org">drobbins@gentoo.org</a>) is the
-President/CEO of Gentoo Technologies,
-Inc., the creator of <a href="http://www.gentoo.org">Gentoo Linux</a>, an advanced Linux for the
-PC, and the <b>Portage</b> system, a next-generation ports system for Linux.
-He has also served as a contributing author for the Macmillan books
-<i>Caldera OpenLinux Unleashed</i>, <i>SuSE Linux Unleased</i> and <i>Samba Unleashed</i>.
-Daniel has been involved with computers in some fashion since the
-second grade, when he was first exposed to the Logo programming
-language as well as a potentially dangerous dose of Pac Man.  This
-probably explains why he has since served as a Lead Graphic Artist at
-<b>SONY Electronic Publishing/Psygnosis</b>.  Daniel enjoys spending
-time with his wife, Mary, and his new baby daughter, Hadassah.</p>
-</td></tr>
-</table>
-
-<!-- END PAPER BODY -->
-
-
-</body>
-</html>
-</xsl:template>
-
-<xsl:template match="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="author">
-	<xsl:apply-templates />
-	<xsl:if test="@title">, <i><xsl:value-of select="@title"/></i>
-	</xsl:if>	
-	<br/>
-</xsl:template>
-
-<xsl:template match="chapter">
-	<xsl:variable name="chapid"><xsl:number/></xsl:variable>
-	<p><a name="{$chapid}"></a><span class="atitle2"><xsl:value-of select="title"/></span>
-	</p>
-	<xsl:apply-templates select="section"/>
-</xsl:template>
-
-<xsl:template match="section">
-	<xsl:if test="title">
-		<p><span class="atitle3"><xsl:value-of select="title"/></span></p>
-	</xsl:if>
-	<xsl:apply-templates select="body"/>
-</xsl:template>
-
-<xsl:template match="figure">
-	<xsl:variable name="fignum"><xsl:number level="any"/></xsl:variable>
-	<xsl:variable name="figid">figure<xsl:number/></xsl:variable>
-	<p><a name="{$figid}"></a><b><xsl:value-of select="@caption" /></b>
-	<br /><img src="{@link}" alt="{@short}"/></p>
-</xsl:template>
-	
-<xsl:template match="note">
-	<!-- SIDEBAR (OPTIONAL) -->
-	<table border="1" cellpadding="5" cellspacing="0" width="30%" align="right"><tr><td background="/developerworks/i/bg-gold.gif">
-	<p><b>Note: </b>
-	<xsl:apply-templates />
-	<!-- END OF SIDEBAR -->
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="impo">
-	<!-- SIDEBAR (OPTIONAL) -->
-	<table border="1" cellpadding="5" cellspacing="0" width="30%" align="right"><tr><td background="/developerworks/i/bg-gold.gif">
-	<p><b>Important: </b>
-	<xsl:apply-templates />
-	<!-- END OF SIDEBAR -->
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="warn">
-	<!-- SIDEBAR (OPTIONAL) -->
-	<table border="1" cellpadding="5" cellspacing="0" width="30%" align="right"><tr><td background="/developerworks/i/bg-gold.gif">
-	<p><b>Warning: </b>
-	<xsl:apply-templates />
-	<!-- END OF SIDEBAR -->
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="codenote">
-	<font color="#ff0000">(Note: <xsl:value-of select="." />)</font>
-</xsl:template>
-
-<xsl:template match="comment">
-	<font color="#ff0000"><xsl:apply-templates /></font>
-</xsl:template>
-
-<xsl:template match="i">
-	<b><xsl:apply-templates /></b>
-</xsl:template>
-
-<xsl:template match="attribution">
-	<i><xsl:apply-templates /></i>
-</xsl:template>
-
-<xsl:template match="b">
-	<b><xsl:apply-templates /></b>
-</xsl:template>
-
-<xsl:template match="body">
-	<xsl:apply-templates />
-</xsl:template>
-
-<xsl:template match="c">
-	<b><xsl:apply-templates /></b> 
-</xsl:template>
-
-<!-- mertzification -->
-<xsl:template match="code">
-	<b><xsl:apply-templates /></b> 
-</xsl:template>
-
-<xsl:template match="box">
-	<p><xsl:apply-templates /></p>
-</xsl:template>
-
-<xsl:template match="pre">
-<xsl:variable name="prenum"><xsl:number level="any" /></xsl:variable>
-<xsl:variable name="preid">code<xsl:number level="any" /></xsl:variable>
-<p><a name="{$preid}"></a><b><xsl:value-of select="@caption" /></b>
-<table border="1" cellpadding="5"  width="100%" cellspacing="0" bgcolor="#cccccc"><tr><td><pre>
-<xsl:apply-templates />
-</pre></td></tr></table></p>
-</xsl:template>
-
-<xsl:template match="path">
-	<xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template match="uri">
-	<xsl:choose>
-		<xsl:when test="@link">
-			<a href="{@link}"><xsl:value-of select="."/></a>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:variable name="loc" select="."/>
-			<a href="{$loc}"><xsl:value-of select="."/></a>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<!--HTML compat.-->
-
-<xsl:template match="a">
-	<a href="{@href}"><xsl:apply-templates /></a>
-</xsl:template>
-
-<xsl:template match="p">
-	<p><xsl:apply-templates /></p>
-</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><xsl:apply-templates /></table>
-</xsl:template>
-
-<xsl:template match="tr">
-	<tr><xsl:apply-templates /></tr>
-</xsl:template>
-
-<xsl:template match="ti">
-	<td bgcolor="#ddddff"><xsl:apply-templates /></td>
-</xsl:template>
-
-<xsl:template match="th">
-	<td bgcolor="#7a5ada"><b><xsl:apply-templates /></b></td>
-</xsl:template>
-
-<xsl:template match="ul">
-	<ul><xsl:apply-templates /></ul>
-</xsl:template>
-
-<xsl:template match="ol">
-	<ol><xsl:apply-templates /></ol>
-</xsl:template>
-
-<xsl:template match="li">
-	<li><xsl:apply-templates /></li>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/xsl/guide-main.xsl b/app-doc/gentoo-web/files/xsl/guide-main.xsl
deleted file mode 100755
index b2d0d1dfab13..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide-main.xsl
+++ /dev/null
@@ -1,713 +0,0 @@
-<?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:preserve-space elements="pre"/>
-
-<xsl:template match="/guide">
-<html>
-<head>
-    <link title="new" rel="stylesheet" href="/main-new.css" type="text/css"></link>
-	<title>Gentoo Linux 
-	<xsl:choose>
-	<xsl:when test="/guide/@type='project'">
-		Projects
-	</xsl:when>
-	<xsl:otherwise>
-		Documentation
-	</xsl:otherwise>
-	</xsl:choose>
--- 
-	<xsl:choose>
-		<xsl:when test="subtitle">
-			<xsl:value-of select="title"/>: <xsl:value-of select="subtitle"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:value-of select="title"/>
-		</xsl:otherwise>
-	</xsl:choose>
-</title>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-	<!--<table border="0" width="100%" cellspacing="0" cellpadding="0">-->
-	<table width="100%" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td valign="top" height="125" bgcolor="#45347b">
-				<table cellspacing="0" cellpadding="0" border="0" width="193">
-					<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 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="/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">
-			<br/>
-			<p class="dochead">
-			<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>
-			</p>
-<!--		<p>
-			<xsl:apply-templates select="author"/>
-
-		</p> -->
-<form>
-	<b>Contents</b>:
-	<select name="url" size="1" OnChange="location.href=form.url.options[form.url.selectedIndex].value" style="font-family:Arial,Helvetica, sans-serif; font-size:10">
-	<xsl:for-each select="chapter">
-		<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-<!--		<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/>
-	<xsl:value-of select="/guide/@link"/>
-	<option value="showdoc.html?i=1514&p=1">Select											
-
-				-->
-				</xsl:for-each>		
-	</select>
-</form>
-	
-
-
-<xsl:apply-templates select="chapter"/> 
-<br/>
-<br/>
-<!--content end-->
-</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="/guide/date"/>
-				</td>
-				</tr>
-				<tr>
-				<td>
-				<img src="/images/line.gif"/>
-				</td>
-				</tr>
-				<tr>
-				<td class="alttext">
-				<xsl:apply-templates select="/guide/author"/>
-				</td>
-				</tr>
-				<tr>
-				<td>
-				<img src="/images/line.gif"/>
-				</td>
-				</tr>
-				<tr>
-					<td class="alttext">
-							<b>Summary:</b>&#160;<xsl:apply-templates select="abstract"/>
-					</td>
-				</tr> <!--
-				<tr>
-				<td>
-				<img src="/images/line.gif"/>
-				</td>
-				</tr>
-				<tr>
-				<td class="altmenu">
-					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/>
-						</xsl:for-each>		
-					</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>
-
-
-
-
-
-</tr></table>
-<!--Netscape 4.7 hack end-->
-			</td>
-		</tr>
-		<tr>
-			<td align="right" class="infohead" width="100%" 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="/mainpage">
-<html>
-<head>
-    <link title="new" rel="stylesheet" href="/main-new.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">-->
-	<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>
-			
-			<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>
-					<a class="menulink" href="/doc/build.html">Download/Install</a> |
-					<a class="menulink" href="/doc/faq.html">FAQ</a> |
-					<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 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/>
-						<font color="#ff0000">Updated 18 Oct 2001:</font> <a class="altlink" href="/doc/desktop.html">Desktop Guide</a><br/>
-						<font color="#ff0000">Updated!</font> <a class="altlink" href="/doc/portage-user.html">Portage User Guide</a><br/>
-						<a class="altlink" href="/doc/openafs.html">OpenAFS Installation Guide</a><br/>
-						<font color="#ff0000">Updated!</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/>	
-						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/>
-						<br/>
-	
-						Mailing Lists:<br/><br/>
-						<font color="#ff0000">New! General User List:</font><br/> <a class="altlink" href="http://lists.gentoo.org/mailman/listinfo/gentoo-user">gentoo-user</a><br/><br/>
-						<font color="#ff0000">New! Ebuild submissions:</font><br/> <a class="altlink" href="http://lists.gentoo.org/mailman/listinfo/gentoo-ebuild">gentoo-ebuild</a><br/><br/>
-						
-						Developer list:<br/> <a class="altlink" href="http://lists.gentoo.org/mailman/listinfo/gentoo-dev">gentoo-dev</a><br/><br/>
-						Announcements:<br/> <a class="altlink" href="http://lists.gentoo.org/mailman/listinfo/gentoo-announce">gentoo-announce</a><br/><br/>
-						Daily CVS logs:<br/>  <a class="altlink" href="http://lists.gentoo.org/mailman/listinfo/gentoo-cvs">gentoo-cvs</a><br/><br/>
-						<a class="altlink" href="http://lists.gentoo.org">Complete list of mailing lists</a><br/>
-						<br/>
-						Other Resources:<br/>
-						<a class="altlink" href="http://www.gentoo.org/cgi-bin/viewcvs.cgi">viewcvs</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">
-	<xsl:apply-templates select="news"/>
-</xsl:template>
-
-<xsl:template match="news">
-	<table width="100%" border="0" cellspacing="5" cellpadding="0">
-	<tr>
-		<td colspan="2" class="ncontent" bgcolor="#bbffbb"><p class="note"><font color="#7a5ada"><b><xsl:value-of select="title"/></b></font></p></td>
-	</tr>
-	<tr>
-	<xsl:choose>
-		<xsl:when test="@align='left'">
-			<td rowspan="2" valign="top" width="1">
-				<img src="{@graphic}"/>
-			</td>		
-			<td class="alttext">
-					<font color="#808080">Posted by <xsl:value-of select="poster"/> on <xsl:value-of select="date"/></font>
-			</td>
-		</xsl:when>
-		<xsl:otherwise>
-			<td class="alttext">
-					<font color="#808080">Posted by <xsl:value-of select="poster"/> on <xsl:value-of select="date"/></font>
-			</td>
-			<td rowspan="2" valign="top" width="1">
-				<img src="{@graphic}"/>
-			</td>		
-		</xsl:otherwise>
-	</xsl:choose>
-	</tr>
-	<tr>
-		<td class="content" valign="top">
-			<xsl:apply-templates select="body"/>
-		</td>
-	</tr>
-	</table>
-	<br/>
-	<table width="100%">
-	<tr>
-		<td height="1" bgcolor="#c0c0c0"></td>
-	</tr>
-	</table>
-	<br/>
-</xsl:template>
-
-<xsl:template match="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="author/mail">
-	<b><a class="altlink" href="mailto:{@link}"><xsl:value-of select="."/></a></b>
-</xsl:template>
-
-<xsl:template match="author">
-	<xsl:apply-templates />
-	<xsl:if test="@title"><br/><i><xsl:value-of select="@title"/></i>
-	</xsl:if>	
-	<br/>
-	<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"><font class="chapnum"><a name="{$chapid}"><xsl:number/>.</a></font> <xsl:value-of select="title"/></p>
-	</xsl:when>
-	<xsl:otherwise>
-		<xsl:if test="/guide">
-			<p class="chaphead"><font class="chapnum"><a name="{$chapid}"><xsl:number/>.</a></font></p> 
-		</xsl:if>
-	</xsl:otherwise>
-	</xsl:choose>
-	<xsl:apply-templates select="section">
-	<xsl:with-param name="chapid" value="$chapid"/>
-	</xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section">
-	<xsl:param name="chapid"/>
-	<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="figure">
-	<xsl:variable name="fignum"><xsl:number level="any"/></xsl:variable>
-	<xsl:variable name="figid">doc_fig<xsl:number/></xsl:variable>
-	<br/>
-	<a name="{$figid}"/>
-	<table cellspacing="0" cellpadding="0" border="0">
-	<tr><td class="infohead" bgcolor="#7a5ada">
-	<p class="caption">
-		<xsl:choose>
-			<xsl:when test="@caption">
-				Figure <xsl:value-of select="$fignum"/>: <xsl:value-of select="@caption" />
-			</xsl:when>
-			<xsl:otherwise>
-				Figure <xsl:value-of select="$fignum"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</p>
-	</td></tr>
-	<tr><td align="center" bgcolor="#ddddff">
-	<xsl:choose>
-		<xsl:when test="@short">
-			<img src="{@link}" alt="Fig. {$fignum}: {@short}"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<img src="{@link}" alt="Fig. {$fignum}"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</td></tr></table>
-	<br/>
-</xsl:template>
-
-<!--figure without a caption; just a graphical element-->
-<xsl:template match="fig">
-	<img src="{@link}" alt="{@short}"/>
-</xsl:template>
-
-<xsl:template match="br"><br/></xsl:template>
-
-<xsl:template match="note">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#bbffbb">
-	<p class="note"><b>Note: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="impo">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#ffffbb">
-	<p class="note"><b>Important: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="warn">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#ffbbbb">
-	<p class="note"><b>Warning: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="codenote">
-	<font class="comment">// <xsl:value-of select="." /></font>
-</xsl:template>
-
-<xsl:template match="comment">
-	<font class="comment"><xsl:apply-templates /></font>
-</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="c">
-	<font class="code"><xsl:apply-templates /></font> 
-</xsl:template>
-
-<xsl:template match="box">
-	<p class="infotext"><xsl:apply-templates /></p>
-</xsl:template>
-
-<xsl:template match="pre">
-	<xsl:variable name="prenum"><xsl:number level="any" /></xsl:variable>
-	<xsl:variable name="preid">doc_pre<xsl:number level="any" /></xsl:variable>
-	<a name="{$preid}"/>
-	<table class="ntable" width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr><td class="infohead" bgcolor="#7a5ada">
-	<p class="caption">
-	<xsl:choose>
-		<xsl:when test="@caption">
-			Code listing <xsl:value-of select="$prenum"/>: <xsl:value-of select="@caption" />
-		</xsl:when>
-		<xsl:otherwise>
-			Code listing <xsl:value-of select="$prenum"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</p>
-	</td></tr>
-	<tr><td bgcolor="#ddddff">
-	<pre> 
-		<xsl:apply-templates /> 
-	</pre> 
-	</td></tr></table> 
-</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="p">
-	<p><xsl:apply-templates /></p>
-</xsl:template>
-
-<xsl:template match="e">
-	<font class="emphasis"><xsl:apply-templates /></font>
-</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:template match="ul">
-	<ul><xsl:apply-templates /></ul>
-</xsl:template>
-
-<xsl:template match="ol">
-	<ol><xsl:apply-templates /></ol>
-</xsl:template>
-
-<xsl:template match="li">
-	<li><xsl:apply-templates /></li>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/xsl/guide-old.xsl b/app-doc/gentoo-web/files/xsl/guide-old.xsl
deleted file mode 100755
index 36454b15a36a..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide-old.xsl
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="xml" indent="yes"/> 
-
-<xsl:template match="/guide">
-	<html>
-	<head>
-	<title><xsl:value-of select="title"/></title>
-	<link rel="stylesheet" href="gentoo-doc.css" type="text/css"/>
-	</head>
-	<body bgcolor="#ffffff" topmargin="0" leftmargin="0" marginwidth="0" marginheight="0">
-	<table class="toptable" width="100%" cellspacing="0" cellpadding="0" border="0" bgcolor="#000000">
-	<tr><td width="160" height="129" align="left" valign="top"><a href="/"><img border="0" src="gentoo-doc.gif"/></a></td>
-	<td>&amp;nbsp;</td></tr>
-	<tr>
-		<td colspan="2" class="doclink">
-			<a href="/doc" style="color: #33ff00">documentation</a> :: <xsl:value-of select="title"/>
-		</td>
-	</tr>
-</table>
-	<table class="secondtable" width="95%" cellspacing="0" cellpadding="2" border="0">
-	<tr><td valign="top">
-	<p class="dochead"><xsl:value-of select="title"/></p>
-	</td><td valign="top">
-	<p class="info">
-	<xsl:apply-templates select="author"/>
-	Version <xsl:value-of select="version"/>, <xsl:value-of select="date"/></p>
-	</td></tr>		
-	<tr><td>
-	<p class="tochead">Summary</p>
-	<p class="abstract">
-	<xsl:value-of select="abstract"/>
-	</p>
-	</td><td width="25%" valign="top">
-	<p class="tochead">Table of contents:</p>
-	<p class="tocitem">
-	<xsl:for-each select="chapter">
-		&lt;a href="#<xsl:value-of select="./@link"/>"&gt;
-		<xsl:value-of select="title"/>&lt;/a&gt;
-		<br/>
-	</xsl:for-each>		
-	</p>
-	</td>
-	</tr>
-</table>
-	<xsl:apply-templates select="chapter"/>
-	</body>
-	</html>
-</xsl:template>
-
-<xsl:template match="author">
-<xsl:choose>
-	<xsl:when test="@email">
-		<![CDATA[<a href="mailto:]]><xsl:value-of select="@email"/><![CDATA[">]]>
-		<xsl:value-of select="."/><![CDATA[</a>]]>
-	</xsl:when>
-	<xsl:otherwise>
-		<xsl:value-of select="."/>
-	</xsl:otherwise>
-</xsl:choose>
-<xsl:if test="@title">, <i><xsl:value-of select="@title"/></i>
-</xsl:if>	
-<br/>
-</xsl:template>
-
-<xsl:template match="chapter">
-	&lt;a name="<xsl:value-of select="./@link"/>"&gt;
-	<p class="chaphead"><xsl:value-of select="title"/></p>&lt;/a&gt;
-	<xsl:apply-templates select="section"/>
-</xsl:template>
-
-<xsl:template match="section">
-	<p class="secthead"><xsl:value-of select="title"/></p>
-	<xsl:apply-templates select="body"/>
-</xsl:template>
-
-<xsl:template match="body">
-	<xsl:copy-of select="./node()"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/app-doc/gentoo-web/files/xsl/guide-project.xsl b/app-doc/gentoo-web/files/xsl/guide-project.xsl
deleted file mode 100755
index 0eb13a221f3f..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide-project.xsl
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="html" indent="yes"/> 
-<xsl:preserve-space elements="pre"/>
-
-<xsl:template match="/guide">
-	<html>
-	<head>
-	<title><xsl:value-of select="title"/></title>
-	<link rel="stylesheet" href="/doc/gentoo-doc.css" type="text/css"/>
-	</head>
-	<body bgcolor="#ffffff" topmargin="0" leftmargin="0" marginwidth="0" marginheight="0">
-	<table class="toptable" width="100%" cellspacing="0" cellpadding="0" border="0" bgcolor="#000000">
-	<tr><td width="160" height="129" align="left" valign="top"><a href="/"><img border="0" src="/projects/gentoo-project.jpg"/></a></td>
-	<td>&amp;nbsp;</td></tr>
-	<tr>
-		<td colspan="2" class="doclink">
-			<!-- <a href="/doc" style="color: #33ff00">documentation</a> :: <xsl:value-of select="title"/> -->
-			projects :: <xsl:value-of select="title"/>
-		</td>
-	</tr>
-</table>
-	<table class="secondtable" width="95%" cellspacing="0" cellpadding="2" border="0">
-	<tr><td valign="top">
-	<p class="dochead"><xsl:value-of select="title"/></p>
-	</td><td valign="top">
-	<p class="info">
-	<xsl:apply-templates select="author"/>
-	Doc Revision <xsl:value-of select="version"/>, <xsl:value-of select="date"/></p>
-	</td></tr>		
-	<tr><td>
-	<p class="tochead">Project Summary</p>
-	<p class="abstract">
-	<xsl:value-of select="abstract"/>
-	</p>
-	</td><td width="25%" valign="top">
-	<p class="tochead">Table of contents:</p>
-	<p class="tocitem">
-	<xsl:for-each select="chapter">
-		<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-		<a href="#{$chapid}"><xsl:number/>. <xsl:value-of select="title"/></a>
-		<br/>
-	</xsl:for-each>		
-	</p>
-	</td>
-	</tr>
-</table>
-	<xsl:apply-templates select="chapter"/>
-	<br/>
-	<br/>
-	<table class="tochead" width="100%" border="0"><tr><td align="right">Copyright 2001 Gentoo Technologies, Inc.<br/>
-	Questions, Comments, Corrections?  Email <a href="mailto:gentoo-dev@gentoo.org">gentoo-dev@gentoo.org</a>.</td></tr></table>
-	</body>
-	</html>
-</xsl:template>
-
-<xsl:template match="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="author">
-	<xsl:apply-templates />
-	<xsl:if test="@title">, <i><xsl:value-of select="@title"/></i>
-	</xsl:if>	
-	<br/>
-</xsl:template>
-
-<xsl:template match="chapter">
-	<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-	<a name="#{$chapid}"><p class="chaphead"><xsl:value-of select="title"/></p></a>
-	<xsl:apply-templates select="section"/>
-</xsl:template>
-
-<xsl:template match="section">
-	<xsl:variable name="sectid"><xsl:value-of select="$chapid"/>_sect<xsl:number/></xsl:variable>
-	<a name="#{$sectid}"><p class="secthead"><xsl:value-of select="title"/></p></a>
-	<xsl:apply-templates select="body"/>
-</xsl:template>
-
-<xsl:template match="figure">
-	<table border="0"><tr><td>
-	<xsl:variable name="fignum"><xsl:number level="any"/></xsl:variable>
-	<xsl:variable name="figid">doc_fig<xsl:number/></xsl:variable>
-	<a name="#{$figid}"/>
-	<xsl:choose>
-		<xsl:when test="@short">
-			<img src="{@link}" alt="Fig. {$fignum}: {@short}"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<img src="{@link}" alt="Fig. {$fignum}"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</td></tr><tr><td class="tochead">
-	<xsl:choose>
-		<xsl:when test="@caption">
-			Figure <xsl:value-of select="$fignum"/>: <xsl:value-of select="@caption" />
-		</xsl:when>
-		<xsl:otherwise>
-			Figure <xsl:value-of select="$fignum"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</td></tr></table>
-</xsl:template>
-	
-<xsl:template match="note">
-	<p class="note"><b>Note: </b>
-	<xsl:apply-templates />
-	</p>
-</xsl:template>
-
-<xsl:template match="impo">
-	<p class="impo"><b>Important: </b>
-	<xsl:apply-templates />
-	</p>
-</xsl:template>
-
-<xsl:template match="warn">
-	<p class="warn"><b>Warning: </b>
-	<xsl:apply-templates />
-	</p>
-</xsl:template>
-
-<xsl:template match="codenote">
-	<span class="comment">// <xsl:value-of select="." /></span>
-</xsl:template>
-
-<xsl:template match="comment">
-	<span class="comment"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="i">
-	<span class="input"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="body">
-	<xsl:apply-templates />
-</xsl:template>
-
-<xsl:template match="c">
-	<span class="code"><xsl:apply-templates /></span> 
-</xsl:template>
-
-<xsl:template match="pre">
-	<xsl:variable name="prenum"><xsl:number level="any" /></xsl:variable>
-	<xsl:variable name="preid">doc_pre<xsl:number level="any" /></xsl:variable>
-	<a name="#{$preid}"/>
-	<p class="caption">
-	<xsl:choose>
-		<xsl:when test="@caption">
-			Code listing <xsl:value-of select="$prenum"/>: <xsl:value-of select="@caption" />
-		</xsl:when>
-		<xsl:otherwise>
-			Code listing <xsl:value-of select="$prenum"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</p>
-	<pre> 
-		<xsl:apply-templates /> 
-	</pre> 
-	</xsl:template>
-
-<!-- path is used for specifying files and URLs; if you are linking
-part of a sentence rather than a path, then don't use this, use span instead-->
-<xsl:template match="path">
-	<span class="path"><xsl:value-of select="."/></span>
-</xsl:template>
-
-<xsl:template match="uri">
-	<xsl:choose>
-		<xsl:when test="@link">
-			<a href="{@link}"><xsl:value-of select="."/></a>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:variable name="loc" select="."/>
-			<a href="{$loc}"><xsl:value-of select="."/></a>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template match="p">
-	<p class="para"><xsl:apply-templates /></p>
-</xsl:template>
-
-<xsl:template match="e">
-	<span class="emphasis"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="table">
-	<table><xsl:apply-templates /></table>
-</xsl:template>
-
-<xsl:template match="tr">
-	<tr><xsl:apply-templates /></tr>
-</xsl:template>
-
-<xsl:template match="ti">
-	<td class="tableinfo"><xsl:apply-templates /></td>
-</xsl:template>
-
-<xsl:template match="th">
-	<td class="tochead"><b><xsl:apply-templates /></b></td>
-</xsl:template>
-
-<xsl:template match="ul">
-	<ul><xsl:apply-templates /></ul>
-</xsl:template>
-
-<xsl:template match="ol">
-	<ol><xsl:apply-templates /></ol>
-</xsl:template>
-
-<xsl:template match="li">
-	<li><xsl:apply-templates /></li>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/xsl/guide.xsl b/app-doc/gentoo-web/files/xsl/guide.xsl
deleted file mode 100755
index f1e29aa88a9f..000000000000
--- a/app-doc/gentoo-web/files/xsl/guide.xsl
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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:preserve-space elements="pre"/>
-
-<xsl:template match="/guide">
-<html>
-<head>
-<title>Gentoo Linux</title>
-    <link title="new" rel="stylesheet" href="main-new.css" type="text/css"></link>
-</head>
-<body leftmargin="0" topmargin="0" marginheight="0" marginwidth="0" bgcolor="#ffffff">
-	<table border="0" width="100%" height="100%" cellspacing="0" cellpadding="0">
-		<tr>
-			<td height="168" width="30%" bgcolor="#45347b">
-				<table cellspacing="0" cellpadding="0" border="0" width="100%">
-					<tr><td class="logobg" valign="bottom" align="center" height="120"><img src="gtop-new.jpg"/></td></tr>
-					<tr><td class="logobg" valign="bottom" align="center" height="48"><img src="gbot-new.gif"/></td></tr>
-				</table>
-			</td>
-			<td class="menu" valign="bottom" height="168" width="70%" bgcolor="#000000">
-				<!--Netscape 4.7 table hack-->
-				main menu ::<br/>
-				&#160;&#160;<a class="oldlink" href="index.html">About Gentoo Linux</a><br/>
-				&#160;&#160;<a class="oldlink" href="index-download.html">Download/Install</a><br/> <br/>
-				docs ::<br/>
-				&#160;&#160;<a class="highlight" href="fixme"><xsl:value-of select="title"/></a>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2" valign="top" height="96" align="right" width="30%" bgcolor="#ffffff">
-		
-<!--content begin-->
-
-<!--Netscape 4.7 hack table start-->
-<table border="0" cellspacing="5" cellpadding="0" height="100%" width="100%">
-<tr><td class="content" valign="top" align="left">
-	<table class="infotab" align="right" cellpadding="0" cellspacing="0" border="0">
-		<tr>
-			<td class="infohead" align="center" bgcolor="#7a5ada">About this Document</td>
-		</tr>
-		<tr valign="top" bgcolor="#ddddff">
-			<td class="infotext">
-				<br/>
-				<p class="infosub">Authors:</p>
-				<p class="infolist">
-				<xsl:apply-templates select="author"/>
-				</p>
-				<br/>
-				<p class="infosub">Table of Contents:</p>
-				<ol>
-				<xsl:for-each select="chapter">
-				<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-				<li><a href="#{$chapid}"><xsl:value-of select="title"/></a></li>
-				</xsl:for-each>		
-				</ol>
-				<br/>
-				<p class="infosub">Doc Revision <xsl:value-of select="version"/>, <xsl:value-of select="date"/></p>
-                </td>
-		</tr>
-	</table>
-<p class="dochead"><xsl:value-of select="title"/></p>
-<xsl:apply-templates select="chapter"/> 
-<!--content end-->
-</td></tr></table>
-<!--Netscape 4.7 hack end-->
-			</td>
-		</tr>
-		<tr>
-			<td align="right" class="infohead" width="100%" colspan="2" 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="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="author">
-	<xsl:apply-templates />
-	<xsl:if test="@title">, <i><xsl:value-of select="@title"/></i>
-	</xsl:if>	
-	<br/>
-</xsl:template>
-
-<xsl:template match="chapter">
-	<xsl:variable name="chapid">doc_chap<xsl:number/></xsl:variable>
-	<a name="#{$chapid}"><p class="chaphead"><span class="chapnum"><xsl:number/>.</span> <xsl:value-of select="title"/></p></a>
-	<xsl:apply-templates select="section"/>
-</xsl:template>
-
-<xsl:template match="section">
-	<xsl:variable name="sectid"><xsl:value-of select="$chapid"/>_sect<xsl:number/></xsl:variable>
-	<a name="#{$sectid}"><p class="secthead"><xsl:value-of select="title"/></p></a>
-	<xsl:apply-templates select="body"/>
-</xsl:template>
-
-<xsl:template match="figure">
-	<table border="0"><tr><td>
-	<xsl:variable name="fignum"><xsl:number level="any"/></xsl:variable>
-	<xsl:variable name="figid">doc_fig<xsl:number/></xsl:variable>
-	<a name="#{$figid}"/>
-	<xsl:choose>
-		<xsl:when test="@short">
-			<img src="{@link}" alt="Fig. {$fignum}: {@short}"/>
-		</xsl:when>
-		<xsl:otherwise>
-			<img src="{@link}" alt="Fig. {$fignum}"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</td></tr><tr><td class="tochead">
-	<xsl:choose>
-		<xsl:when test="@caption">
-			Figure <xsl:value-of select="$fignum"/>: <xsl:value-of select="@caption" />
-		</xsl:when>
-		<xsl:otherwise>
-			Figure <xsl:value-of select="$fignum"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</td></tr></table>
-</xsl:template>
-	
-<xsl:template match="note">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#bbffbb">
-	<p class="note"><b>Note: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="impo">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#ffffbb">
-	<p class="impo"><b>Important: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="warn">
-	<table class="ncontent" width="100%" border="0" cellspacing="0" cellpadding="0">
-	<tr><td bgcolor="#ffbbbb">
-	<p class="warn"><b>Warning: </b>
-	<xsl:apply-templates />
-	</p>
-	</td></tr></table>
-</xsl:template>
-
-<xsl:template match="codenote">
-	<span class="comment">// <xsl:value-of select="." /></span>
-</xsl:template>
-
-<xsl:template match="comment">
-	<span class="comment"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="i">
-	<span class="input"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="body">
-	<xsl:apply-templates />
-</xsl:template>
-
-<xsl:template match="c">
-	<span class="code"><xsl:apply-templates /></span> 
-</xsl:template>
-
-<xsl:template match="pre">
-	<xsl:variable name="prenum"><xsl:number level="any" /></xsl:variable>
-	<xsl:variable name="preid">doc_pre<xsl:number level="any" /></xsl:variable>
-	<a name="#{$preid}"/>
-	<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr><td class="infohead" bgcolor="#7a5ada">
-	<p class="caption">
-	<xsl:choose>
-		<xsl:when test="@caption">
-			Code listing <xsl:value-of select="$prenum"/>: <xsl:value-of select="@caption" />
-		</xsl:when>
-		<xsl:otherwise>
-			Code listing <xsl:value-of select="$prenum"/>
-		</xsl:otherwise>
-	</xsl:choose>
-	</p>
-	</td></tr>
-	<tr><td bgcolor="#ddddff">
-	<pre> 
-		<xsl:apply-templates /> 
-	</pre> 
-	</td></tr></table> 
-	</xsl:template>
-
-<!-- path is used for specifying files and URLs; if you are linking
-part of a sentence rather than a path, then don't use this, use span instead-->
-<xsl:template match="path">
-	<span class="path"><xsl:value-of select="."/></span>
-</xsl:template>
-
-<xsl:template match="uri">
-	<xsl:choose>
-		<xsl:when test="@link">
-			<a href="{@link}"><xsl:value-of select="."/></a>
-		</xsl:when>
-		<xsl:otherwise>
-			<xsl:variable name="loc" select="."/>
-			<a href="{$loc}"><xsl:value-of select="."/></a>
-		</xsl:otherwise>
-	</xsl:choose>
-</xsl:template>
-
-<xsl:template match="p">
-	<p><xsl:apply-templates /></p>
-</xsl:template>
-
-<xsl:template match="e">
-	<span class="emphasis"><xsl:apply-templates /></span>
-</xsl:template>
-
-<xsl:template match="mail">
-	<a href="mailto:{@link}"><xsl:value-of select="."/></a>
-</xsl:template>
-
-<xsl:template match="table">
-	<table><xsl:apply-templates /></table>
-</xsl:template>
-
-<xsl:template match="tr">
-	<tr><xsl:apply-templates /></tr>
-</xsl:template>
-
-<xsl:template match="ti">
-	<td class="tableinfo"><xsl:apply-templates /></td>
-</xsl:template>
-
-<xsl:template match="th">
-	<td class="tochead"><b><xsl:apply-templates /></b></td>
-</xsl:template>
-
-<xsl:template match="ul">
-	<ul><xsl:apply-templates /></ul>
-</xsl:template>
-
-<xsl:template match="ol">
-	<ol><xsl:apply-templates /></ol>
-</xsl:template>
-
-<xsl:template match="li">
-	<li><xsl:apply-templates /></li>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/app-doc/gentoo-web/files/xsl/ibm/ie1.css b/app-doc/gentoo-web/files/xsl/ibm/ie1.css
deleted file mode 100644
index 6182b3a4e12d..000000000000
--- a/app-doc/gentoo-web/files/xsl/ibm/ie1.css
+++ /dev/null
@@ -1,91 +0,0 @@
-.dwbg { background-color : #ffcc66 }
-.dwg3 { background-color : #333333 }
-.dwg6 { background-color : #666666 }
-.dwr1 { background-color : #cc6633 }
-.dwb1 { background-color : #99ccff }
-a.rightnav:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 94% }
-a.rightnav:visited { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 94% }
-a.rightnav:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 94% }
-.title { font-family: Arial, sans-serif; font-weight: bold; font-size: 200% }
-.title2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 140% }
-.title3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 100% }
-.homehead1 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 100%; } 
-.homehead2 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 95%; }
-.dwsmall { font-family: Verdana, sans-serif; font-size: 70% }
-.dwsearch { font-family: Verdana, sans-serif; color: #000000; font-size: 77% }
-.poweredby { font-family: Verdana, sans-serif; font-weight: bold; color: #006699; font-size: 65% }
-.dwinput { font-family: Verdana, sans-serif; font-size: 70%; width: 124; }
-code {font-family: courier, monospace; font-size: 90%}
-.boldcode {font-family: courier, monospace; font-size: 90%; font-weight: bold}
-.atitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 185% }
-.astitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 185%; color: #CC6633}
-.atitle2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 145% }
-.atitle3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 120% }
-
-.hbg { background-color : #006699; background-image: url(http://www-106.ibm.com/developerworks/i/lines.gif) ;background-repeat: repeat; }
-.tbg { background-color : #006699; background-image: url(http://www-106.ibm.com/developerworks/i/gr760.gif); }
-.tbgc { background-color : #006699 }
-.bbg { background-color : #000000; vertical-align: middle }
-.dbg { background-color : #6699cc }
-.mbg { background-color : #99ccff }
-.lbg { background-color : #cce5ff }
-.hil { background-color : #ffffff; font-family: Arial, sans-serif; }
-.country { color: #99ccff; font-family: Verdana, sans-serif; font-weight: bold; font-size: 80% }
-.related { color: #ffffff; font-family: Arial, sans-serif; font-weight: bold }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-a.rlinks:link { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif }
-a.rlinks:visited { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif }
-a.rlinks:hover { text-decoration: underline; color: #ffffff; font-family: Arial, sans-serif }
-
-a.highlight:link { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-a.highlight:visited { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-a.highlight:hover { text-decoration: underline; color: #ffcc00; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-
-a.mainlink:link { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-a.mainlink:visited { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-a.mainlink:hover { text-decoration: underline; color: #ffffff; font-family: Verdana, Arial, sans-serif;  font-weight: bold; font-size: 80% }
-
-a.parent:link { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif;  font-size: 77% }
-a.parent:visited { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 77% }
-a.parent:hover { text-decoration: underline; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 77% }
-
-a.nav:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 94% }
-a.nav:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 94% }
-a.nav:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 94% }
-
-a.fbox:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif }
-a.fbox:visited { text-decoration: none; color: #996699; font-family: Arial, sans-serif }
-a.fbox:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif }
-
-a.bctl:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 77% }
-a.bctl:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 77% }
-a.bctl:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 77% }
-
-.divider { color: #999999; font-family: Verdana, Arial, sans-serif;  font-weight: normal }
-.input { color: #000000 ;font-weight: normal;  width: 150 }
-.iform { color: #000000; background: #cccc99; font-weight: normal }
-
-td,th { font-family: Arial, sans-serif; font-size: 78% }
-
-font { font-family: Arial, sans-serif; font-size: 100% }
-ul,ol { margin-top: 2px;  margin-bottom: 2px; padding-top: 2px; padding-bottom: 2px }
-u,em,blink,b,strong,i,p,li,em,div { font-family: Arial, sans-serif }
-
-h1 { font-family: Arial, sans-serif; font-weight: normal; font-size: 240% }
-h2 { font-family: Arial, sans-serif; font-weight: normal; font-size: 185% }
-h3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 145% }
-h4 { font-family: Arial, sans-serif; font-weight: normal; font-size: 130% }
-
-.small { font-family: Verdana, sans-serif; font-size: 77% }
-.title1 { font-family: Arial, sans-serif; font-size: 200% }
-
-.tblue { color: #ffffff; background: #6699cc; font-family: Arial, sans-serif; font-weight: bold }
-.tdblue { color: #ffffff; background: #006699; font-family: Arial, sans-serif; font-weight: bold }
-.tgray { color: #ffffff; background: #666666; font-family: Arial, sans-serif; font-weight: bold }
-.bct { color: #000000; font-family: Arial, sans-serif; font-weight: normal; font-size: 77% }
-.fnt { font-family: Verdana, sans-serif; font-size: 77% }
-
diff --git a/app-doc/gentoo-web/files/xsl/ibm/ln1.css b/app-doc/gentoo-web/files/xsl/ibm/ln1.css
deleted file mode 100644
index abf1e368b83a..000000000000
--- a/app-doc/gentoo-web/files/xsl/ibm/ln1.css
+++ /dev/null
@@ -1,91 +0,0 @@
-.dwbg { background-color : #ffcc66 }
-.dwg3 { background-color : #333333 }
-.dwg6 { background-color : #666666 }
-.dwr1 { background-color : #cc6633 }
-.dwb1 { background-color : #99ccff }
-a.rightnav:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 12pt; }
-a.rightnav:visited { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 12pt; }
-a.rightnav:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 12pt; }
-select { font-family: font-size: 8pt; }
-.title { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: normal; font-size: 17pt; }
-.title2 { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 15pt; }
-.title3 { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 13pt; }
-.homehead1 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 18pt; }
-.homehead2 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 14pt; }
-.dwsmall { font-family: Helvetica, sans-serif; font-size: 10pt; }
-.dwsearch { font-family: serif; color: #ffffff; font-size: small; }  
-.poweredby { font-family: Helvetica, sans-serif; font-weight: bold; color: #006699; font-size: 10pt; }
-.dwinput { font-family: Verdana, sans-serif; font-size: 6pt; width: 130; } 
-code {font-family: courier, monospace; font-size: 10pt;}
-.boldcode {font-family: sans-serif; font-size: 14pt; font-weight: bold}
-.atitle { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 17pt; }
-.astitle { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 17pt; color: #CC6633}
-.atitle2 { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 16pt; }
-.atitle3 { font-family: Helvetica, Helv, Arial, sans-serif; font-weight: bold; font-size: 13pt; }
-
-.hbg { background-color: #006699; background-image: url(http://www-106.ibm.com/developerworks/i/lines.gif) ;background-repeat: repeat; }
-.tbg { background-color: #006699; background-image: url(http://www-106.ibm.com/developerworks/i/gr760.gif); }
-.tbgc { background-color: #006699; }
-.bbg { background-color: #000000; vertical-align: middle; }
-.dbg { background-color: #6699cc; }
-.mbg { background-color: #99ccff; }
-.lbg { background-color: #cce5ff; }
-.hil { background-color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 12pt }
-.country { color: #99ccff; font-family: Verdana, sans-serif; font-size: 8pt; font-weight: bold; }
-.related { color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; font-weight: bold; }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-a.rlinks:link { text-decoration: none; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-a.rlinks:visited { text-decoration: none; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-a.rlinks:hover { text-decoration: underline; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-
-a.highlight:link { text-decoration: none; color: #ffcc00; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; font-weight: bold; }
-a.highlight:visited { text-decoration: none; color: #ffcc00; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; font-weight: bold; }
-a.highlight:hover { text-decoration: underline; color: #ffcc00; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; font-weight: bold; }
-
-a.mainlink:link { text-decoration: none; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; font-weight: bold; }
-a.mainlink:visited { text-decoration: none; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; font-weight: bold; }
-a.mainlink:hover { text-decoration: underline; color: #ffffff; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; font-weight: bold; }
-
-a.parent:link { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-a.parent:visited { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-a.parent:hover { text-decoration: underline; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-
-a.nav:link { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; }
-a.nav:visited { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; }
-a.nav:hover { text-decoration: underline; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 12pt; }
-
-a.fbox:link { text-decoration: none; color: #006699; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-a.fbox:visited { text-decoration: none; color: #996699; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-a.fbox:hover { text-decoration: underline; color: #006699; font-family: Helvetica, Arial, sans-serif; font-size: 9pt; }
-
-a.bctl:link { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-a.bctl:visited { text-decoration: none; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-a.bctl:hover { text-decoration: underline; color: #000000; font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-
-.divider { color: #999999; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 9pt; font-weight: normal; }
-.input { color: #000000; font-weight: normal; font-size: 8pt; width: 150; }
-.iform { color: #000000; background: #cccc99; font-weight: normal; font-size: 8pt; }
-
-body,dt,dd,dl,sl,th,td,tr,select,option,form,font,ul,ol,p,blockquote { font-family: Helvetica, Helvetica, Arial, sans-serif; font-size: 12pt; }
-
-ul,ol { margin-top: 2px;  margin-bottom: 2px; padding-top: 2px; padding-bottom: 2px; }
-
-u,em,blink,b,strong,i,p,li,div { font-family: Helvetica, Arial, sans-serif; }
-
-h1 { font-family: Helvetica, Arial, sans-serif; font-weight: normal; font-size: 21pt; }
-h2 { font-family: Helvetica, Arial, sans-serif; font-weight: normal; font-size: 17pt; }
-h3 { font-family: Helvetica, Arial, sans-serif; font-weight: bold; font-size: 15pt; }
-h4 { font-family: Helvetica, Arial, sans-serif; font-weight: normal; font-size: 13pt; }
-.small { font-family: Helvetica, Arial, sans-serif; font-size: 8pt; }
-.title1 { font-family: Helvetica, Arial, sans-serif; font-size: 19pt; }
-
-.tblue { color: #ffffff; background: #6699cc; font-family: Helvetica, Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.tdblue { color: #ffffff; background: #006699; font-family: Helvetica, Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.tgray { color: #ffffff; background: #666666; font-family: Helvetica, Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.bct { color: #000000; font-family: Helvetica, Arial, sans-serif; font-weight: normal; font-size: 8pt; }
-.fnt { font-family: Verdana, sans-serif; font-size: 8pt; }
-
diff --git a/app-doc/gentoo-web/files/xsl/ibm/ns1.css b/app-doc/gentoo-web/files/xsl/ibm/ns1.css
deleted file mode 100644
index dbc9a3d68d4d..000000000000
--- a/app-doc/gentoo-web/files/xsl/ibm/ns1.css
+++ /dev/null
@@ -1,91 +0,0 @@
-.dwbg { background-color : #ffcc66 }
-.dwg3 { background-color : #333333 }
-.dwg6 { background-color : #666666 }
-.dwr1 { background-color : #cc6633 } 
-.dwb1 { background-color : #99ccff }
-a.rightnav:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 9pt; }
-a.rightnav:visited { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 9pt; }
-a.rightnav:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 9pt; }
-.title { font-family: Arial, sans-serif; font-weight: bold; font-size: 17pt; }
-.title2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 13pt; }
-.title3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 10pt; }
-.homehead1 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 12pt; }
-.homehead2 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 12pt; }
-.homehead2red { font-family: Helvetica, sans-serif; color: #cc6633; font-weight: bold; font-size: 12pt; }
-.dwsmall { font-family: Verdana, sans-serif; font-size: 8pt; }
-.dwsearch { font-family: Verdana, sans-serif; color: #000000; font-size: 8pt; }  
-.poweredby { font-family: Verdana, sans-serif; font-weight: bold; color: #006699; font-size: 8pt; }
-.dwinput { font-family: Verdana, sans-serif; font-size: 8pt; width: 124; }
-code {font-family: courier, monospace; font-size: 10pt;}
-.boldcode {font-family: courier, monospace; font-size: 10pt; font-weight: bold} 
-.atitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 17pt; }
-.astitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 17pt; color: #CC6633}
-.atitle2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 13pt; }
-.atitle3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 10pt; }
-
-.hbg { background-color: #006699; background-image: url(http://www-106.ibm.com/developerworks/i/lines.gif) ;background-repeat: repeat; }
-.tbg { background-color: #006699; background-image: url(http://www-106.ibm.com/developerworks/i/gr760.gif); }
-.tbgc { background-color: #006699; }
-.bbg { background-color: #000000; vertical-align: middle; }
-.dbg { background-color: #6699cc; }
-.mbg { background-color: #99ccff; }
-.lbg { background-color: #cce5ff; }
-.hil { background-color: #ffffff; font-family: Arial, sans-serif; font-size: 9pt }
-.country { color: #99ccff; font-family: Verdana, sans-serif; font-size: 8pt; font-weight: bold; }
-.related { color: #ffffff; font-family: Arial, sans-serif; font-size: 9pt; font-weight: bold; }
-
-a:link { color: #006699; }
-a:visited { color: #996699; }
-a:hover  { color: #006699 }
-
-a.rlinks:link { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif; font-size: 9pt; }
-a.rlinks:visited { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif; font-size: 9pt; }
-a.rlinks:hover { text-decoration: underline; color: #ffffff; font-family: Arial, sans-serif; font-size: 9pt; }
-
-a.highlight:link { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-a.highlight:visited { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-a.highlight:hover { text-decoration: underline; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-
-a.mainlink:link { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-a.mainlink:visited { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-a.mainlink:hover { text-decoration: underline; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 8pt; font-weight: bold; }
-
-a.parent:link { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 8pt; }
-a.parent:visited { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 8pt; }
-a.parent:hover { text-decoration: underline; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 8pt; }
-
-a.nav:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 9pt; }
-a.nav:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 9pt; }
-a.nav:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 9pt; }
-
-a.fbox:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 9pt; }
-a.fbox:visited { text-decoration: none; color: #996699; font-family: Arial, sans-serif; font-size: 9pt; }
-a.fbox:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 9pt; }
-
-a.bctl:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 8pt; }
-a.bctl:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 8pt; }
-a.bctl:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 8pt; }
-
-.divider { color: #999999; font-family: Verdana, Arial, sans-serif; font-size: 9pt; font-weight: normal; }
-.input { color: #000000; font-weight: normal; font-size: 8pt; width: 150; }
-.iform { color: #000000; background: #cccc99; font-weight: normal; font-size: 8pt; }
-
-body,dt,dd,dl,sl,th,td,tr,select,option,form,font,ul,ol,p,blockquote { font-family: Arial, sans-serif; font-size: 9pt; }
-
-ul,ol { margin-top: 2px;  margin-bottom: 2px; padding-top: 2px; padding-bottom: 2px; }
-
-u,em,blink,b,strong,i,p,li,div { font-family: Arial, sans-serif; }
-
-h1 { font-family: Arial, sans-serif; font-weight: normal; font-size: 21pt; }
-h2 { font-family: Arial, sans-serif; font-weight: normal; font-size: 17pt; }
-h3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 15pt; }
-h4 { font-family: Arial, sans-serif; font-weight: normal; font-size: 13pt; }
-.small { font-family: Verdana, sans-serif; font-size: 8pt; }
-.title1 { font-family: Arial, sans-serif; font-size: 19pt; }
-
-.tblue { color: #ffffff; background: #6699cc; font-family: Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.tdblue { color: #ffffff; background: #006699; font-family: Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.tgray { color: #ffffff; background: #666666; font-family: Arial, sans-serif; font-weight: bold; font-size: 9pt; }
-.bct { color: #000000; font-family: Arial, sans-serif; font-weight: normal; font-size: 8pt; }
-.fnt { font-family: Verdana, sans-serif; font-size: 8pt; }
-
diff --git a/app-doc/gentoo-web/files/xsl/ibm/r1.css b/app-doc/gentoo-web/files/xsl/ibm/r1.css
deleted file mode 100644
index c49881c7639d..000000000000
--- a/app-doc/gentoo-web/files/xsl/ibm/r1.css
+++ /dev/null
@@ -1,94 +0,0 @@
-.dwbg { background-color : #ffcc66 }
-.dwg3 { background-color : #333333 }
-.dwg6 { background-color : #666666 }
-.dwr1 { background-color : #cc6633 }
-.dwb1 { background-color : #99ccff }
-a.rightnav:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 12px; }
-a.rightnav:visited { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 12px; }
-a.rightnav:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 12px; }
-.title { font-family: Arial, sans-serif; font-weight: bold; font-size: 25px; }
-.title2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 22px; }
-.title3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 18px; }
-.homehead1 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 17px; } 
-.homehead2 { font-family: Helvetica, sans-serif; font-weight: bold; font-size: 15px; } 
-.dwsmall { font-family: Verdana, sans-serif; font-size: 11px; } 
-.dwsearch { font-family: Verdana, sans-serif; color: #000000; font-size: 11px; }
-.poweredby { font-family: Verdana, sans-serif; font-weight: bold; color: #006699; font-size: 11px; } 
-code {font-family: monospace; font-size: 14px;}
-.boldcode {font-family: monospace; font-size: 14px; font-weight: bold}
-.atitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 25px; }
-.astitle { font-family: Arial, sans-serif; font-weight: bold; font-size: 25px; color: #CC6633}
-.atitle2 { font-family: Arial, sans-serif; font-weight: bold; font-size: 18px; }
-.atitle3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 14px; }
-
-.hbg {
-background-color: #006699;
-background-image: url(http://www-106.ibm.com/developerworks/i/lines.gif);
-background-repeat: repeat;
-}
-.tbg {
-background-color: #006699;
-background-image: url(http://www-106.ibm.com/developerworks/i/gr760.gif);
-}
-.tbgc { background-color : #006699; }
-.bbg { background-color : #000000; vertical-align: middle; }
-.dbg { background-color : #6699cc; }
-.mbg { background-color : #99ccff; }
-.lbg { background-color : #cce5ff; }
-.hil { background-color : #ffffff; }
-.country { color: #99ccff; font-family: Verdana, sans-serif; font-size: 10px; font-weight: bold; }
-.related { color: #ffffff; font-family: Arial, sans-serif; font-size: 12px; font-weight: bold; }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-a.rlinks:link { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif; font-size: 12px; }
-a.rlinks:visited { text-decoration: none; color: #ffffff; font-family: Arial, sans-serif; font-size: 12px; }
-a.rlinks:hover { text-decoration: underline; color: #ffffff; font-family: Arial, sans-serif; font-size: 12px; }
-
-a.highlight:link { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-a.highlight:visited { text-decoration: none; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-a.highlight:hover { text-decoration: underline; color: #ffcc00; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-
-a.mainlink:link { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-a.mainlink:visited { text-decoration: none; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-a.mainlink:hover { text-decoration: underline; color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: bold; }
-
-a.parent:link { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 10px; }
-a.parent:visited { text-decoration: none; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 10px; }
-a.parent:hover { text-decoration: underline; color: #000000; font-family: Verdana, Arial, sans-serif; font-size: 10px; }
-
-a.nav:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 12px; }
-a.nav:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 12px; }
-a.nav:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 12px; }
-
-a.fbox:link { text-decoration: none; color: #006699; font-family: Arial, sans-serif; font-size: 12px; }
-a.fbox:visited { text-decoration: none; color: #996699; font-family: Arial, sans-serif; font-size: 12px; }
-a.fbox:hover { text-decoration: underline; color: #006699; font-family: Arial, sans-serif; font-size: 12px; }
-
-a.bctl:link { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 10px; }
-a.bctl:visited { text-decoration: none; color: #000000; font-family: Arial, sans-serif; font-size: 10px; }
-a.bctl:hover { text-decoration: underline; color: #000000; font-family: Arial, sans-serif; font-size: 10px; }
-
-.divider { color: #999999; font-family: Verdana, Arial, sans-serif; font-size: 10px; font-weight: normal; }
-.input { color: #000000 ;font-weight: normal; font-size: 8pt; width: 150; }
-.iform { color: #000000; background: #cccc99; font-weight: normal; font-size: 8pt; }
-
-body,p,b,i,strong,em,dt,dd,dl,sl,th,td,tr,u,blink,select,option,form,div,font,li,blockquote { font-family: Arial, sans-serif; font-size: 12px; }
-
-ul,ol { font-family: Arial, sans-serif; font-size: 12px; margin-top: 2px;  margin-bottom: 2px; padding-top: 2px; padding-bottom: 2px; }
-
-h1 { font-family: Arial, sans-serif; font-weight: normal; font-size: 35px; }
-h2 { font-family: Arial, sans-serif; font-weight: normal; font-size: 25px; }
-h3 { font-family: Arial, sans-serif; font-weight: bold; font-size: 22px; }
-h4 { font-family: Arial, sans-serif; font-weight: normal; font-size: 18px; }
-.small { font-family: Verdana, sans-serif; font-size: 11px; }
-.title1 { font-family: Arial, sans-serif; font-size: 25px; }
-
-.tblue { color: #ffffff; background: #6699cc; font-family: Arial, sans-serif; font-weight: bold; font-size: 12px; }
-.tdblue { color: #ffffff; background: #006699; font-family: Arial, sans-serif; font-weight: bold; font-size: 12px; }
-.tgray { color: #ffffff; background: #666666; font-family: Arial, sans-serif; font-weight: bold; font-size: 12px; }
-.bct { color: #000000; font-family: Arial, sans-serif; font-weight: normal; font-size: 10px; }
-.fnt { font-family: Verdana, sans-serif; font-size: 11px; }
-
diff --git a/app-doc/gentoo-web/files/xsl/ibm/style.js b/app-doc/gentoo-web/files/xsl/ibm/style.js
deleted file mode 100644
index 73f3d5504dcf..000000000000
--- a/app-doc/gentoo-web/files/xsl/ibm/style.js
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-if ((navigator.appName == "Microsoft Internet Explorer") && (parseInt(navigator.appVersion) >= 4 ))
-	if((navigator.appVersion.indexOf("Macintosh"))!= -1)
-		document.write('<link rel="stylesheet" href="r1.css" type="text/css"/>')
-	else document.write('<link rel="stylesheet" href="ie1.css" type="text/css"/>')
-else if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) >= 4))
-	if((navigator.appVersion.indexOf("Macintosh"))!= -1)
-		document.write('<link rel="stylesheet" href="r1.css" type="text/css"/>')
-	else if ((navigator.appVersion.indexOf("X11"))!= -1)
-		document.write('<link rel="stylesheet" href="ln1.css" type="text/css"/>')
-	else document.write('<link rel="stylesheet" href="ns1.css" type="text/css"/>')
-else document.write('<link rel="stylesheet" href="r1.css" type="text/css"/>')// -->
\ No newline at end of file
diff --git a/app-doc/gentoo-web/files/xsl/resume-fo.xsl b/app-doc/gentoo-web/files/xsl/resume-fo.xsl
deleted file mode 100644
index 07edb42fa4f9..000000000000
--- a/app-doc/gentoo-web/files/xsl/resume-fo.xsl
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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
deleted file mode 100644
index c637115ca56e..000000000000
--- a/app-doc/gentoo-web/files/xsl/resume-html.xsl
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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="/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="secthead"><xsl:value-of select="name"/></span><br/><br/>
-<xsl:apply-templates select="contactinfo"/>
-</b></p>
-</center>
-<p class="secthead"><b>Experience</b></p>
-<xsl:apply-templates select="employer"/>
-<p class="secthead"><b>Skills</b></p>
-<xsl:apply-templates select="skills"/>
-<p class="secthead"><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">
-	<table class="desc" border="0" width="100%">
-		<xsl:apply-templates select="school"/>
-	</table>
-</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="employer"><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 class="desc"><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>
-