Made final adjustments before roll-out

diff --git a/xen.org/.htaccess b/xen.org/.htaccess
index c6b5221fb7e47270c7e629e5eee9e7e2a53aabe5..2871028719e40a467ba94a4e33c88142aa9ccffe 100644 (file)
--- a/xen.org/.htaccess
+++ b/xen.org/.htaccess
@@ -1,91 +1,91 @@
-# Redirects to www.xenproject.org
+# Redirect 301s to www.xenproject.org
 
-Redirect /lists-index.html http://www.xenproject.org/help/mailing-list.html
+Redirect 301 /lists-index.html http://www.xenproject.org/help/mailing-list.html
 
-Redirect /products/index.html http://www.xenproject.org/users/why-the-xen-project.html
-Redirect /products/downloads.html http://www.xenproject.org/downloads.html
-Redirect /products/xenhyp.html http://www.xenproject.org/developers/teams/hypervisor.html
-Redirect /products/xen_arm.html http://www.xenproject.org/developers/teams/arm-hypervisor.html
-Redirect /products/cloudxen.html http://www.xenproject.org/developers/teams/xapi.html
+Redirect 301 /products/index.html http://www.xenproject.org/users/why-the-xen-project.html
+Redirect 301 /products/downloads.html http://www.xenproject.org/downloads.html
+Redirect 301 /products/xenhyp.html http://www.xenproject.org/developers/teams/hypervisor.html
+Redirect 301 /products/xen_arm.html http://www.xenproject.org/developers/teams/arm-hypervisor.html
+Redirect 301 /products/cloudxen.html http://www.xenproject.org/developers/teams/xapi.html
 
-Redirect /products/projectgov.html http://www.xenproject.org/governance.html
-Redirect /projects/governance.html http://www.xenproject.org/governance.html
-Redirect /projects/security_vulnerability_process.html http://www.xenproject.org/security-policy.html
-Redirect /projects/trademark.html http://www.xenproject.org/trademark-policy.html
+Redirect 301 /products/projectgov.html http://www.xenproject.org/governance.html
+Redirect 301 /projects/governance.html http://www.xenproject.org/governance.html
+Redirect 301 /projects/security_vulnerability_process.html http://www.xenproject.org/security-policy.html
+Redirect 301 /projects/trademark.html http://www.xenproject.org/trademark-policy.html
 
-Redirect /support/index.html http://www.xenproject.org/help/questions-and-answers.html
-Redirect /support/community.html http://www.xenproject.org/help/questions-and-answers.html
-Redirect /support/documentation.html http://www.xenproject.org/help/documentation.html
-Redirect /support/tutorial.html http://www.xenproject.org/help/presentations-and-videos.html
+Redirect 301 /support/index.html http://www.xenproject.org/help/questions-and-answers.html
+Redirect 301 /support/community.html http://www.xenproject.org/help/questions-and-answers.html
+Redirect 301 /support/documentation.html http://www.xenproject.org/help/documentation.html
+Redirect 301 /support/tutorial.html http://www.xenproject.org/help/presentations-and-videos.html
 
