summaryrefslogtreecommitdiff
path: root/xmpp/slides
diff options
context:
space:
mode:
authorElena ``of Valhalla'' Grandi <valhalla@trueelena.org>2017-10-27 21:34:57 +0200
committerElena ``of Valhalla'' Grandi <valhalla@trueelena.org>2017-10-27 21:34:57 +0200
commitbdb4e71754179b06c884e254d69e8e26dfbda775 (patch)
tree1ad388a3149708bfb7b0688dc7a0cf7d95303ed0 /xmpp/slides
parent06ad4215f4e56d8330798af7e867ef7cef889aba (diff)
xmpp: altre foto di gatti
Diffstat (limited to 'xmpp/slides')
-rw-r--r--xmpp/slides/img/800px-Cat_playing.jpegbin0 -> 114571 bytes
-rw-r--r--xmpp/slides/img/cat-70736_960_720.jpgbin0 -> 184326 bytes
-rw-r--r--xmpp/slides/xmpp.rst29
3 files changed, 20 insertions, 9 deletions
diff --git a/xmpp/slides/img/800px-Cat_playing.jpeg b/xmpp/slides/img/800px-Cat_playing.jpeg
new file mode 100644
index 0000000..3605a3a
--- /dev/null
+++ b/xmpp/slides/img/800px-Cat_playing.jpeg
Binary files differ
diff --git a/xmpp/slides/img/cat-70736_960_720.jpg b/xmpp/slides/img/cat-70736_960_720.jpg
new file mode 100644
index 0000000..212b6ba
--- /dev/null
+++ b/xmpp/slides/img/cat-70736_960_720.jpg
Binary files differ
diff --git a/xmpp/slides/xmpp.rst b/xmpp/slides/xmpp.rst
index 3e7c1cb..2c11891 100644
--- a/xmpp/slides/xmpp.rst
+++ b/xmpp/slides/xmpp.rst
@@ -62,12 +62,6 @@ Caratteristiche importanti: desktop
.. image:: img/kittens.png
:align: center
-Server consigliati
-------------------
-
-* Prosody https://prosody.im/
-* Ejabberd https://www.ejabberd.im/
-
Client consigliati: desktop
---------------------------
@@ -86,16 +80,33 @@ Client consigliati: android
https://conversations.im/
-.. image:: img/
+Server pubblici
+---------------
+
+* https://list.jabber.at/
+* https://account.conversations.im/ (8 EUR/anno)
+
+Self hosting
+------------
+
+.. image:: img/cat-70736_960_720.jpg
:align: center
+.. https://pixabay.com/en/cat-computer-cable-playing-animal-70736/ (CC0)
+
+Server consigliati
+------------------
+
+* Prosody https://prosody.im/
+* Ejabberd https://www.ejabberd.im/
+
Questions?
----------
-.. image:: img/feral_cat_buster.jpg
+.. image:: img/800px-Cat_playing.jpeg
:align: center
-https://commons.wikimedia.org/wiki/File:%27Feral_Cat%27_%22Buster%22.jpg
+https://commons.wikimedia.org/wiki/File:Cat_playing.jpeg
Queste slide
------------