From e506a01ee5250be2146ce27637bc7485eca9e8a8 Mon Sep 17 00:00:00 2001
From: Elena ``of Valhalla'' Grandi <valhalla@trueelena.org>
Date: Tue, 23 Oct 2018 18:22:33 +0200
Subject: Socializzare nella Federazione: alcune slide

---
 federazione/slides/img/oil_rags.png                | Bin 0 -> 130106 bytes
 .../slides/socializzare_nella_federazione.rst      |  56 +++++++++++++++++++++
 federazione/useful_urls.txt                        |   1 +
 3 files changed, 57 insertions(+)
 create mode 100644 federazione/slides/img/oil_rags.png
 create mode 100644 federazione/useful_urls.txt

(limited to 'federazione')

diff --git a/federazione/slides/img/oil_rags.png b/federazione/slides/img/oil_rags.png
new file mode 100644
index 0000000..e8ac45d
Binary files /dev/null and b/federazione/slides/img/oil_rags.png differ
diff --git a/federazione/slides/socializzare_nella_federazione.rst b/federazione/slides/socializzare_nella_federazione.rst
index a4aaf3a..5f44fdb 100644
--- a/federazione/slides/socializzare_nella_federazione.rst
+++ b/federazione/slides/socializzare_nella_federazione.rst
@@ -2,6 +2,62 @@
  Socializzare nella Federazione
 ================================
 
+Social Network
+--------------
+
++------------+------------+------------+------------+
+| Facebook   | Twitter    | Google +   | Instagram  |
++------------+------------+------------+------------+
+| Telegram   | LinkedIn   | Tumblr     | Flickr     |
++------------+------------+------------+------------+
+| MySpace    | WhatsApp   | Baidu      | Snapchat   |
++------------+------------+------------+------------+
+| Pinterest  | Fetlife    | Ravelry    | E-mail     |
++------------+------------+------------+------------+
+
+Pila di stracci impregnati di olio
+----------------------------------
+
+.. image:: img/oil_rags.png
+   :align: center
+
+Riprendiamoci internet!
+-----------------------
+
+* Servizi decentralizzati e federati
+* Software libero
+* Self-hosting
+* Community-based hosting
+
+Strumenti classici
+------------------
+
+* E-mail
+* Feed RSS
+* Chat (XMPP)
+
+Social Network Federati
+-----------------------
+
++------------+------------+------------+------------+
+| Mastodon   | Pleroma    | Friendica  | Diaspora   |
++------------+------------+------------+------------+
+| Hubzilla   | Pump.io    | GNU Social | Movim      |
++------------+------------+------------+------------+
+| PeerTube   | Osada      | Socialhome | ...        |
++------------+------------+------------+------------+
+
+La Federazione
+--------------
+
+Summer of ActivityPub
+---------------------
+
+Per approfondire
+----------------
+
+* https://craphound.com/news/2018/07/02/mark-zuckerberg-and-his-empire-of-oily-rags/
+* https://the-federation.info/
 
 Questions?
 ----------
diff --git a/federazione/useful_urls.txt b/federazione/useful_urls.txt
new file mode 100644
index 0000000..8fb97e6
--- /dev/null
+++ b/federazione/useful_urls.txt
@@ -0,0 +1 @@
+https://mastodon.at/@switchingsocial/100464510004807543
-- 
cgit v1.2.3