move education to /freesoftware

.htaccess

@@ -53,7 +53,7 @@ RewriteRule ^publiccode/?$ https://registration.fsfe.org/Digitale-Verwaltung-202
 
 # Others
 RewriteRule ^standards(.*) /activities/os$1 [R=301,L]
-RewriteRule ^education(.*) /activities/education$1 [R=301,L]
+RewriteRule ^education(.*) /freesoftware/education$1 [R=301,L]
 
 
 # =============================================================================
@@ -127,7 +127,6 @@ RewriteRule ^projects(/.*)?$ /activities/activities.html [R=301,L]
 RewriteRule ^about/basics/?(.*)$ /freesoftware/ [R=301,L]
 RewriteRule ^freesoftware/basics/(comparison|gnuproject)(.*)$ /freesoftware/$1$2 [R=301,L]
 RewriteRule ^freesoftware/basics/legal/?(.*)$ /freesoftware/legal/ [R=301,L]
-RewriteRule ^freesoftware/education/?(.*)$ /activities/education/ [R=301,L]
 RewriteRule ^freesoftware/society/?(.*)$ /freesoftware/democracy.html [R=301,L]
 RewriteRule ^freesoftware/legal/flashingdevices(.*)$ /activities/android/flashingdevices$1 [R=301,L]
 RewriteRule ^freesoftware/public-sector/german-foreign-office-comment(.*)$ https://k7r.eu/buchartikel-freie-software-im-auswartigen-amt-erst-hu-dann-hott/ [R=301,L]
@@ -142,6 +141,11 @@ RewriteRule ^activities/ftf/ngi0(.*)$ /activities/ngi/ [R=301,L]
 # TODO: as soon as a new "work" page is available, update this to the legal section
 RewriteRule ^activities/ftf/?(.*)$ /freesoftware/legal/legal.html [R=301,L]
 
+# /activities
+RewriteRule ^activities/askyourcandidates(.*) /activities/elections/askyourcandidates$1 [R=301,L]
+RewriteRule ^activities/education/tgs(.*) /activities/tgs$1 [R=301,L]
+RewriteRule ^activities/education(.*) /freesoftware/education$1 [R=301,L]
+
 # Campaigns pages
 RewriteRule ^campaigns(/.*)?$ /activities$1 [R=301,L]
 
@@ -163,7 +167,6 @@ RewriteRule ^about/localteams(.*) /contact/contact$1 [R=301,L]
 RewriteRule ^fr/(news|events)\.(..\.)?html /fr/fr.$2html [R=301,L]
 RewriteRule ^activities/wsis/cs-benchmarks\.(.*)$ /activities/wsis/cs-benchmarks-03-11-14.$1 [R=301,L]
 RewriteRule ^contribute/booth(.*) https://wiki.fsfe.org/KnowHow/Groups/OrganizeABooth [R=301,L]
-RewriteRule ^activities/askyourcandidates(.*) /activities/elections/askyourcandidates$1 [R=301,L]
 
 
 # =============================================================================

activities/tgs/activity.en.xml

@@ -12,7 +12,7 @@
       other interesting topics for teachers, students and all software
       freedom advocates.
     </description>
-    <link href="/activities/education/tgs/" />
+    <link href="/activities/tgs/" />
     <order priority="1" />
     <tags>
       <tag key="awareness" />

activities/tgs/tagatschool1.de.xhtml

@@ -328,9 +328,9 @@
        [9] <a href="http://develop.kde.org">Entwickler-Seite von
       KDE: http://develop.kde.org</a><br />
        [10] <a
-      href="/activities/education/tgs/tagatschool1.de.html">Homepage
+      href="/activities/tgs/tagatschool1.de.html">Homepage
       von TUX&amp;GNU@school:
-      https://fsfe.org/activities/education/tgs/tagatschool1.de.html</a><br />
+      https://fsfe.org/activities/tgs/tagatschool1.de.html</a><br />
       </p>
 
       <h4>Über den Autor:</h4>

activities/tgs/tagatschool1.en.xhtml

@@ -303,9 +303,9 @@
        [9] <a href="http://develop.kde.org">Developer page of KDE:
       http://develop.kde.org</a><br />
        [10] <a
-      href="/activities/education/tgs/tgs.en.html">Homepage
+      href="/activities/tgs/tgs.en.html">Homepage
       of TUX&amp;GNU@school:
-      https://fsfe.org/activities/education/tgs/tgs.en.html</a><br />
+      https://fsfe.org/activities/tgs/tgs.en.html</a><br />
       </p>
 
       <h4>About the author:</h4>

activities/tgs/tagatschool1.fr.xhtml

@@ -305,9 +305,9 @@
        [9] <a href="http://develop.kde.org">Site pour les développeurs KDE :
       http://develop.kde.org</a><br />
        [10] <a
