1 |
tove 10/08/29 12:14:30 |
2 |
|
3 |
Modified: index.xml |
4 |
Log: |
5 |
Add OpenRheinRuhr to upcoming events and FrOSCon and Ottawa Linux Symposium to past events |
6 |
|
7 |
Revision Changes Path |
8 |
1.81 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.81&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/pr/events/index.xml?rev=1.81&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/pr/events/index.xml?r1=1.80&r2=1.81 |
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.80 |
18 |
retrieving revision 1.81 |
19 |
diff -u -r1.80 -r1.81 |
20 |
--- index.xml 2 Jul 2010 14:34:25 -0000 1.80 |
21 |
+++ index.xml 29 Aug 2010 12:14:30 -0000 1.81 |
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.80 2010/07/02 14:34:25 sping Exp $ --> |
25 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/pr/events/index.xml,v 1.81 2010/08/29 12:14:30 tove 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 |
@@ -7,7 +7,7 @@ |
30 |
<project> |
31 |
<name>events</name> |
32 |
<longname>Gentoo Events</longname> |
33 |
-<date>2010-06-29</date> |
34 |
+<date>2010-08-29</date> |
35 |
|
36 |
<author title="Author"> |
37 |
<mail link="wolf31o2@g.o">Chris Gianelloni</mail> |
38 |
@@ -79,19 +79,11 @@ |
39 |
</tr> |
40 |
|
41 |
<tr> |
42 |
-<ti>Ottawa Linux Symposium</ti> |
43 |
-<ti>Canada, ON, Ottawa, Ottawa Westin Hotel</ti> |
44 |
-<ti>2010-06-13 .. 2010-06-16</ti> |
45 |
-<ti><mail>robbat2</mail></ti> |
46 |
-<ti><uri link="http://en.wikipedia.org/wiki/Birds_of_a_Feather_%28computing%29">BoF</uri> session entitled <uri link="http://www.linuxsymposium.org/2010/view_abstract.php?content_key=75">"State of Gentoo"</uri></ti> |
47 |
-</tr> |
48 |
- |
49 |
-<tr> |
50 |
-<ti>FrOSCon</ti> |
51 |
-<ti>Germany, St. Augustin (nearby Bonn)</ti> |
52 |
-<ti>2010-08-21 .. 2010-08-22</ti> |
53 |
-<ti><mail>sping</mail></ti> |
54 |
-<ti><uri link="https://www.gentoo-ev.org/wiki/Events:FrOSCon_2010">Join us!</uri></ti> |
55 |
+<ti>OpenRheinRuhr 2010</ti> |
56 |
+<ti>Germany, Oberhausen</ti> |
57 |
+<ti>2010-11-13 .. 2010-11-14</ti> |
58 |
+<ti><mail>tove</mail></ti> |
59 |
+<ti><uri link="https://www.gentoo-ev.org/wiki/Events:OpenRheinRuhr_2010">Join us!</uri></ti> |
60 |
</tr> |
61 |
|
62 |
</table> |
63 |
@@ -115,6 +107,22 @@ |
64 |
</tr> |
65 |
|
66 |
<tr> |
67 |
+<ti>FrOSCon</ti> |
68 |
+<ti>Germany, St. Augustin (nearby Bonn)</ti> |
69 |
+<ti>2010-08-21 .. 2010-08-22</ti> |
70 |
+<ti><mail>sping</mail></ti> |
71 |
+<ti>See the <uri link="https://www.gentoo-ev.org/wiki/Events:FrOSCon_2010">Wiki</uri> for more details.</ti> |
72 |
+</tr> |
73 |
+ |
74 |
+<tr> |
75 |
+<ti>Ottawa Linux Symposium</ti> |
76 |
+<ti>Canada, ON, Ottawa, Ottawa Westin Hotel</ti> |
77 |
+<ti>2010-06-13 .. 2010-06-16</ti> |
78 |
+<ti><mail>robbat2</mail></ti> |
79 |
+<ti><uri link="http://en.wikipedia.org/wiki/Birds_of_a_Feather_%28computing%29">BoF</uri> session entitled <uri link="http://www.linuxsymposium.org/2010/view_abstract.php?content_key=75">"State of Gentoo"</uri></ti> |
80 |
+</tr> |
81 |
+ |
82 |
+<tr> |
83 |
<ti>LinuxTag</ti> |
84 |
<ti>Germany, Berlin</ti> |
85 |
<ti>2010-06-09 .. 2010-06-12</ti> |
86 |
@@ -328,7 +336,7 @@ |
87 |
<ti>FrOSCon</ti> |
88 |
<ti>Germany, St. Augustin</ti> |
89 |
<ti>2007-08-25 .. 2007-08-26</ti> |
90 |
-<ti><mail link="tove@g.o">torsten Veller</mail></ti> |
91 |
+<ti><mail>tove</mail></ti> |
92 |
</tr> |
93 |
|
94 |
<tr> |