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

diff --git a/CurrentOccupation b/CurrentOccupation
index 988f420..e4719ca 100644
--- a/CurrentOccupation
+++ b/CurrentOccupation
@@ -1,20 +1,23 @@
 === Current Occupation ===
 
+I'm a software engineer at [[http://google.com|Google]] working on the Static Content Service, a high-performance
+component of Google's search engine. Our software handles the highest number of queries per second across all of
+Google's products.
+
 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]]
 and coordinator of the [[http://sugarlabs.org/go/InfrastructureTeam | Infrastructure Team]].
-I've also worked on business relationships, deployment coordination and community building.
+
 
 === Previous occupations ===
 
-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.
+In 2011, I've been working as a Senior Systems Administrator at the [[http://www.fsf.org/|Free Software Foundation]],
+where I developed and maintained a hosting infrastructure comprising about 100 virtual machines FSF, the GNU project,
+Savannah, Trisquel, 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]].
+In 2007, during my "sabbatical", I worked pro-bono in Boston for [[OneLaptopPerChild]] and in Brussels for [[OlpcEurope]].