-      href="/education/tgs/tgs.fr.html">Page web 
+      href="/activities/tgs/tgs.fr.html">Page web 
       de TUX&amp;GNU@school:
-      https://fsfe.org/education/tgs/tgs.fr.html</a><br />
+      https://fsfe.org/activities/tgs/tgs.fr.html</a><br />
       </p>
 
       <h4>À propos de l'auteur :</h4>

activities/tgs/tagatschool2.de.xhtml

@@ -360,9 +360,9 @@
       online generieren und runterladen:
       www.atreju.ch/1mal1.phtml</a><br />
        [18] <a
-      href="/activities/education/tgs/tgs.de.html">Homepage
+      href="/activities/tgs/tgs.de.html">Homepage
       von TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.de.html</a><br />
+      fsfe.org/activities/tgs/tgs.de.html</a><br />
       </p>
 
       <h4>Über den Autoren:</h4>

activities/tgs/tagatschool2.en.xhtml

@@ -328,9 +328,9 @@
       worksheets generating online and downloading:
       www.atreju.ch/1mal1.phtml</a><br />
        [18] <a
-      href="/activities/education/tgs/tgs.en.html">Homepage
+      href="/activities/tgs/tgs.en.html">Homepage
       of TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.en.html</a><br />
+      fsfe.org/activities/tgs/tgs.en.html</a><br />
       </p>
 
       <h4>About the author:</h4>

activities/tgs/tagatschool2.fr.xhtml

@@ -309,9 +309,9 @@
       de travail à télécharger :
       www.atreju.ch/1mal1.phtml</a><br />
        [18] <a
-      href="/education/tgs/tgs.fr.html">Site web de
+      href="/activities/tgs/tgs.fr.html">Site web de
       TUX&amp;GNU@school :
-      fsfe.org/education/tgs/tgs.fr.html</a><br />
+      fsfe.org/activities/tgs/tgs.fr.html</a><br />
       </p>
 
       <h4>À propos de l'auteur :</h4>

activities/tgs/tagatschool3.de.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - Ausgabe 3</h1>
 
       <p><i>Die Kolumne <a
-      href="/activities/education/tgs/tgs.de.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.de.html">TUX&amp;GNU@school
       [2]</a> berichtet monatlich jeweils über ein Stück freie
       Lernsoftware, eine Homepage zum Thema und eine leicht
       umzusetzende Idee. Diesen Monat geht es um <a
@@ -253,7 +253,7 @@
       Mal darum, einen Text zu formatieren, Gross-Kleinschreibung,
       und die Entfernung von Satzzeichen. Roland Spielhofer
       berichtete mir bereits eine Woche nach Erscheinen von <a
-      href="/activities/education/tgs/tagatschool2.html">TUX&amp;GNU@school
+      href="/activities/tgs/tagatschool2.html">TUX&amp;GNU@school
       2 [22]</a>, dass er den Text4mator in PHP implementiert habe
       und dass dieser nun unter <a
       href="http://zbp.boku.ac.at/schule/">[23]</a> zur Verfügung
@@ -315,9 +315,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Kritik, Fragen,
       Kommentare, Ideen und mehr bitte an: foxman@lugo.ch</a><br />
        [2] <a
-      href="/activities/education/tgs/tgs.de.html">Homepage
+      href="/activities/tgs/tgs.de.html">Homepage
       von TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.de.html</a><br />
+      fsfe.org/activities/tgs/tgs.de.html</a><br />
        [3] <a href="http://edu.kde.org/kgeo">KDE-Edutainment
       Homepage von KGeo: edu.kde.org/kgeo</a><br />
        [4] <a href="http://kgeo.sourceforge.net">Sourceforge.net
@@ -359,8 +359,8 @@
        [21] <a href="http://www.transgaming.com">Homepage von
       TransGaming und WineX: www.transgaming.com</a><br />
        [22] <a
-      href="/activities/education/tgs/tagatschool2.html">TUX&amp;GNU@school
-      - Ausgabe 2: fsfe.org/education/tgs/tagatschool2.html</a><br />
+      href="/activities/tgs/tagatschool2.html">TUX&amp;GNU@school
+      - Ausgabe 2: fsfe.org/activities/tgs/tagatschool2.html</a><br />
        [23] <a href="http://zbp.boku.ac.at/schule/">Text4mator von
       Roland Spielhofer aus Wien: zbp.boku.ac.at/schule</a><br />
       </p>

activities/tgs/tagatschool3.en.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - 3rd edition</h1>
 
       <p><i>Every month the column <a
-      href="/activities/education/tgs/tgs.en.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.en.html">TUX&amp;GNU@school
       [2]</a> reports about free education software, a homepage on
       the topic and an easy to implement idea. This month I talk
       about <a href="http://edu.kde.org/kgeo">KGeo</a>, a free
