Updates before go-live of initial site.

11 files changed, 47 insertions, 36 deletions

diff --git a/website/Makefile b/website/Makefile
index 0c54bc8..4122d82 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -7,6 +7,5 @@ clean:
 	find -name '*~' -delete
 	rm -rf build/*
 
-go-live:
-	@echo "Sorry, we've not written this yet."
-	@exit 1
+go-live: clean all
+	./go-live.sh
diff --git a/website/go-live.sh b/website/go-live.sh
new file mode 100755
index 0000000..2d297ef
--- /dev/null
+++ b/website/go-live.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -
+
+rsync -av --delete --exclude=.\* --exclude=#\* --exclude=\*~ \
+  build/* \
+  et.redhat.com:/var/www/sites/virt-tools.et.redhat.com
diff --git a/website/src/about/index.html b/website/src/about/index.html
index ff1ba35..a27ba42 100644
--- a/website/src/about/index.html
+++ b/website/src/about/index.html
@@ -14,7 +14,7 @@ system administrators.
 
 <p>
 This site provides tutorials, videos, documentation, online help and
-roadmaps to help you understand and get started with the tools.
+roadmaps to help you get started with and understand the tools.
 </p>
 
 <p>
@@ -27,10 +27,10 @@ the best pages from here.
 
 <p>
 This site is open source.  You can clone the sources from
-<a href="https://fedorahosted.org/virt-tools">this git repository</a>
-(in the website subdirectory).  We welcome contributions.
-Please <a href="[% topdir %]/contact/">contact us through the mailing
-list</a>.
+<a href="http://git.fedorahosted.org/git/?p=virt-tools.git">this git
+repository</a> (in the website subdirectory).  We welcome
+contributions.  Please <a href="[% topdir %]/contact/">contact us
+through the mailing list</a>.
 </p>
 
 [% END %]
@@ -149,10 +149,12 @@ can use to detect if your program is running inside a virtual machine." },
 
 <p>
 The main content of this site is copyright &copy; [% year %]
-<a href="http://redhat.com/">Red Hat Inc.</a> and licensed under
-the GNU General Public License, version 2 or (at your option) any
-later version.  Tutorials, videos and other documentation are owned by
-the respective authors.
+<a href="http://redhat.com/">Red Hat Inc.</a> and dual licensed under
+either the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License, version 2 or (at your option) any
+later version</a>, or
+<a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative
+Commons Attribution-Share Alike 3.0 Unported</a>.  Tutorials, videos
+and other documentation are owned by the respective authors.
 </p>
 
 [% END %]
diff --git a/website/src/css/standard.css b/website/src/css/standard.css
index be60b31..a254305 100644
--- a/website/src/css/standard.css
+++ b/website/src/css/standard.css
@@ -102,6 +102,11 @@ p#vtfooter {
     color: #888;
 }
 
+p#vtfooter a {
+    text-decoration: none;
+    color: #888;
+}
+
 /* Permalinks (see templates/h2) */
 
 a.vtpermalink {
diff --git a/website/src/faq/index.html b/website/src/faq/index.html
index 8e994b4..4bae4b8 100644
--- a/website/src/faq/index.html
+++ b/website/src/faq/index.html
@@ -26,9 +26,9 @@ questions = [
     from all the major Linux distros.
   </p>
   <p>
-    Red Hat sponsors some of the developers, Canonical are
-    active in libvirt development, and others projects and
-    people come from the rest of the community.
+    Red Hat sponsors some of the developers, Canonical are active in
+    libvirt development, Novell employees have sent patches, and
+    others projects and people come from the rest of the community.
   </p>
   <p>
     If a tool you need is not available on your distro of choice,
diff --git a/website/src/index.html b/website/src/index.html
index 2f66c7b..2179190 100644
--- a/website/src/index.html
+++ b/website/src/index.html
@@ -9,8 +9,8 @@
 <p id="vtboxout">
 Virt Tools are open source virtualization management tools for Linux
 system administrators.  This site provides tutorials, videos,
-documentation, online help and roadmaps to help you understand and get
-started with the tools.  Our most popular virt tools are virt-manager,
+documentation, online help and roadmaps to help you get started with
+and understand the tools.  Our most popular virt tools are virt-manager,
 virsh, virt-install, virt-v2v, guestfish, virt-p2v, virt-df and
 virt-viewer.  <a href="[% topdir %]/about/">Find out more ...</a>
 </p>
diff --git a/website/src/learning/advanced-virt-df/index.html b/website/src/learning/advanced-virt-df/index.html
index c8840f0..af2789c 100644
--- a/website/src/learning/advanced-virt-df/index.html
+++ b/website/src/learning/advanced-virt-df/index.html
@@ -148,7 +148,7 @@ over approximately one month, generated using OpenOffice Calc
 
 [% WRAPPER h2 h2="Alerts" anchor="alerts" %]
 
-
+XXX
 
 
 
diff --git a/website/src/learning/check-hardware-virt/index.html b/website/src/learning/check-hardware-virt/index.html
index 11160cd..1469729 100644
--- a/website/src/learning/check-hardware-virt/index.html
+++ b/website/src/learning/check-hardware-virt/index.html
@@ -9,17 +9,17 @@
 [% WRAPPER h2 h2="Hardware virtualization technologies" anchor="hvm" %]
 
 <p>
-The first machines to support virtualization were IBM mainframes
-in the 1970s.
-XXXXXXXXXXX BACKGROUND XXXXXXXXXXXX
+The first machines to support virtualization commercially were IBM
+mainframes in the 1970s.  It has taken PCs nearly 40 years to catch
+up.
 </p>
 
 <p>
-Until a few years ago the central processors in server PCs were not
-<a href="http://XXX">virtualizable</a> except by using slow
-emulation or tricks.  However both AMD and Intel have recently
-produced processors which include extra modes and instructions
-that allow full, hardware-accelerated virtualization.
+Until a few years ago the central processors in PCs were not
+<a href="http://en.wikipedia.org/wiki/Popek_and_Goldberg_virtualization_requirements">virtualizable</a>
+except by using slow emulation or tricks.  However both AMD and Intel
+have recently produced processors which include extra modes and
+instructions that allow full, hardware-accelerated virtualization.
 </p>
 
 <p>
@@ -39,7 +39,7 @@ efficient too.
 
 [% END %]
 
-XXX XXX XXX
+XXX
 [%#
 - look up model number on Intel's site
 - dmesg
diff --git a/website/src/learning/start-install-with-virt-manager/index.html b/website/src/learning/start-install-with-virt-manager/index.html
index 29d610c..154c67b 100644
--- a/website/src/learning/start-install-with-virt-manager/index.html
+++ b/website/src/learning/start-install-with-virt-manager/index.html
@@ -29,10 +29,10 @@ Here are some common starting points:
 </p>
 
 <ul>
-<li> XXX FEDORA XXX </li>
-<li> XXX DEBIAN XXX </li>
-<li> XXX UBUNTU XXX </li>
-<li> XXX WINDOWS MSDN XXX </li>
+<li> <a href="http://fedoraproject.org/get-fedora">Get Fedora</a> </li>
+<li> <a href="http://www.debian.org/CD/http-ftp/">Get Debian by HTTP</a> </li>
+<li> <a href="http://www.ubuntu.com/desktop/get-ubuntu/download">Get Ubuntu desktop edition</a> </li>
+<li> <a href="http://msdn.microsoft.com/subscriptions/downloads">MSDN subscriber downloads (Windows)</a> </li>
 </ul>
 
 <p>
diff --git a/website/src/learning/start-list-with-command-line/index.html b/website/src/learning/start-list-with-command-line/index.html
index 3fe5deb..bc2ea5e 100644
--- a/website/src/learning/start-list-with-command-line/index.html
+++ b/website/src/learning/start-list-with-command-line/index.html
@@ -149,8 +149,8 @@ virsh -r -c qemu:///system list --all
 </pre>
 
 <p>
-<a href="http://libvirt.org/">This libvirt documentation describes
-remote connections</a> in detail.
+<a href="http://libvirt.org/remote.html">This libvirt documentation
+describes remote connections</a> in detail.
 </p>
 
 [% END %]
diff --git a/website/templates/page b/website/templates/page
index 93dd573..ec98e14 100644
--- a/website/templates/page
+++ b/website/templates/page
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title>[% title %]</title>
-<meta name="description" content="Virt Tools are open source virtualization management tools for Linux system administrators.  This site provides tutorials, videos, documentation, online help and roadmaps to help you understand and get started with the tools." />
+<meta name="description" content="Virt Tools are open source virtualization management tools for Linux system administrators.  This site provides tutorials, videos, documentation, online help and roadmaps to help you get started with and understand the tools." />
 <meta name="keywords" content="virsh, virt-install, virt-manager, virt-top, virt-df, virt-p2v, virt-v2v, virt-viewer, virt-df, ncftool, augeas, aug-tool, guestfish, guestfs-browser, hivex, libguestfs, virt-what" />
 <link rel="stylesheet" href="[% topdir %]/css/standard.css" type="text/css" title="Standard"/>
 [% IF local_stylesheet %]<link rel="stylesheet" href="style.css" type="text/css" title="Standard"/>[% END %]
@@ -46,8 +46,8 @@ Back to <a href="../">[% section_titles.$section %]</a>.
 [%- END %]
 
 <p id="vtfooter">
-Copyright &copy; [% year %] <a href="http://redhat.com/">Red Hat Inc.</a> &mdash;
-License: GPLv2+ &mdash;
+Copyright &copy; [% year %] <a href="http://redhat.com/">Red Hat, Inc.</a> &mdash;
+License: <a href="[% topdir %]/about/#license">GPL or CC</a> &mdash;
 Last updated on [% printable_date %]
 </p>