Updated "Upcoming Events"

[Jonathan <jonathan.george@xxxxxxxx>]

https://fedorahosted.org/fedora-websites/ticket/85#comment:2


>From 5b752323301a3d2665df67faa6044f85e82aed54 Mon Sep 17 00:00:00 2001
From: Jonathan George <jonathan.george@xxxxxxxx>
Date: Sat, 8 Sep 2012 01:05:06 -0500
Subject: [PATCH 2/2] Updated upcoming events on Join Fedora page

---
 fedoraproject.org/data/content/join-fedora.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fedoraproject.org/data/content/join-fedora.html b/fedoraproject.org/data/content/join-fedora.html
index 64b29ff..49832b8 100644
--- a/fedoraproject.org/data/content/join-fedora.html
+++ b/fedoraproject.org/data/content/join-fedora.html
@@ -132,17 +132,17 @@ fdd = feedparse('https://lists.fedoraproject.org/rss/devel-announce.xml')
             <div class="grid_5">
                 <h4>${_('Upcoming Events')}</h4>
                 <h5><a href="http://fedoraproject.org/wiki/Events#North_America_.28NA.29";>${_('North American events')}</a></h5>
-		<p>${_('Events include FUDcon Tempe 2011 in Arizona, USA and SXSW Interactive 2011 in Austin, Texas.')}
-		<br /><a href="http://fedoraproject.org/wiki/Events#North_America_.28NA.29";>${Markup(_('View more events &gt;'))}</a></p>  
+		<p>${_('Events include Dallas Software Freedom Day 2012 in Dallas, TX and Ohio Linuxfest 2012 in Columbus, OH')}
+		<br /><a href="http://fedoraproject.org/wiki/Events#FY13_Q3_.28Sept_2012_-_Nov_2012.29";>${Markup(_('View more events &gt;'))}</a></p>  
 		<h5><a href="http://fedoraproject.org/wiki/Events#Central_.26_South_America_.28LATAM.29";>${_('Central &amp; South American events')}</a></h5>
-		<p>${_('Events include Latinoware 2010, Fedora Activity Day Argentina 2010, and Encontro Nordestino de Software Livre.')} 
-		<br /><a href="http://fedoraproject.org/wiki/Events#Central_.26_South_America_.28LATAM.29";>${Markup(_('View more events &gt;'))}</a></p>
+		<p>${_('Events include Free Software for Generation Y in São Paulo, Brazil, and XIII Encuentro Linux in Curico, Chile')} 
+		<br /><a href="http://fedoraproject.org/wiki/Events#FY13_Q3_.28September_2012_-_November_2012.29";>${Markup(_('View more events &gt;'))}</a></p>
 		<h5><a href="http://fedoraproject.org/wiki/Events#Europe.2C_Middle_East.2C_and_Africa_.28EMEA.29";>${_('European, Middle Eastern, &amp; African events')}</a></h5>
-		<p>${_('Events include LinuxALT 2010 in the Czech Republic, OpenRheinRuhr2010 in Germany, and FOSDEM 2011 in Belgium.')} 
-		<br /><a href="http://fedoraproject.org/wiki/Events#Europe.2C_Middle_East.2C_and_Africa_.28EMEA.29";>${Markup(_('View more events &gt;'))}</a></p>
+		<p>${_('Events include SFD Hamburg 2012 in Hamburg, Germany, and Fedora Round Table Hungary 2nd in Hungary, Budapest')} 
+		<br /><a href="http://fedoraproject.org/wiki/Events#FY13_Q3_.28September_2012_-_November_2012.29_2";>${Markup(_('View more events &gt;'))}</a></p>
 		<h5><a href="http://fedoraproject.org/wiki/Events#India.2C_Asia.2C_and_Australia_.28India.2FAPAC.29";>${_('Indian, Asian, &amp; Australian events')}</a></h5>
-		<p>${_('Events include the Fedora 14 Tokyo Release Party and FOSSASIA 2010 in Vietnam.')} 
-		<br /><a href="http://fedoraproject.org/wiki/Events#India.2C_Asia.2C_and_Australia_.28India.2FAPAC.29";>${Markup(_('View more events &gt;'))}</a></p>
+		<p>${_('Events include the Software Freedom Workshop 2012 in Kolkata')} 
+		<br /><a href="http://fedoraproject.org/wiki/Events#FY13_Q3_.28September_2012_-_November_2012.29_3";>${Markup(_('View more events &gt;'))}</a></p>
                 <div class="clear"></div>
             </div>
             <div class="grid_5">
-- 
1.7.11.4

-- 
websites mailing list
websites@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/websites