Modified 'Program' section to include CFP.

1 files changed, 5 insertions, 2 deletions

diff --git a/Events/XDC2012.moin b/Events/XDC2012.moin
index fae38413..c0860ab4 100644
--- a/Events/XDC2012.moin
+++ b/Events/XDC2012.moin
@@ -16,7 +16,10 @@ Please join us to celebrate the 25th anniversary of the first [[http://groups.go
 The conference will be held in the main conference room at the SUSE headquarters at [[http://maps.google.de/maps?f=q&source=s_q&hl=de&authuser=0&q=Maxfeldstra%C3%9Fe+5,+Altstadt+und+Engere+Innenstadt+90409+N%C3%BCrnberg,+Bayern&aq=&vps=1&jsv=402e&sll=51.151786,10.415039&sspn=14.100269,34.936523&vpsrc=1&ie=UTF8&oi=georefine&ct=clnk&cd=2&geocode=FT2y8gIdqRupAA&split=0|Maxfeldstrasse 5]]

 

 == Program ==

-If you would like to give a talk during the event, please add it to the [[/Program|program page]].

+There are two ways to submit a presentation for this event:

+ 1. There is a [[http://www.x.org/wiki/Other/Press/CFP2012_supplemental|Call for Papers]]. The deadline for submission is August, 15, 2012.

+ 1. For more informal presentations you may add your talk to the [[/Program|program page]]. The deadline for submission here is September 14, 2012.

+For more information please also check [[http://www.x.org/wiki/Other/Press/CFP2012_supplemental|here]].

 

 == Registration ==

 If you want to attend XDC2012 please add your name to the [[/Attendees|attendees page]]. Additionally please subscribe to the [[http://lists.x.org/mailman/listinfo/events|X.org events mailing list]] where we will post regular updates.

@@ -42,7 +45,7 @@ It is unlikely that you will need any public transportation during the time of t
 == Local Dining ==

 The conference venue is right outside the old city wall, thus in close walking distance from the city center. There are many restaurants close-by as well as towards the city center. Just walk down the street or ask for recommendations on site.

 

-Also check out the [[http://tourismus.nuernberg.de/|Nuernberg Tourist Information]]. 

+Also check out the [[http://tourismus.nuernberg.de/|Nuernberg Tourist Information]].

 

 == Remote Participation ==

 For those who cannot make it to the conference we are planning to record the sessions. We may even have a live stream, also participation via IRC should be available.