fix article categories

content/federations.md

@@ -1,5 +1,5 @@
 Title: Welcome to the � Federation
-Category: introduction
+Category: an introduction
 slug: welcome-to-the-federation
 tags: Wtt�F, software, design
 
@@ -21,7 +21,7 @@ The Wtt�F question is to explore how arts and design communities can play a su
 
 Wtt�F will host a series of two-day gatherings that invite developers of these software projects and people active in arts and design. After an evening of presentation and discussion on the first day, the second day will be dedicated to a hands-on worksession.
 
-During these worksessions participants will be invited to work on making a concrete contribution to the project as a way to introduce these critical software practices in a practical way.
+For these worksessions the invited developers will introduce outline a few issues in the context of language, design and ux that participantes are invited to address.  Concrete *contributions* are explored as a way to introduce these critical software practices in a tangible way.  
 
 ## Coming gatherings
 

content/have_you_considered.md

@@ -1,6 +1,6 @@
 Title: Have you considered the alternative?
 Date: 2017-3-9
-Category: x-post
+Category: a x-post
 Tags: xmpp, conversations, instant messaging, ecosystem
 Slug: have-you-considered-the-alternative
 summary: Signal is often considered an alternative to Whatsapp, but is it really? Why you should gather a group of friends and consider staring into the abyss of self-hosted, federated messaging services.

content/meet_the_dev_1.md

@@ -1,22 +1,16 @@
 Title: 'The Ecosystem is Moving' a gathering with Daniel Gultsch
-Category: exchange with a developer
+Category: a meeting with a developer
 slug: conversations-gultsch
 tags: instant messaging, conversations, xmpp
 
 
-On the 1st and 2nd of June *Varia* will host a gathering with Daniel Gultsch.
+On the 1st and 2nd of june [*varia*](https://varia.zone) will host 'The Ecosystem Is Moving', a lecture by and worksesion with Daniel Gultsch about federated instant messaging, open source software and the sustainability of open systems.
 
-Daniel Gultsch is the developer behind [Conversations](https://conversations.im), an open source instant messaging application for Android. In 2014 he decided to work full time on Conversations and try to make a living from it. Rather than starting from scratch with Conversations, he built it as a client for the existing federated messaging protocol XMPP. 
+* June 1st, 19.00 - 22.00 - introduction to XMPP and lecture by Daniel Gultsch
+* June 2nd, 10.00 - 18.00 - hands on worksession on design and federated chat systems. Please register for the worksession via `info * varia.zone`
 
-<!-- PELICAN_END_SUMMARY -->
-
-Since an XMPP messenger can, in a way, only be as good as the entire ecosystem, Daniels work on Conversations included work on expanding and improving that larger ecosystem. This work included helping to draft and implement protocol standards, such as introducing OMEMO, modern and user-friendly end-to-end encryption based on Signal's protocol. In addition he has contributed code to other XMPP servers and clients in the ecosystem to bring them up to speed and [through his critical essays](https://gultsch.de/xmpp_2016.html) he has been a vocal defender of XMPP and open standards in general.
-
-Conversations is notable because, through its singular focus on user experience, design and security it has garnered a lot of interest and revived work and interest on the XMPP ecosystem as a whole. This makes it an interesting example.
-
----
-
-
-This is a chat protocol which has at one point also been the underlying technology of both Google and Facebook chat before they closed it down and made it proprietary. From the onset Conversations focused on a combination of user friendliness, security and ultimately visual design to be on par with mobile messengers such as whatsapp and telegram. The work of Conversations has reinvigorated the XMPP protocol. Partly because it focused on implementing the double-ratchett encryption algorithm almost immediately after it was open-sourced. This is the modern userfriendly end-to-end encryption algorithm developed by Moxie Marlinspike for Signal and licensed to companies like Whatsapp. Another effect of the work of Conversations is that the decades old protocol has been updated in the span of a few years to work very well for mobile usage. For me one of the interesting aspects of the development of Conversations is the role that modern thinking on UIs, design and user friendliness played in its popularity. This especially becomes apparent in the very technical and awkward world of XMPP software. The developer has mentioned multiple times that he 'bases' his design on that of his GAFA 'competitors'. Apropos tactical media, this project's appropriation of corporate design, yet very clear and solid political stance (see <https://gultsch.de/objection.html>) leading to an increase in popularity and community involvement is an interesting development.
+Daniel Gultsch is the developer behind [Conversations](https://conversations.im), an open source instant messaging application for Android. In 2014 he decided to work full time on Conversations and try to <!-- PELICAN_END_SUMMARY --> make a living from it. Rather than starting from scratch with Conversations, he built it as a client for the existing federated messaging protocol XMPP.
 
+Since an XMPP messenger can, in a way, only be as good as the entire ecosystem, Daniels work on Conversations also meant work on expanding and improving that larger XMPP ecosystem. This work includes helping to draft and implement protocol standards, such as OMEMO, a modern and user-friendly end-to-end encryption based on Signal's protocol. He also contributed code to other XMPP servers and clients in the ecosystem to bring them up to speed with modern uses. Additionally, [through his critical essays](https://gultsch.de/xmpp_2016.html) he is a vocal defender of XMPP and open standards in general.
 
+Conversations is notable because, through its continuous focus on user experience, design and security it has garnered a lot of interest for both itself and the XMPP ecosystem as a whole. This makes it an interesting example to talk about what the design field could potentially contribute to critical software practices.

theme/wttf/templates/article.html

@@ -25,7 +25,6 @@
 		<a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
 	</h1>
 	<div class="entry-subtitle">
-		A(n)
 		<span class="entry-category">
 			{{ article.category }}
 		</span> 

theme/wttf/templates/index.html

@@ -14,8 +14,7 @@
 					<h1 class="entry-title p-name">
 						<a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
 					</h1>
-					<div class="entry-subtitle">
-						A(n) 
+					<div class="entry-subtitle"> 
 						<span class="entry-category">
 							{{ article.category }}
 						</span> 
@@ -66,8 +65,7 @@
 						<h1 class="p-name entry-title">
 							<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
 						</h1>
-						<div class="entry-subtitle">
-							A 
+						<div class="entry-subtitle"> 
 							<span class="entry-category">
 								<em>{{ article.category }}</em>
 							</span>