aboutsummaryrefslogtreecommitdiffstats
path: root/docs/events/Conferences/Linuxcon
diff options
context:
space:
mode:
Diffstat (limited to 'docs/events/Conferences/Linuxcon')
-rw-r--r--docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst22
-rw-r--r--docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst22
-rw-r--r--docs/events/Conferences/Linuxcon/index.rst13
3 files changed, 57 insertions, 0 deletions
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
new file mode 100644
index 00000000000..35d851852a1
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_introfdio:
+
+.. toctree::
+
+##############
+Intro to FD.io
+##############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Ed Warnicke
+
+Presentation
+-------------
+
+`Powerpoint <https://wiki.fd.io/images/8/87/Fd.io_intro_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
new file mode 100644
index 00000000000..a3202a4ad0d
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_onelispintro:
+
+.. toctree::
+
+###############
+ONE-LISP Intro
+###############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Florin Coras
+
+Presentation
+------------
+
+`Powerpoint <https://wiki.fd.io/images/3/3e/ONE-LISP_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Conferences/Linuxcon/index.rst b/docs/events/Conferences/Linuxcon/index.rst
new file mode 100644
index 00000000000..d166ca89b19
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/index.rst
@@ -0,0 +1,13 @@
+.. _Linuxcon:
+
+.. toctree::
+
+##############################
+August 2017 - Linuxcon NA 2016
+##############################
+
+.. toctree::
+ :maxdepth: 1
+
+ 2016_08_24_introfdio
+ 2016_08_24_onelispintro \ No newline at end of file