[Debconf6-data-commit] r563 - in website/www: . about about/faq
about/sponsorship about/talks venue/travel
Neil McGovern
neilm at costa.debian.org
Thu Apr 20 10:34:53 UTC 2006
Author: neilm
Date: 2006-04-20 10:34:50 +0000 (Thu, 20 Apr 2006)
New Revision: 563
Modified:
website/www/about/accommodation.html
website/www/about/faq/index.html
website/www/about/faq/menubar.html
website/www/about/menubar.html
website/www/about/sponsorship/index.html
website/www/about/sponsorship/menubar.html
website/www/about/talks/menubar.html
website/www/index.html
website/www/venue/travel/tips.html
Log:
Added moray's patches
Modified: website/www/about/accommodation.html
===================================================================
--- website/www/about/accommodation.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/accommodation.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -1,4 +1,10 @@
<h1>Accommodation</h1>
+
+If you do not have sponsored accommodation for the conference, please
+make your own booking directly with a hotel, or contact <a
+href="reservations at debconf.org">reservations at debconf.org</a> for help
+making a booking.
+
<h2>Vacational Center IMSS Oaxtepec</h2>
<br/>
@@ -9,8 +15,9 @@
inside the Vacational Center IMSS Oaxtepec. Each hotel's capacity is 188
beds in 20 four-bed rooms (2 single beds and 2 bunk beds) and 18
six-bed (2 bunk beds and 2 single beds); each room is equipped with
-bathroom, televisor, phone, a table, a small refrigerator. Also, each hotel has a small
-kitchen and dining room.</p>
+bathroom, televisor, phone, a table, a small refrigerator.
+Bedding and towels will be provided.
+Each hotel has a small kitchen and dining room.</p>
<p><a
href="http://media.debconf.org/dc6/images/oaxtepec/hotels_floorplan-en.png"
Modified: website/www/about/faq/index.html
===================================================================
--- website/www/about/faq/index.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/faq/index.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -10,7 +10,8 @@
DebConf is a free (as in free beer) event, the organization makes its best to
provide the most enjoyable environment and means for the attendees to be
-comfortable.
+comfortable. We will provide sponsored accommodation and meals to registered
+attendees.
<h2>What is DebianDay?</h2>
Modified: website/www/about/faq/menubar.html
===================================================================
--- website/www/about/faq/menubar.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/faq/menubar.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -8,7 +8,7 @@
<ul id="bottommenu">
<li><a href="/about/" title="About Debconf">Introduction</a></li>
<li><a href="/about/talks/" title="Talks/BOFs information">Talks/BOFs</a></li>
- <li>Schedule</li>
+ <li><a href="/about/schedule/">Schedule</a></li>
<li>Donate</li>
<li><a href="/about/sponsorship/" title="Information about Sponsorship">Sponsorship</a></li>
<li id="bottomactive">FAQ</li>
Modified: website/www/about/menubar.html
===================================================================
--- website/www/about/menubar.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/menubar.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -8,7 +8,7 @@
<ul id="bottommenu">
<li id="bottomactive">Introduction</li>
<li><a href="/about/talks/" title="Talks/BOFs information">Talks/BOFs</a></li>
- <li>Schedule</li>
+ <li><a href="/about/schedule/">Schedule</a></li>
<li>Donate</li>
<li><a href="accommodation.html" title="About accommodation">Accommodation</a></li>
<li><a href="/about/sponsorship/" title="Information about Sponsorship">Sponsorship</a></li>
Modified: website/www/about/sponsorship/index.html
===================================================================
--- website/www/about/sponsorship/index.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/sponsorship/index.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -1,5 +1,7 @@
<h1>Sponsorship</h1>
+<b>The sponsorship process is now closed.</b>
+
To be able to plan and budget for this we ask people who need travel support to
tell us as early as possible. This is done so that we might take advance of
the cheaper flight prices and special offers that can be found.
Modified: website/www/about/sponsorship/menubar.html
===================================================================
--- website/www/about/sponsorship/menubar.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/sponsorship/menubar.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -8,7 +8,7 @@
<ul id="bottommenu">
<li><a href="/about/" title="About Debconf">Introduction</a></li>
<li><a href="/about/talks/" title="Talks/BOFs information">Talks/BOFs</a></li>
- <li>Schedule</li>
+ <li><a href="/about/schedule/">Schedule</a></li>
<li>Donate</li>
<li id="bottomactive">Sponsorship</li>
<li><a href="/about/faq/" title="Frequent Asked Questions">FAQ</a></li>
Modified: website/www/about/talks/menubar.html
===================================================================
--- website/www/about/talks/menubar.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/about/talks/menubar.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -8,7 +8,7 @@
<ul id="bottommenu">
<li><a href="/about/" title="About Debconf">Introduction</a></li>
<li id="bottomactive">Talks/BOFs</li>
- <li>Schedule</li>
+ <li><a href="/about/schedule/">Schedule</a></li>
<li>Donate</li>
<li><a href="/about/sponsorship/" title="Information about Sponsorship">Sponsorship</a></li>
<li><a href="/about/faq/" title="Frequent Asked Questions">FAQ</a></li>
Modified: website/www/index.html
===================================================================
--- website/www/index.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/index.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -35,16 +35,16 @@
<h2>Timeline</h2>
<table>
-<tr><td>3th of April 2006</td><td>Reconfirmation deadline</td></tr>
-<tr><td>6th of May 2006</td><td>Debcamp starts</td></tr>
-<tr><td>13th of May 2006</td><td>Last day of DebCamp</td></tr>
-<tr><td>13th of May 2006</td><td>Debian Day<!--, programme from HH:MM to HH:MM --></td></tr>
-<tr><td>14th of May 2006</td><td>First conference day<!--, programme from HH:MM to HH:MM --></td></tr>
-<tr><td>17th of May 2006</td><td>Day Trip (no programm)</td></tr>
-<tr><td>18th of May 2006</td><td>formal diner</td></tr>
-<tr><td>19th of May 2006</td><td><a href="http://people.debian.org/~anibal/ksp-dc6/ksp-dc6.html">key signing party</a></td></tr>
-<tr><td>21st of May 2006</td><td>Last conference day<!--, programme from HH:MM to HH:MM--></td></tr>
-<tr><td>22nd of May 2006</td><td>Cleanup day, last chance to check out</td></tr>
+ <tr><td>Monday 3rd of April 2006</td><td>Reconfirmation deadline</td></tr>
+<tr><td>Saturday 6th of May 2006</td><td>Debcamp starts</td></tr>
+<tr><td>Saturday 13th of May 2006</td><td>Last day of DebCamp</td></tr>
+<tr><td>Saturday 13th of May 2006</td><td>Debian Day<!--, programme from HH:MM to HH:MM --></td></tr>
+<tr><td>Sunday 14th of May 2006</td><td>First conference day<!--, programme from HH:MM to HH:MM --></td></tr>
+<tr><td>Wednesday 17th of May 2006</td><td>Day Trip (no programmes)</td></tr>
+<tr><td>Thursday 18th of May 2006</td><td>Conference Formal Dinner</td></tr>
+<tr><td>Friday 19th of May 2006</td><td><a href="http://people.debian.org/~anibal/ksp-dc6/ksp-dc6.html">Key-signing party</a></td></tr>
+<tr><td>Sunday 21st of May 2006</td><td>Last conference day<!--, programme from HH:MM to HH:MM--></td></tr>
+<tr><td>Monday 22nd of May 2006</td><td>Cleanup day, last chance to check out</td></tr>
</table>
If you have further questions about the timeline during the conference, feel
Modified: website/www/venue/travel/tips.html
===================================================================
--- website/www/venue/travel/tips.html 2006-04-20 08:43:57 UTC (rev 562)
+++ website/www/venue/travel/tips.html 2006-04-20 10:34:50 UTC (rev 563)
@@ -8,7 +8,7 @@
will be spot-checked and a green light means a search will not be conducted.
<br />Tourists are allowed to bring in personal effects duty-free. According
to customs regulations, in addition to clothing, personal effects may include a
-camera, video cassette player, personal computer, CD player, 5 DVDs, 20 music
+camera, video cassette player, laptop computer, CD player, 5 DVDs, 20 music
CDs or audio cassettes, 12 rolls of unused film and a cellular phone.
<h2>Electricity</h2>
More information about the Debconf6-data-commit
mailing list