@@ -219,7 +219,7 @@
       For remembrance: The idea of the last time was to format
       text, to use small and large letters and to erase punctuation
       marks. Already one week after publishing <a
-      href="/activities/education/tgs/tagatschool2.en.html">TUX&amp;GNU@school
+      href="/activities/tgs/tagatschool2.en.html">TUX&amp;GNU@school
       2 [22]</a> Roland Spielhofer told me that he implemented the
       idea in PHP and that it is now available unter <a
       href="http://zbp.boku.ac.at/schule/">[23]</a>. After a query
@@ -274,9 +274,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Criticism, questions,
       comments, ideas and more please to: foxman@lugo.ch</a><br />
        [2] <a
-      href="/activities/education/tgs/tgs.en.html">Homepage
+      href="/activities/tgs/tgs.en.html">Homepage
       of TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.en.html</a><br />
+      fsfe.org/activities/tgs/tgs.en.html</a><br />
        [3] <a href="http://edu.kde.org/kgeo">KDE-Edutainment
       homepage of KGeo: edu.kde.org/kgeo</a><br />
        [4] <a href="http://kgeo.sourceforge.net">Sourceforge.net
@@ -320,9 +320,9 @@
        [21] <a href="http://www.transgaming.com">Homepage of
       TransGaming and WineX: www.transgaming.com</a><br />
        [22] <a
-      href="/activities/education/tgs/tagatschool2.html">TUX&amp;GNU@school
+      href="/activities/tgs/tagatschool2.html">TUX&amp;GNU@school
       - 2nd edition:
-      fsfe.org/education/tgs/tagatschool2.html</a><br />
+      fsfe.org/activities/tgs/tagatschool2.html</a><br />
        [23] <a href="http://zbp.boku.ac.at/schule/">Text4mator of
       Roland Spielhofer from Vienna:
       zbp.boku.ac.at/schule</a><br />

activities/tgs/tagatschool3.fr.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - 3ème édition</h1>
 
       <p><i>Tous les mois, la colonne <a
-      href="/education/tgs/tgs.fr.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.fr.html">TUX&amp;GNU@school
       [2]</a> vous présente un  logiciel éducatif libre, un site web sur le même sujet
       et une idée facile à réaliser. Ce mois-ci, je vais parler de 
 	  <a href="http://edu.kde.org/kgeo">KGeo</a>, un logiciel libre de géométrie pour
@@ -209,7 +209,7 @@
 	  de mettre un texte à un certain format, d'utiliser des petites lettres ou des 
 	  grosses et de supprimer les marques de ponctuation. Une semaine seulement après la 
 	  publication de <a
-      href="/education/tgs/tagatschool2.fr.html">TUX&amp;GNU@school
+      href="/activities/tgs/tagatschool2.fr.html">TUX&amp;GNU@school
       2 [22]</a> Roland Spielhofer m'a dit qu'il avait développé l'idée en
       PHP et qu'elle est maintenant disponible à <a
       href="http://zbp.boku.ac.at/schule/">[23]</a>. Après lui avoir posé des
@@ -262,9 +262,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Veuillez envoyer vos critiques, questions,
       commentaires, idées et plus à&#160;: foxman@lugo.ch</a><br />
        [2] <a
-      href="/education/tgs/tgs.fr.html">Site web de
+      href="/activities/tgs/tgs.fr.html">Site web de
       TUX&amp;GNU@school&#160;:
-      fsfe.org/education/tgs/tgs.fr.html</a><br />
+      fsfe.org/activities/tgs/tgs.fr.html</a><br />
        [3] <a href="http://edu.kde.org/kgeo">Page web de KGeo dans 
 			KDE-Éducation&#160;: edu.kde.org/kgeo</a><br />
        [4] <a href="http://kgeo.sourceforge.net">Page web de KGeo à Sourceforge.net&#160;: 
@@ -308,9 +308,9 @@
        [21] <a href="http://www.transgaming.com">Site web de
       TransGaming et WineX&#160;: www.transgaming.com</a><br />
        [22] <a
-      href="/education/tgs/tagatschool2.fr.html">TUX&amp;GNU@school
+      href="/activities/tgs/tagatschool2.fr.html">TUX&amp;GNU@school
       - 2ème édition&#160;:
-      fsfe.org/education/tgs/tagatschool2.fr.html</a><br />
+      fsfe.org/activities/tgs/tagatschool2.fr.html</a><br />
        [23] <a href="http://zbp.boku.ac.at/schule/">Text4mator de
       Roland Spielhofer de Vienne&#160;:
       zbp.boku.ac.at/schule</a><br />

activities/tgs/tagatschool4.de.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - Ausgabe 4</h1>
 
       <p><i>Die Kolumne <a
