[Debconf6-data-commit] r136 - in website/www: . about/debianday about/faq about/talks

[Alexander Schmehl]

Author: tolimar-guest
Date: 2005-12-22 00:22:15 +0000 (Thu, 22 Dec 2005)
New Revision: 136

Modified:
   website/www/about/debianday/index.html
   website/www/about/faq/index.html
   website/www/about/talks/index.html
   website/www/contact.html
Log:
fixing bugs reported by fabian

Modified: website/www/about/debianday/index.html
===================================================================
--- website/www/about/debianday/index.html	2005-12-21 23:31:37 UTC (rev 135)
+++ website/www/about/debianday/index.html	2005-12-22 00:22:15 UTC (rev 136)
@@ -6,7 +6,8 @@
 
 <h2>Date:</h2>
 
-To be defined.
+DebianDay will take place on<br />
+<b>Saturday, 13rd of May 2006</b>
 
 <h2>Location:</h2>
 
@@ -14,4 +15,4 @@
 
 <h2>Program:</h2>
 
-Program will be available soon.
\ No newline at end of file
+Program will be available soon.

Modified: website/www/about/faq/index.html
===================================================================
--- website/www/about/faq/index.html	2005-12-21 23:31:37 UTC (rev 135)
+++ website/www/about/faq/index.html	2005-12-22 00:22:15 UTC (rev 136)
@@ -12,3 +12,14 @@
 provide the most enjoyable environment and means for the attendees to be
 comfortable.
 
+<h2>What is DebianDay</h2>
+
+DebianDay is a kick off event for DebConf, where Debian represents itself to
+the outside world. It is filled with presentations on topics of general
+interest, for decision makers and for ordinary people who want to learn more
+about Debian and about Free Software.<br />
+
+You can find more information about DebianDay at <a
+href="http://www.debconf.org/about/debianday/">our DebianDay</a> site.  We
+would kindly ask you to register there, if you like to attend DebianDay.
+

Modified: website/www/about/talks/index.html
===================================================================
--- website/www/about/talks/index.html	2005-12-21 23:31:37 UTC (rev 135)
+++ website/www/about/talks/index.html	2005-12-22 00:22:15 UTC (rev 136)
@@ -1,9 +1,29 @@
 <h1>Talks</h1>
 
-This section will contain information about the various talks that are going on. Right now, there haven't been any talks scheduled, as we're waiting receipt of potential candidates. If you want to speak at DebConf 6, please see the...
+This section will contain information about the various talks that are going
+on. Right now, there haven't been any talks scheduled. After our commitee
+reviewed the proposals and accepted, the schedule will be created in some kind
+of election system.<br />
+
+Every attendee will be asked to select those talks he or she would like to
+attend.  Knowing when the attendes will arrive and depart, we will then try to
+minimize conflicts.  Hopefully this will allow all attendees to visit all
+sessions they would like to attend.<br />
+
+Therefore a schedule won't be published soon.
+
+
+
 <h2>Call for Papers</h2>
-Information on how to submit your paper propsal can be found on the <a href='cfp.html' title='Call for Papers information'>Call for Papers</a> page.
 
+Information on how to submit your paper propsal can be found on the <a
+href='cfp.html' title='Call for Papers information'>Call for Papers</a> page.<br />
+
+Note that the deadline to propose talks, round tables and workshops has been
+reached.  You can't propose those any more.  However, you can still register
+<a href="http://www.debconf.org/about/talks/presentation-types.html#bof">BoF sessions</a>.
+
+
 <h2>Presentation Types</h2>
 Information on the different possible presentation types can be found on
 the <a href='presentation-types.html' title='Presentation types'>Presentation Types</a>

Modified: website/www/contact.html
===================================================================
--- website/www/contact.html	2005-12-21 23:31:37 UTC (rev 135)
+++ website/www/contact.html	2005-12-22 00:22:15 UTC (rev 136)
@@ -1,3 +1,12 @@
-<h4>DRAFT</h4>
 <h1>Contacting the team</h1>
-The main email address for contacting the organisers is debconf6-team at lists.debconf.org
+
+The main email address for contacting the organisers is <a
+href="mailto:debconf6-team at lists.debconf.org">debconf6-team at lists.debconf.org</a>.<br />
+
+In urgent cases you can try to reach one the organisers via irc.  Channelname:
+#debconf-team on irc.debian.org (freenode).<br />
+
+The are some mailinglist you might be interested, too.  Please take a look at
+our <a href="http://lists.debconf.org/mailman/listinfo">listinfo</a> page.
+
+