Merge branch 'master' of ssh://git.gag.com/scm/git/web/gag.com

diff --git a/bdale/bio/bdale_bio.txt b/bdale/bio/bdale_bio.txt
index 6fe4b02741922e30c22ce100dda1039b84dea1e2..2a5e49581616de37ac429b11f464139bcc4e545a 100644 (file)
--- a/bdale/bio/bdale_bio.txt
+++ b/bdale/bio/bdale_bio.txt
@@ -17,9 +17,11 @@ Altus Metrum, LLC, is a small business Bdale founded with Keith Packard that
 designs, builds, and sells completely open hardware and open source avionics 
 solutions for use in high power model rockets.
 
-Bdale serves as President of Software in the Public Interest, and on the 
-boards of directors of the Linux Foundation, the Freedombox Foundation, and
-Aleph Objects.  He is a frequent speaker at Linux and Open Source conferences.
+Bdale serves on the boards of directors of the Linux Foundation, the 
+Freedombox Foundation, and Aleph Objects.  He is a frequent speaker at Linux 
+and Open Source conferences.
+
+For a decade, Bdale served as President of Software in the Public Interest.
 
 In 2008, Bdale became the first individual recipient of a Lutece d'Or award
 from the Federation Nationale de l'Industrie du Logiciel Libre in France.

diff --git a/bdale/blog/posts/ChaosKey.mdwn b/bdale/blog/posts/ChaosKey.mdwn
new file mode 100644 (file)
index 0000000..0ce5919
--- /dev/null
+++ b/bdale/blog/posts/ChaosKey.mdwn
@@ -0,0 +1,11 @@
+I'm pleased to announce that, at long last, the [ChaosKey](http://chaoskey.org)
+hardware random number generator described in talks at 
+[Debconf 14 in Portland](https://summit.debconf.org/debconf14/meeting/20/security-not-by-chance-the-altusmetrum-hardware-true-random-number-generator/)
+and
+[Debconf 16 in Cape Town](https://debconf16.debconf.org/talks/94/)
+is now available for purchase from
+[Garbee and Garbee](http://shop.gag.com/random.html).
+
+[[!tag tags/crypto]]
+[[!tag tags/debian]]
+[[!tag tags/freedombox]]

diff --git a/bdale/index.mdwn b/bdale/index.mdwn
index cbe6e001f76128f950bf8cd0e9d0f3f636128df3..8fd66471f6fad1bfb9bac8b1322a8f57caa4500c 100644 (file)
--- a/bdale/index.mdwn
+++ b/bdale/index.mdwn
@@ -16,8 +16,10 @@ America.
 
 I serve on the boards of the [Linux Foundation](http://linuxfoundation.org) 
 the [FreedomBox Foundation](http://freedomboxfoundation.org), and 
-[Aleph Objects](http://alephobjects.com), and as 
-President of [Software in the Public Interest](http://spi-inc.org).  
+[Aleph Objects](http://alephobjects.com).  
+
+I served for a decade as President of 
+[Software in the Public Interest](http://spi-inc.org).  
 
 I remain actively involved in the [Debian](http://debian.org) project,
 where I served for a year as the elected Debian Project Leader, and for many