-      href="/activities/education/tgs/tgs.de.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.de.html">TUX&amp;GNU@school
       [2]</a> berichtet monatlich jeweils über ein Stück freie
       Lernsoftware, eine Homepage zum Thema und eine leicht
       umzusetzende Idee. Diesen Monat geht es um <a
@@ -346,24 +346,24 @@
       <ul>
         <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 -
         Schreibmaschinenkurs unter KDE 3.0.3 (<a
-        href="/activities/education/tgs/tagatschool1.de.html">TGS
+        href="/activities/tgs/tagatschool1.de.html">TGS
         1</a>)</li>
 
         <li><a href="http://www.ofset.org/gcompris">GCompris</a>
         1.1.0 - Lernsoftplattform mit verschiedensten Boards (<a
-        href="/activities/education/tgs/tagatschool2.de.html">TGS
+        href="/activities/tgs/tagatschool2.de.html">TGS
         2</a>)</li>
 
         <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
         Geometrieprogramm unter KDE 3.0.3 (<a
-        href="/activities/education/tgs/tagatschool3.de.html">TGS
+        href="/activities/tgs/tagatschool3.de.html">TGS
         3</a>)</li>
 
         <li><a
         href="http://bioinformatics.org/ghemical/">Ghemical</a>
         0.90 - Chemieprogramm zur Modellierung und Berechnung von
         Molekülen (<a
-        href="/activities/education/tgs/tagatschool4.de.html">TGS
+        href="/activities/tgs/tagatschool4.de.html">TGS
         4</a>)</li>
       </ul>
       <br />
@@ -377,9 +377,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Kritik, Fragen,
       Kommentare, Ideen und mehr bitte an: foxman@lugo.ch</a><br />
        [2] <a
-      href="/activities/education/tgs/tgs.de.html">Homepage
+      href="/activities/tgs/tgs.de.html">Homepage
       von TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.de.html</a><br />
+      fsfe.org/activities/tgs/tgs.de.html</a><br />
        [3] <a href="http://bioinformatics.org/ghemical/">Homepage
       von Ghemical: bioinformatics.org/ghemical/</a><br />
        [4] <a href="http://www.seul.org/edu">Homepage von SEUL/edu:

activities/tgs/tagatschool4.en.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - 4th edition</h1>
 
       <p><i>Every month the column <a
-      href="/activities/education/tgs/tgs.en.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.en.html">TUX&amp;GNU@school
       [2]</a> reports about free software, a homepage on the topic
       and an easy to implement idea. This month I talk about <a
       href="http://bioinformatics.org/ghemical/">Ghemical [3]</a>,
@@ -340,24 +340,24 @@
       <ul>
         <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 -
         Type writing course under KDE 3.0.3 (<a
-        href="/activities/education/tgs/tagatschool1.en.html">TGS
+        href="/activities/tgs/tagatschool1.en.html">TGS
         1</a>)</li>
 
         <li><a href="http://www.ofset.org/gcompris">GCompris</a>
         1.1.0 - Education plattform with different boards (<a
-        href="/activities/education/tgs/tagatschool2.en.html">TGS
+        href="/activities/tgs/tagatschool2.en.html">TGS
         2</a>)</li>
 
         <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
         Geometry program under KDE 3.0.3 (<a
-        href="/activities/education/tgs/tagatschool3.en.html">TGS
+        href="/activities/tgs/tagatschool3.en.html">TGS
         3</a>)</li>
 
         <li><a
         href="http://bioinformatics.org/ghemical/">Ghemical</a>
         0.90 - Chemistry program for modelling and computing
         molecules (<a
-        href="/activities/education/tgs/tagatschool4.en.html">TGS
+        href="/activities/tgs/tagatschool4.en.html">TGS
         4</a>)</li>
       </ul>
       <br />
@@ -371,9 +371,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Criticism, questions,
       comments, ideas and more please to: foxman@lugo.ch</a><br />
        [2] <a
-      href="/activities/education/tgs/tgs.en.html">Homepage
+      href="/activities/tgs/tgs.en.html">Homepage
       of TUX&amp;GNU@school:
-      fsfe.org/education/tgs/tgs.en.html</a><br />
+      fsfe.org/activities/tgs/tgs.en.html</a><br />
        [3] <a href="http://bioinformatics.org/ghemical/">Homepage
       of Ghemical: bioinformatics.org/ghemical/</a><br />
        [4] <a href="http://www.seul.org/edu">Homepage of SEUL/edu:

activities/tgs/tagatschool4.fr.xhtml

@@ -12,7 +12,7 @@
       <h1>TUX&amp;GNU@school - 4ème édition</h1>
 
       <p><i>Tous les mois, la colonne <a
