Edit page MicrosoftTactics

[wiki.git] / Affiliations

diff --git a/Affiliations b/Affiliations
index 1a55b7eb2055f900b5136aa6074e7b989d719b08..2f02f521e15ecd3398cb347681ef5defc1fdc762 100644 (file)
--- a/Affiliations
+++ b/Affiliations
@@ -1,20 +1,20 @@
 == Current Affiliations ==
 
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
 [[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
 
 ----
 
-System Administrator Intern, [[http://fsf.org/ | Free Software Foundation]]
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
 
 [[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
 
 ----
 
@@ -24,12 +24,24 @@ Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
 ----
 
+Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+
+[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+
+----
+
+Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
+
+[[http://www.bertos.org | http://www.bertos.org/media/web-stuff/avatars/bertos-en.png]]
+
+----
+
 Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
 
 [[http://gcc.gnu.org/ | http://upload.wikimedia.org/wikipedia/commons/c/c4/GCC_logo.png]]
 
-== Past Affiliations ==
+== Former Affiliations ==
 
- * Contributor, uClinux
+ * Contributor, [[http://uclinux.org/ | uClinux]]
 
- * Developer, OLPC
+ * Developer, [[http://laptop.org/ | OLPC]]