From 6e4d7d0281c9de5249696ed58a6fad9b59e918ef Mon Sep 17 00:00:00 2001 From: Elena ``of Valhalla'' Grandi Date: Sat, 21 Oct 2017 15:20:54 +0200 Subject: xmpp: additional slides --- xmpp/slides/.gitignore | 1 + xmpp/slides/Makefile | 5 +- .../img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg | Bin 382528 -> 381781 bytes xmpp/slides/img/441px-Chappe_semaphore.jpg | Bin 0 -> 52819 bytes xmpp/slides/img/800px-Post_Office_Engineers.jpg | Bin 0 -> 114488 bytes xmpp/slides/img/README.txt | 1 - xmpp/slides/img/XMPP_logo.svg | 25 ++++++++ xmpp/slides/img/chat_systems.png | Bin 0 -> 82898 bytes xmpp/slides/xmpp.rst | 69 +++++++++++++++++++++ 9 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 xmpp/slides/img/441px-Chappe_semaphore.jpg create mode 100644 xmpp/slides/img/800px-Post_Office_Engineers.jpg delete mode 100644 xmpp/slides/img/README.txt create mode 100644 xmpp/slides/img/XMPP_logo.svg create mode 100644 xmpp/slides/img/chat_systems.png create mode 100644 xmpp/slides/xmpp.rst (limited to 'xmpp') diff --git a/xmpp/slides/.gitignore b/xmpp/slides/.gitignore index 378eac2..cb7c35e 100644 --- a/xmpp/slides/.gitignore +++ b/xmpp/slides/.gitignore @@ -1 +1,2 @@ build +img/XMPP_logo.pdf diff --git a/xmpp/slides/Makefile b/xmpp/slides/Makefile index e9c9d8a..dcf8218 100644 --- a/xmpp/slides/Makefile +++ b/xmpp/slides/Makefile @@ -1,10 +1,13 @@ all: build/xmpp.pdf -build/xmpp.pdf: xmpp.rst img/ +build/xmpp.pdf: xmpp.rst img/XMPP_logo.pdf img/ mkdir -p build pandoc --listings -t beamer --latex-engine=xelatex \ -o build/xmpp.pdf \ xmpp.rst +img/XMPP_logo.pdf: img/XMPP_logo.svg + rsvg-convert -f pdf img/XMPP_logo.svg > img/XMPP_logo.pdf + clean: rm -f build/xmpp.pdf diff --git a/xmpp/slides/img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg b/xmpp/slides/img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg index b329685..b09eff4 100644 Binary files a/xmpp/slides/img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg and b/xmpp/slides/img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg differ diff --git a/xmpp/slides/img/441px-Chappe_semaphore.jpg b/xmpp/slides/img/441px-Chappe_semaphore.jpg new file mode 100644 index 0000000..2e16cd6 Binary files /dev/null and b/xmpp/slides/img/441px-Chappe_semaphore.jpg differ diff --git a/xmpp/slides/img/800px-Post_Office_Engineers.jpg b/xmpp/slides/img/800px-Post_Office_Engineers.jpg new file mode 100644 index 0000000..86082f4 Binary files /dev/null and b/xmpp/slides/img/800px-Post_Office_Engineers.jpg differ diff --git a/xmpp/slides/img/README.txt b/xmpp/slides/img/README.txt deleted file mode 100644 index 413ebc5..0000000 --- a/xmpp/slides/img/README.txt +++ /dev/null @@ -1 +0,0 @@ -https://commons.wikimedia.org/wiki/File:6_bonobos_WHCalvin_IMG_1341.jpg diff --git a/xmpp/slides/img/XMPP_logo.svg b/xmpp/slides/img/XMPP_logo.svg new file mode 100644 index 0000000..b7787be --- /dev/null +++ b/xmpp/slides/img/XMPP_logo.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmpp/slides/img/chat_systems.png b/xmpp/slides/img/chat_systems.png new file mode 100644 index 0000000..7689ac7 Binary files /dev/null and b/xmpp/slides/img/chat_systems.png differ diff --git a/xmpp/slides/xmpp.rst b/xmpp/slides/xmpp.rst new file mode 100644 index 0000000..697f3d0 --- /dev/null +++ b/xmpp/slides/xmpp.rst @@ -0,0 +1,69 @@ +====== + XMPP +====== + +-------------------- + La chat del futuro +-------------------- + +Animali sociali +--------------- + +.. image:: img/1280px-6_bonobos_WHCalvin_IMG_1341.jpg + :align: center + +https://commons.wikimedia.org/wiki/File:6_bonobos_WHCalvin_IMG_1341.jpg + +e tecnologici +------------- + +.. image:: img/441px-Chappe_semaphore.jpg + :align: center + +https://commons.wikimedia.org/wiki/File:Chappe_semaphore.jpg + +piĆ¹ tecnologici +--------------- + +.. image:: img/800px-Post_Office_Engineers.jpg + :align: center + +https://commons.wikimedia.org/wiki/File:Post_Office_Engineers.jpg + +Chat Systems +------------ + +.. image:: img/chat_systems.png + :align: center + +https://xkcd.com/1810/ (licensed CC-BY-NC 2.5) + +XMPP +---- + +.. image:: img/XMPP_logo.pdf + :align: center + +https://xmpp.org/ + +https://commons.wikimedia.org/wiki/File:XMPP_logo.svg + +.. image:: img/ + :align: center + +Questions? +---------- + +.. image:: img/feral_cat_buster.jpg + :align: center + +https://commons.wikimedia.org/wiki/File:%27Feral_Cat%27_%22Buster%22.jpg + +Queste slide +------------ + +https://git.trueelena.org/cgit.cgi/docs/talks/ + +Licenza Creative Commons Attribution-ShareAlike 4.0 International License. + +https://creativecommons.org/licenses/by-sa/4.0/ -- cgit v1.2.3