-      href="/education/tgs/tgs.fr.html">TUX&amp;GNU@school
+      href="/activities/tgs/tgs.fr.html">TUX&amp;GNU@school
       [2]</a> vous présente des logiciels éducatifs libres, un site web sur le même sujet
       et une idée facile à réaliser. Ce mois-ci, je vais vous parler de <a
       href="http://bioinformatics.org/ghemical/">Ghemical [3]</a>,
@@ -327,24 +327,24 @@
       <ul>
         <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 -
         Apprentissage de la frappe au clavier sous KDE 3.0.3 (<a
-        href="/education/tgs/tagatschool1.en.html">TGS
+        href="/activities/tgs/tagatschool1.en.html">TGS
         1</a>)</li>
 
         <li><a href="http://www.ofset.org/gcompris">GCompris</a>
         1.1.0 - Plate-forme éducative avec différents tableaux (<a
-        href="/education/tgs/tagatschool2.en.html">TGS
+        href="/activities/tgs/tagatschool2.en.html">TGS
         2</a>)</li>
 
         <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
         Programme de géométrie sous KDE 3.0.3 (<a
-        href="/education/tgs/tagatschool3.en.html">TGS
+        href="/activities/tgs/tagatschool3.en.html">TGS
         3</a>)</li>
 
         <li><a
         href="http://bioinformatics.org/ghemical/">Ghemical</a>
         0.90 - Programme de chimie pour créer et faire des calculs sur des 
         molécules (<a
-        href="/education/tgs/tagatschool4.en.html">TGS
+        href="/activities/tgs/tagatschool4.en.html">TGS
         4</a>)</li>
       </ul>
       <br />
@@ -358,9 +358,9 @@
       <p>[1] <a href="mailto:foxman@lugo.ch">Veuillez envoyer vos critiques, questions,
       commentaires, idées et plus à&#160;: foxman@lugo.ch</a><br />
        [2] <a
-      href="/education/tgs/tgs.fr.html">Site web
+      href="/activities/tgs/tgs.fr.html">Site web
       de TUX&amp;GNU@school&#160;:
-      fsfe.org/education/tgs/tgs.fr.html</a><br />
+      fsfe.org/activities/tgs/tgs.fr.html</a><br />
        [3] <a href="http://bioinformatics.org/ghemical/">Site web
       de Ghemical&#160;: bioinformatics.org/ghemical/</a><br />
        [4] <a href="http://www.seul.org/edu">Site web de SEUL/edu&#160;:

activities/tgs/tagatschool5.de.xhtml

@@ -12,7 +12,7 @@
     <h1>TUX&amp;GNU@school - Ausgabe 5</h1>
 
     <p><i>Die Kolumne <a
-    href="/activities/education/tgs/tgs.de.html">TUX&amp;GNU@school
+    href="/activities/tgs/tgs.de.html">TUX&amp;GNU@school
     [2]</a> berichtet monatlich jeweils über ein Stück freie
     Lernsoftware, eine Homepage zum Thema und eine leicht
     umzusetzende Idee. Diesen Monat geht es um <a
@@ -30,13 +30,13 @@
     TUX&amp;GNU@school fortan in mehreren Sprachen erscheinen,
     zuerst allerdings mal in Englisch und Deutsch. Es sind
     ebenfalls schon alle früheren Versionen in Englisch verfügbar
