Merge remote-tracking branch 'refs/remotes/origin/master'

[wiki.git] / tmarble / posts / mailz-in-tails.mdwn

diff --git a/tmarble/posts/mailz-in-tails.mdwn b/tmarble/posts/mailz-in-tails.mdwn
index 9610bc0c91d26d5b922602bd84c8cde7dc125b92..cd3b1f7aaa1d1fd0db3ecea54af39250c1109d45 100644 (file)
--- a/tmarble/posts/mailz-in-tails.mdwn
+++ b/tmarble/posts/mailz-in-tails.mdwn
@@ -5,6 +5,8 @@ Here is the background on my workshop presentation
 at [Code Freeze 2015][codefreeze15].
 Currently the slides are under heavy development -- stay
 tuned as they are updated in anticipation of v1.0.0 on January 14, 2015.
+Of course the slides alone don't provided the extra commentary
+and personal experiences -- you'll have to come to Code Freeze for that!
 
 <a href="https://www.umsec.umn.edu/events/Code-Freeze-2015-Security">
 <img src="https://www.umsec.umn.edu/sites/all/themes/grid960/umsec960/assets/code_freeze/code_freeze_banner_2015.png" alt="Code Freeze 2015"/>
@@ -21,7 +23,10 @@ He has combined his EE and community experiences in open source hardware
 projects such as [USB TRNG][usbtrngblog]
 and his software and intellectual property experiences by organizing
 a legal and policy issues track at Europe's largest open source
-conference, [FOSDEM][devroom2015].
+conference, [FOSDEM][devroom2015]. Tom's passion for Free Software is
+demonstrated by frequent speaking at conferences such as O'Reilly's Open
+Source Convention, JavaOne, the Debian conference, Software Passion (Sweden),
+Fórum Internacional do Software Livre (Brazil) and Linux Conf Australia.
 
 Mr. Marble is committed to increasing diversity in technology
 (especially in open source) by volunteering as an organizer
@@ -31,7 +36,7 @@ as well as the
 [GNOME Outreach Program for Women][opw]
 on behalf of the [Debian][debian] project.
 
-Mr. Marble is the founder of Informatique, Inc.: a consultancy which
+Tom is the founder of Informatique, Inc.: a consultancy which
 leverages his hardware, software and legal engineering background for
 client projects as diverse as telematics for electric vehicles,
 probabilistic model checking, autonomous cyber defense, and