Merge commit 'giskard/master'

diff --git a/AbridgedResume b/AbridgedResume
index 0711b53ddb5957b1f3d0dea5a0cd9018f81cc2f6..8aaa4ee92f48c1c89f1eb7cd3a235b16be97601b 100644 (file)
--- a/AbridgedResume
+++ b/AbridgedResume
@@ -6,7 +6,7 @@ Embedded systems engineer, Linux OS and application developer, system administra
 
 === Contact ===
 
-Please use e-mail: bernie@codewiz.org
+Personal e-mail: bernie@codewiz.org
 
 === Career Objectives ===
 

diff --git a/BrainDump b/BrainDump
index edf0e1021ab494ee5ee1729b75e2de29ed9e8e17..5f238d6487ea303ad2b6dce9aa8eb17d58fee474 100644 (file)
--- a/BrainDump
+++ b/BrainDump
@@ -1,4 +1,6 @@
-''Speak Friend and Enter, You Fools!''
+<img style="float: right" src="http://codewiz.org/wiki/BernieAvatar128x128.png" alt="Bernie Avatar" />
+
+**Speak Friend and Enter, You Fools!**
 
 {{blog/2010}}
 {{blog/2009}}

diff --git a/FrontPage b/FrontPage
index 0332c2c2c36114ec5fc324554f68ba365b37e777..9836b685fb5855c1156733aa6ec6e940cab25a12 100644 (file)
--- a/FrontPage
+++ b/FrontPage
@@ -2,7 +2,7 @@
 
 <div id="hcard-Bernie-Innocenti" class="vcard">
 <h1 class="fn">Bernie Innocenti</h1>\\
-<img style="float: right" src="http://codewiz.org/wiki/BernieAvatar128x128.png" alt="Bernie Avatar" />
+<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>\\
@@ -17,8 +17,7 @@ Public GPG key:  [[https://www.develer.com/~bernie/pub/bernie_pgp_pubkey.asc|71F
 <div class="tags">
 Tags:
 [[tags/freeasinfreedom]]
-[[tags/h4x0r]]
-[[tags/überh4xx0rz]]
+[[tags/überh4x0rz]]
 [[tags/!microsoft]]
 </div>
 </div>
@@ -37,7 +36,7 @@ Tags:
 === About Me ===
 
  * BrainDump -- My personal blog. You don't care. Really.
- * BernardoInnocenti -- My [real] picture
+ * BernieInnocenti -- My [real] picture
  * [[pictures|Codew'z]] -- Photos of my life; or lack thereof
 
 === Professional Profile ===