[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 9228f64f320f1ecaa44f2697869921900e56f93c

Michael DeHaan mdehaan at redhat.com
Thu Jun 14 19:04:09 UTC 2007


Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  9228f64f320f1ecaa44f2697869921900e56f93c (commit)
       via  f2f269183b63c5a8f7c02de5284153d063ce7109 (commit)
       via  990ad806153de5cebddce6fdbdabcdbeba821842 (commit)
      from  a73cf14b21cb9b23ea5ef1791d75acd8469f1753 (commit)

- Log -----------------------------------------------------------------
commit 9228f64f320f1ecaa44f2697869921900e56f93c
Merge: f2f2691... a73cf14...
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Jun 14 15:05:14 2007 -0400

    Merge branch 'master' of git+ssh://g-mdehaan@et.redhat.com/git/virt-factory
    
    Conflicts:
    
    	website/docs/vf-install-setup.html

commit f2f269183b63c5a8f7c02de5284153d063ce7109
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Jun 14 15:04:09 2007 -0400

    Fix push URL

commit 990ad806153de5cebddce6fdbdabcdbeba821842
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Thu Jun 14 15:01:31 2007 -0400

    Relabelling things.
-----------------------------------------------------------------------

Diffstat:
 docs/webpush.sh                                    |    2 +-
 website/about.html                                 |   22 +--
 website/communicate.html                           |    4 +-
 website/communicate.php                            |    2 +-
 website/components.html                            |    7 +-
 website/components.php                             |    2 +-
 ...mp-install-setup.html => vf-install-setup.html} |   37 ++--
 website/docs/vf-roadmap.html                       |  175 ++++++++++++++++++++
 website/documentation.html                         |    6 +-
 website/documentation.php                          |    2 +-
 website/download.html                              |   12 +-
 website/download.php                               |    2 +-
 website/faq.html                                   |   60 ++++----
 website/faq.php                                    |    2 +-
 website/img/logo-virt-factory.png                  |  Bin
 website/index.html                                 |   18 +--
 website/index.php                                  |    2 +-
 website/news.php                                   |    4 +-
 website/top.html                                   |    2 +-
 website/ump-install-setup.php                      |   44 -----
 .../{documentation.php => vf-install-setup.php}    |    4 +-
 .../{documentation.php => vf-profile-format.php}   |    4 +-
 website/{documentation.php => vf-roadmap.php}      |    4 +-
 23 files changed, 268 insertions(+), 149 deletions(-)

