X-Git-Url: https://git.madduck.net/cv.git/blobdiff_plain/931b6d318decc6402969396005659f9180bdd1d6..HEAD:/cv.en.rst diff --git a/cv.en.rst b/cv.en.rst index 58a8bf2..f2632f3 100644 --- a/cv.en.rst +++ b/cv.en.rst @@ -8,7 +8,7 @@ .. a brief note and link would be appreciated, if the CV is served as a web .. page. You can use the screen-only class for this. -.. |today| replace:: 12 October 2010 +.. |today| replace:: 15 Jun 2013 =============================================================================== Curriculum Vitae @@ -45,11 +45,7 @@ Email: cv@martin-krafft.net |nl| .. class:: print-only -Telephone: +41 (0)32 511 9 511 |nl| - -.. class:: print-only - -Address: Waldpromenade 36a, 82131 Gauting, Germany +Telephone: +49 (0)89 420 951 852 |nl| .. class:: screen-only @@ -161,7 +157,7 @@ Operating systems `MS Windows`_ (NT 4.0 (MCSE), 2k, XP); Mac OS (7.0 |--| 9.x) Administration - `Nagios`_/`Icinga`_; `munin`_; `Puppet`_; `BackupPC`_; `nsd3`_; `unbound`_; |nl| + `Nagios`_/`Icinga`_; `munin`_; `Ansible`_; `Puppet`_; `BackupPC`_; `nsd3`_; `unbound`_; |nl| `postfix`_; `Apache2`_; `Zope`_/`Plone`_; `PostgreSQL`_; `Mailman`_; `squid`_; `OpenLDAP`_ |nl| `Linux QoS`_; `iproute2`_; `netfilter`_; `tcpdump`_; |nl| `Cisco IOS`_; `VPN-1`_; `Firewall-1`_ @@ -313,7 +309,7 @@ Please also take a look at my `list of references`_. .. class:: signature print-only -Zürich, |today| |nl| +München, |today| |nl| Martin F. Krafft .. class:: online-notes screen-only