Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

[wiki.git] / ContactInformation

diff --git a/ContactInformation b/ContactInformation
index 0f2875252836edb6034577b5afac387e4d1bc7fb..c27b2f9620fa89ade0a02ee849007e2d8d50e9a3 100644 (file)
--- a/ContactInformation
+++ b/ContactInformation
@@ -2,25 +2,33 @@
 
 == Bernie Innocenti's contact information ==
 
-== Internet contact info ==
+=== Internet contact info ===
 
  * e-mail: bernie-nospam@codewiz.org (**remove -nospam**)
  * Home page: http://codewiz.org/
 
 
-== Geeky contact info ==
+=== Geeky contact info ===
 
- * Jabber: bernie-nospam@codewiz.org (**remove -nospam**, and, yes I run my own Jabber server!)
- * IRC: ##bernie## on ##irc.freenode.org## (always online, sometimes afk)
- * OpenID: http://codewiz.org/ (yes, I run my own OpenID provider!)
+ * IRC: ##bernie## on ##irc.freenode.org## (my proxy is always online, but I might be afk)
+ * Jabber: bernie-nospam@codewiz.org (**remove -nospam** and, yes, I run my own Jabber server!)
+ * OpenID: http://codewiz.org/ (yes, I run my own OpenID provider too!)
  * Public SSH keys: https://www.develer.com/~bernie/pub/authorized_keys
  * Public GPG key: ##71FF4BAC##: https://www.develer.com/~bernie/pub/bernie_pgp_pubkey.asc
  * hCard: http://codewiz.org/wiki
 
-== Retro ==
+=== Retro contact info ===
 
- * Mobile (Italy): +39-377-1436808 or +39-329-4008545
  * Mobile (USA): +1-781-BIG-FITK (+1-781-244-3485)
+ * Mobile (Italy): +39-377-1436808 or +39-329-4008545
+ * Snail mail (USA):
+ {{{
+Bernie Innocenti
+265 Elm Street, Apt 4
+c/o Benjamin Hill
+02144 Somerville MA
+USA
+}}}
  * Snail mail (Italy):
  {{{
 Bernie Innocenti
@@ -28,11 +36,3 @@ Via Ventiquattro Maggio, 14
 50129 Firenze
 ITALY
 }}}
- * Snail mail (USA):
- {{{
-Bernie Innocenti
-265-4 Elm Sr.
-c/o Hill
-02144 Somerville MA
-USA
-}}}