X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=CurrentOccupation;fp=CurrentOccupation;h=988f42085c6accb2f71e7655aa5d821e72d1def9;hp=fa75c79ae7204fc72d9b9efa290ebe796a9fc1b9;hb=a6b74c55a3ae611df5658be0550f40b155828888;hpb=0dd3af268826afdd7f2857203cb0c6b242da8b13

diff --git a/CurrentOccupation b/CurrentOccupation
index fa75c79..988f420 100644
--- a/CurrentOccupation
+++ b/CurrentOccupation
@@ -1,9 +1,5 @@
 === Current Occupation ===
 
-I work at the [[http://www.fsf.org/|Free Software Foundation]] as a member of the Systems Administrators team.
-Me and my coworkers maintain a hosting infrastructure comprising about 100 virtual machines which supports the
-FSF, the GNU project, Savannah, Gnewsesne, and dozens of other projects.
-
 I'm also co-founder of [[http://sugarlabs.org/ | Sugar Labs]], a non-profit
 developing a constructionist learning engine targeted at low-age children.
 I'm an elected member of the [[http://sugarlabs.org/go/Oversight_Board | Oversight Board]]
@@ -12,8 +8,13 @@ I've also worked on business relationships, deployment coordination and communit
 
 === Previous occupations ===
 
-I worked at two OLPC deployments: [[http://paraguayeduca.org | Paraguay Educa]] and [[http://olenepal.org | OLE Nepal]],
-where I've been taking care of the network infrastructure, platform development and communication with the Sugar developers.
+I've been working at the [[http://www.fsf.org/|Free Software Foundation]] as a member of the Systems Administrators team,
+where I maintained a hosting infrastructure comprising about 100 virtual machines which supports the FSF, the GNU project,
+Savannah, Gnewsesne, and dozens of other projects.
+
+Before that, I've been working at several OLPC deployments: [[http://olenepal.org | OLE Nepal]], [[http://paraguayeduca.org | Paraguay Educa]],
+[[http://www.latu.org.uy/en/|LATU]] (Technology Laboratory of Uruguay) and Mozambique (for [[http://www.laptop.org/|OLPC Association]]).
+In these settings, I've been working on networking infrastructure, OS development, security, training and communication with upstream developers of Sugar and OLPC.
 
 In 2007, during my "sabbatical", I worked pro-bono in Boston for [[OneLaptopPerChild]] and
 in Brussels for [[OlpcEurope]].