One update

svn path=/trunk/; revision=13715
This commit is contained in:
kirschner
2009-12-09 14:11:16 +00:00
parent 6631cdc40a
commit 3e53a798e4
3 changed files with 54 additions and 65 deletions

View File

@@ -1,54 +1,48 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0"?>
<html>
<head>
<title>Reclaim your computer </title>
</head>
<countryset>
<body>
<!--Basic overview -->
<basics>
<h1>Basic overview</h1>
<ul>
<li>Main Local Free Software Organisations:</li>
<!-- Main Local Free Software Organisations: -->
<mainorgs>
<ul>
<li><a href="http://april.org">April</a>, the leading association promoting Free Software.</li>
<li><a href="http://www.aful.org">Aful</a>, French speaking-LUG, in charge of the <a href="http://racketiciel.info">Racketware campaign</a>.</li>
<li><a href="http://www.fdn.fr">French Data Network</a>, associative Internet provider promoting Free Software and Network Neutrality.</li>
</ul>
</mainorgs>
<li>FS events:</li>
<!-- Free Software Events -->
<fsevents>
<ul>
<li><a href="http://www.agendadulibre.org/">The Free Software Agenda</a> aggregates events in France, Belgium and Switzerland.</li>
<li><a href="http://www.rmll.info/">The Free Software World Meetings</a> (Rencontres Mondiales du Logiciel Libre) is an important meetings especially for associations. </li>
<li><a href="http://www.openworldforum.org/">Open World Forum</a> about Business models and innovatons.</li>
<li><a href="http://www.solutionslinux.fr/">Solutions Linux</a> is dedicated to helping companies with Free Software.</li>
</ul>
</fsevents>
<li>Prominent users of Free Software:</li>
<!-- Prominent users of Free Software: -->
<prominentusers>
<ul>
<li><a href="http://www.defense.gouv.fr/gendarmerie/actualite_et_dossiers">Gendarmerie Nationale</a> (Military Police)</li>
<li><a href="http://www.assemblee-nationale.fr/">Assemblée Nationale</a> (Deputees)</li>
<li><a href="http://www.impots.gouv.fr/">The fiscal administration</a></li>
</ul>
</prominentusers>
<li>FS related news:</li>
<!-- FS related news: -->
<fsnews>
<ul>
<li><a href="http://www.framablog.org/index.php">Framablog</a> selects relevant articles (and translations).</li>
<li><a href="https://www.linuxfr.org">LinuxFr</a>, news from the Community.</li>
<li><a href="http://www.toolinux.com">Toolinux</a>, from Linagora.</li>
<li><a href="http://www.ecrans.fr/+-logiciel-libre-+.html">Écrans.fr</a>, from newspaper <em>Libération</em></li>
</ul>
</fsnews>
</ul>
</basics>
</body>
<timestamp>$Date$ $Author$</timestamp>
</html>
<!--
Local Variables: ***
mode: xml ***
End: ***
-->
</countryset>

View File

@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0"?>
<html>
<head>
<title>Basic overview</title>
</head>
<countryset>
<body>
<h1>Basic overview</h1>
<!--Basic overview -->
<basics>
<!-- Main Local Free Software Organisations: -->
<mainorgs>
<ul>
<li>Main Local Free Software Organisations:</li>
<ul>
<li><a href="http://www.linuxverband.de">Linuxverband</a></li>
<li><a href="http://www.ffii.de/">Förderverein für eine Freie Informationelle Infrastruktur e.V.</a></li>
</ul>
</mainorgs>
<!-- Free Software Events -->
<fsevents>
<li>Free Software events:</li>
<ul>
<li><a href="http://www.luga.de/Aktionen/LIT-2010/">Augsburger Linux-Infotag</a></li>
@@ -25,16 +26,20 @@
<li><a href="http://www.linuxtag.org/">Linuxtag (Berlin)</a></li>
<li><a href="http://www.openrheinruhr.de/">Open Rhein Ruhr (Bottrop)</a></li>
</ul>
</fsevents>
<li>Prominent users of Free Software:</li>
<!-- Prominent users of Free Software: -->
<prominentusers>
<ul>
<li><a href="https://www.bsi.bund.de">Federal Office for Information Security (BSI)</a></li>
<li><a href="http://www.auswaertiges-amt.de">Foreign Office</a></li>
<li><a href="http://www.muenchen.de/Rathaus/dir/limux/english/147197/index.html">City of Munich</a></li>
<li><a href="http://www.schwaebischhall.de/index.php?id=2786">City of Schwäbisch Hall</a></li>
</ul>
</prominentusers>
<li>FS related news:</li>
<!-- FS related news: -->
<fsnews>
<ul>
<li><a href="http://www.pro-linux.de">Pro-Linux</a></li>
<li><a href="http://www.linux-magazin.de">Linux Magazin</a></li>
@@ -43,14 +48,8 @@
<li><a href="http://www.heise.de/open/">Heise Open</a></li>
<li><a href="http://www.golem.de/oss/">Golem</a></li>
</ul>
</ul>
</fsnews>
</body>
</basics>
<timestamp>$Date$ $Author$</timestamp>
</html>
<!--
Local Variables: ***
mode: xml ***
End: ***
-->
</countryset>

View File

@@ -1,46 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0"?>
<html>
<head>
<title>Basic overview</title>
</head>
<countryset>
<body>
<!--Basic overview -->
<basics>
<h1>Basic overview</h1>
<ul>
<li>Main Local Free Software Organisations:</li>
<!-- Main Local Free Software Organisations: -->
<mainorgs>
<ul>
<li><a href="http://manchester.fsuk.org">Manchester Free Software</a></li>
<li><a href="http://www.bristolwireless.net/">Bristol Wireless</a></li>
<li><a href="http://www.ukuug.org/">UKUUG</a></li>
</ul>
</mainorgs>
<li>Free Software events:</li>
<!-- Free Software Events -->
<fsevents>
<ul>
<li><a href="http://summer2009.ukuug.org/">UKUUG Summer</a></li>
</ul>
</fsevents>
<li>Prominent users of Free Software:</li>
<!-- Prominent users of Free Software: -->
<prominentusers>
<ul>
<li>?</li>
</ul>
</prominentusers>
<li>FS related news:</li>
<!-- FS related news: -->
<fsnews>
<ul>
<li><a href="http://www.fsdaily.com">FS Daily</a></li>
<li><a href="http://www.freesoftwaremagazine.com">Free Software Magazine</a></li>
<!-- <li><a href="http://www.golem.de/oss/">Golem</a></li> -->
</ul>
<ul>
</fsnews>
</body>
</basics>
<timestamp>$Date$ $Author$</timestamp>
</html>
<!--
Local Variables: ***
mode: xml ***
End: ***
-->
</countryset>