-    (<a href="/activities/education/tgs/tagatschool1.en.html">TGS
+    (<a href="/activities/tgs/tagatschool1.en.html">TGS
     1 [7]</a>, <a
-    href="/activities/education/tgs/tagatschool2.en.html">TGS 2
+    href="/activities/tgs/tagatschool2.en.html">TGS 2
     [8]</a>, <a
-    href="/activities/education/tgs/tagatschool3.en.html">TGS 3
+    href="/activities/tgs/tagatschool3.en.html">TGS 3
     [9]</a> und <a
-    href="/activities/education/tgs/tagatschool4.en.html">TGS 4
+    href="/activities/tgs/tagatschool4.en.html">TGS 4
     [10]</a>). Falls also noch jemand, der oder die eine ältere
     Ausgabe liest, Lust hat, eine Idee zu implementieren, nur zu.
     An dieser Stelle recht herzlichen Dank für die Unterstützung
@@ -219,7 +219,7 @@
     es bei Freier Software üblich ist, kooperiert auch Debian Jr.
     mit verwandten Projekten, wie z.B. dem letztmals vorgestellten
     <a
-    href="/activities/education/tgs/tagatschool4.de.html">[24]</a>
+    href="/activities/tgs/tagatschool4.de.html">[24]</a>
     <a href="http://www.seul.org/edu">SEUL/edu [25]</a>. Was gerade
     auch für die jungen Debian-Benutzer besonders wichtig scheint,
     ist die Anpassung an deren Muttersprache. Auch dies ist ein
@@ -392,29 +392,29 @@
     <ul>
       <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 -
       Schreibmaschinenkurs unter KDE 3.0.5 (<a
-      href="/activities/education/tgs/tagatschool1.html">TGS
+      href="/activities/tgs/tagatschool1.html">TGS
       1</a>)</li>
 
       <li><a href="http://www.ofset.org/gcompris">GCompris</a>
       1.2.1 - Lernsoftplattform mit verschiedensten Boards (<a
-      href="/activities/education/tgs/tagatschool2.html">TGS
+      href="/activities/tgs/tagatschool2.html">TGS
       2</a>)</li>
 
       <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
       Geometrieprogramm unter KDE 3.0.5 (<a
-      href="/activities/education/tgs/tagatschool3.de.html">TGS
+      href="/activities/tgs/tagatschool3.de.html">TGS
       3</a>)</li>
 
       <li><a
       href="http://bioinformatics.org/ghemical/">Ghemical</a> 1.0 -
       Chemieprogramm zur Modellierung und Berechnung von Molekülen
       (<a
-      href="/activities/education/tgs/tagatschool4.de.html">TGS
+      href="/activities/tgs/tagatschool4.de.html">TGS
       4</a>)</li>
 
       <li><a href="http://www.breedsoft.com">Tuxpaint</a> 0.9.2 -
       Malprogramm für Kinder und Kind-Gebliebene (<a
-      href="/activities/education/tgs/tagatschool5.de.html">TGS
+      href="/activities/tgs/tagatschool5.de.html">TGS
       5</a>)</li>
     </ul>
     <br />
@@ -443,9 +443,9 @@
     <p>[1] <a href="mailto:foxman@lugo.ch">Kritik, Fragen,
     Kommentare, Ideen und mehr bitte an: foxman@lugo.ch</a><br />
      [2] <a
-    href="/activities/education/tgs/tgs.de.html">Homepage
+    href="/activities/tgs/tgs.de.html">Homepage
     von TUX&amp;GNU@school:
-    fsfe.org/education/tgs/tgs.de.html</a><br />
+    fsfe.org/activities/tgs/tgs.de.html</a><br />
      [3] <a
     href="http://www.newbreedsoftware.com/tuxpaint/">Homepage von
     Tuxpaint: www.newbreedsoftware.com/tuxpaint</a><br />
@@ -456,16 +456,16 @@
      [6] <a href="http://www.gnu.org">Homepage des GNU-Projektes:
     www.gnu.org</a><br />
      [7] <a
-    href="/activities/education/tgs/tagatschool1.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool1.en.html">TUX&amp;GNU@school
     1 auf englisch</a><br />
      [8] <a
-    href="/activities/education/tgs/tagatschool2.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool2.en.html">TUX&amp;GNU@school
     2 auf englisch</a><br />
      [9] <a
-    href="/activities/education/tgs/tagatschool3.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool3.en.html">TUX&amp;GNU@school
     3 auf englisch</a><br />
      [10] <a
-    href="/activities/education/tgs/tagatschool4.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool4.en.html">TUX&amp;GNU@school
     4 auf englisch</a><br />
      [11] <a
     href="http://www.gnu.org/licenses/licenses.html#TOCGPL">GNU GPL
@@ -500,7 +500,7 @@
     href="http://wiki.debian.net/JuniorPackages">Meta-Pakete von
     Debian Jr.</a><br />
      [24] <a
-    href="/activities/education/tgs/tagatschool4.de.html">SEUL/edu
+    href="/activities/tgs/tagatschool4.de.html">SEUL/edu
     in TUX&amp;GNU@school Ausgabe 4</a><br />
      [25] <a href="http://www.seul.org/edu">Homepage von SEUL/edu:
     www.SEUL.org/edu</a><br />

activities/tgs/tagatschool5.en.xhtml

@@ -12,7 +12,7 @@
     <h1>TUX&amp;GNU@school - 5th edition</h1>
 
     <p><i>Every month the column <a
-    href="/activities/education/tgs/tgs.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tgs.en.html">TUX&amp;GNU@school
     [2]</a> reports about free software, a homepage on the topic
     and an easy to implement idea. This month I talk about <a
     href="http://www.newbreedsoftware.com/tuxpaint/">Tuxpaint
@@ -28,13 +28,13 @@
     TUX&amp;GNU@school will be released in different languages in
     the future but right now only in German and English. All
     earlier edition are in english available too (<a
-    href="/activities/education/tgs/tagatschool1.en.html">TGS 1
+    href="/activities/tgs/tagatschool1.en.html">TGS 1
     [7]</a>, <a
-    href="/activities/education/tgs/tagatschool2.en.html">TGS 2
+    href="/activities/tgs/tagatschool2.en.html">TGS 2
     [8]</a>, <a
-    href="/activities/education/tgs/tagatschool3.en.html">TGS 3
+    href="/activities/tgs/tagatschool3.en.html">TGS 3
     [9]</a> and <a
-    href="/activities/education/tgs/tagatschool4.en.html">TGS 4
+    href="/activities/tgs/tagatschool4.en.html">TGS 4
     [10]</a>). If there is anybody reading one of the older
     editions who want to implement an idea, go on. At this point I
     want to thank Christian Selig and Kristian Rink for their
@@ -201,7 +201,7 @@
     Debian Jr. cooperates with related projects, such as, for
     example, the <a href="http://www.seul.org/edu">SEUL/edu
     project[25]</a> which has been introduced in the <a
-    href="/activities/education/tgs/tagatschool4.en.html">4th
+    href="/activities/tgs/tagatschool4.en.html">4th
     edition [24]</a>. What's just as important for the young debian
     users is the adaption to their mother tongue. This is a goal
     for Debian Jr. too, but right for this there is another special
@@ -368,29 +368,29 @@
     <ul>
       <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 - Type
       writing course under KDE 3.0.5 (<a
-      href="/activities/education/tgs/tagatschool1.en.html">TGS
+      href="/activities/tgs/tagatschool1.en.html">TGS
       1</a>)</li>
 
       <li><a href="http://www.ofset.org/gcompris">GCompris</a>
       1.2.1 - Education plattform with different boards (<a
-      href="/activities/education/tgs/tagatschool2.en.html">TGS
+      href="/activities/tgs/tagatschool2.en.html">TGS
       2</a>)</li>
 
       <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
       Geometry program under KDE 3.0.5 (<a
-      href="/activities/education/tgs/tagatschool3.en.html">TGS
+      href="/activities/tgs/tagatschool3.en.html">TGS
       3</a>)</li>
 
       <li><a
       href="http://bioinformatics.org/ghemical/">Ghemical</a> 1.0 -
       Chemistry program for modelling and computing molecules (<a
-      href="/activities/education/tgs/tagatschool4.en.html">TGS
+      href="/activities/tgs/tagatschool4.en.html">TGS
       4</a>)</li>
 
       <li><a href="http://www.breedsoft.com">Tuxpaint</a> 0.9.2 -
       Painting programm for children and for those who stayed
       children (<a
-      href="/activities/education/tgs/tagatschool5.en.html">TGS
+      href="/activities/tgs/tagatschool5.en.html">TGS
       5</a>)</li>
     </ul>
     <br />
@@ -418,9 +418,9 @@
     <p>[1] <a href="mailto:foxman@lugo.ch">Criticism, questions,
     comments, ideas and more please to: foxman@lugo.ch</a><br />
      [2] <a
-    href="/activities/education/tgs/tgs.en.html">The
+    href="/activities/tgs/tgs.en.html">The
     homepage of TUX&amp;GNU@school:
-    fsfe.org/education/tgs/tgs.en.html</a><br />
+    fsfe.org/activities/tgs/tgs.en.html</a><br />
      [3] <a href="http://www.newbreedsoftware.com/tuxpaint/">The
     homepage of Tuxpaint:
     www.newbreedsoftware.com/tuxpaint</a><br />
@@ -431,16 +431,16 @@
      [6] <a href="http://www.gnu.org">The homepage of the GNU
     project: www.gnu.org</a><br />
      [7] <a
-    href="/activities/education/tgs/tagatschool1.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool1.en.html">TUX&amp;GNU@school
     1 in english</a><br />
      [8] <a
-    href="/activities/education/tgs/tagatschool2.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool2.en.html">TUX&amp;GNU@school
     2 in english</a><br />
      [9] <a
-    href="/activities/education/tgs/tagatschool3.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool3.en.html">TUX&amp;GNU@school
     3 in english</a><br />
      [10] <a
-    href="/activities/education/tgs/tagatschool4.en.html">TUX&amp;GNU@school
+    href="/activities/tgs/tagatschool4.en.html">TUX&amp;GNU@school
     4 in english</a><br />
      [11] <a
     href="http://www.gnu.org/licenses/licenses.html#TOCGPL">GNU GPL
@@ -475,7 +475,7 @@
      [23] <a href="http://wiki.debian.net/JuniorPackages">Meta
     packages of Debian Jr.</a><br />
      [24] <a
-    href="/activities/education/tgs/tagatschool4.en.html">SEUL/edu
+    href="/activities/tgs/tagatschool4.en.html">SEUL/edu
     in TUX&amp;GNU@school - 4th edition</a><br />
      [25] <a href="http://www.seul.org/edu">The homepage of
     SEUL/edu: www.SEUL.org/edu</a><br />

activities/tgs/tagatschool5.fr.xhtml

@@ -12,7 +12,7 @@
     <h1>TUX&amp;GNU@school - 5ème édition</h1>
 
     <p><i>Chaque mois la colonne <a
-    href="/education/tgs/tgs.fr.html">TUX&amp;GNU@school
+    href="/activities/tgs/tgs.fr.html">TUX&amp;GNU@school
     [2]</a> vous informe sur un logiciel libre, un site web traitant du sujet
     et une idée facile à réaliser. Ce mois-ci, je vais vous parler de <a
     href="http://www.newbreedsoftware.com/tuxpaint/?lang=fr">Tuxpaint
@@ -28,13 +28,13 @@
     TUX&amp;GNU@school sera publié en différentes langues dans
     le futur mais pour l'instant seulement en allemand et anglais (et en français, ndt). Toute
     édition précédente est maintenant aussi disponible en français (<a
-    href="/education/tgs/tagatschool1.fr.html">TGS 1
+    href="/activities/tgs/tagatschool1.fr.html">TGS 1
     [7]</a>, <a
-    href="/education/tgs/tagatschool2.fr.html">TGS 2
+    href="/activities/tgs/tagatschool2.fr.html">TGS 2
     [8]</a>, <a
-    href="/education/tgs/tagatschool3.fr.html">TGS 3
+    href="/activities/tgs/tagatschool3.fr.html">TGS 3
     [9]</a> et<a
-    href="/education/tgs/tagatschool4.fr.html">TGS 4
+    href="/activities/tgs/tagatschool4.fr.html">TGS 4
     [10]</a>). Si vous lisez une version précédente et si vous voulez programmer l'une 
 	des idées, allez-y. J'en profite pour remercier
     Christian Selig et Kristian Rink pour leur support dans l'écriture et la traduction.
@@ -191,7 +191,7 @@
     Debian Jr. collabore avec des projets ayant le même objectif comme, par
     exemple, le <a href="http://www.seul.org/edu">projet SEUL/edu
     [25]</a> qui a été présenté dans la <a
-    href="/education/tgs/tagatschool4.fr.html">4ème
+    href="/activities/tgs/tagatschool4.fr.html">4ème
     édition [24]</a>. Ce qui est aussi très important pour les jeunes utilisateurs Debian
     est l'adaptation à leur langue maternelle. Ceci est aussi l'un des objectifs de
     Debian Jr., mais pour cela il existe aussi un autre sous-projet spécifique&#160;: 
@@ -346,30 +346,30 @@
     <ul>
       <li><a href="http://edu.kde.org/ktouch">KTouch</a> 1.0 - Apprentissage de la frappe au clavier
       sous KDE 3.0.5 (<a
-      href="/education/tgs/tagatschool1.fr.html">TGS
+      href="/activities/tgs/tagatschool1.fr.html">TGS
       1</a>)</li>
 
       <li><a href="http://www.ofset.org/gcompris">GCompris</a>
       1.2.1 - Plate-forme éducative avec différents tableaux (<a
-      href="/education/tgs/tagatschool2.fr.html">TGS
+      href="/activities/tgs/tagatschool2.fr.html">TGS
       2</a>)</li>
 
       <li><a href="http://edu.kde.org/kgeo">KGeo</a> 1.0.2 -
       Programme de géométrie sous KDE 3.0.5 (<a
-      href="/education/tgs/tagatschool3.fr.html">TGS
+      href="/activities/tgs/tagatschool3.fr.html">TGS
       3</a>)</li>
 
       <li><a
       href="http://bioinformatics.org/ghemical/">Ghemical</a> 1.0 -
       Programme de chimie pour créer et faire des calculs sur des 
       molécules (<a
-      href="/education/tgs/tagatschool4.fr.html">TGS
+      href="/activities/tgs/tagatschool4.fr.html">TGS
       4</a>)</li>
 
       <li><a href="http://www.breedsoft.com/tuxpaint/?lang=fr">Tuxpaint</a> 0.9.2 -
       Programme de dessin pour les enfants et pour tous ceux qui restent des 
 	  enfants (<a
-      href="/education/tgs/tagatschool5.fr.html">TGS
+      href="/activities/tgs/tagatschool5.fr.html">TGS
       5</a>)</li>
     </ul>
     <br />
@@ -397,9 +397,9 @@
     <p>[1] <a href="mailto:foxman@lugo.ch">Veuillez envoyer vos critiques, questions,
     commentaires, idées et plus à&#160;: foxman@lugo.ch</a><br />
      [2] <a
-    href="/education/tgs/tgs.fr.html">La
+    href="/activities/tgs/tgs.fr.html">La
     page web de TUX&amp;GNU@school&#160;:
-    fsfe.org/education/tgs/tgs.fr.html</a><br />
+    fsfe.org/activities/tgs/tgs.fr.html</a><br />