Merge branch 'master' of sleepmap.de:sleepmap

* 'master' of sleepmap.de:sleepmap:
  content/blog/201511-cccamp2015-aftermath.rst: Removing accidental blockquotes around unordered lists.
  content/blog/201604-extended-longevity-of-a-htc-one-s-using-cyanogenmod.rst: Remove accidental blockquotes surrounding unordered lists.
  content/blog/201604-extended-longevity-of-a-htc-one-s-using-cyanogenmod.rst: Fixing capital letter typo.
  201509-donaueschingen.rst, images: Adding post about Donaueschingen.
  201511-cccamp2015-aftermath.rst: Moving to new name with year/month prefix.
  cccamp2015-aftermath.rst: Adding circuit circle link. Removing TODO.
  Renaming posts with year/month as prefix.
  longevity-of-a-htc-one-s-using-cyanogenmod.rst: Adding further links to the article. Extending tile.

6 files changed, 240 insertions, 79 deletions

diff --git a/content/blog/mikromusik2015.rst b/content/blog/201507-mikromusik2015.rst
index 22250bf..22250bf 100644
--- a/content/blog/mikromusik2015.rst
+++ b/content/blog/201507-mikromusik2015.rst
diff --git a/content/blog/chaos-communication-camp-2015.rst b/content/blog/201508-cccamp2015.rst
index 67e9de5..67e9de5 100644
--- a/content/blog/chaos-communication-camp-2015.rst
+++ b/content/blog/201508-cccamp2015.rst
diff --git a/content/blog/hardware-section.rst b/content/blog/201508-hardware-section.rst
index 438b04b..438b04b 100644
--- a/content/blog/hardware-section.rst
+++ b/content/blog/201508-hardware-section.rst
diff --git a/content/blog/201509-donaueschingen.rst b/content/blog/201509-donaueschingen.rst
new file mode 100644
index 0000000..e1b7c26
--- /dev/null
+++ b/content/blog/201509-donaueschingen.rst
@@ -0,0 +1,132 @@
+Donaueschingen 2015
+###################
+
+:date: 2015-11-01 16:00
+:modified: 2016-04-03 16:00
+:tags: robots, orm finnendahl, hans hübner, ensemble mosaik, swr, ircam, neue musik, donaueschingen
+:category: events
+:slug: donaueschingen-2015
+:summary: A short review of Donaueschinger Musiktage 2015
+:authors: David Runge
+
+The festival
+____________
+| Due to a fortunate contact through the |tu_electronic_studio| I went to |donaueschinger_musiktage_2015| being the *robot kindergarten worker* for |orm_finnendahl|'s piece |orm_finnendahl_ast| at most likely **the** "|new_music|" festival worldwide.
+| The festival is curated and organized by the |swr| (a regional public broadcasting station serving the southwest of Germany). Traditionally it is held in |donaueschingen|, a small town in Baden-Württemberg.
+| As it is a highly publicly subsidized event and genre of music that is presented there, the whole festival is quite an interesting and diverse place to be in.
+| An additionally very interesting aspect is, that all pieces presented are premieres!
+| That being said, I didn't have that much time to watch other pieces, but I made it to those two: The dress rehearsal of |michael_beil|'s |michael_beil_bluff| (incredible timing!) and |olga_neuwirth|'s |olga_neuwirth_piece| (literally **big** production).
+| The latter made me miss my train on the way back (which was okay, because I ended up with parts of |ensemble_mosaik|).
+|
+
+The ensemble
+____________
+| Berlin based |ensemble_mosaik| realized Orm's piece amongst several others in the Donauhallen (one of the many locations used during the festival) and presented it to the public two times (the first one also being a live broadcast).
+| You can listen to the whole broadcast |donaueschingen_ensemble_mosaik_stream|. |orm_finnendahl_ast| begins around **01:06:30**.
+| For a more general overview, have a look |donaueschingen_ensemble_mosaik_donauhallen|.
+
+.. figure:: /images/donaueschingen_ast_dress_rehearsal.jpg
+  :alt: Rehearsal of |orm_finnendahl_ast| with |ensemble_mosaik| in Donaueschingen
+
+  Dress rehearsal of |orm_finnendahl|'s |orm_finnendahl_ast| with |ensemble_mosaik| in Donaueschingen
+
+The piece
+_________
+| |orm_finnendahl_ast| is quite a challenging piece to perform, as it not only involves *"robots"* (designed by |hans_huebner|) that bang on different materials and thus have to be *"in tune"*, but also a nifty |puredata| based setup, that allows all involved musicians to sample themselves and improvise to those samples at certain times, while at the same time gives Finnendahl the possibility to oversee all of their actions according to local and global timelines.
+| Like all of his newer pieces, its score is written using :abbr:`LISP (a powerful family of functional programming languages)` and sonified by using backends that base on |supercollider| or |puredata|, while the spatialization is done in |puredata|.
+| Sounds like a powerful setup? It is!
+
+.. figure:: /images/donaueschingen_ast_aftershow.jpg
+  :alt: Rehearsal of |orm_finnendahl_ast| with |ensemble_mosaik| in Donaueschingen
+
+  The *"robots"* after the first round of |ensemble_mosaik| presented pieces in Donaueschingen
+
+The rehearsals
+______________
+| Rehearsals for |orm_finnendahl_ast| took place in Berlin at |ensemble_mosaik|'s rehearsal space.
+| A handful of weird issues had to be worked out during those, including network problems (*"Don't ever user WiFi for anything! Ever!"*), MacOSX related hickups (*"Ah, is that application really closed?"*) and versioning fun (*"What version of the application was it, I gave to you?"*).
+| As with all technical setups a methodical procedure is of the essence. I worked out a plan for moving all needed tools and boxes from Berlin to Donaueschingen.
+| In the end everything worked out rather nicely and I think the piece went for a very good start at |donaueschinger_musiktage_2015|!
+
+.. figure:: /images/ensemble_mosaik_rehearsal1.jpg
+  :alt: Ensemble Mosaik rehearsal
+
+  Rehearsal of |orm_finnendahl|'s |orm_finnendahl_ast| with |ensemble_mosaik| in Berlin
+
+.. figure:: /images/ensemble_mosaik_rehearsal2.jpg
+  :alt: Ensemble Mosaik rehearsal
+
+  Rehearsal of |orm_finnendahl|'s |orm_finnendahl_ast| with |ensemble_mosaik| in Berlin
+
+| All in all I'm very happy for the opportunity to have worked with such professional musicians as the |ensemble_mosaik| and a mindblowing setup as |orm_finnendahl|'s.
+| You live and learn.
+|
+
+.. |tu_electronic_studio| raw:: html
+
+  <a href="https://www.ak.tu-berlin.de/studio" target="_blank">Electronic Studio of TU Berlin</a>
+
+.. |new_music| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/20th-century_classical_music" target="_blank">New Music</a>
+
+.. |olga_neuwirth| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Olga_Neuwirth" target="_blank">Olga Neuwirth</a>
+
+.. |michael_beil| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/komponisten/beil-michael/-/id=3500652/did=16163430/nid=3500652/1tp2eso/index.html" target="_blank">Michael Beil</a>
+
+.. |michael_beil_bluff| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/programme/beil-michael-und-bruehl-thierry-bluff-fuer-ensemble-mit-live-video-und-audio/-/id=2136962/did=16163008/nid=2136962/16s9yii/index.html" target="_blank">"Bluff"</a>
+
+.. |olga_neuwirth_piece| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/programme/donaueschinger-musiktage-2015-programm-10/-/id=2136962/did=15652832/nid=2136962/1bqma8o/index.html" target="_blank">"Le Encantadas o le avventure nel mare delle meraviglie"</a>
+
+.. |orm_finnendahl| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/komponisten/finnedahl-orm/-/id=3500652/did=16164758/nid=3500652/193aegv/index.html" target="_blank">Orm Finnendahl</a>
+
+.. |orm_finnendahl_ast| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/programme/finnendahl-orm-ast-fuer-fuer-kammerensemble-32-selbstspielende-maschinen-live-elektronik-und-zuspielung/-/id=2136962/did=16164718/nid=2136962/r4kp9f/index.html" target="_blank">AST</a>
+
+.. |donaueschinger_musiktage_2015| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen" target="_blank">Donaueschinger Musiktage 2015</a>
+
+.. |swr| raw:: html
+
+  <a href="http://swr.de/" target="_blank">SWR</a>
+
+.. |donaueschingen| raw:: html
+
+  <a href="https://www.openstreetmap.org/relation/1242301" target="_blank">Donaueschingen</a>
+
+.. |ensemble_mosaik| raw:: html
+
+  <a href="http://www.ensemble-mosaik.de/" target="_blank">Ensemble Mosaik</a>
+
+.. |donaueschingen_ensemble_mosaik_stream| raw:: html
+
+  <a href="http://www.swr.de/swr2/programm/sendungen/jetztmusik/donaueschinger-musiktage-2015-konzert-mit-dem-ensemble-mosaik/-/id=659442/did=16411542/nid=659442/ma12z8/index.html" target="_blank">here</a>
+
+.. |donaueschingen_ensemble_mosaik_donauhallen| raw:: html
+
+  <a href="http://www.swr.de/swr2/festivals/donaueschingen/programme/sa-17-ensemble-mosaik/-/id=2136962/did=16282162/nid=2136962/1rfnyef/index.html" target="_blank">here</a>
+
+.. |hans_huebner| raw:: html
+
+  <a href="https://plus.google.com/+HansH%C3%BCbner" target="_blank">Hans Hübner</a>
+
+.. |puredata| raw:: html
+
+  <a href="http://puredata.info/" target="_blank">PureData</a>
+
+.. |supercollider| raw:: html
+
+  <a href="http://supercollider.github.io/" target="_blank">SuperCollider</a>
+
diff --git a/content/blog/cccamp2015-aftermath.rst b/content/blog/201511-cccamp2015-aftermath.rst
index fbc8dc3..966a782 100644
--- a/content/blog/cccamp2015-aftermath.rst
+++ b/content/blog/201511-cccamp2015-aftermath.rst
@@ -21,11 +21,11 @@ ________
 | How best to begin to describe? It's pretty hard actually, as there was so much going on.
 | Possibly it would be best to start with the general direction of this event:
 
