Gentoo Archives: gentoo-commits

From: "Sebastian Pipping (sping)" <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in xml/htdocs/proj/en/pr/events: index.xml
Date: Mon, 28 Jun 2010 17:05:19
Message-Id: 20100628170513.079302C621@corvid.gentoo.org
1 sping 10/06/28 17:05:12
2
3 Modified: index.xml
4 Log:
5 Turn event locations into a proper hierarchy
6
7 Revision Changes Path
8 1.66 xml/htdocs/proj/en/pr/events/index.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/pr/events/index.xml?rev=1.66&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/pr/events/index.xml?rev=1.66&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/pr/events/index.xml?r1=1.65&r2=1.66
13
14 Index: index.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/pr/events/index.xml,v
17 retrieving revision 1.65
18 retrieving revision 1.66
19 diff -u -r1.65 -r1.66
20 --- index.xml 28 Jun 2010 16:52:48 -0000 1.65
21 +++ index.xml 28 Jun 2010 17:05:12 -0000 1.66
22 @@ -1,5 +1,5 @@
23 <?xml version='1.0' encoding="UTF-8"?>
24 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/pr/events/index.xml,v 1.65 2010/06/28 16:52:48 sping Exp $ -->
25 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/pr/events/index.xml,v 1.66 2010/06/28 17:05:12 sping Exp $ -->
26 <?xml-stylesheet href="/xsl/project.xsl" type="text/xsl"?>
27 <?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
28 <!DOCTYPE project SYSTEM "/dtd/project.dtd">
29 @@ -97,56 +97,56 @@
30
31 <tr>
32 <ti>Free and Open Source Software Developers' European Meeting</ti>
33 -<ti>Brussels, Belgium, Europe</ti>
34 +<ti>Belgium, Brussels</ti>
35 <ti>2006-02-25 .. 2006-02-26</ti>
36 <ti><mail link="wolf31o2@g.o">Chris Gianelloni</mail></ti>
37 </tr>
38
39 <tr>
40 <ti>Linux World Conference and Expo</ti>
41 -<ti>Boston, MA, USA</ti>
42 +<ti>USA, MA, Boston</ti>
43 <ti>2006-04-03 .. 2006-04-06</ti>
44 <ti><mail link="dostrow@g.o">Daniel Ostrow</mail></ti>
45 </tr>
46
47 <tr>
48 <ti>Free and Open Source Conference (FrOSCon)</ti>
49 -<ti>Sankt Augustin, Germany</ti>
50 +<ti>Germany, Sankt Augustin</ti>
51 <ti>2006-06-24 .. 2006-06-25</ti>
52 <ti><mail link="sebastian@g.o">Sebastian Bergmann</mail></ti>
53 </tr>
54
55 <tr>
56 <ti>GNOME User and Developer European Conference (GUADEC)</ti>
57 -<ti>Vilanova, Spain</ti>
58 +<ti>Spain, Vilanova</ti>
59 <ti>2006-06-24 .. 2006-06-30</ti>
60 <ti><mail link="dsd@g.o">Daniel Drake</mail></ti>
61 </tr>
62
63 <tr>
64 <ti><uri link="lsm2006-france/index.xml">Libre Software Meeting</uri></ti>
65 -<ti>Nancy, France</ti>
66 +<ti>France, Nancy</ti>
67 <ti>2006-07-04 .. 2006-07-08</ti>
68 <ti><mail link="dams@g.o">Damien Krotkine</mail></ti>
69 </tr>
70
71 <tr>
72 <ti>Gentoo UK Conference</ti>
73 -<ti>London, UK</ti>
74 +<ti>UK, London</ti>
75 <ti>2006-07-08</ti>
76 <ti><mail link="dsd@g.o">Daniel Drake</mail></ti>
77 </tr>
78
79 <tr>
80 <ti>Ottawa Linux Symposium</ti>
81 -<ti>Ottawa, Canada</ti>
82 +<ti>Canada, Ottawa</ti>
83 <ti>2006-07-19 .. 2006-07-22</ti>
84 <ti><mail link="chutzpah@g.o">Patrick McLean</mail></ti>
85 </tr>
86
87 <tr>
88 <ti>Open Source Convention (OSCON)</ti>
89 -<ti>Portland, OR, USA</ti>
90 +<ti>USA, OR, Portland</ti>
91 <ti>2006-07-24 .. 2006-07-28</ti>
92 <ti><mail link="dberkholz@g.o">Donnie Berkholz</mail></ti>
93 </tr>
94 @@ -154,7 +154,7 @@
95 <tr>
96 <ti><uri link="lwe2006-sanfran/index.xml">Linux World Conference and
97 Expo</uri></ti>
98 -<ti>San Fransisco, CA, USA</ti>
99 +<ti>USA, CA, San Fransisco</ti>
100 <ti>2006-08-14 .. 2006-08-17</ti>
101 <ti><mail link="dostrow@g.o">Daniel Ostrow</mail></ti>
102 </tr>
103 @@ -162,14 +162,14 @@
104 <tr>
105 <ti><uri link="jdll2006-france/index.xml">Journées du Logiciel Libre
106 (JDLL)</uri></ti>
107 -<ti>Lyon, France</ti>
108 +<ti>France, Lyon</ti>
109 <ti>2006-10-13 .. 2006-10-14</ti>
110 <ti><mail link="nattfodd@g.o">Alexandre Buisse</mail></ti>
111 </tr>
112
113 <tr>
114 <ti>Linux World Conference and Expo</ti>
115 -<ti>Cologne, Germany</ti>
116 +<ti>Germany, Cologne</ti>
117 <ti>2006-11-14 .. 2006-11-16</ti>
118 <ti><mail link="ian@g.o">Christian Hartmann</mail></ti>
119 </tr>
120 @@ -184,7 +184,7 @@
121
122 <tr>
123 <ti>Southern California Linux Expo (SCALE)</ti>
124 -<ti>Los Angeles, CA, USA</ti>
125 +<ti>USA, CA, Los Angeles</ti>
126 <ti>2007-02-10 .. 2007-02-11</ti>
127 <ti><mail link="christel@g.o">Christel Dahlskjaer</mail></ti>
128 </tr>
129 @@ -192,56 +192,56 @@
130 <tr>
131 <ti><uri link="fosdem2007-belgium">Free and Open Source Software Developers'
132 European Meeting</uri></ti>
133 -<ti>Brussels, Belgium, Europe</ti>
134 +<ti>Belgium, Brussels</ti>
135 <ti>2007-02-24 .. 2007-02-25</ti>
136 <ti><mail link="diox@g.o">Dimitry Bradt</mail></ti>
137 </tr>
138
139 <tr>
140 <ti><uri link="linuxforum2007-denmark">LinuxForum</uri></ti>
141 -<ti>Copenhagen, Denmark, Europe</ti>
142 +<ti>Denmark, Copenhagen</ti>
143 <ti>2007-03-02 .. 2007-03-03</ti>
144 <ti><mail link="eroyf@g.o">Alexander Færøy</mail></ti>
145 </tr>
146
147 <tr>
148 <ti><uri link="clt2007-germany">"Chemnitzer Linuxtage"</uri></ti>
149 -<ti>Chemnitz, Germany, Europe</ti>
150 +<ti>Germany, Chemnitz</ti>
151 <ti>2007-03-03 .. 2007-03-04</ti>
152 <ti><mail link="dertobi123@g.o">Tobias Scherbaum</mail></ti>
153 </tr>
154
155 <tr>
156 <ti><uri link="24hours-france">"Computer Fair and OS meeting"</uri></ti>
157 -<ti>Maubeuge, France, Europe</ti>
158 +<ti>France, Maubeuge</ti>
159 <ti>2007-06-02 .. 2007-06-03</ti>
160 <ti><mail>dimitry</mail></ti>
161 </tr>
162
163 <tr>
164 <ti><uri link="guk07">Gentoo UK 2007</uri></ti>
165 -<ti>London, England, Europe</ti>
166 +<ti>UK, London</ti>
167 <ti>2007-06-14</ti>
168 <ti><mail link="welp@g.o">Peter Weller</mail></ti>
169 </tr>
170
171 <tr>
172 <ti>Linux World Conference and Expo</ti>
173 -<ti>San Fransico, CA</ti>
174 +<ti>USA, CA, San Fransico</ti>
175 <ti>2007-08-06 .. 2007-08-09</ti>
176 <ti><mail link="dostrow@g.o">Daniel Ostrow</mail></ti>
177 </tr>
178
179 <tr>
180 <ti>FOSSCON</ti>
181 -<ti>San Diego, CA, USA</ti>
182 +<ti>USA, CA, San Diego</ti>
183 <ti>2007-08-11 .. 2007-08-12</ti>
184 <ti><mail link="christel@g.o">Christel Dahlskjaer</mail></ti>
185 </tr>
186
187 <tr>
188 <ti>FrOSCon</ti>
189 -<ti>St. Augustin, Germany</ti>
190 +<ti>Germany, St. Augustin</ti>
191 <ti>2007-08-25 .. 2007-08-26</ti>
192 <ti><mail link="tove@g.o">torsten Veller</mail></ti>
193 </tr>
194 @@ -255,28 +255,28 @@
195
196 <tr>
197 <ti><uri link="lca2008-australia">linux.conf.au 2008</uri></ti>
198 -<ti>Melbourne, Victoria, Australia</ti>
199 +<ti>Australia, Victoria, Melbourne</ti>
200 <ti>2008-01-28 .. 2008-02-02</ti>
201 <ti><mail link="mark_alec@g.o">Mark Kowarsky</mail></ti>
202 </tr>
203
204 <tr>
205 <ti>SCALE</ti>
206 -<ti>Los Angelos, California, USA</ti>
207 +<ti>USA, California, Los Angelos</ti>
208 <ti>2008-02-08 .. 2008-02-10</ti>
209 <ti><mail link="omp@g.o">David Shakaryan</mail></ti>
210 </tr>
211
212 <tr>
213 <ti>Florida Linux Show</ti>
214 -<ti>Jacksonville, Florida, USA</ti>
215 +<ti>USA, Florida, Jacksonville</ti>
216 <ti>2008-02-11</ti>
217 <ti><mail link="wltjr@g.o">William Thomson</mail></ti>
218 </tr>
219
220 <tr>
221 <ti>FOSDEM</ti>
222 -<ti>Brussels, Belgium</ti>
223 +<ti>Belgium, Brussels</ti>
224 <ti>2008-02-23 .. 2008-02-24</ti>
225 <ti>
226 <mail link="jokey@g.o">Markus Ullmann</mail>,
227 @@ -286,7 +286,7 @@
228
229 <tr>
230 <ti><uri link="clt2008-germany">Chemnitzer Linuxtage</uri></ti>
231 -<ti>Chemnitz, Germany</ti>
232 +<ti>Germany, Chemnitz</ti>
233 <ti>2008-03-01 .. 2008-03-02</ti>
234 <ti>
235 <mail link="dertobi123@g.o">Tobias Scherbaum</mail>,
236 @@ -296,7 +296,7 @@
237
238 <tr>
239 <ti>OpenExpo</ti>
240 -<ti>Bern, Switzerland</ti>
241 +<ti>Switzerland, Bern</ti>
242 <ti>2008-03-12 .. 2008-03-13</ti>
243 <ti>
244 <mail link="dev-zero@g.o">Tiziano Muller</mail>,
245 @@ -306,7 +306,7 @@
246
247 <tr>
248 <ti>Grazer Linuxtag</ti>
249 -<ti>Graz, Austria, Europe</ti>
250 +<ti>Austria, Graz</ti>
251 <ti>????-04-19</ti>
252 <ti>
253 <mail link="amne@g.o">Wernfried Haas</mail>,
254 @@ -316,14 +316,14 @@
255
256 <tr>
257 <ti>Open Source Expo 08 (talk, no booth)</ti>
258 -<ti>Karlsruhe, Germany</ti>
259 +<ti>Germany, Karlsruhe</ti>
260 <ti>2008-05-25 .. 2008-05-26</ti>
261 <ti><mail link="dertobi123@g.o">Tobias Scherbaum</mail></ti>
262 </tr>
263
264 <tr>
265 <ti>LinuxTag (booth accepted, no talks)</ti>
266 -<ti>Berlin, Germany</ti>
267 +<ti>Germany, Berlin</ti>
268 <ti>2008-05-28 .. 2008-05-31</ti>
269 <ti><mail link="rbu@g.o">Robert Buchholz</mail></ti>
270 </tr>
271 @@ -338,7 +338,7 @@
272
273 <tr>
274 <ti>25c3</ti>
275 -<ti>Berlin, Germany</ti>
276 +<ti>Germany, Berlin</ti>
277 <ti>2008-12-27 .. 2008-12-30</ti>
278 <ti><mail>dertobi123</mail></ti>
279 <ti>No booth or something like that, we'll have a dinner with Gentoo people on 27th, poke <mail>dertobi123</mail>.</ti>
280 @@ -346,7 +346,7 @@
281
282 <tr>
283 <ti>FOSDEM</ti>
284 -<ti>Brussels, Belgium</ti>
285 +<ti>Belgium, Brussels</ti>
286 <ti>2009-02-07 .. 2009-02-08</ti>
287 <ti><mail>dertobi123</mail>, <mail>grobian</mail></ti>
288 <ti>Booth confirmed, see <uri link="http://www.gentoo-ev.org/wiki/Fosdem2009">the Wiki</uri> for more details.</ti>
289 @@ -362,7 +362,7 @@
290
291 <tr>
292 <ti>Chemnitzer Linux-Tage</ti>
293 -<ti>Chemnitz, Germany</ti>
294 +<ti>Germany, Chemnitz</ti>
295 <ti>2009-03-14 .. 2009-03-15</ti>
296 <ti><mail>amne</mail></ti>
297 <ti>Booth confirmed, if you want to help poke <mail>amne</mail> or <mail>dertobi123</mail>.</ti>
298 @@ -370,7 +370,7 @@
299
300 <tr>
301 <ti>OpenExpo Bern</ti>
302 -<ti>Bern, Switzerland</ti>
303 +<ti>Switzerland, Bern</ti>
304 <ti>2009-04-01 .. 2009-04-02</ti>
305 <ti><mail>dev-zero</mail>, <mail>dertobi123</mail></ti>
306 <ti>Booth confirmed</ti>
307 @@ -378,21 +378,21 @@
308
309 <tr>
310 <ti>Grazer Linuxtag</ti>
311 -<ti>Graz, Austria</ti>
312 +<ti>Austria, Graz</ti>
313 <ti>2009-04-25</ti>
314 <ti><mail>amne</mail>, <mail>dertobi123</mail></ti>
315 </tr>
316
317 <tr>
318 <ti>LinuxTag</ti>
319 -<ti>Berlin, Germany</ti>
320 +<ti>Germany, Berlin</ti>
321 <ti>2009-06-24 .. 2009-06-27</ti>
322 <ti><mail>rbu</mail></ti>
323 </tr>
324
325 <tr>
326 <ti>Gentoo Summer Camp Russia</ti>
327 -<ti>Bologye, Russia</ti>
328 +<ti>Russia, Bologye</ti>
329 <ti>????-08-01 .. ????-08-02</ti>
330 <ti>xmpp:gentoo_summer_camp@×××××××××××××××××.ru</ti>
331 <ti><uri link="http://translate.google.ru/translate?u=http%3A%2F%2Fwww.gentoo.ru%2FGentoo_Summer_Camp_2009.html&amp;sl=ru&amp;tl=en&amp;hl=ru&amp;ie=UTF-8">Camp Website</uri></ti>
332 @@ -400,14 +400,14 @@
333
334 <tr>
335 <ti>FroSCon</ti>
336 -<ti>St. Augustin (nearby Bonn), Germany</ti>
337 +<ti>Germany, St. Augustin (nearby Bonn)</ti>
338 <ti>????-08-22 .. ????-08-23</ti>
339 <ti><mail>patrick</mail></ti>
340 </tr>
341
342 <tr>
343 <ti>OpenExpo Zurich/Winterthur</ti>
344 -<ti>Bern, Switzerland</ti>
345 +<ti>Switzerland, Bern</ti>
346 <ti>2009-09-23 .. 2009-09-24</ti>
347 <ti><mail>dev-zero</mail>, <mail>dertobi123</mail></ti>
348 </tr>