Revert "Edit page FrontPage"

[wiki.git] / FrontPage

diff --git a/FrontPage b/FrontPage
index 8574b8f19200324cb4adf84ff7fa78290ddc9684..0e75f1a4629f22aca1dd91b57a9e5bb5e34c9583 100644 (file)
--- a/FrontPage
+++ b/FrontPage
@@ -4,16 +4,16 @@
 <h1 class="fn">Bernie Innocenti</h1>\\
 <div style="float: right">{{ BernieXo.jpg | maxwidth=422 }}</div>
 
-<a class="url org" href="http://sugarlabs.org/">Sugar Labs Foundation</a>\\
-<a class="email" href="mailto:bernie@codewiz.org">bernie****@****codewiz.org</a>\\
+Senior Systems Administrator, <a class="url org" href="http://www.fsf.org/">Free Software Foundation</a> \\
+Infrastructure Team Coordinator, <a class="url org" href="http://sugarlabs.org/">Sugar Labs Foundation</a> \\
+<a class="email" href="mailto:bernie@codewiz.org">bernie****@****codewiz.org</a> \\
 
-Jabber ID: <a class="url" href="xmpp:bernie@codewiz.org">bernie****@****codewiz.org</a>\\
-IRC Nick: <span class="irc">bernie</span> on freenode and OFTC\\
+Jabber ID: <a class="url" href="xmpp:bernie@codewiz.org">bernie****@****codewiz.org</a> \\
+IRC Nick: <span class="irc">bernie</span> on Freenode and OFTC \\
 
 Public SSH keys: [[http://codewiz.org/pub/authorized_keys]] \\
 Public GPG key:  [[https://www.develer.com/~bernie/pub/bernie_pgp_pubkey.asc|71FF4BAC]] \\
 
-
 <div class="tags">
 Tags:
 [[tags/freeasinfreedom]]
@@ -22,14 +22,15 @@ Tags:
 </div>
 </div>
 
-=== Free projects ===
+(see also my full [[ContactInformation]])
+
+=== Free Software projects ===
 
- * [[http://www.sugarlabs.org/ | Sugar Labs]] -- A non-profit foundation promoting Sugar, the educational environment powering [[OneLaptopPerChild]]
+ * [[http://www.sugarlabs.org/ | Sugar Labs]] -- A non-profit foundation promoting Sugar, a spin off of [[OneLaptopPerChild]]
+ * [[www.gnu.org|GNU]] -- I support the GNU project and the Free Software Foundation
  * [[BeRTOS]] -- A microkernel for small embedded systems
  * GeekiGeeki -- The tiny, Git-powered wiki engine
- * LinuxProjects -- Misc Linux projects
- * ???
- * WorldDomination!
+ * LinuxProjects -- Misc GNU/Linux projects
 
  * OldProjects