diff options
| author | MaZderMind | 2014-12-05 16:15:57 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-05 16:15:57 +0100 |
| commit | 2498b5df0f45947a9e90dba23b203b936c079ec1 (patch) | |
| tree | 28f89acbf59c1c42efeb76ec63aa7e8f922f8fc5 | |
| parent | c72a19e944552c272faf19e7f195d04c6768bbf1 (diff) | |
more rework of about-text
| -rw-r--r-- | template/about.phtml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/template/about.phtml b/template/about.phtml index d67b92a..589e1fa 100644 --- a/template/about.phtml +++ b/template/about.phtml @@ -1,17 +1,16 @@ <div class="container-fluid about"> <h1>About the Live-Streams and Recordings</h1> <p> - Video and Audio recording and streaming on the 31st Chaos Communication Congress is organized and performed by the c3voc, the <a href="//c3voc.de">CCC Video Operation Center</a>. - We are a group of enthusiasts running lecture recording and streaming infrastructure. + Lecture recording and streaming at 31st Chaos Communication Congress in Hamburg is organized and performed by a joint venture of <a href="http://fem.tu-ilmenau.de">Forschungsgemeinschaft elektronische Medien e.V.</a>, <a href="http://www.ags.tu-bs.de/">Wissenschaftliche Arbeitsgemeinschaft für Studio- und Senderfragen an der TU Braunschweig e.V.</a> and <a href="http://c3voc.de">Chaos Computer Club Video Operation Center</a>. </p> - <h2>Licenses</h2> + <h2>Licences</h2> <p> - The video-stream is licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/">Attribution-ShareAlike 3.0</a>. This may not hold true for the slides or the actual performance. If in doubt please contact the speaker directly. + The video stream is licensed under <a href="https://creativecommons.org/licenses/by-sa/3.0/">Attribution-ShareAlike 3.0</a>. This may not hold true for the slides or the actual performance. If in doubt please contact the speaker directly. </p> <p> - Although the Licence permits it, we would like to ask you to <strong>not distribute Stream-Dumps</strong>. We try to release finished cuts of the videos as quick as possible at <a href="http://media.ccc.de/browse/congress/2014/index.html">media.ccc.de</a> and <a href="https://www.youtube.com/user/mediacccde">YouTube</a> and early releases of incomplete stream dumps without audio-translation and subtitles and intros and <a href="https://auphonic.com/">unprocessed audio</a> will not help anybody. + Although the licence permits it, we would like to ask you to <strong>don't distribute stream dumps</strong>. We try to release finished cuts of recordings as quickly as possible on <a href="http://media.ccc.de/browse/congress/2014/index.html">media.ccc.de</a> and <a href="https://www.youtube.com/user/mediacccde">YouTube</a>. Early releases of incomplete stream dumps without audio translation, subtitles, intros, <a href="https://auphonic.com/">unprocessed audio</a> and missing meta data information is not what we have in mind when we spend three month of preparation in our spare time. </p> <h2>Privacy Policy</h2> @@ -21,9 +20,9 @@ <p>The following data is collected and saved for an undefined duration:</p> <ul> - <li>Date and time,</li> - <li>the visited pages,</li> - <li>status codes the webserver answered with,</li> + <li>date and time</li> + <li>the visited pages</li> + <li>status codes the webserver answered with</li> <li>your browser and operating system,</li> <li>and the referring URL</li> </ul> |