-Redirect /community/index.html http://www.xenproject.org/users/getting-started.html
-Redirect /community/xenevents.html http://www.xenproject.org/about/events.html
-Redirect /community/events/xenhackathondublin2013.html http://xenproject.org/component/content/article/97-event-details/126-xen-hackathon-dublin-2013.html
-Redirect /community/presentations.html http://www.xenproject.org/help/presentations-and-videos.html
-Redirect /community/ecosystem.html http://www.xenproject.org/directory/directory.html
-Redirect /community/xenpapers.html http://www.xenproject.org/directory/directory/research.html
-Redirect /community/vendors/XenProjectsPage.html http://www.xenproject.org/directory/directory/projects.html
-Redirect /community/vendors/XCPProjectsPage.html http://www.xenproject.org/directory/directory/projects.html
-Redirect /community/vendors/Consultants.html http://www.xenproject.org/directory/directory/consulting.html
-Redirect /community/vendors/Consulting.html http://www.xenproject.org/directory/directory/consulting.html
-Redirect /community/vendors/XenProductsPage.html http://www.xenproject.org/directory/directory/products.html
-Redirect /community/vendors/XCPProductsPage.html http://www.xenproject.org/directory/directory/products.html
-Redirect /community/vendors/VirtualPrivateServerProviders.html http://www.xenproject.org/directory/directory/hosting.html
+Redirect 301 /community/index.html http://www.xenproject.org/users/getting-started.html
+Redirect 301 /community/xenevents.html http://www.xenproject.org/about/events.html
+Redirect 301 /community/events/xenhackathondublin2013.html http://xenproject.org/component/content/article/97-event-details/126-xen-hackathon-dublin-2013.html
+Redirect 301 /community/presentations.html http://www.xenproject.org/help/presentations-and-videos.html
+Redirect 301 /community/ecosystem.html http://www.xenproject.org/directory/directory.html
+Redirect 301 /community/xenpapers.html http://www.xenproject.org/directory/directory/research.html
+Redirect 301 /community/vendors/XenProjectsPage.html http://www.xenproject.org/directory/directory/projects.html
+Redirect 301 /community/vendors/XCPProjectsPage.html http://www.xenproject.org/directory/directory/projects.html
+Redirect 301 /community/vendors/Consultants.html http://www.xenproject.org/directory/directory/consulting.html
+Redirect 301 /community/vendors/Consulting.html http://www.xenproject.org/directory/directory/consulting.html
+Redirect 301 /community/vendors/XenProductsPage.html http://www.xenproject.org/directory/directory/products.html
+Redirect 301 /community/vendors/XCPProductsPage.html http://www.xenproject.org/directory/directory/products.html
+Redirect 301 /community/vendors/VirtualPrivateServerProviders.html http://www.xenproject.org/directory/directory/hosting.html
 
-Redirect /community/logos.html http://www.xenproject.org/logos-mascots.html
-Redirect /community/xenhistory.html http://www.xenproject.org/about/history.html
-Redirect /community/irc.html http://www.xenproject.org/help/irc.html
-Redirect /community/jobs.html http://www.xenproject.org/about/jobs.html
+Redirect 301 /community/logos.html http://www.xenproject.org/logos-mascots.html
+Redirect 301 /community/xenhistory.html http://www.xenproject.org/about/history.html
+Redirect 301 /community/irc.html http://www.xenproject.org/help/irc.html
+Redirect 301 /community/jobs.html http://www.xenproject.org/about/jobs.html
 
-Redirect /news/press.html http://www.xenproject.org/about/in-the-news.html
-Redirect /news/2012/10_Xen_Cloud_Platform_1_6_Releases.html http://www.xenproject.org/about/in-the-news/120-xen-cloud-platform-1-6-releases.html
-Redirect /news/2012/09_Xen_4_2_Releases.html  http://www.xenproject.org/about/in-the-news/119-xen-4-2-releases.html
+Redirect 301 /news/press.html http://www.xenproject.org/about/in-the-news.html
+Redirect 301 /news/2012/10_Xen_Cloud_Platform_1_6_Releases.html http://www.xenproject.org/about/in-the-news/120-xen-cloud-platform-1-6-releases.html
+Redirect 301 /news/2012/09_Xen_4_2_Releases.html  http://www.xenproject.org/about/in-the-news/119-xen-4-2-releases.html
 
-Redirect /download/index.html http://www.xenproject.org/downloads
+Redirect 301 /download/index.html http://www.xenproject.org/downloads
 