-  * It's not a festival (no music stages, however there's music happening)
-  * There's wifi and RJ45 based Internet access everywhere!
-  * There are conference-grade talks about various topics (I made it to... two?)
-  * Many hackerspaces/ hacking groups from all over the world bring their projects (or even half of their interior)
-  * An old brick factory was used as the playground for all this. Awesome place!
+* It's not a festival (no music stages, however there's music happening)
+* There's wifi and RJ45 based Internet access everywhere!
+* There are conference-grade talks about various topics (I made it to... two?)
+* Many hackerspaces/ hacking groups from all over the world bring their projects (or even half of their interior)
+* An old brick factory was used as the playground for all this. Awesome place!
 
 The Van
 _______
@@ -44,14 +44,14 @@ _______
 
 These are the recordings I made (as mp3). If you want some flacs, let me know!
 
-  * Long session with |silicium|, |psychotronic| and |hellais|. |recording_van1|
-  * Shorter session with |silicium| and |psychotronic|. |recording_van2|
+* Long session with |silicium|, |psychotronic| and |hellais|. |recording_van1|
+* Shorter session with |silicium| and |psychotronic|. |recording_van2|
 
 Unexpected Encounters
 _____________________
 | Especially bumping into the latter again, after a first encounter at 2014's |bended_realities|, was a very pleasant surprise.