diff --git a/docs/webpush.sh b/docs/webpush.sh
index 482e150..acf079d 100644
--- a/docs/webpush.sh
+++ b/docs/webpush.sh
@@ -1 +1 @@
-scp -r ../website/* et.redhat.com:/var/www/sites/ump.et.redhat.com/
+scp -r ../website/* et.redhat.com:/var/www/sites/virt-factory.et.redhat.com
diff --git a/website/about.html b/website/about.html
index e0ab5fa..ffde8c5 100644
--- a/website/about.html
+++ b/website/about.html
@@ -1,20 +1,16 @@
-<h2>About UMP</h2>
-<h3>Introducing the next generation of systems management</h3>
+<h2>About Virt-Factory</h2>
+<h3>Introducing the next generation of virtualization management</h3>
 
 <a href="img/screenshot_full.png"><img src="img/screenshot.png" style="float: left; margin-right: 10px;" /></a>
 
-<p> There are many great and free and open source systems management tools -- perhaps too many.  As systems management choices are numerous and disparate, selecting which tools to use and how to connect them can become a time consuming process.</p>
-
-<p> The Update & Management Platform (UMP) is a software application framework for integrating systems management applications.  It's also a product.  Configuration management, provisioning, and update management come batteries included -- without time consuming setup and rewiring.  Other features can be swapped in/out over time, making it easy to incorporate the best features of other open source applications (such as your favorite monitoring stack) and choose the best options for a particular environment.
-</p>
-
-<p> For users, this means a well-integrated systems management solution with a common Web UI, command line scripting tools, and a uniform XMLRPC interface.  For infrastructure developers, struggling to deal with the cognitive dissonance of multiple systems management apps, it's one tool to unite them all.
+<p>Virt-Factory is a framework for managing a very large number of virtual machines such as might be found in datacenters or compute farms.  In many ways, it is a bit of a research project to determine new and efficient ways to control these large environments.
 </p>
 
-<p>Read more about <a href="components.php">our approach to system management</a> and let us know what you think.</p>
+<p>
+Virt-Factory works by managing a pool of registered physical hosts, and then deploying virtual machines, which have specific roles as defined by their "profiles", onto those hosts.</p>
 
-<h3>Free to use, developed openly</h3>
-
-<p>Use UMP freely to get your system update and management tasks done. Get involved with the UMP developers or become an UMP developer in UMP's open development community to get your system update and management tasks done <strong>better</strong>.</p>
+<p>
+The application provides a Web UI, an XMLRPC API, and a command line interface is in development.  Basic management support is available now, though the future will revolve around tagging, batch management, reporting, and automated assistance around deployment ("deploying into the cloud"), and finding good candidate systems for migrations.  An example migration case: when taking a host machine down for maintaince, where should the guest virtual machines be moved?  We want virt-factory to be able to make these kinds of decisions automatically.
+</p>
 
-<p>Your feedback is valuable to us. Let us know which UMP features are most valuable to you, which ones are not, and which ones you'd like to see. Become an UMP developer and help us reach our vision. Either way, we'd love to hear from you.</p>
+<p>Your feedback is valuable to us. Let us know which virtualization management features are most valuable to you, which ones are not, and which ones you'd like to see. Become a Virt-Factory developer and help us reach our vision. Either way, we'd love to hear from you.</p>
diff --git a/website/communicate.html b/website/communicate.html
index e35cc2e..ef3d692 100644
--- a/website/communicate.html
+++ b/website/communicate.html
@@ -8,9 +8,9 @@
 <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>There are a couple of UMP-related IRC channels on <strong><a href="http://www.freenode.net/">irc.freenode.net</a></strong>:</p>
+<p>There are a couple of related IRC channels on <strong><a href="http://www.freenode.net/">irc.freenode.net</a></strong>:</p>
 <ul>
-<li><strong>#ump</strong> - for general UMP discussion.</li>
+<li><strong>#virt-factory</strong> - for general virt-factory discussion.</li>
 <li><strong>#cobbler</strong> - for discussion of <a href="components.php">cobbler</a>.</li>
 </ul>
 
diff --git a/website/communicate.php b/website/communicate.php
index 2c4371f..19b338b 100755
--- a/website/communicate.php
+++ b/website/communicate.php
@@ -10,7 +10,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/components.html b/website/components.html
index 19e58f7..c61bf2a 100644
--- a/website/components.html
+++ b/website/components.html
@@ -1,9 +1,8 @@
 <h2>Components</h2>
 
 <h3>The 'Component' Philosophy</h3>
-<p>UMP is a <strong>platform</strong> upon which different tools may be developed and can then communicate with each other. This is because we understand that by nature system administration involves heterogeneous environments and a one-size-fits-all, monolithic approach to management tools does not work well in these environments.</p>
+<p>Virt-Factory is a <strong>platform</strong> upon which different tools may be developed and can then communicate with each other. This is because we understand that by nature system administration involves heterogeneous environments and a one-size-fits-all, monolithic approach to management tools does not work well in these environments.</p>
 <p>Our goal is for this platform to be easily extensible, so that if it doesn't quite meet your needs in some way, you can easily add on whatever functionality you need to get your job done.</p>
-<p>UMP is of course in the very early stages of development, so some of the components listed here may not be complete or even started yet. Check back on this page to check on their progress!</p>
 
 <h3>The Components</h3>
 
@@ -16,6 +15,7 @@
 <li>Discuss cobbler on the <a href="http://www.redhat.com/mailman/listinfo/et-mgmt-tools">et-mgmt-tools at redhat.com mailing list</a>.</li>
 </ul>
 
+<!--
 <h4>surfr</h4>
 <img src="img/logo-surfr.png" />
 <p>surfr will be a <strong>software channel management tool</strong>. The goal of surfr is to make it easier to create repos, add software to them, mirror existing ones, and to merge them together. It will also support virtual repositories, which allow systems to receive controlled access to multiple repositories through a single (as visible to yum) repository.</p>
@@ -24,3 +24,6 @@
 <li><a href="http://git.et.redhat.com/?p=surfr.git;a=summary">surfr git repository</a></li>
 <li>Discuss surfr on the <a href="http://www.redhat.com/mailman/listinfo/et-mgmt-tools">et-mgmt-tools at redhat.com mailing list</a>.</li>
 </ul>
+-->
+
+
diff --git a/website/components.php b/website/components.php
index 235f519..2707928 100755
--- a/website/components.php
+++ b/website/components.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/docs/ump-install-setup.html b/website/docs/vf-install-setup.html
similarity index 79%
rename from website/docs/ump-install-setup.html
rename to website/docs/vf-install-setup.html
index ea3c30d..990793d 100644
--- a/website/docs/ump-install-setup.html
+++ b/website/docs/vf-install-setup.html
@@ -1,7 +1,6 @@
 <a name="toc">
-<h2>Update & Management Platform (UMP) Installation & Setup Guide</h2>
+<h2>Virt-Factory Installation & Setup Guide</h2>
 </a>
-<p>A printer-friendly version of this guide is available:<br /> <a href="docs/ump-install-setup.html">Update & Management Platform (UMP) Installation & Setup Guide: Printer-Friendly Version</a>.</p>
 <h3>Table of Contents</h3>
 <ul id="toc">
 <li><a href="#about">About this Document</a></li>
@@ -20,19 +19,19 @@
 <a name="about">
 <h3>About this Document</h3>
 </a>
-<p>This document explains how to install and set up a basic installation of Update & Management Platform (UMP).
+<p>This document explains how to install and set up a basic installation of Virt-Factory.
 </p>
 <p><a href="#toc" class="back-to-top">Back to top</a></p>
 
 <a name="requirements">
 <h3>Before You Start: Requirements</h3>
 </a>
-<h4>For the UMP Management Server:</h4>
-<p>Currently you will need a system running Fedora Core 6 to most easily install and setup an UMP management server. We recommend using a 32-bit system.</p>
-<p class="note">You may also install an UMP management server using our <a href="download.php">source tarballs or our git code respository</a>. Using these methods you may install the server on a Fedora Core 6, Fedora Core 7, or Red Hat Enterprise Linux 5 system (32-bit x86 or 64-bit x86_64.) However, these instructions currently refer to using a yum repository which currently only supports Fedora Core 6 x86.</p>
+<h4>For the Virt-Factory Management Server:</h4>
+<p>Currently you will need a system running Fedora Core 6 to most easily install and setup an Virt-Factory management server. We recommend using a 32-bit system.</p>
+<p class="note">You may also install an Virt-Factory management server using our <a href="download.php">source tarballs or our git code respository</a>. Using these methods you may install the server on a Fedora Core 6, Fedora Core 7, or Red Hat Enterprise Linux 5 system (32-bit x86 or 64-bit x86_64.) However, these instructions currently refer to using a yum repository which currently only supports Fedora Core 6 x86.</p>
 <p>You will also need access to one of the <a href="http://mirrors.fedoraproject.org/publiclist/Fedora/6/<">Fedora Core 6 public rsync mirrors</a> or a DVD ISO of Fedora Core 6, Fedora 7, or Red Hat Enterprise Linux 5 to enable the server to provision new guest systems.</p>
-<h4>For systems registering to the UMP Management Server:</h4>
-<p>You will need at least one additional system to register to the UMP management server. Currently UMP supports client systems running Fedora Core 6, Fedora 7, or Red Hat Enterprise Linux 5 on 32-bit x86 or 64-bit x86_64 hardware.</p>
+<h4>For systems registering to the Virt-Factory Management Server:</h4>
+<p>You will need at least one additional system to register to the Virt-Factory management server. Currently Virt Factory supports client systems running Fedora Core 6, Fedora 7, or Red Hat Enterprise Linux 5 on 32-bit x86 or 64-bit x86_64 hardware.</p>
 <p><a href="#toc" class="back-to-top">Back to top</a></p>
 
 <a name="getrpms">
@@ -47,17 +46,17 @@
 <h3>Installing the Management Server</h3>
 </a>
 <h4>Installing the Management Server Package</h4>
-<p>Run the following command on the system you would like to setup as an UMP management server:</p>
+<p>Run the following command on the system you would like to setup as an Virt-Factory management server:</p>
 <blockquote>yum install virt-factory-server</blockquote>
 <h4>Configuring the Database</h4>
-<p>UMP uses <A HREF="http://www.postgresql.org">PostgreSQL</A> for it's database.</p>
+<p>Virt-Factory uses <A HREF="http://www.postgresql.org">PostgreSQL</A> for it's database.</p>
 <p>If you are not already using any PostgreSQL databases on the server, run the following command to set up the database to allow connections by the virt factory user:</p>
 <blockquote>vf_fix_db_auth</blockquote> 
 <p>If the server already has a PostgreSQL installation that other applications are relying upon, do <strong>not</strong> run the above command, but instead manually change the server's <A HREF="http://www.postgresql.org/docs/7.4/interactive/client-authentication.html">pg_hba.conf</A> file to allow "md5" authentication for all "host" connections, then restart the Postgresql service with:</p>
 <blockquote>/sbin/service postgresql restart</blockquote>
 </p>
 <h4>Setting Up Mirrors For Virtual Guest Deployment</h4>
-<p>As root, edit the <tt>/etc/virt-factory/settings</tt> file to include the address of a public rsync mirror for Fedora Core 6, or otherwise change the path to point to where you have a DVD or the DVD ISO mounted. This path settings will allow UMP to import a distribution mirror for use in installing virtual systems.</p>
+<p>As root, edit the <tt>/etc/virt-factory/settings</tt> file to include the address of a public rsync mirror for Fedora Core 6, or otherwise change the path to point to where you have a DVD or the DVD ISO mounted. This path settings will allow Virt-Factory to import a distribution mirror for use in installing virtual systems.</p>
 
 <p class="note"><strong>Note:</strong> A list of current public mirrors of Fedora Core 6, including rsync mirrors, is available here: <a href="http://mirrors.fedoraproject.org/publiclist/Fedora/6/">http://mirrors.fedoraproject.org/publiclist/Fedora/6/</a>.<br /><br />We recommend that you import Fedora Core 6 as this is the operating system we provide pre-built profiles for. If you import something else, you will need to create a profile for it before you can deploy a virtual guest using it.</p>
 </p>
@@ -77,8 +76,8 @@
 <p>Now you'll want to import some profiles to deploy to machines. To do this, you'll first of course need to find some profile files. We have some samples profiles available at: <a href="http://virt-factory.et.redhat.com/download/profiles">http://virt-factory.et.redhat.com/download/profiles</a>.</p>
 <p>We recommend that you download all of our sample profiles for starters. You can make your own profiles later if you want. For each profile you wish to deploy, run:</p>
 <blockquote>sudo vf_import <em>/path/to/profile.tar.gz</em></blockquote>
-<h4>Set Up the UMP Management Server Web Interface</h4>
-<p>You'll need to install and start the web interface on the UMP management server using the following commands:</p>
+<h4>Set Up the Virt-Factory Management Server Web Interface</h4>
+<p>You'll need to install and start the web interface on the Virt-Factory management server using the following commands:</p>
 <blockquote>sudo yum install virt-factory-wui</blockquote>
 <blockquote>sudo /sbin/service virt-factory-wui start</blockquote>
 <p>You will be able to access the web interface by visiting <tt>http://www.example.com/vf/</tt>, where <tt>www.example.com</tt> is your server's actual IP address or domain name.</p>
@@ -93,7 +92,7 @@
 <a name="loggingin">
 <h3>Logging In</h3>
 </a>
-<p>The default username and password for the UMP Management Server web interface are the following:</p>
+<p>The default username and password for the Virt-Factory Management Server web interface are the following:</p>
 <ul>
 <li><strong>Username:</strong> admin</li>
 <li><strong>Password:</strong> fedora</li>
@@ -105,17 +104,17 @@
 </a>
 <p>You'll want to add some systems that can serve as virtual hosts. Consider these machines part of your "machine farm". There are two ways to do this, all of which should be available in the fairly minimalistic web interface.</p>
 <h4>Registering Virtual Host Systems via PXE Provisioning</h4>
-<p>The easiest way to register a physical host system to the UMP management server is to use the "add a machine for PXE" item in the web interface. Type in a MAC address in the web form, and select a profile for the system to run after it PXE boots. Most likely, you'll want to pick the "Container" profile (available from our <a href="download.php">download page</a>), because that profile means "This machine is going to run managed virtual guests". In fact, when assigning profiles to machines, always pick the "Container" profile. It will keep things simple.</p>
+<p>The easiest way to register a physical host system to the Virt-Factory management server is to use the "add a machine for PXE" item in the web interface. Type in a MAC address in the web form, and select a profile for the system to run after it PXE boots. Most likely, you'll want to pick the "Container" profile (available from our <a href="download.php">download page</a>), because that profile means "This machine is going to run managed virtual guests". In fact, when assigning profiles to machines, always pick the "Container" profile. It will keep things simple.</p>
 <p>To make PXE work, your dhcp server will need to specify that the address of the virt-factory management server is the "next-server" for that particular machine.</p>
 <h4>Registering Virtual Host Systems using a Registration Token on an pre-installed System</h4>
-<p>If you do not have access to your dhcp server to setup PXE, another option you have for registering virtual host systems is the registration token feature of UMP. This will involve installing client software and running a registration script on an already-installed system. This system must be running <a href="#requirements">one of the operating systems required for an UMP-registered system</a>. Also, you'll need to make sure that the system is running a xen kernel so you may deploy virtual guest system on it.</p>
+<p>If you do not have access to your dhcp server to setup PXE, another option you have for registering virtual host systems is the registration token feature of Virt-Factory. This will involve installing client software and running a registration script on an already-installed system. This system must be running <a href="#requirements">one of the operating systems required for an Virt-Factory registered system</a>. Also, you'll need to make sure that the system is running a xen kernel so you may deploy virtual guest system on it.</p>
 <p class="tip">To check if your system is running a xen kernel, run <tt>uname -a</tt>. In the output of that command, check to make sure the kernel has the string 'xen' in it. If not, you'll need to reboot the system into a xen kernel before attempting to provision guests on it.</p>
-<p>Generate a registration token with the "Machines/Create Registration Token" option in the web interface and specify that you want it to be a registration token for the "Container" profile you imported earlier. Then, on an existing installed system run the following commands (where 'www.example.com' is the IP address or hostname of your UMP management server):</p>
+<p>Generate a registration token with the "Machines/Create Registration Token" option in the web interface and specify that you want it to be a registration token for the "Container" profile you imported earlier. Then, on an existing installed system run the following commands (where 'www.example.com' is the IP address or hostname of your Virt-Factory management server):</p>
 <blockquote>yum install virt-factory-nodes<br />
    vf_register --serverurl=http://www.example.com:5150 --token=tokenvalue<br />
    /sbin/service start vf-node-server
 </blockquote>
-<p>Now that system show up as managed in the UMP management server web interface. You are now ready (assuming you just configured it as a "Container" machine, to deploy virtualized systems running specific profiles.</p>
+<p>Now that system show up as managed in the Virt-Factory management server web interface. You are now ready (assuming you just configured it as a "Container" machine, to deploy virtualized systems running specific profiles.</p>
 <p><a href="#toc" class="back-to-top">Back to top</a></p>
 <a name="viewprofiles">
 <h3>Viewing Imported Profiles</h3>
@@ -135,7 +134,7 @@
 <h3>Creating Profiles</h3>
 </a>
 <p>We have made some sample profiles available on our <a href="download.php">download page</a>.</p>
-<p>You may wish to refer to the <a href="http://et.redhat.com/page/VF_Profile_Format">UMP Profile Format</a> documentation. Follow the same format (XML file + puppet files and manifests) to create your own profiles for how your servers should run and be set up. Our Test1 profile is as minimalistic as it gets, and it's possible to create much more tailored profiles, including ones that set up web servers, application servers, and so forth - and keep them configured - using puppet.</p>
+<p>You may wish to refer to the <a href="http://et.redhat.com/page/VF_Profile_Format">Virt-Factory Profile Format</a> documentation. Follow the same format (XML file + puppet files and manifests) to create your own profiles for how your servers should run and be set up. Our Test1 profile is as minimalistic as it gets, and it's possible to create much more tailored profiles, including ones that set up web servers, application servers, and so forth - and keep them configured - using puppet.</p>
 <p><a href="#toc" class="back-to-top">Back to top</a></p>
 <a name="schemadbupgrade">
 <h3>Upgrading the Database and Schema</h3>
diff --git a/website/docs/vf-roadmap.html b/website/docs/vf-roadmap.html
new file mode 100644
index 0000000..bba17cd
--- /dev/null
+++ b/website/docs/vf-roadmap.html
@@ -0,0 +1,175 @@
+<a name="toc">
+<h2>Virt-Factory Roadmap</h2>
+</a>
+<h3>Table of Contents</h3>
+<ul id="toc">
+<li><a href="#2">0.0.2 -- released 5/1</a></li>
+<li><a href="#3">0.0.3</a></li>
+<li><a href="#4">0.0.4</a></li>
+<li><a href="#5">0.0.5</a></li>
+<li><a href="#6">0.0.6</a></li>
+<li><a href="#7">0.0.6</a></li>
+<li><a href="#tbf">Future / To Be Filed</a></li>
+</ul>
+
+<a name="2">
+<h3>0.0.2 -- released 5/1</h3>
+</a>
+<p>
+<pre>
+Simplify the setup process. This is one of the most important things we need to do. --
+
+* DVD imports + misc cobbler features (Michael, 7 days) -- OK
+* automated puppet setup,  (Scott, 2 days) -- OK
+* and automated vf_repo setup from something like on command. (Adrian 4, days) -- OK
+
+Test PXE menu provisioning by profile, fix anything that comes up with kickstarts, registration, etc (Michael, 3 days) -- done
+
+Change any prints to use log files. (Scott 1 day) -- done
+
+Database upgrade support (Scott 5 days) -- OK
+
+Have cobbler mirror extras (using reposync rather than rsync:// -- preferably with mirror-list awareness) to allow nodes to get things like puppet and koan -- rather important as this keeps node installs from working from PXE (or from cases where yum isn't accessible in non-PXE). This will become even more important as we move to having everything in extras. Once this is all done, finish PXE testing for registration hooks. (mdehaan, 3-4 days) -- done
+
+Have registration ensure time is synced up for SSL purposes (sseago, ...) -- done, (NTP)
+
+Have registration or node tool install configure iptables such that it allows puppet to go through (sseago) -- skipped?
+
+More logging from register.py -- /var/log/virt-factory/register maybe. Right now there is no way to tell what happens during registration and failures are pretty easy given time issues, stopped services, etc (sseago) -- done 
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+<a name="3">
+<h3>0.0.3</h3>
+</a>
+<p>
+<pre>
+(If anyone wants anything else, sign up)
+
+Use busrpc(AMQP) to communicate with WUI, nodes, etc. -- alikins, ksmith (server-side); sseago (WUI side)
+
+Further test infrastructure tweaks? -- alikins?
+
+Minor architecture cleanup in modules as needed -- mdehaan, jortel?, others as needed
+
+ORM usage and move to Postgres (possibly also support MySQL?). Database init scripts also. -- jortel, sseago
+
+Work on new cobbler features (HW virt, other virt types, CD installs, better DHCP control) -- mdehaan, zeus
+
+Work on jumpstarting [sic] channel/repo management project 'surfr' -- mmccune, ksmith
+
+Incorporate shinier and better CSS/HTML/artwork (mostly done; minor CSS additions expected, and maybe some changes to the view/edit pages) -- mizmo, sseago, zeus (if needed)
+
+Refactor vf_import to use puppet modules (done) -- sseago
+
+Come up with plan for localization framework -- mmccune, ksmith, zeus 
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+<a name="4">
+<h3>0.0.4</h3>
+</a>
+<p>
+<pre>
+Status tracking -- heartbeat from node daemons and associated infrastructure work to do that securely. Not to be confused with monitoring but may include what is accessible through libvirt, etc.
+
+Keeping VM's started when host nodes restart and so on.
+
+Display view cleanup, UI refinement, possible support for pagination for very large groups of machines.
+
+Better integration with cobbler status tracking, etc. Watch provisioning status and make it visible in the WUI (mdehaan?)
+
+Seperate WUI from central server so they can optionally be installed on seperate machines.
+
+The Naming Question...
+
+Integrate role/permission based control over what users can access what in the GUI. Specific use cases should be given so that starter roles can be established. This is probably not super-critical for initial release, so just having "Admin" and "Guest" for default roles may be enough. Consider support for authentication against other sources (LDAP) though do not require it.
+
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+<a name="5">
+
+<h3>0.0.5</h3>
+</a>
+<p>
+<pre>
+Upload and import profiles via the WUI without using vf_import
+
+A per host task view. Slice by hosts. See what is going on in a specific host when you visit that page for the individual host.
+
+Tracking of who initiated tasks. (Audit logging). Show this when clicking on the task.
+
+Task error reporting (in GUI).... show why things fail and what state tasks are in better.
+
+Batch management via tasks and tag selection. (Do this to all machines tagged "foo" and "bar").
+
+Yum channel management. Be able to create new channels in the WUI and add software to it. This requires a fairly advanced channel module, so we might want to create this seperately and let stand-alone cobbler use it also. Also be able to mirror existing (external) content.
+
+Fedora 7 support. How to select which distros to import? 
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+<a name="6">
+<h3>0.0.6</h3>
+</a>
+<p>
+<pre>
+Ability to lock down channels (entitlements) for specific systems. May involve changing the way registration tokens work today.
+
+Support for non-virtual clients running earlier RHEL. Associated package management support -- example: delivering ISV content. (Configure up2date for yum support?). Server software does need to support earlier editions.
+
+Improve registration tool to store more inventory data about the system.
+
+Improve registration tool to allow jailing of systems that do not have profile information contained in their registration token. Require that sysadmins approve the system and choose a profile. If using a regtoken, this would be automatically included and the step can be skipped.
+
+Command line client -- ampm. 
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+<a name="7">
+<h3>0.0.7</h3>
+</a>
+<p>
+<pre>
+Tag management tools should be able to store the tags required to run a virtual machine, i.e. "lab4 storagepool5 fullvirtcapable" and be able to have a button to click on for a mahcine, that will allow all virtual deployments running on it to move to similarly tagged guests. These should be selected on an individual basis and can be overriden with non-similarly tagged guests as needed. Automation will come later.
+
+Knowledge of basic storage information needed for migration.
+
+Integration with basic monitoring information (something like SPECTRE) needed to develop automated "into the cloud" deployment heuristics. 
+</pre>
+</p>
+
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+<a name="tbf">
+<h3>Future / To Be Filed</h3>
+</a>
+<p>
+<pre>
+Automate cloud deployment and migration based on tags and basic resource availability.
+
+Run WUI on seperate server from management daemon
+
+Guard against unauthorized registration in the case of PXE (requires Cobbler voodoo).
+
+Create more sample profiles
+
+API cleanup -- create higher level API more suitable for ISVs and sysadmins who want to integrate with VF. It's a bit low-level as it stands now, but workable.
+
+Scaling
+
+Backup features
+
+Make it easy to deploy RHX-type content as virtual appliance apps 
+</pre>
+</p>
+<p><a href="#toc" class="back-to-top">Back to top</a></p>
+
+
+
+
diff --git a/website/documentation.html b/website/documentation.html
index 8bf858a..c94730a 100644
--- a/website/documentation.html
+++ b/website/documentation.html
@@ -2,8 +2,10 @@
 
 <h3>Available Documents</h3>
 
-<p>The following documentation and guides are available for UMP:</p>
+<p>The following documentation and guides are available:</p>
 
 <ul>
-<li><a href="ump-install-setup.php">UMP Installation & Setup Guide</a></li>
+<li><a href="vf-install-setup.php">Virt-Factory Installation & Setup Guide</a></li>
+<li><a href="vf-profile-format.php">Virt-Factory Profile Format</a></li>
+<li><a href="vf-roadmap.php">Virt-Factory Project Roadmap</a></li>
 </ul>
diff --git a/website/documentation.php b/website/documentation.php
index 63ba719..2ac8b53 100755
--- a/website/documentation.php
+++ b/website/documentation.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/download.html b/website/download.html
index bd3d0f1..e7fe795 100644
--- a/website/download.html
+++ b/website/download.html
@@ -1,6 +1,6 @@
-<p>UMP is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">General Public License (GPL)</a>.</p>
+<p>Virt-Factory is licensed under the <a href="http://www.gnu.org/copyleft/gpl.html">General Public License (GPL)</a>.</p>
 
-<h3>Download UMP Management Server Software</h3>
+<h3>Download Virt-Factory</h3>
 
 <h4>Latest Source</h4>
 <p>The latest source code (Python and Ruby-on-Rails) is available through git:</p>
@@ -9,7 +9,7 @@
 git clone git://et.redhat.com/virt-factory
 </blockquote>
 
-<h4>Pre-packaged Release via the UMP Repository</h4>
+<h4>Pre-packaged Release via the Virt-Factory Repository</h4>
 <p>Prebuilt RPMs are available for Fedora Core 6. You may configure your system to use this repository by running the following command:</p>
 
 <blockquote>
@@ -25,11 +25,11 @@ wget http://virt-factory.et.redhat.com/download/repo/virt-factory.repo --output-
 <ul>
 <li> <a href="http://virt-factory.et.redhat.com/download/src/">http://virt-factory.et.redhat.com/download/src/</a></li>
 </ul>
-<h3>Installing UMP</h3>
-<p>You'll probably want to read the <a href="ump-install-setup">installation and setup guide</a>. Also see the rest of the <a href="http://et.redhat.com/page/Virt-Factory_Wiki">UMP wiki</a> for descriptions of ongoing work, what's not finished yet, and future plans.</p>
+<h3>Installing Virt-Factory</h3>
+<p>You'll probably want to read the <a href="ump-install-setup">installation and setup guide</a>. Also see the rest of the <a href="http://et.redhat.com/page/Virt-Factory_Wiki">Virt Factory wiki</a> for descriptions of ongoing work, what's not finished yet, and future plans.</p>
 
 <h3>Downloading System Profiles</h3>
-<p>In order to provision systems using UMP, you'll need to load system profiles into the UMP Management Server to determine the configuration of deployed clients. We've provided some sample profiles for you to start with below. Have you come up with a good profile? Please feel free to <a href="communicate.php">share it with us</a>!</p>
+<p>In order to provision systems using Virt-Factory, you'll need to load system profiles into the Virt-Factory Management Server to determine the configuration of deployed clients. We've provided some sample profiles for you to start with below. Have you come up with a good profile? Please feel free to <a href="communicate.php">share it with us</a>!</p>
 <ul>
 <li><a href="http://virt-factory.et.redhat.com/download/profiles/container.tar.gz">Container Profile</a> - a generic profile for virtual host systems.</li>
 <li><a href="http://virt-factory.et.redhat.com/download/profiles/test1.tar.gz">test1 Profile</a> - a sample profile for an x86-based virtual guest.</li>
diff --git a/website/download.php b/website/download.php
index f33b7d6..4581e9e 100755
--- a/website/download.php
+++ b/website/download.php
@@ -10,7 +10,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/faq.html b/website/faq.html
index ccb1c3c..e5fb0d4 100644
--- a/website/faq.html
+++ b/website/faq.html
@@ -2,15 +2,15 @@
 <h3>Questions</h3>
 </a>
 <ul id="faq">
-<li><a href="#whatis">What is UMP?</a></li>
-<li><a href="#requiments">What do I need to run UMP?</a></li>
-<li><a href="stability">How stable is UMP?</a></li>
-<li><a href="#architecture">What kind of architecture does UMP have?</a></li>
-<li><a href="#targetuser">Who is the target user of UMP?</a></li>
-<li><a href="#virtualization">How does UMP work with virtualization?</a></li>
-<li><a href="#appliances">How does UMP work with appliances?</a></li>
-<li><a href="#puppet">How does UMP use puppet?</a></li>
-<li><a href="#deployment">How are systems deployed using UMP?</a></li>
+<li><a href="#whatis">What is Virt-Factory?</a></li>
+<li><a href="#requiments">What do I need to run Virt-Factory?</a></li>
+<li><a href="stability">How stable is Virt-Factory?</a></li>
+<li><a href="#architecture">What kind of architecture does Virt-Factory have?</a></li>
+<li><a href="#targetuser">Who is the target user of Virt-Factory?</a></li>
+<li><a href="#virtualization">How does Virt-Factory work with virtualization?</a></li>
+<li><a href="#appliances">How does Virt-Factory work with appliances?</a></li>
+<li><a href="#puppet">How does Virt-Factory use puppet?</a></li>
+<li><a href="#deployment">How are systems deployed using Virt-Factory?</a></li>
 <li><a href="#monitoring">What about monitoring?</a></li>
 <li><a href="#roadmap">What about the future roadmap?</a></li>
 <li><a href="#profile-build">How do I build profiles (appliances)?</a></li>
@@ -20,70 +20,70 @@
 <h3>Answers</h3>
 
 <a name="whatis">
-<dt>What is UMP?</dt>
+<dt>What is Virt-Factory?</dt>
 </a>
- <dd>UMP is a set of free and open source system management tools. The UMP platform is a free and open source platform upon which management tools can be built.
+ <dd>Virt-Factory is a set of free and open source system management framework that concentrates on the issues involved in a managing a large number of virtual systems. 
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 <a name="requirements">
-<dt>What do I need to run UMP?</dt>
+<dt>What do I need to run Virt-Factory?</dt>
 </a>
- <dd>UMP is currently supported on Fedora Core 6. Fedora 7 and Red Hat Enterprise Linux 5 support will be released shortly.
+ <dd>Virt-Factory is currently supported on Fedora Core 6. Fedora 7 and Red Hat Enterprise Linux 5 support will be released shortly.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 <a name="stability">
-<dt>How stable is UMP?</dt>
+<dt>How stable is Virt-Factory?</dt>
 </a>
- <dd>UMP is currently an alpha-level project with a fast-paced rate of development.
+ <dd>Virt-Factory is currently an alpha-level project with a fast-paced rate of development.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 <a name="architecture">
-<dt>What kind of architecture does UMP have?</dt>
+<dt>What kind of architecture does Virt-Factory have?</dt>
 </a>
- <dd>UMP provides a central server for managing physical systems (including virtual hosts) and virtual guests. The server exposes an XMLRPC API that is used by the web user interface, and can also be used by custom scripts. On 'managed' systems, a special "node daemon" is installed, which is used to communicate with the central server over secure XMLRPC.
+ <dd>Virt-Factory provides a central server for managing physical systems (including virtual hosts) and virtual guests. The server exposes an XMLRPC API that is used by the web user interface, and can also be used by custom scripts. On 'managed' systems, a special "node daemon" is installed, which is used to communicate with the central server over secure XMLRPC.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 
 <a name="targetuser">
-<dt>Who is the target user of UMP?</dt>
+<dt>Who is the target user of Virt-Factory?</dt>
 </a>
- <dd>We are currently targeting developers who want to be involved in new systems management technology as well as system administrators wishing to run a large number of virtual systems that have a key interest in virtualization and system recipes / appliance concepts.
+ <dd>We are currently targeting developers who want to be involved in new systems management technology as well as system administrators wishing to run a large number of virtual systems or have a key interest in virtualization and system recipes / appliance concepts.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 
 <a name="virtualization">
-<dt>How does UMP work with virtualization?</dt>
+<dt>How does Virt-Factory work with virtualization?</dt>
 </a>
- <dd>Virtualization plays a core role in UMP and is heavily integrated. The software takes care of the nuts and bolts and can entirely manage your virtualization, though logging into virtualization via xm and virsh is still supported.
+ <dd>Virtualization plays a core role in Virt-Factory and is heavily integrated. The software takes care of the nuts and bolts and can entirely manage your virtualization, though accessing your virtualization via xm and virsh is still supported.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 
 <a name="appliances">
-<dt>How does UMP work with appliances?</dt>
+<dt>How does Virt-Factory work with appliances?</dt>
 </a>
- <dd>Appliances can be defined purely as metadata ('profiles') rather than binary blobs. The metadata describes the required virtual machine 9number of processors, memory etc.), the base system installation (as a kickstart file), and the appliance's 'personality' as a puppet manifest. this makes it possible to distribute appliances easily, and allows endusers to adapt appliances to their needs while still being able to consume appliance updates.
+ <dd>Appliances mean different things to different people.  Our Appliances can be defined purely as metadata ('profiles') rather than binary blobs that are copied around. The metadata describes the requirements for the virtual machine (number of processors, memory etc.), the base system installation (as a kickstart file), and the appliance's 'personality' as a puppet manifest. this makes it possible to distribute (and share!) appliances easily, with minimal bandwidth, and allows endusers to adapt appliances to their needs while still being able to consume appliance updates.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 
 <a name="puppet">
-<dt>How does UMP use puppet?</dt>
+<dt>How does Virt-Factory use puppet?</dt>
 </a>
- <dd>Puppet is a core feature of our system recipes. Puppet is used to specify what a particular virtual or bare metal machine should have installed and how it is configured. However, since the puppet information is contained within the profile, it's not required that users of profiles have to understand Puppet. Authors of profiles definitely do though. We'll be working on more tools later, though cft is a great starting point.
+ <dd>Puppet is used as the backend to implement our system recipes. Puppet is used to specify what a particular virtual or bare metal machine should have installed and how it is configured. However, since the puppet information is contained within the profile, it's not required that users of profiles have to understand Puppet. Authors of profiles definitely do though. We'll be working on more tools later, though <A HREF="http://cft.et.redhat.com">CFT</A> is a great starting point.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
 
 <a name="deployment">
-<dt>How are systems deployed using UMP?</dt>
+<dt>How are systems deployed using Virt-Factory?</dt>
 </a>
- <dd>UMP uses cobbler as an internal library for provisioning. This means that if you have a datacenter and get new machines "off the truck", you'll be able to walk up to a machine and pick a "profile" for that machine to run, and provision it on the spot from a PXE menu. Virtualization management is there too. However, UMP takes over a cobbler server completely, so no knowledge of Cobbler or cobbler commands is required. In fact, you can't run UMP on your existing cobbler server. Sorry :)
+ <dd>Virt-Factory uses <A HREF="http://cobbler.et.redhat.com">Cobbler</A> as an internal library for provisioning. This means that if you have a datacenter and get new machines "off the truck", you'll be able to walk up to a machine and pick a "profile" for that machine to run, and provision it on the spot from a PXE menu. Virtualization management is there too. However, Virt-Factory takes over a cobbler server completely, so no knowledge of Cobbler or cobbler commands is required. In fact, you can't run Virt-Factory on your existing cobbler server. Sorry :)  In the future, this may be possible.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
@@ -91,7 +91,7 @@
 <a name="monitoring">
 <dt>What about monitoring?</dt>
 </a>
- <dd>We'll be looking at adding some basic monitoring for our virt needs in a future release, although we're not trying to write any new monitoring frameworks at this point. The first release does not include monitoring, but you are more than welcome to specify monitoring setup in profiles that you deploy.
+ <dd>We'll be looking at adding some basic monitoring for our virt needs in a future release, although we're not trying to write any new monitoring frameworks at this point. The first release does not include monitoring, but you are more than welcome to specify monitoring setup in profiles that you deploy.  Monitoring data will eventually be critical to automated management and reporting and is obviously important -- though we do not want to mandate one single monitoring solution.  For instance, a Nagios shop should be able to write profiles to Virt-Factory that include Nagios setup.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
@@ -99,7 +99,7 @@
 <a name="roadmap">
 <dt>What about the future roadmap?</dt>
 </a>
-<dd>We want to break down the walls that currently control server deployment. We would like to be able to support tagging servers and deploying amongst arbitrary criteria, such that one would be able to say "I want 10 web servers on this network and they can run on any boxes with FOO and BAR capabilities". We also want to be more aware of storage configurations and support migrations. Eventually this can lead to more automated network policy management and SLA's -- but that's a ways off. There's lots of info on the Wiki here: <a href="http://et.redhat.com/page/VF_Roadmap">Roadmap</a>.
+<dd>We want to break down the walls that currently control server deployment. We would like to be able to support tagging servers and deploying amongst arbitrary criteria, such that one would be able to say "I want 10 web servers on this network and they can run on any boxes with FOO and BAR capabilities". We also want to be more aware of storage configurations and support migrations. Eventually this can lead to more automated network policy management and SLA's -- but that's a ways off. There's lots of info here: <a href="./vf-roadmap.php">Roadmap</a>.
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
@@ -107,7 +107,7 @@
 <a name="profile-build">
 <dt>How do I build profiles (appliances)?</dt>
 </a>
- <dd>Appliances are very simple. They are a tar.gz file in a certain format, with an xml manifest file, and directories for puppet files and manifests. We have documentation on the format (<a href="http://et.redhat.com/page/VF_Profile_Format">VF Profile Format</a>) and installation of downloaded profiles is covered in the install guide. (<a hre="http://et.redhat.com/page/VF_Install_and_Setup_Guide">VF Install and Setup Guide</a>).
+ <dd>Appliances are very simple. They are a tar.gz file in a certain format, with an xml manifest file, and directories for puppet files and manifests. We have documentation on the format (<a href="./vf-profile-format.php">VF Profile Format</a>).
  <br />
  <a href="#questions" class="back-to-top">Back to top</a>
 </dd>
diff --git a/website/faq.php b/website/faq.php
index c7a1528..3f323e7 100755
--- a/website/faq.php
+++ b/website/faq.php
@@ -10,7 +10,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/img/logo-virt-factory.png b/website/img/logo-virt-factory.png
new file mode 100644
index 0000000..ead1224
Binary files /dev/null and b/website/img/logo-virt-factory.png differ
diff --git a/website/index.html b/website/index.html
index 5638630..4a5964c 100644
--- a/website/index.html
+++ b/website/index.html
@@ -9,7 +9,7 @@
 <link rel="alternate" type="application/rss+xml" title="RSS feed" href="??" />
 <link rel="stylesheet" type="text/css" href="/css/print.css" media="print" />
 -->
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory: Large-scale virtualization management</title>
 
 <!--
   <link rel="stylesheet" href="/css/home.css" type="text/css" media="all" />
@@ -80,7 +80,7 @@ div#content p {
 <body>
 
 <h1 id="masthead">
-<a href="/"><img src="img/logo-ump.png" alt="UMP: Update and Management Platform" /></a>
+<a href="/"><img src="img/logo-virt-factory.png" alt="Virt Factory" /></a>
 </h1>
 
 <div id="main">
@@ -95,19 +95,7 @@ div#content p {
 
 <div id="content">
 
-<h2>Introducing the next generation of systems management</h2>
-
-<p>There are many systems management tools out there, including many great free and open source tools. These tools are numerous and disparate, however, making it a complex and time-consuming process to select which tools ot use and how to connect the pieces together.</p>
-
-<p>By introducing a free and open source platform upon which management tools can be built and adhere to, the Update & Management Platform (UMP) will make it simpler for system administrators to choose and implement whichever management tools they desire.</p>
-
-<h2>Free to use, developed openly</h2>
-
-<p>Use UMP freely to get your system update and management tasks done. Get involved with the UMP developers or become an UMP developer in UMP's open development community to get your system update and management tasks done <strong>better</strong>.</p>
-
-<p>Your feedback is valuable to us. Let us know which UMP features are most valuable to you, which ones are not, and which ones you'd like to see. Become an UMP developer and help us reach our vision. Either way, we'd love to hear from you.</p>
-
-</div>
+<!-- FIXME: use php include to avoid dual maintaince of this section -->
 
 </div>
 
diff --git a/website/index.php b/website/index.php
index f3d34d5..36deef1 100755
--- a/website/index.php
+++ b/website/index.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
diff --git a/website/news.php b/website/news.php
index f44d24f..92b6498 100755
--- a/website/news.php
+++ b/website/news.php
@@ -10,7 +10,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
@@ -36,7 +36,7 @@
 
 require_once('magpierss/rss_fetch.inc');
 
-$url = 'http://umpdevel.wordpress.com/feed/';
+$url = 'http://virtfactory.wordpress.com/feed/';
 $rss = fetch_rss($url);
 
 	foreach ($rss->items as $item) {
diff --git a/website/top.html b/website/top.html
index ec7aae8..26f80b1 100644
--- a/website/top.html
+++ b/website/top.html
@@ -1,3 +1,3 @@
 <h1 id="masthead">
-<a href="index.php"><img src="img/logo-ump.png" alt="UMP: Update and Management Platform" /></a>
+<a href="index.php"><img src="img/logo-virt-factory.png" alt="Virt-Factory" /></a>
 </h1>
diff --git a/website/ump-install-setup.php b/website/ump-install-setup.php
deleted file mode 100755
index 99d6456..0000000
--- a/website/ump-install-setup.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>UMP: Update and Management Platform</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/ump-install-setup.html"); 
-?>
-
-</div>
-</div>
-<div id="footer">
-<?php 
-  include("footer.html"); 
-?>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/documentation.php b/website/vf-install-setup.php
similarity index 89%
copy from website/documentation.php
copy to website/vf-install-setup.php
index 63ba719..6a6638c 100755
--- a/website/documentation.php
+++ b/website/vf-install-setup.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
@@ -29,7 +29,7 @@
 
 <div id="content">
 <?php 
-  include("documentation.html"); 
+  include("docs/vf-install-setup.html"); 
 ?>
 
 </div>
diff --git a/website/documentation.php b/website/vf-profile-format.php
similarity index 89%
copy from website/documentation.php
copy to website/vf-profile-format.php
index 63ba719..2be1580 100755
--- a/website/documentation.php
+++ b/website/vf-profile-format.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
@@ -29,7 +29,7 @@
 
 <div id="content">
 <?php 
-  include("documentation.html"); 
+  include("docs/vf-profile-format.html"); 
 ?>
 
 </div>
diff --git a/website/documentation.php b/website/vf-roadmap.php
similarity index 89%
copy from website/documentation.php
copy to website/vf-roadmap.php
index 63ba719..1d0d6bf 100755
--- a/website/documentation.php
+++ b/website/vf-roadmap.php
@@ -9,7 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="description" content="" />
 <meta name="keywords" content="" />
-<title>UMP: Update and Management Platform</title>
+<title>Virt-Factory</title>
 
   <link rel="stylesheet" href="css/style.css" type="text/css" media="all" />
 </head>
@@ -29,7 +29,7 @@
 
 <div id="content">
 <?php 
-  include("documentation.html"); 
+  include("docs/vf-roadmap.html"); 
 ?>
 
 </div>

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  a73cf14b21cb9b23ea5ef1791d75acd8469f1753 \
  9228f64f320f1ecaa44f2697869921900e56f93c




More information about the Et-mgmt-commits-list mailing list