Website cleanup, add link to other et projects, remove some code we no longer need, consolidate docs on FPO for stuff that frequently changes.

19 files changed, 13 insertions, 787 deletions

diff --git a/website/new/about.html b/website/new/about.html
index 2d8370a..b9dfc1a 100644
--- a/website/new/about.html
+++ b/website/new/about.html
@@ -1,12 +1,15 @@
 <h2>About Cobbler</h2>
 
-<p>Cobbler is a Linux boot server that allows for rapid setup of network installation environments.  With a simple series of commands, network installs can be configured for PXE, reinstallations, and virtualized installs using Xen or KVM.  Cobbler uses a helper program called 'Koan' (which interacts with Cobbler) for reinstallation and virtualization support.</p>
+<p>Cobbler is a Linux provisioning server that allows for rapid setup of network installation environments.  With a simple series of commands, network installs can be configured for PXE, reinstallations, and virtualized installs using Xen or KVM.  Cobbler uses a helper program called 'Koan' (which interacts with Cobbler) for reinstallation and virtualization support.</p>
 
-<p>Setting up Cobbler is simple.  Installation trees can be <A HREF="./cobbler-import.php">imported</A> directly from media you already have (or copied from a mirror location), and turned into network install sources within minutes.  RHEL, Fedora, and Centos are all supported for both the boot server and installation targets.</p>
+<p>Setting up a new Cobbler server is trivial as Cobbler eliminates much of the complexity of configuring the underlying install components.  Simply install cobbler via yum, import media you may already have from mirrors or DVD ISOs, and start adding new records into cobbler using the command line or web interface.  Extensive documentation is provided on the <A HREF="https://fedorahosted.org/cobbler">Cobbler Wiki</A>.</p>
 
