summaryrefslogtreecommitdiff
path: root/doc/news/Linux.Conf.Au.presentation.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-02-15 15:22:13 -0400
committerJoey Hess <joeyh@joeyh.name>2017-02-15 15:22:13 -0400
commit4f29d576115d1bcbed60eacb3642523f1b5f480f (patch)
treecb4b5ada932bbdea7c4ee97008fc871cd810b543 /doc/news/Linux.Conf.Au.presentation.mdwn
parent6e3192f0d2e063f07d7a5d2b96648e9167cc576a (diff)
parentb29bab35747e6345a4818e5a77c53d029562e3c3 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'doc/news/Linux.Conf.Au.presentation.mdwn')
-rw-r--r--doc/news/Linux.Conf.Au.presentation.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/news/Linux.Conf.Au.presentation.mdwn b/doc/news/Linux.Conf.Au.presentation.mdwn
new file mode 100644
index 00000000..54180979
--- /dev/null
+++ b/doc/news/Linux.Conf.Au.presentation.mdwn
@@ -0,0 +1,5 @@
+<video controls src="http://mirror.linux.org.au/pub/linux.conf.au/2017/Type_driven_configuration_management_with_Propellor.webm"></video>
+
+[video](http://mirror.linux.org.au/pub/linux.conf.au/2017/Type_driven_configuration_management_with_Propellor.webm)
+
+Also see this writeup in [Linux Weekly News](https://lwn.net/Articles/713653/)