Edit page UbuntuPaperCuts

[wiki.git] / Affiliations

diff --git a/Affiliations b/Affiliations
index 3fa1a061e691f6a06ec312894b0887d98e7604fb..3a1dfed704bc37590835ebf53a89314567be04f8 100644 (file)
--- a/Affiliations
+++ b/Affiliations
@@ -1,12 +1,18 @@
 == 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]]
+Software Engineer, [[http://www.google.com/|Google Inc.]]
+
+[[http://www.google.com/ | GoogleLogoAlpha.png]]
+
+----
+
+Member, [[http://fsf.org/ | Free Software Foundation]]
 
 [[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
 
@@ -18,15 +24,15 @@ Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+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]]
+Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
 
-[[http://www.bertos.org | http://www.bertos.org/static/14a32621f4d893117e06fe0019952f3220bbe4f8/avatars/bertos-en.png]]
+[[http://www.bertos.org | http://www.bertos.org/media/web-stuff/avatars/bertos-en.png]]
 
 ----
 
@@ -36,6 +42,24 @@ Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
 
 == Former Affiliations ==
 
- * Contributor, [[http://uclinux.org/ | uClinux]]
+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 ]]
+
+----
+
+Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[http://laptop.org/ | OlpcLogoAlpha.png]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
 
- * Developer, [[http://laptop.org/ | OLPC]]
+[[http://uclinux.org/ | http://www.uclinux.org/images/logo.gif]]