X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=Affiliations;h=32db3014ca68efa159f19ac83526593e056c9f3d;hp=fe72aed7e8a2ada73671b6882b606e1b5be11082;hb=ece6577250cfb62da9e07579721e6b1700517d76;hpb=c3c3ffc8350583a59c3dc4af0872f1c9d08d22b7

diff --git a/Affiliations b/Affiliations
index fe72aed..32db301 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,21 +1,61 @@
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+== Current Affiliations ==
 
-{{http://wiki.sugarlabs.org/images/thumb/1/15/Logo_alt_1.png/400px-Logo_alt_1.png}}
+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]]
+Software Engineer, [[http://www.google.com/|Google Inc.]]
 
-{{http://static.fsf.org/fsforg/img/logo-new.png}}
+[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l.]]
+Member, [[http://fsf.org/ | Free Software Foundation]]
 
-{{http://www.develer.com/pics/develer_logo.png}}
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
 Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
-{{http://fedoraproject.org/w/uploads/2/2d/Logo_fedoralogo.png|maxwidth=400}}
+[[http://fedoraproject.org | http://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
+
+----
+
+Founder, [[http://www.develer.com/ | Develer]]
+
+[[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]]
+
+== Former Affiliations ==
+
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+----
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+----
+
+Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file