Merge branch 'via_lo_streaming' into 'master'

fix: lo streaming non c'e' piu

See merge request !95

src/services/index.en.md

@@ -22,7 +22,7 @@ We provide a suite of communication tools:
 - [Mailing lists and Newsletters](/services/lists)
 - [Web Hosting](/services/website)
 - [Instant Messaging and Chat](/services/chat)
-- [Videoconference and Streaming](/services/videoconference-streaming "Videoconference and streaming")
+- [Videoconference](/services/videoconference "Videoconference")
 - [Anonymity Services](/services/anon)
 
 ## Costs

src/services/index.it.md

@@ -19,7 +19,7 @@ A/I offre un'ampia gamma di strumenti per comunicare:
 - [Mailing list e Newsletter](/services/lists "Mailing list")
 - [Siti web](/services/website "Siti web")
 - [Instant Messaging e chat](/services/chat "Instant Messaging e chat")
-- [Videoconferenze e streaming](/services/videoconference-streaming "Videoconferenze e streaming")
+- [Videoconferenze](/services/videoconference "Videoconferenze")
 - [Servizi per l'anonimato](/services/anon "Anonimato")
 
 ## Costi

src/services/videoconference-streaming.en.md → src/services/videoconference.en.md

-title: Video Conference and Streaming
+title: Video Conference
 ----
 
-Video Conference and Streaming
-===============================
+Video Conference
+================
 
-In the spring of 2020 Autistici/Inventati started offering a videoconference and a streaming service.
+In the spring of 2020 Autistici/Inventati started offering a videoconference service.
 
 <a name="VC"></a>
 
@@ -16,16 +16,3 @@ A/I offers VoIP and video conferences on [vc.autistici.org](https://vc.autistici
 With Jitsi Meet, you can start a videoconference by connecting to the service with a common browser, without having to install anything in your computer. What you need to do is just open the website [vc.autistici.org](https://vc.autistici.org) (preferably with [Chromium](https://www.chromium.org/getting-involved/download-chromium)), and click the "Go" button to start a videoconference. Once the videoconference has started, you will just need to share the URL with the people you want to talk to.
 
 You can find detailed instructions on Autistici/Inventati's videoconferencing service in this [guide](/docs/vc).
-
-<a name="streaming"></a>
-
-Streaming
---------------------------
-
-** THIS SERVICE IS TEMPORARILY SUSPENDED **
-
-Our streaming service can be found at [live.autistici.org](https://live.autistici.org).
-
-In the home page, you will find basic instructions on how to use the service, and you can find out what is being currently streamed in [the stats page](https://live.autistici.org/stats).
-
-You can also find a basic tutorial on how to start a stream on live.autistici.org [in our tech documentation](/docs/stream-obs).

src/services/videoconference-streaming.it.md → src/services/videoconference.it.md

-title: Videoconferenze e streaming
+title: Videoconferenze
 ----
 
-Videoconferenze e streaming
-===============================
+Videoconferenze
+===============
 
-Dalla primavera del 2020 Autistici/Inventati offre un servizio di videoconferenze e uno di streaming.
+Dalla primavera del 2020 Autistici/Inventati offre un servizio di videoconferenze.
 
 <a name="VC"></a>
 
@@ -17,15 +17,3 @@ Jitsi Meet permette di avviare una videoconferenza attraverso un semplice browse
 
 Per istruzioni dettagliate su come usare il servizio di videoconferenze di Autistici/Inventati, vai alla [guida](/docs/vc).
 
-<a name="streaming"></a>
-
-Streaming
---------------------------
-
-** QUESTO SERVIZIO E' MOMENTANEAMENTE SOSPESO **
-
-Il nostro servizio di streaming si trova su [live.autistici.org](https://live.autistici.org).
-
-Nella home page trovate istruzioni base sul suo funzionamento, mentre potete scoprire quali stream stanno funzionando in [questa pagina](https://live.autistici.org/stats).
-
-Puoi trovare una guida di base su come avviare uno streaming sul servizio di Autistici/Intentati in [questa guida](/docs/stream-obs).