diff --git a/template/about-global.phtml b/template/about-global.phtml
index 4d1546d..2a091ae 100644
--- a/template/about-global.phtml
+++ b/template/about-global.phtml
@@ -33,25 +33,25 @@
We try to record and stream events (lectures, lightning talks, podiums, etc) of the conferences we are present at. We exclude events where the speaker opts out. We provide the following services to our users.
At the conference
-
At conferences were eventphone Eventphone is offering their services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the GURU to find out which numbers are used.
+
At conferences where Eventphone is offering their services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the GURU to find out which numbers are used.
-
During CCC Congress and Camp we try to offer the video feeds via DVB-T. Checkout Twitter for announcements.
+
During CCC Congress and Camp we try to offer the video feeds via DVB-T. Check out Twitter for announcements.
-
Live Content
+
Live content
Our streams are available on streaming.media.ccc.de. We provide the streams in a number of codecs, containers and resolutions and on some conferences even different translations.
-
The web player will choses the hopefully right format depending on your operation system and browser. As web browser and video streaming is still broken in , we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.
+
The web player will hopefully chose the right format depending on your operation system and browser. As video streaming in web browsers is still broken in , we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.
-
The probably most comfortable way to watch the streams is the KODI (former XBMC) add-on. This add-on integrates live streams and recordings into a nice media center UI. The add-on is available via the offical kodi add-on repository (Add-ons / Video add-ons / CCC-TV (media.ccc.de)).
+
Probably the most comfortable way to watch the streams is the KODI (former XBMC) add-on. This add-on integrates live streams and recordings into a nice media center UI. The add-on is available via the offical kodi add-on repository (Add-ons / Video add-ons / CCC-TV (media.ccc.de)).
-
On some conferences we also provide streams of the lounges or content provides of other parties additionally to the main conference program.
+
At some conferences we also provide streams of the lounges or content provides of other parties additionally to the main conference program.
-
ReLive Content
-
As soon as a events has started it is also available via our video-on-demand portal (also located on streaming.media.ccc.de). This means that you can jump back to the beginning of the event or pause a live event. ReLive provides the same quality as the our live streams. The streams have a lower bitrate than the final recordings to allow people with slow Internet connection to use the streams. There we remove the ReLive "recordings" as soon as the final recoding is released. This has a much better quality and is free of the watermark. Therefor we ask you to not distribute the ReLive recordings but wait for the final releases. More on this topic can be found in this blog post on events.ccc.de
+
ReLive content
+
As soon as a events has started it is also available via our video-on-demand portal (also located on streaming.media.ccc.de). This means that you can jump back to the beginning of the event or pause a live event. ReLive provides the same quality as our live streams. These streams have a lower bitrate than the final recordings to allow people with a slow internet connection to use the streams. We remove the ReLive "recordings" as soon as the final recoding is released. This has a much better quality and is free of watermarks. Therefore, we ask you to not distribute the ReLive recordings but wait for the final releases. More on this topic can be found in this blog post on events.ccc.de
Recordings
-
The recordings can be found at media.ccc.de and in our youtube channel youtube.com/user/mediacccde (in case your preferred device only supports this). Besides our productions you can find content produced by other members of the chaos family on media.ccc.de. Similar to the streamplayer media.ccc.de provides player that tries to play the most suitable format for your OS / browser combination. You can find other formats and links to play in a desktop video player in the "Downloads" tab. Usually also a audio only version is available. All files are also available via an RSS-feed which comes handy with e.g. podcast clients. Our CDN provides metalink which are used by download managers to download in parallel from different CDN servers which can speed up your downloads. Further there is http file listing of the media files on cdn.media.ccc.de which comes handy for binge watching. Also not all content is in the frontend yet but is available via this listing.
+
The recordings can be found at media.ccc.de and in our YouTube channel youtube.com/user/mediacccde (in case your preferred device only supports this). Beyond our own productions, you can find content produced by other members of the chaos family on media.ccc.de. Similar to the streamplayer on this website, media.ccc.de provides a player that tries to play the most suitable format for your OS / browser combination. You can find other formats and links to play in a desktop video player in the "Downloads" tab. Usually also a audio only version is available. All files are also available via an RSS-feed which comes handy with e.g. podcast clients. Our CDN provides metalink files, which are used by download managers to download in parallel from different CDN servers which can speed up your downloads. Furthermore, there is http file listing of the media files on cdn.media.ccc.de which comes in handy for binge watching. Also, not all content is listed in the frontend yet, but is only available via this listing.
Again we want to point you to the kodi add-on which also lists the recordings. There is also a plugin for Plex and an Apple-TV app.
diff --git a/template/allclosed.phtml b/template/allclosed.phtml
index e01aa3b..a7ec690 100644
--- a/template/allclosed.phtml
+++ b/template/allclosed.phtml
@@ -5,7 +5,7 @@
diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml
index 7c8f617..5aa56b4 100644
--- a/template/assemblies/switcher/dash.phtml
+++ b/template/assemblies/switcher/dash.phtml
@@ -2,7 +2,7 @@
WebM DASH
-
DASH is an adaptive-bitrate HTTP-based streaming solution, that is (unlike existing proprietary solutions such as HLS) internationally standardized.
+
DASH is an adaptive-bitrate HTTP-based streaming solution that is (unlike existing proprietary solutions such as HLS) internationally standardized.
Support for DASH in open source software such as ffmpeg is still pretty rough, so consider this a technology-preview, it's not yet a stable solution.
Please report your experience to @c3voc.
diff --git a/template/relive.phtml b/template/relive.phtml
index 5c337fa..3c3761e 100644
--- a/template/relive.phtml
+++ b/template/relive.phtml
@@ -13,7 +13,7 @@