-| To all of you, who don't know who Alwin Weber (aka. |stoerenfried|) is, go check out his website and book him for a soldering workshop, to make one of his famous noise toys! He's always a damn impressive positive force of nature to reckon with and generally a very pleasant person.
-| His reasons for being at CCCamp was also mainly to give workshops, alongside people like |mitch_altman|.
+| To all of you, who don't know who Alwin Weber (aka. |stoerenfried|) is, go check out his |circuit_circle| and book him for a soldering workshop, to make one of his famous noise toys! He's always a damn impressive positive force of nature to reckon with and generally a very pleasant person.
+| One of the main reasons for him being at CCCamp was actually to give workshops, alongside people like |mitch_altman|.
 
 .. figure:: /images/cccamp2015_weber_noise_toy.jpg
   :alt: Alwin Weber's Noise Toys
@@ -67,12 +67,13 @@ _____________________
 
 The Oven and Ideopolis
 ______________________
-| Additional to the awesome - most of the time purely moduluar - jams in the van, we (|psychotronic|, |stoerenfried| and `I </music/deviser/>`_) also did a session in one of the old brick ovens (#TODO audio here) and (|stoerenfried| and `I </music/deviser/>`_) one in the |idiopolis| dome.
-| Both were a lot of fun. The first one was pretty much a five hour playground/ freak show, the second more of a full on electronica/glitch/techno session (where we even made the camp organizers come over to turn down the music). |idiopolis| was proud.
+| Additional to the awesome - most of the time purely moduluar - jams in the van, we (|psychotronic|, |stoerenfried| and `I </music/deviser/>`_) also did a session in one of the old brick ovens and (|stoerenfried| and `I </music/deviser/>`_) one in the |idiopolis| dome.
+| Both were a lot of fun. The first one was pretty much a five hour playground/ freak show, the second more of a full on electronica/glitch/techno session (where we even made the camp organizers come over to turn down the music).
+| |idiopolis| was proud.
 
-  * Session at the oven with |stoerenfried| and |psychotronic|. |recording_oven|
-    **Note**: There are also videos [|video_vimeo1|] [|video_vimeo2|] available on vimeo, that show a subset of the above recording
-  * Session at the |idiopolis| dome with |stoerenfried|. |recording_ideopolis|
+* Session at the oven with |stoerenfried| and |psychotronic|. |recording_oven|
+  **Note**: There are also videos [|video_vimeo1|] [|video_vimeo2|] available on vimeo, that show a subset of the above recording
+* Session at the |idiopolis| dome with |stoerenfried|. |recording_ideopolis|
 
 |
 | So after all, the CCCamp2015 turned out to be much more DIY live music than I initially anticipated! What a pleasant surprise!
@@ -87,6 +88,10 @@ ______________________
 |
 | All in all, CCCamp2015 was a great experience (although there are really way too many stories to tell) and I'm already looking forward to the next one!
 
+.. |circuit_circle| raw:: html
+
+  <a href="http://circuitcircle.de/" target="_blank">website</a>
+
 .. |hellais| raw:: html
 
   <a href="https://twitter.com/hellais" target="_blank">hellais</a>
diff --git a/content/blog/longevity-of-a-htc-one-s-using-cyanogenmod.rst b/content/blog/201604-extended-longevity-of-a-htc-one-s-using-cyanogenmod.rst
index c6ed723..62a3f5a 100644
--- a/content/blog/longevity-of-a-htc-one-s-using-cyanogenmod.rst
+++ b/content/blog/201604-extended-longevity-of-a-htc-one-s-using-cyanogenmod.rst
@@ -1,11 +1,11 @@
-Longevity of a HTC One S using Cyanogenmod
-##########################################
+Extended longevity of a HTC One S using Cyanogenmod
+###################################################
 
 :date: 2016-04-02 20:00
 :modified: 2016-04-03 20:00
 :tags: cyanogenmod, android, apps, f-droid, guardian project, tor, htc one s
 :category: mobile
-:slug: longevity-of-a-htc-one-s-using-cyanogenmod
+:slug: extended-longevity-of-a-htc-one-s-using-cyanogenmod
 :authors: David Runge
 :summary: Or howto setup Cyanogenmod on a HTC One S and live with F-Droid happily ever after
 
@@ -13,14 +13,14 @@ The mobile
 __________
 | I own a quite old - at least by today's standards of planned obsolescence for every consumer device - |htc_one_s| (2012), that won't be receiving any more Android upgrades (|htc_one_s_last_update|: version 4.0.4) or support by its manufacturer directly or any distributor for that matter.
 | It's quite a nice, small and lightweight phone, that by now has seen the world and besides a self-administered chassis change hasn't yielded any serious problems.
-| The phone doesn't have much RAM or much space. Neither does it have a microSD card slot, NFC or other fancy new stuff that people seem to need.
+| The phone doesn't have much RAM or much space. Neither does it have a microSD card slot, :abbr:`NFC (Near field communication)` or other fancy new stuff that people seem to need.
 |
 
 CyanogenMod
 ___________
 | The alternative firmware for some mobile devices |cyanogenmod| is available for free and offers a community driven development branch of the Android kernel, without the Google and mobile vendor bloat.
 | Have a look: Maybe your phone is amongst the |cyanogenmod_supported_devices|?
-| Not all vendors allow flashing other firmwares though. Some prevent this completely (watch |28c3_doctorow| for a commentary on this), others let you do it by voiding your warranty, yet others just let you do it, because they are awesome.
+| Not all vendors allow flashing other firmwares though. Some prevent this completely (watch |28c3_doctorow| for an in-depth comment on this), others let you do it by voiding your warranty, yet others just let you do it, because they are awesome.
 | All |cyanogenmod| capable devices have development codenames. For the |htc_one_s| this is "|cyanogenmod_ville|".
 | Each device offers a |cyanogenmod_ville_release_channel| (with stable releases) and a |cyanogenmod_ville_development_channel| (with nightly builds for the adventurous and daring).
 | An |cyanogenmod_ville_install| explains how to get |cyanogenmod| on your device.
@@ -28,79 +28,103 @@ ___________
 
 F-Droid
 _______
-| |f-droid| is an alternative app store to |google_play|. It only offers free/ libre software. This is pretty awesome.
+| |f-droid| is an alternative app store to |google_play|. It only offers |free_software|. This is pretty awesome.
 | Some useful apps I like, use or have used:
 
-  * |f-droid_afwall| - Control network traffic
-  * |f-droid_antennapod| - Advanced podcast manager and player
-  * |f-droid_ardroid| - Remote control for |ardour|
-  * |f-droid_cadroid| - Certificate importer
-  * |f-droid_connectbot| - SSH and local shell client
-  * |f-droid_conversations| - XMPP client
-  * |f-droid_davdroid| - Contacts and Calendar sync
-  * |f-droid_droidshows| - TV series browser and tracker
-  * |f-droid_f-droid| - Application manager
-  * |f-droid_firefox| - Web browser
-  * |f-droid_irssi_connectbot| - Specialised SSH Client
-  * |f-droid_k-9_mail| - Full-featured email client
-  * |f-droid_kontalk| - Community-driven messaging
-  * |f-droid_kore| - Remote control for Kodi (XBMC)
-  * |f-droid_logical_defence| - Encyclopedia of logical fallacies
-  * |f-droid_mpdroid| - MPD (Music Player Daemon) client
-  * |f-droid_mupdf| - Lightweight document viewer
-  * |f-droid_owncloud| - Synchronization client
-  * |f-droid_owncloud_news| - News/feed reader
-  * |f-droid_owncloud_notes| - Client for ownCloud Notes App
-  * |f-droid_oandbackup| - Backup manager
-  * |f-droid_open_camera| - Camera App
-  * |f-droid_openkeychain| - Encrypt files and communications with OpenPGP
-  * |f-droid_opentasks| - Keep track of your list of goals
-  * |f-droid_openvpn_for_android| - OpenVPN without root
-  * |f-droid_openvpn_settings| - VPN settings
-  * |f-droid_osmand| - Offline/online maps and navigation
-  * |f-droid_orbot| - Tor (anonymity) client
-  * |f-droid_orwall| - Force apps to use Tor
-  * |f-droid_orweb| - Privacy-enhanced browser
-  * |f-droid_password_store| - Manage your passwords
-  * |f-droid_plumble| - Voice chat for Mumble servers
-  * |f-droid_practice_hub| - Tools for musicians
-  * |f-droid_port_authority| - Port scanner
-  * |f-droid_quickdic| - Offline translation dictionary
-  * |f-droid_sms_backup| - Bakcup SMS and call logs to IMAP
-  * |f-droid_smssecure| - Send encrypted text messages (SMS)
-  * |f-droid_satstat| - Signal Generator for tablets
-  * |f-droid_signal_generator| - Signal Generator for tablets
-  * |f-droid_snoopsnitch| - Check mobile network security
-  * |f-droid_syncthing| - File synchronization
-  * |f-droid_termux| - Terminal emulator with packages
-  * |f-droid_transportr| - Public Transport Companion
-  * |f-droid_tryton| - Enterprise resource management
-  * |f-droid_twidere| - Microblogging client
-  * |f-droid_vlc| - Media player
-  * |f-droid_weechat| - Internet relay chat
-  * |f-droid_world_weather| - View weather forecast
+* |f-droid_afwall| - Control network traffic
+* |f-droid_antennapod| - Advanced podcast manager and player
+* |f-droid_ardroid| - Remote control for |ardour|
+* |f-droid_cadroid| - Certificate importer
+* |f-droid_connectbot| - :abbr:`SSH (Secure Shell)` and local shell client
+* |f-droid_conversations| - :abbr:`XMPP (Extensible Messaging and Presence Protocol)` client
+* |f-droid_davdroid| - Contacts and Calendar sync
+* |f-droid_droidshows| - TV series browser and tracker
+* |f-droid_f-droid| - Application manager
+* |f-droid_firefox| - Web browser
+* |f-droid_irssi_connectbot| - Specialised :abbr:`SSH (Secure Shell)` Client
+* |f-droid_k-9_mail| - Full-featured email client
+* |f-droid_kontalk| - Community-driven messaging
+* |f-droid_kore| - Remote control for |kodi| (XBMC)
+* |f-droid_logical_defence| - Encyclopedia of logical fallacies
+* |f-droid_mpdroid| - |mpd| (Music Player Daemon) client
+* |f-droid_mupdf| - Lightweight document viewer
+* |f-droid_owncloud| - Synchronization client
+* |f-droid_owncloud_news| - News/feed reader
+* |f-droid_owncloud_notes| - Client for ownCloud Notes App
+* |f-droid_oandbackup| - Backup manager
+* |f-droid_open_camera| - Camera App
+* |f-droid_openkeychain| - Encrypt files and communications with OpenPGP
+* |f-droid_opentasks| - Keep track of your list of goals
+* |f-droid_openvpn_for_android| - |openvpn| without root
+* |f-droid_openvpn_settings| - :abbr:`VPN (Virtual Private Network)` settings
+* |f-droid_osmand| - Offline/online maps and navigation
+* |f-droid_orbot| - |tor_project| (anonymity) client
+* |f-droid_orwall| - Force apps to use |tor_project|
+* |f-droid_orweb| - Privacy-enhanced browser
+* |f-droid_password_store| - Manage your passwords
+* |f-droid_plumble| - Voice chat for |mumble| servers
+* |f-droid_practice_hub| - Tools for musicians
+* |f-droid_port_authority| - Port scanner
+* |f-droid_quickdic| - Offline translation dictionary
+* |f-droid_sms_backup| - Backup :abbr:`SMS (Short Message Service)` and call logs to :abbr:`IMAP (Internet Message Access Protocol)`
+* |f-droid_smssecure| - Send encrypted text messages (SMS)
+* |f-droid_satstat| - Signal Generator for tablets
+* |f-droid_signal_generator| - Signal Generator for tablets
+* |f-droid_snoopsnitch| - Check mobile network security
+* |f-droid_syncthing| - File synchronization
+* |f-droid_termux| - Terminal emulator with packages
+* |f-droid_transportr| - Public Transport Companion
+* |f-droid_tryton| - Enterprise resource management
+* |f-droid_twidere| - Microblogging client
+* |f-droid_vlc| - Media player
+* |f-droid_weechat| - Internet relay chat
+* |f-droid_world_weather| - View weather forecast
 
 Guardian Project
 ________________
-| The |guardian_project| offers a |guardian_project_repository| for |f-droid| with free/ libre Android applications that are being developed by a team of volunteers and are all evolving around the matter of strong encryption of communication.
+| The |guardian_project| offers a |guardian_project_repository| for |f-droid| with free/ libre Android applications that are being developed by a team of volunteers and are all evolving around the matter of strong encryption for communication.
 | One of the more notable projects was to bring |tor_project| to Android.
 | The |guardian_project| has more buns in the oven though. Some are directly available through |f-droid|, others only through their own |guardian_project_repository|. This is a collection of the currently available projects:
 
-  * |guardian_project_chatsecure| - A free and open source messaging app that features OTR encryption over XMPP
-  * |guardian_project_orbot| - A free proxy app that empowers other apps to use the internet more securely
-  * |guardian_project_camerav| - The easiest way to capture and share verifiable photos and video proof on a smartphone or tablet, all the while keeping it entirely secure and private
-  * |guardian_project_obscuracam| - A photo and video app for Android that keeps certain information private.
-  * |guardian_project_pixelknot| - An Android application that allows users to hide short text-based messages in photographs and share them across trusted channels.
+* |guardian_project_chatsecure| - A free and open source messaging app that features |otr| encryption over :abbr:`XMPP (Extensible Messaging and Presence Protocol)`
+* |guardian_project_orbot| - A free :abbr:`proxy (a computer network service that allows clients to make indirect network connections to other network services)` app that empowers other apps to use the internet more securely
+* |guardian_project_camerav| - The easiest way to capture and share verifiable photos and video proof on a smartphone or tablet, all the while keeping it entirely secure and private
+* |guardian_project_obscuracam| - A photo and video app for Android that keeps certain information private.
+* |guardian_project_pixelknot| - An Android application that allows users to hide short text-based messages in photographs and share them across trusted channels.
 
 Conclusion
 __________
 Yay!
 
-  * I don't need to buy a new phone each year, because my battery got eaten by malicious apps that I can't disable.
-  * I can use an Android device without Google
-  * I can use an Android device without vendor bloat
-  * I can use an Android device as root and modify it the way I want it
-  * I can choose to only install free apps
+* I don't need to buy a new phone each year, because my battery got eaten by malicious apps that I can't disable.
+* I can use an Android device without Google
+* I can use an Android device without vendor bloat
+* I can use an Android device as root and modify it the way I want it
+* I can choose to only install free apps
+
+.. |otr| raw:: html
+
+  <a href="https://otr.cypherpunks.ca/" target="_blank">OTR</a>
+
+.. |kodi| raw:: html
+
+  <a href="https://kodi.tv/" target="_blank">Kodi</a>
+
+.. |mpd| raw:: html
+
+  <a href="https://www.musicpd.org/" target="_blank">MPD</a>
+
+.. |openvpn| raw:: html
+
+  <a href="https://openvpn.net/" target="_blank">OpenVPN</a>
+
+.. |mumble| raw:: html
+
+  <a href="https://wiki.mumble.info/wiki/Main_Page" target="_blank">mumble</a>
+
+.. |free_software| raw:: html
+
+  <a href="https://en.wikipedia.org/wiki/Free_software" target="_blank">free/libre software</a>
 
 .. |tor_project| raw:: html