git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2715...

diff --git a/README.txt b/README.txt
index c417efa72d7306bbe417c8af77877181d2aeacdc..0072dbd86da726ba522a144fcbe8aa2ae12c3651 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
-======================================================================================================\r
+==========================================================================================================\r
 CasparCG Video and Graphics Playout Server\r
-======================================================================================================\r
+==========================================================================================================\r
 \r
 Thank you for your interest in CasparCG. The included software\r
 is provided as-is by Sveriges Televison AB.\r
@@ -11,17 +11,17 @@ trigger many of the new features. Please use the provided AIR app to
 try out the new functionality or add the new features to you \r
 control application (you can find the documentation on the wiki or ask in the forums). \r
 \r
-======================================================================================================\r
+==========================================================================================================\r
 INSTALLATION\r
-======================================================================================================\r
+==========================================================================================================\r
 \r
 You can place the CasparCG Server 2.0 folder anywhere you like, and even move it.\r
 \r
 If you don't already have Flash installed, use the bundled version in the Flash folder\r
 \r
-======================================================================================================\r
+==========================================================================================================\r
 CONFIGURATION\r
-======================================================================================================\r
+==========================================================================================================\r
 \r
 By default, CasparCG Server will look in the media folder \r
 for videos, audio and images files. Flash templates are stored in the\r
@@ -48,45 +48,29 @@ Open casparcg.config and use the following node for consumers:
 \r
 At the bottom of the casparcg.config file you will find comments which document additional settings.\r
 \r
-======================================================================================================\r
+==========================================================================================================\r
 LICENSING\r
-======================================================================================================\r
-CasparCG is distributed under the GNU General Public \r
-License GPLv3 or higher, see the file COPYING.TXT for details. \r
-More information, samples and documentation at: \r
-http://casparcg.com/\r
-http://casparcg.com/forum/\r
-http://casparcg.com/wiki/\r
+==========================================================================================================\r
 \r
-CasparCG uses FFmpeg (http://ffmpeg.org/) under the GPLv2 Licence. \r
-FFmpeg is a trademark of Fabrice Bellard, originator of the FFmpeg project.\r
 \r
-CasparCG uses the Threading Building Blocks (http://www.threadingbuildingblocks.org/) library under the GPLv2 Licence.\r
+CasparCG is distributed under the GNU General Public License GPLv3 or higher, see COPYING.TXT for details.\r
 \r
-CasparCG uses FreeImage (http://freeimage.sourceforge.net/) under the GPLv2.\r
-\r
-CasparCG uses SFML (http://www.sfml-dev.org/) under the zlib/libpng License.\r
-\r
-CasparCG uses GLEW (http://glew.sourceforge.net) under the modified BSD license.\r
-\r
-CasparCG uses boost (http://www.boost.org/) under the Boost Software License, Version 1.0.\r
-\r
-======================================================================================================\r
+==========================================================================================================\r
 AUTHORS - People who have developed the CasparCG Server Software (sorted alphabetically by last name).\r
-======================================================================================================\r
+==========================================================================================================\r
 \r
-       Niklas  Andersson       (Server 1.0-1.8)\r
-       Andreas Jeansson        (Template-Host)\r
-       Robert  Nagy            (Server 1.7-2.x)\r
+Niklas         Andersson       (Server 1.0-1.8)\r
+Andreas        Jeansson        (Template-Host)\r
+Robert         Nagy            (Server 1.7-2.x)\r
        \r
-==================================================================================================\r
+==========================================================================================================\r
 CREDITS - People who have contributed to the CasparCG Project (sorted alphabetically by last name).\r
-==================================================================================================\r
-\r
-       Niklas  Andersson                       \r
-       Jonas   Hummelstrand    (jonas.hummelstrand@svt.se)\r
-       Andreas Jeansson                (andreas.jeansson@svt.se)\r
-       Peter   Karlsson                (peter.p.karlsson@svt.se)\r
-       Robert  Nagy                    (ronag89@gmail.com)\r
-       Olle    Soprani                 \r
-       Thomas  R. Kaltz III \r
+==========================================================================================================\r
+\r
+Niklas Andersson                       \r
+Jonas  Hummelstrand    (jonas.hummelstrand@svt.se)\r
+Andreas Jeansson               (andreas.jeansson@svt.se)\r
+Peter  Karlsson                (peter.p.karlsson@svt.se)\r
+Robert         Nagy                    (robert.nagy@dfindredpatch.se, ronag89@gmail.com)\r
+Olle   Soprani                 \r
+Thomas         R. Kaltz III \r