-Redirect /download/archives.html http://www.xenproject.org/downloads/xen-archives.html
-Redirect /products/xen_archives.html http://www.xenproject.org/downloads/xen-archives.html
-Redirect /download/disclaimer.html http://www.xenproject.org/terms-of-use.html
+Redirect 301 /download/archives.html http://www.xenproject.org/downloads/xen-archives.html
+Redirect 301 /products/xen_archives.html http://www.xenproject.org/downloads/xen-archives.html
+Redirect 301 /download/disclaimer.html http://www.xenproject.org/terms-of-use.html
 
-Redirect /download/index_3.0.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-302.html
-Redirect /download/index_3.0.3.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-303.html
-Redirect /download/index_3.0.4.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-304.html
-Redirect /download/index_3.1.4.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-314.html
-Redirect /download/index_3.1.html   http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-313.html
-Redirect /download/index_3.2.0.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-320.html
-Redirect /download/index_3.2.1.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-321.html
-Redirect /download/index_3.2.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-322.html
-Redirect /download/index_3.2.3.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-323.html
-Redirect /download/index_3.3.0.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-330.html
-Redirect /download/index_3.3.1.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-331.html
-Redirect /download/index_3.3.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-332.html
-Redirect /download/index_3.4.0.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-340.html
-Redirect /download/index_3.4.1.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-341.html
-Redirect /download/index_3.4.2.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-342.html
-Redirect /download/index_3.4.3.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-343.html
-Redirect /download/index_3.4.4.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-344.html
-Redirect /download/index_4.0.0.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-400.html
-Redirect /download/index_4.0.1.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-401.html
-Redirect /download/index_4.0.2.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-402.html
-Redirect /download/index_4.0.3.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-403.html
-Redirect /download/index_4.0.4.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-404.html
-Redirect /download/index_4.1.0.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-410.html
-Redirect /download/index_4.1.1.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-411.html
-Redirect /download/index_4.1.2.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-412.html
-Redirect /download/index_4.1.3.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-413.html
-Redirect /download/index_4.1.4.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-414.html
-Redirect /download/index_4.2.0.html http://www.xenproject.org/downloads/xen-archives/supported-xen-42-series/xen-420.html
-Redirect /download/index_4.2.1.html http://www.xenproject.org/downloads/xen-archives/supported-xen-42-series/xen-421.html
+Redirect 301 /download/index_3.0.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-302.html
+Redirect 301 /download/index_3.0.3.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-303.html
+Redirect 301 /download/index_3.0.4.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-304.html
+Redirect 301 /download/index_3.1.4.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-314.html
+Redirect 301 /download/index_3.1.html   http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-313.html
+Redirect 301 /download/index_3.2.0.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-320.html
+Redirect 301 /download/index_3.2.1.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-321.html
+Redirect 301 /download/index_3.2.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-322.html
+Redirect 301 /download/index_3.2.3.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-323.html
+Redirect 301 /download/index_3.3.0.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-330.html
+Redirect 301 /download/index_3.3.1.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-331.html
+Redirect 301 /download/index_3.3.2.html http://www.xenproject.org/downloads/xen-archives/legacy-xen-series/xen-332.html
+Redirect 301 /download/index_3.4.0.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-340.html
+Redirect 301 /download/index_3.4.1.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-341.html
+Redirect 301 /download/index_3.4.2.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-342.html
+Redirect 301 /download/index_3.4.3.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-343.html
+Redirect 301 /download/index_3.4.4.html http://www.xenproject.org/downloads/xen-archives/community-supported-xen-34-series/xen-344.html
+Redirect 301 /download/index_4.0.0.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-400.html
+Redirect 301 /download/index_4.0.1.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-401.html
+Redirect 301 /download/index_4.0.2.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-402.html
+Redirect 301 /download/index_4.0.3.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-403.html
+Redirect 301 /download/index_4.0.4.html http://www.xenproject.org/downloads/xen-archives/unsupported-xen-40-series/xen-404.html
+Redirect 301 /download/index_4.1.0.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-410.html
+Redirect 301 /download/index_4.1.1.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-411.html
+Redirect 301 /download/index_4.1.2.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-412.html
+Redirect 301 /download/index_4.1.3.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-413.html
+Redirect 301 /download/index_4.1.4.html http://www.xenproject.org/downloads/xen-archives/supported-xen-41-series/xen-414.html
+Redirect 301 /download/index_4.2.0.html http://www.xenproject.org/downloads/xen-archives/supported-xen-42-series/xen-420.html
+Redirect 301 /download/index_4.2.1.html http://www.xenproject.org/downloads/xen-archives/supported-xen-42-series/xen-421.html
 
