Merge branch 'master' into develop

Makefile

@@ -14,8 +14,8 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
-wiki:
+web:
 	@ikiwiki --setup ikiwiki.setup
 
-wiki_deploy:
+web_deploy:
 	@rsync -avz --delete www/ blog:/var/sites/rhatto/www/

fisl.mdwn

-# A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle
+[[!meta title="A Internet das Coisas Livres vencendo os gigantes da vigilância e do controle"]]
 
-* FISL16 - 2015
+* FISL16 - 10/07/2015
 * rhatto.sarava.org/fisl / rhatto @ sarava.org
 * `66CA 01CE 2BF2 C9B7 E8D6  4E34 0546 8239 64E3 9FCA`
+* [Slides](slides.pdf).
 
 # Distopia
 

fisl/Makefile

+all:
+		pandoc -t beamer ../fisl.mdwn -o slides.pdf

static.mdwn

@@ -34,7 +34,7 @@ It's a good pratice to keep your work under version control:
 
 ## Add a bit of sofistication
 
-* Use [this Makefile](/Makefile) as an starting point to refresh and publish your wiki by simply running `make`.
+* Use [this Makefile](/Makefile) as an starting point to refresh and publish your wiki by simply running `make web`.
 * Use a [complete ikiwiki template](https://git.sarava.org/?p=templates.git;a=tree;f=ikiwiki;h=HEAD) and change to your needs.
 * If you're a automation junkie, try the [puppet-ikiwiki](https://git.sarava.org/puppet-ikiwiki.git) module.