-<p>Cobbler can, if desired, also assist in <A HREF="./cobbler-dhcp.php">managing of DHCP infrastructure</A> for provisioned systems (using <A HREF="http://www.isc.org/sw/dhcp/">ISC dhcp</A> or <A HREF="http://www.thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</A>), mirroring install trees, templating kickstart files, automatically creating PXE menus, and locally <A HREF="./cobbler-repos.php">mirroring repositories</A> used by systems on your network.  Lots of additional information on advanced features can be found on the <A HREF="https://hosted.fedoraproject.org/projects/cobbler/">Cobbler Wiki</A>.</p>
+<p>When creating deployment infrastructure, many components must be dealt with.  Cobbler glues together all of these diverse components and makes them easy to manage.  As low-level bringup often involves adding records to DHCP and DNS, cobbler "system add" commands can (optionally) be configured to help manage DHCP and DNS using templates.  For static IP networks, cobbler still provides solid deployment solutions, including the ability to build DVD network install CDs and reinstall existing Linux systems via the koan command line.</p>
 
-<p>In short, Cobbler helps build and maintain network installation infrastructure really easily.  It's highly customizable to your particular methods of operation through a wide variety of options, a pluggable extension mechanism, and (for developers) its own Python API.  Cobbler lets administrators forget <i>how</i> software gets installed and delivered and lets them concentrate instead on what they want to install where.</p>
+<p>Cobbler also contains a very powerful kickstart templating system that can help you manage all of the differences in the answer files that drive your automated deployments.  Additionally, Cobbler can help mirror packages via yum and rsync, and associate those local mirrors with profiles in cobbler, so they are available to all installed systems.  </p>
+
+<p>In short, Cobbler helps build and maintain network installation infrastructure really easily.  It's highly customizable to your particular methods of operation through a wide variety of options, a powerful command line, a Web interface, a pluggable extension mechanism, and (for developers) its own Python API.  Cobbler lets administrators forget <i>how</i> software gets installed and delivered and lets them concentrate instead on what they want to install where.</p>
 
 <p>Whether you run a large datacenter, a campus lab, or just have a handfull of machines on a home network, cobbler can help you perform installations and updates faster.</p>
 
+
diff --git a/website/new/cobbler-dhcp.php b/website/new/cobbler-dhcp.php
deleted file mode 100755
index 08f7ea4..0000000
--- a/website/new/cobbler-dhcp.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-  $current_page = 'documentation';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-<?php 
-  include("docs/cobbler-dhcp.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/cobbler-import.php b/website/new/cobbler-import.php
deleted file mode 100755
index 11310fb..0000000
--- a/website/new/cobbler-import.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-  $current_page = 'documentation';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-<?php 
-  include("docs/cobbler-import.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/cobbler-manpage.php b/website/new/cobbler-manpage.php
deleted file mode 100755
index ebbc56c..0000000
--- a/website/new/cobbler-manpage.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-  $current_page = 'documentation';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-<?php 
-  include("docs/cobbler.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/cobbler-repos.php b/website/new/cobbler-repos.php
deleted file mode 100755
index a5a81db..0000000
--- a/website/new/cobbler-repos.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-  $current_page = 'documentation';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-<?php 
-  include("docs/cobbler-repos.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/communicate.html b/website/new/communicate.html
deleted file mode 100644
index 6274b16..0000000
--- a/website/new/communicate.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h3>Mailing List</h3>
-
-<p>Send comments, questions, patches, and suggestions to the <a href="https://www.redhat.com/mailman/listinfo/et-mgmt-tools">et-mgmt-tools mailing list</a>. You can send mail even if you aren't a list member. This is a community project, so if you feel like contributing, download the source, check it out, and join the list.</p>
-
-<ul>
-<li>Mailing List Signup Form: <a href="https://www.redhat.com/mailman/listinfo/et-mgmt-tools">https://www.redhat.com/mailman/listinfo/et-mgmt-tools</a></li>
-<li>Mailling List Archives: <a href="https://www.redhat.com/archives/et-mgmt-tools/">https://www.redhat.com/archives/et-mgmt-tools/</a></li>
-<li>gmane.org RSS feed of et-mgmt-tools: <a href="http://blog.gmane.org/gmane.linux.redhat.et-mgmt-tools"><img src="img/rss_entries.png" alt="rss entries" style="vertical-align: middle;"></a></li>
-</ul>
-
-<h3>Internet Relay Chat (IRC)</h3>
-<p>Cobbler has a chat room on <strong><a href="http://www.freenode.net/">irc.freenode.net</a></strong> ... <strong>#cobbler</strong>:</p>
-
-<p> If no one seems to be responding to your requests in IRC, feel free to ask your questions on the mailing list. (It's quite common for IRC users to 'idle' their nicks in a channel so they can catch up on any conversation they missed later on.)</p>
-<p class="note"><strong>Note:</strong> irc.freenode.net has an IRC 'nick' (nickname, the name you go by in chat) registration system. Some irc.freenode.net channels require that you identify with the server every time you log in. This identification is also required for private messages on the network (no, they're not ignoring you; you probably just haven't identified with the registration system!) For more information, please consult <a href="http://freenode.net/faq.shtml#contents-userregistration">the Freenode Frequently-Asked Questions page on user registration</a>.</p>
-
-<h3>User Submitted Content</h3>
-
-As mentioned in the documentation section, <A HREF="http://cobbler.et.redhat.com/documentation.php">Cobbler has a Wiki</A> for user submitted content.
-
-<h3>Bugs/Features</h3>
-
-Bugs and Features for all distributions can be filed on the <A HREF="https://hosted.fedoraproject.org/projects/cobbler/">Cobbler</A> and <A HREF="https://hosted.fedoraproject.org/projects/koan/">Koan</A> Trac pages.  Cobbler and koan also have <A HREF="http://bugzilla.redhat.com">bugzilla</A> components if you are using Fedora and prefer to post items there.   Regardless, the mailing list and the IRC channel are very active -- so if you need help, you do not need to file a bug report unless you want to do so.
-
-
-
-
diff --git a/website/new/communicate.php b/website/new/communicate.php
deleted file mode 100755
index 59af7ae..0000000
--- a/website/new/communicate.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-  $current_page = 'communicate';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-
-<h2>Communicate</h2>
-
-<?php
-  include('communicate.html');
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/css/style.css b/website/new/css/style.css
index b02cb02..d3bfe13 100644
--- a/website/new/css/style.css
+++ b/website/new/css/style.css
@@ -183,7 +183,7 @@ tt {
     border: 0px;
     width: 100%;
     background: #757575;
-    height: 180px;
+    height: 290px;
 }
 
 /* This is hidden from IE <= 6 because it can't do transparency */
diff --git a/website/new/download.html b/website/new/download.html
index 977fb1b..ddf3978 100644
--- a/website/new/download.html
+++ b/website/new/download.html
@@ -1,4 +1,4 @@
-<p>Cobbler is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">General Public License (GPL)</a>.</p>
+<p>Cobbler is licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">General Public License (GPL)</a>.</p>
 
 <h3>Download Cobbler</h3>
 
diff --git a/website/new/faq.html b/website/new/faq.html
deleted file mode 100644
index 9147adb..0000000
--- a/website/new/faq.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-<a name="questions">
-<h3>Questions</h3>
-</a>
-<ul id="faq">
-<li><a href="#whouses">Who Uses Cobbler?</a></li>
-<li><a href="#supported">What Operating Systems Are Supported?</a></li>
-<li><a href="#reinstalls">What are my non-PXE install options?</a></li>
-<li><a href="#virt">How are virtual systems installed?</a></li>
-<li><a href="#architecture">How does Cobbler work internally?</a></li>
-<li><a href="#contribute">How can I contribute?</a></li>
-</ul>
-
-<h3>Answers</h3>
-
-<a name="whouses">
-<dt>Who Uses Cobbler?</dt>
-</a>
- <dd>Cobbler is in use in a lot of diverse configurations. Large companies, hosting datacenters, college labs, consultants, ISVs, developers, and home Linux users all use cobbler and koan in different ways. It is intended to cover the large configurations just as easily as the smaller ones -- and be non-complex for all classes of users.
- <br />
- <a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-<a name="supported">
-<dt>What Operating Systems Are Supported?</dt>
-</a>
- <dd>
-Cobbler runs on RHEL 4 and later, Fedora 5 and later, and Centos 4 and later.  Koan, cobbler's helper program, also works with RHEL 3.
- <br />
- <a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-<a name="reinstalls">
-<dt>What are my non-PXE install options?</dt>
-</a>
- <dd>Cobbler's helper program koan can be used on the target system to reinstall it's operating system with another operating system.  This solution is ideal for those users who can not take advantage of PXE due to hardware, network, or policy constraints. For more information, see the <A HREF="./koan.html">koan</A> manpage documentation.
- <br />
- <a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-<a name="virt">
-<dt>How are virtual systems installed?</dt>
-</a>
- <dd>Cobbler's helper program, koan, when invoked on the remote host system, pulls down information from the remote cobbler server to begin a fully automated installation of a virtual guest. This works out of the box for any distribution that contains a Xen kernel. For more information, see the <A HREF="./koan.html">koan</A> manpage documentation.
- <br />
- <a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-
-<a name="architecture">
-<dt>How does Cobbler work internally?</dt>
-</a>
-<dd>
-When the administrator on the Cobbler server runs Cobbler commands, cobbler updates a configuration tree, which is stored in /var/lib/cobbler.  Data from this configuration database is used to update various entities on the target operating system.  Cobbler will restart services, as well as create trees of files in /tftpboot and /var/www/cobbler -- for use with PXE and koan, respectively.
-<br/>
-Koan interacts with cobbler by retrieving data over XMLRPC.  Cobbler serves up XMLRPC using "cobblerd", which also has the dual purpose of logging syslog data from kickstart -- which is used in Cobbler's kickstart tracking feature.  For a better understanding of how this works, see the <A HREF="./cobbler.html">Cobbler</A> manpage documentation.
-<a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-
-<a name="contribute">
-<dt>How can I contribute?</dt>
-</a>
- <dd>
-Send in bug reports, patches, ideas, or comments.  We're interested in hearing about your real-world provisioning challenges and how we can solve them for system administrators everywhere.
- <br />
- <a href="#questions" class="back-to-top">Back to top</a>
-</dd>
-
-
-
diff --git a/website/new/faq.php b/website/new/faq.php
deleted file mode 100755
index 0fbd05e..0000000
--- a/website/new/faq.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-  $current_page = 'faq';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
-<div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
-</div>
-
-<div id="content">
-
-<h2>Frequently-Asked Questions</h2>
-
-<?php
-  include('faq.html');
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/feed.php b/website/new/feed.php
deleted file mode 100755
index a92f985..0000000
--- a/website/new/feed.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<div id="feed">
-<p>Below are the latest 3 message subjects from the <a href="https://www.redhat.com/mailman/listinfo/et-mgmt-tools">et-mgmt-tools list</a>:</p>
-<ul>
-<?php
-
-require_once('magpierss/rss_fetch.inc');
-
-$url = 'http://rss.gmane.org/gmane.linux.redhat.et-mgmt-tools';
-$rss = fetch_rss($url);
-
-	for ($i = 0; $i < 3; $i++) 
-	{
-		$item_array = $rss->items;
-                $item = $item_array[$i];
-		$href = $item['link'];
-		$title = $item['title'];
-		$body = $item['description'];
-		$author = $item['dc']['creator'];
-		$raw_timestamp = $item['dc']['date'];
-		$unixtime = strtotime($raw_timestamp);
-		$timestamp = date('g:i A T j F Y', $unixtime);
-
-		echo "<li><a href=$href>$title</a></li>";
-	}
-	
-
-?>
-</ul>
-<p>
-[ <a href="https://www.redhat.com/archives/et-mgmt-tools/">View More ...</a> ]</p>
-</div>
diff --git a/website/new/footer.html b/website/new/footer.html
index cf18ff8..68993c8 100644
--- a/website/new/footer.html
+++ b/website/new/footer.html
@@ -6,8 +6,8 @@
 
         <dt><a href="http://libvirt.org/">libvirt</a></dt>
         <dd><span>The open source virtualization API</span></dd>
-<!--        <dt><a href="http://thincrust.et.redhat.com/">Thin Crust</a></dt>
-        <dd><span>Tools for building virtual appliances</span></dd>-->
+        <dt><a href="https://fedorahosted.org/func">Func</A></dt>
+        <dd><span>A secure, scriptable remote control framework & API</span></dd>
       </dl>
       <dl id="p2">
         <dt><a href="http://cobbler.et.redhat.com/">Cobbler</a></dt>
@@ -15,8 +15,6 @@
 
         <dt><a href="http://ovirt.org/">oVirt</a></dt>
         <dd><span>Virtualization management across the data center</span></dd>
-<!--        <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">p-2-v</a></dt>
-        <dd><span>Virtualize existing deployed servers</span></dd>-->
       </dl>
       <dl id="p3">
         <dt><a href="http://freeipa.org/">FreeIPA</a></dt>
@@ -24,8 +22,7 @@
 
         <dt><a href="http://virt-manager.org/">Virtual Machine Manager</a></dt>
         <dd><span>Virtualization management from the desktop</span></dd>
-<!--        <dt><a href="http://virt-manager.org/">Virtual Tools</a></dt>
-        <dd><span>Virtualization management from the command line</span></dd>-->
+        
       </dl>
     </div>
     <p id="et">
diff --git a/website/new/koan-manpage.php b/website/new/koan-manpage.php
deleted file mode 100755
index ad400df..0000000
--- a/website/new/koan-manpage.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-  $current_page = 'documentation';
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="description" content="" />
-<meta name="keywords" content="" />
-<title>Cobbler</title>
-
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
-</head>
-
-<body>
-<div id="wrap">
-<?php 
-  include("top.html"); 
-?>
-
-<div id="main">
- <div id="sidebar">
-<?php 
-  include("nav.php"); 
-?>
- </div>
-
-<div id="content">
-<?php 
-  include("docs/koan.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/new/nav.php b/website/new/nav.php
index b093a75..8f4ee69 100755
--- a/website/new/nav.php
+++ b/website/new/nav.php
@@ -7,59 +7,20 @@
 		echo "<ul id=\"nav\">
   		 <li id=\"active\"><a href=\"index.php\">About</a></li>
    		<li><a href=\"download.php\">Download</a></li>
-  		 <li><a href=\"faq.php\">FAQ</a></li>
-  		 <li><a href=\"documentation.php\">Documentation</a></li>
-  		 <li><a href=\"communicate.php\">Communicate</a></li>
-  		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
+  		 <li><a href=\"https://fedorahosted.org/projects/cobbler\">Wiki</a></li>
  		</ul>";
 		break;
   	case "download":
 		echo "<ul id=\"nav\">
    		<li><a href=\"index.php\">About</a></li>
   		 <li id=\"active\"><a href=\"#\">Download</a></li>
-  		 <li><a href=\"faq.php\">FAQ</a></li>
-  		 <li><a href=\"documentation.php\">Documentation</a></li>
- 		  <li><a href=\"communicate.php\">Communicate</a></li>
   		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
 		 </ul>";
 		break;
-  	case "faq":
-		echo "<ul id=\"nav\">
-   		<li><a href=\"index.php\">About</a></li>
-  		 <li><a href=\"download.php\">Download</a></li>
-  		 <li id=\"active\"><a href=\"faq.php\">FAQ</a></li>
-  		 <li><a href=\"documentation.php\">Documentation</a></li>
-  		 <li><a href=\"communicate.php\">Communicate</a></li>
-  		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
- 		</ul>";
-		break;
-  	case "communicate":
-		echo "<ul id=\"nav\">
- 		  <li><a href=\"index.php\">About</a></li>
-  		 <li><a href=\"download.php\">Download</a></li>
-  		 <li><a href=\"faq.php\">FAQ</a></li>
-  		 <li><a href=\"documentation.php\">Documentation</a></li>
-  		 <li id=\"active\"><a href=\"communicate.php\">Communicate</a></li>
-  		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
- 		</ul>";
-		break;
-	case "documentation":
-                echo "<ul id=\"nav\">
-                  <li><a href=\"index.php\">About</a></li>
-                 <li><a href=\"download.php\">Download</a></li>
-                 <li><a href=\"faq.php\">FAQ</a></li>
-                 <li id=\"active\"><a href=\"documentation.php\">Documentation</a></li>                 
-		<li><a href=\"communicate.php\">Communicate</a></li>
-  		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
-                </ul>";
-		break;
 	default:
 		echo " <ul id=\"nav\">
   		 <li id=\"active\"><a href=\"index.php\">About</a></li>
   		 <li><a href=\"download.php\">Download</a></li>
-  		 <li><a href=\"faq.php\">FAQ</a></li>
-  		 <li><a href=\"documentation.php\">Documentation</a></li>
- 		  <li><a href=\"communicate.php\">Communicate</a></li>
   		 <li><a href=\"http://hosted.fedoraproject.org/projects/cobbler/\">Wiki</a></li>
  		</ul>";
 		break;
diff --git a/website/new/news-feed.php b/website/new/news-feed.php
deleted file mode 100644
index e69de29..0000000
--- a/website/new/news-feed.php
+++ /dev/null
diff --git a/website/new/news.html b/website/new/news.html
deleted file mode 100644
index 2981fd1..0000000
--- a/website/new/news.html
+++ /dev/null
@@ -1 +0,0 @@
-news goes here.
diff --git a/website/new/rss-aggregator.php b/website/new/rss-aggregator.php
deleted file mode 100755
index 9cbb837..0000000
--- a/website/new/rss-aggregator.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<h1>Simple RSS agregator</h1>
-<a href="http://www.webdot.cz/lastrss/">
-<img src="lastrss_button.gif" alt="" width="88" height="31" border="0">
-</a><hr>
-<!-- / Heading -->
-
-<?php
-/* 
- ======================================================================
- lastRSS usage DEMO 3 - Simple RSS agregator
- ----------------------------------------------------------------------
- This example shows, how to create simple RSS agregator
-     - create lastRSS object
-    - set transparent cache
-    - show a few RSS files at once
- ======================================================================
-*/
-
-function ShowOneRSS($url) {
-    global $rss;
-    if ($rs = $rss->get($url)) {
-        echo "<big><b><a href=\"$rs[link]\">$rs[title]</a></b></big><br />\n";
-        echo "$rs[description]<br />\n";
-
-            echo "<ul>\n";
-            foreach ($rs['items'] as $item) {
-                echo "\t<li><a href=\"$item[link]\" title=\"$item[description]\">$item[title]</a></li>\n";
-            }
-            if ($rs['items_count'] <= 0) { echo "<li>Sorry, no items found in the RSS file :-(</li>"; }
-            echo "</ul>\n";
-    }
-    else {
-        echo "Sorry: It's not possible to reach RSS file $url\n<br />";
-        // you will probably hide this message in a live version
-    }
-}
-
-// ===============================================================================
-
-// include lastRSS
-include "./rss-parser.php";
-
-// List of RSS URLs
-$rss_left = array(
-    'http://freshmeat.net/backend/fm.rdf',
-    'http://slashdot.org/slashdot.rdf'
-);
-$rss_right = array(
-    'http://www.freshfolder.com/rss.php',
-    'http://phpbuilder.com/rss_feed.php'
-);
-
-// Create lastRSS object
-$rss = new lastRSS;
-
-// Set cache dir and cache time limit (5 seconds)
-// (don't forget to chmod cahce dir to 777 to allow writing)
-$rss->cache_dir = './temp';
-$rss->cache_time = 1200;
-
-
-// Show all rss files
-echo "<table cellpadding=\"10\" border=\"0\"><tr><td width=\"50%\" valign=\"top\">";
-foreach ($rss_left as $url) {
-    ShowOneRSS($url);
-}
-echo "</td><td width=\"50%\" valign=\"top\">";
-foreach ($rss_right as $url) {
-    ShowOneRSS($url);
-}
-echo "</td></tr></table>";
-?>
-
diff --git a/website/new/rss-parser.php b/website/new/rss-parser.php
deleted file mode 100755
index cfe1637..0000000
--- a/website/new/rss-parser.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/*
- ======================================================================
- lastRSS 0.9.1
- 
- Simple yet powerfull PHP class to parse RSS files.
- 
- by Vojtech Semecky, webmaster @ oslab . net
- 
- Latest version, features, manual and examples:
-     http://lastrss.oslab.net/
-
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ======================================================================
-*/
-
-/**
-* lastRSS
-* Simple yet powerfull PHP class to parse RSS files.
-*/
-class lastRSS {
-    // -------------------------------------------------------------------
-    // Public properties
-    // -------------------------------------------------------------------
-    var $default_cp = 'UTF-8';
-    var $CDATA = 'nochange';
-    var $cp = '';
-    var $items_limit = 0;
-    var $stripHTML = False;
-    var $date_format = '';
-
-    // -------------------------------------------------------------------
-    // Private variables
-    // -------------------------------------------------------------------
-    var $channeltags = array ('title', 'link', 'description', 'language', 'copyright', 'managingEditor', 'webMaster', 'lastBuildDate', 'rating', 'docs');
-    var $itemtags = array('title', 'link', 'description', 'author', 'category', 'comments', 'enclosure', 'guid', 'pubDate', 'source');
-    var $imagetags = array('title', 'url', 'link', 'width', 'height');
-    var $textinputtags = array('title', 'description', 'name', 'link');
-
-    // -------------------------------------------------------------------
-    // Parse RSS file and returns associative array.
-    // -------------------------------------------------------------------
-    function Get ($rss_url) {
-        // If CACHE ENABLED
-        if ($this->cache_dir != '') {
-            $cache_file = $this->cache_dir . '/rsscache_' . md5($rss_url);
-            $timedif = @(time() - filemtime($cache_file));
-            if ($timedif < $this->cache_time) {
-                // cached file is fresh enough, return cached array
-                $result = unserialize(join('', file($cache_file)));
-                // set 'cached' to 1 only if cached file is correct
-                if ($result) $result['cached'] = 1;
-            } else {
-                // cached file is too old, create new
-                $result = $this->Parse($rss_url);
-                $serialized = serialize($result);
-                if ($f = @fopen($cache_file, 'w')) {
-                    fwrite ($f, $serialized, strlen($serialized));
-                    fclose($f);
-                }
-                if ($result) $result['cached'] = 0;
-            }
-        }
-        // If CACHE DISABLED >> load and parse the file directly
-        else {
-            $result = $this->Parse($rss_url);
-            if ($result) $result['cached'] = 0;
-        }
-        // return result
-        return $result;
-    }
-    
-    // -------------------------------------------------------------------
-    // Modification of preg_match(); return trimed field with index 1
-    // from 'classic' preg_match() array output
-    // -------------------------------------------------------------------
-    function my_preg_match ($pattern, $subject) {
-        // start regullar expression
-        preg_match($pattern, $subject, $out);
-
-        // if there is some result... process it and return it
-        if(isset($out[1])) {
-            // Process CDATA (if present)
-            if ($this->CDATA == 'content') { // Get CDATA content (without CDATA tag)
-                $out[1] = strtr($out[1], array('<![CDATA['=>'', ']]>'=>''));
-            } elseif ($this->CDATA == 'strip') { // Strip CDATA
-                $out[1] = strtr($out[1], array('<![CDATA['=>'', ']]>'=>''));
-            }
-
-            // If code page is set convert character encoding to required
-            if ($this->cp != '')
-                //$out[1] = $this->MyConvertEncoding($this->rsscp, $this->cp, $out[1]);
-                $out[1] = iconv($this->rsscp, $this->cp.'//TRANSLIT', $out[1]);
-            // Return result
-            return trim($out[1]);
-        } else {
-        // if there is NO result, return empty string
-            return '';
-        }
-    }
-
-    // -------------------------------------------------------------------
-    // Replace HTML entities &something; by real characters
-    // -------------------------------------------------------------------
-    function unhtmlentities ($string) {
-        // Get HTML entities table
-        $trans_tbl = get_html_translation_table (HTML_ENTITIES, ENT_QUOTES);
-        // Flip keys<==>values
-        $trans_tbl = array_flip ($trans_tbl);
-        // Add support for &apos; entity (missing in HTML_ENTITIES)
-        $trans_tbl += array('&apos;' => "'");
-        // Replace entities by values
-        return strtr ($string, $trans_tbl);
-    }
-
-    // -------------------------------------------------------------------
-    // Parse() is private method used by Get() to load and parse RSS file.
-    // Don't use Parse() in your scripts - use Get($rss_file) instead.
-    // -------------------------------------------------------------------
-    function Parse ($rss_url) {
-        // Open and load RSS file
-        if ($f = @fopen($rss_url, 'r')) {
-            $rss_content = '';
-            while (!feof($f)) {
-                $rss_content .= fgets($f, 4096);
-            }
-            fclose($f);
-
-            // Parse document encoding
-            $result['encoding'] = $this->my_preg_match("'encoding=[\'\"](.*?)[\'\"]'si", $rss_content);
-            // if document codepage is specified, use it
-            if ($result['encoding'] != '')
-                { $this->rsscp = $result['encoding']; } // This is used in my_preg_match()
-            // otherwise use the default codepage
-            else
-                { $this->rsscp = $this->default_cp; } // This is used in my_preg_match()
-
-            // Parse CHANNEL info
-            preg_match("'<channel.*?>(.*?)</channel>'si", $rss_content, $out_channel);
-            foreach($this->channeltags as $channeltag)
-            {
-                $temp = $this->my_preg_match("'<$channeltag.*?>(.*?)</$channeltag>'si", $out_channel[1]);
-                if ($temp != '') $result[$channeltag] = $temp; // Set only if not empty
-            }
-            // If date_format is specified and lastBuildDate is valid
-            if ($this->date_format != '' && ($timestamp = strtotime($result['lastBuildDate'])) !==-1) {
-                        // convert lastBuildDate to specified date format
-                        $result['lastBuildDate'] = date($this->date_format, $timestamp);
-            }
-
-            // Parse TEXTINPUT info
-            preg_match("'<textinput(|[^>]*[^/])>(.*?)</textinput>'si", $rss_content, $out_textinfo);
-                // This a little strange regexp means:
-                // Look for tag <textinput> with or without any attributes, but skip truncated version <textinput /> (it's not beggining tag)
-            if (isset($out_textinfo[2])) {
-                foreach($this->textinputtags as $textinputtag) {
-                    $temp = $this->my_preg_match("'<$textinputtag.*?>(.*?)</$textinputtag>'si", $out_textinfo[2]);
-                    if ($temp != '') $result['textinput_'.$textinputtag] = $temp; // Set only if not empty
-                }
-            }
-            // Parse IMAGE info
-            preg_match("'<image.*?>(.*?)</image>'si", $rss_content, $out_imageinfo);
-            if (isset($out_imageinfo[1])) {
-                foreach($this->imagetags as $imagetag) {
-                    $temp = $this->my_preg_match("'<$imagetag.*?>(.*?)</$imagetag>'si", $out_imageinfo[1]);
-                    if ($temp != '') $result['image_'.$imagetag] = $temp; // Set only if not empty
-                }
-            }
-            // Parse ITEMS
-            preg_match_all("'<item(| .*?)>(.*?)</item>'si", $rss_content, $items);
-            $rss_items = $items[2];
-            $i = 0;
-            $result['items'] = array(); // create array even if there are no items
-            foreach($rss_items as $rss_item) {
-                // If number of items is lower then limit: Parse one item
-                if ($i < $this->items_limit || $this->items_limit == 0) {
-                    foreach($this->itemtags as $itemtag) {
-                        $temp = $this->my_preg_match("'<$itemtag.*?>(.*?)</$itemtag>'si", $rss_item);
-                        if ($temp != '') $result['items'][$i][$itemtag] = $temp; // Set only if not empty
-                    }
-                    // Strip HTML tags and other bullshit from DESCRIPTION
-                    if ($this->stripHTML && $result['items'][$i]['description'])
-                        $result['items'][$i]['description'] = strip_tags($this->unhtmlentities(strip_tags($result['items'][$i]['description'])));
-                    // Strip HTML tags and other bullshit from TITLE
-                    if ($this->stripHTML && $result['items'][$i]['title'])
-                        $result['items'][$i]['title'] = strip_tags($this->unhtmlentities(strip_tags($result['items'][$i]['title'])));
-                    // If date_format is specified and pubDate is valid
-                    if ($this->date_format != '' && ($timestamp = strtotime($result['items'][$i]['pubDate'])) !==-1) {
-                        // convert pubDate to specified date format
-                        $result['items'][$i]['pubDate'] = date($this->date_format, $timestamp);
-                    }
-                    // Item counter
-                    $i++;
-                }
-            }
-
-            $result['items_count'] = $i;
-            return $result;
-        }
-        else // Error in opening return False
-        {
-            return False;
-        }
-    }
-}
-
-?>
-