-Redirect /download/xcp/index.html http://www.xenproject.org/downloads/xen-cloud-platform-archives.html
-Redirect /download/xcp/index_0.5.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-05.html
-Redirect /download/xcp/index_1.0.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-10.html
-Redirect /download/xcp/index_1.1.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-11.html
-Redirect /download/xcp/index_1.5.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-15-beta.html
-Redirect /download/xcp/index_1.6.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-16.html
+Redirect 301 /download/xcp/index.html http://www.xenproject.org/downloads/xen-cloud-platform-archives.html
+Redirect 301 /download/xcp/index_0.5.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-05.html
+Redirect 301 /download/xcp/index_1.0.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-10.html
+Redirect 301 /download/xcp/index_1.1.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-11.html
+Redirect 301 /download/xcp/index_1.5.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-15-beta.html
+Redirect 301 /download/xcp/index_1.6.0.html http://www.xenproject.org/downloads/xen-cloud-platform-archives/xen-cloud-platform-16.html
 
 # Non specific rules (should cover everything that was not previously covered
-Redirect /download http://www.xenproject.org/downloads.html
+Redirect 301 /download http://www.xenproject.org/downloads.html
 
-# Redirects to www-archive.xenproject.org
-Redirect / http://www-archive.xenproject.org/
\ No newline at end of file
+# Redirect 301s to www-archive.xenproject.org
+Redirect 301 / http://www-archive.xenproject.org/
\ No newline at end of file

diff --git a/xen.org/includes/rackspace.html b/xen.org/includes/rackspace.html
index 900957bbc33ad9b21eb53b801bbca3192b541d3f..e68bafa0227ca8352dfed182823b56a53983456d 100644 (file)
--- a/xen.org/includes/rackspace.html
+++ b/xen.org/includes/rackspace.html
@@ -1,11 +1,9 @@
-<table cellpadding="0" align="center" width="915px">
-  <tr><td><hr></td></tr>  
-</table>
+<hr>
 <table cellpadding="0" align="center" width="895px">
   <tr valign="top">
     <td width="70px"><img src="/images/globals/Rackspace_Logo_Small.png" alt="Rackspace"></td>
     <td class="copyright">        
-        <p>Xenproject.org's servers are hosted with <a href="http://www.rackspace.com/">RackSpace</a>, monitoring our<br>
+        <p>Www-archive.xenproject.org is hosted with <a href="http://www.rackspace.com/">RackSpace</a>, monitoring our<br>
            servers 24x7x365 and backed by RackSpace's Fanatical Support&reg;.</p>
     </td>
   </tr>

diff --git a/xen.org/includes/statscode.html b/xen.org/includes/statscode.html
index ef12113c1620d8993ead14a65b03ff0960e42e58..0ef115ee80caac45c84c481bb14651bc5faf41ae 100644 (file)
--- a/xen.org/includes/statscode.html
+++ b/xen.org/includes/statscode.html
@@ -1,12 +1,15 @@
-<!-- Asynchronous tracking code introduced in&nbsp;Q1 2011 -->
+<!-- Asynchronous tracking code for Xen Project -->
 <script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-40152447-1']);
-  _gaq.push(['_trackPageview']);
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-</script>
\ No newline at end of file
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-40152447-1']);
+_gaq.push(['_setDomainName', 'xenproject.org']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+
+</script>