Cleaned up events section

diff --git a/xen.org/community/xenevents.html b/xen.org/community/xenevents.html
index f01d3837700aa888dffadfe5236502b1bb983707..118651eab18ce9b046d5013a21286460f4366cc1 100644 (file)
--- a/xen.org/community/xenevents.html
+++ b/xen.org/community/xenevents.html
@@ -50,6 +50,7 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
       <tr valign="top">
         <td width="48%">
          <!-- left column -->
+         <!--
             <h2>Upcoming Events</h2>
             <h3>Xen Day Barcelona 2012, November 8 @ LinuxCon Europe</h3>
            <img src="/images/logos/XenDayBarcelona2012.png" width="400px" />
@@ -58,6 +59,7 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
            Xen Day: this is your chance to ask them questions that you always wanted to ask.
             To attend Xen Day, you do not need to register for LinuxCon. As spaces are limited, we do ask you to register
             for the Xen Day.</p>
+    -->
           <!-- 
             <h2>Xen.org Events</h2>
            <a href="/community/xensummit.html"><img src="/images/logos/XS12SD_VSmall.png" width="400px" /></a>
@@ -96,10 +98,12 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
        <td width="4%"></td>
        <td width="48%">
          <!-- right column -->
+         <!--
             <h2>Xen at Industry Events</h2>
              <p>Xen will have a presence at 
              <a href="http://summit.ubuntu.com/">Ubuntu Developer Summit R</a>, Oct 29 - Nov 1, Copenhagen and
              <a href="http://events.linuxfoundation.org/events/linuxcon-europe">LinuxCon Europe</a> (see <a href="http://linuxconeurope2012.sched.org/event/66687a6427e4c16dc3e7982e994875f4?iframe=no&w=900&sidebar=yes&bg=no#.UFHUr67cAww">Virtualization in the Cloud: Featuring Xen and XCP</a>), Nov 5-7, Barcelona.</p>
+       -->
 <!--
            
              <p><b><a href="https://events.linuxfoundation.org/events/cloudopen">CloudOpen 2012</a>, August 29-31, San Diego, Ca</b>. Xen related talks are
@@ -117,7 +121,7 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
            <p><b><a href="http://cloudstack.org/about-cloudstack/cloudstack-events/viewevent/74-build-a-cloud-day-san-francisco.html">Build a Cloud Day - San Francisco</a>, May 10, SF, CA</b>: The Xen team will give an overview of virtualization in the cloud.</p>
 -->
             <h2>Selected XenSummit Presentations</h2>
-           <iframe src="http://www.slideshare.net/slideshow/embed_code/14276068" width="400" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen> </iframe>
+           <iframe src="http://www.slideshare.net/slideshow/embed_code/14123110" width="400" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen> </iframe>
            <iframe src="http://www.slideshare.net/slideshow/embed_code/14167555" width="400" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen> </iframe>
            <iframe src="http://www.slideshare.net/slideshow/embed_code/14167530" width="400" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen> </iframe>
 

diff --git a/xen.org/index.html b/xen.org/index.html
index 7c4b15d76e0e79249e595bfed52dceea22f9bdfb..6a6538dea58ce341f38ab64c4d280bef152f35f1 100644 (file)
--- a/xen.org/index.html
+++ b/xen.org/index.html
@@ -91,7 +91,8 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
         <table width="100%"  border="0" cellspacing="0" cellpadding="0">
          <tr valign="top">
             <td width="47%">
-            <!-- left column --> 
+            <!-- left column -->
+           <!--
             <h2>Upcoming Events</h2>
             <h3>Xen Day Barcelona 2012, November 8 @ LinuxCon Europe</h3>
            <img src="/images/logos/XenDayBarcelona2012.png" width="400px" />
@@ -100,6 +101,7 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
            Xen Day: this is your chance to ask them questions that you always wanted to ask.
             To attend Xen Day, you do not need to register for LinuxCon. As spaces are limited, we do ask you to register
             for the Xen Day.</p>
+            -->
            <!--
                <h2>Upcoming Events</h2>
 
@@ -155,10 +157,12 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
             <td width="47%">
             <!-- right column -->        
          <!-- right column -->
+         <!-- 
              <h2>Xen at Industry Events</h2>
              
              <p>Xen will have a presence at <a href="http://summit.ubuntu.com/">Ubuntu Developer Summit R</a>, Oct 29 - Nov 1, Copenhagen and
              <a href="http://events.linuxfoundation.org/events/linuxcon-europe">LinuxCon Europe</a> (see <a href="http://linuxconeurope2012.sched.org/event/66687a6427e4c16dc3e7982e994875f4?iframe=no&w=900&sidebar=yes&bg=no#.UFHUr67cAww">Virtualization in the Cloud: Featuring Xen and XCP</a>), Nov 5-7, Barcelona.</p>
+           -->
 <!--         
              <p><b><a href="http://summit.ubuntu.com/uds-q/">Ubuntu Developer Summit - Q</a>, May 7-11, Oakland, CA</b>: The Xen and XCP teams will be participating in the Ubuntu Developer Summit in Oakland, CA.
              Come and see us in <b>Grand Ballroom B</b> to discuss <a href="http://summit.ubuntu.com/uds-q/meeting/20367/servercloud-q-xcp/">XCP Toolstack Improvements</a> in future Ubuntu releases.