From: florianf <florianf@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Fri, 12 Feb 2010 07:15:50 +0000 (+0000)
Subject: {,data/}README: Document license of data files.
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=d625a7bfb131e5e6c8061901c0d69352788820d8

{,data/}README: Document license of data files.

Thanks to ohnobinki for the patch.
Resolves: #578.


git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6327 837edb03-e0f3-0310-88ca-d4d4e8b29345
---

diff --git a/README b/README
index 7576d30cf..49fb78869 100644
--- a/README
+++ b/README
@@ -49,12 +49,14 @@ DOCUMENTATION
     README               - (This file.)  Game story, usage, rules and controls.
     WHATSNEW.txt         - Changes since the previous versions of SuperTux.
     COPYING              - The GNU General Public License, under whose terms
-                           SuperTux is licensed.
-    levelguidelines.txt  - Very useful information for those that want to design
+                           SuperTux is licensed. (The data subdiretory is also
+			   licensed under CC-by-SA)
+    docs/levelguidelines.txt - Very useful information for those that want to design
                            levels for SuperTux.
-    credits.txt          - Credits for people that contributed to the creation
+    data/credits.txt     - Credits for people that contributed to the creation
                            of SuperTux. (You can view these in the game menu
                            as well.)
+    data/README		 - Licensing information about the data.
 
 
 RUNNING THE GAME
@@ -67,7 +69,8 @@ RUNNING THE GAME
   Options can be reached from the menu, so you don't need to specify arguments,
   but if you want, type 'supertux2 --help' to check the ones that are available.
   Also, notice that SuperTux saves the options, so it's often enough to
-  specify them once.
+  specify them once. For example, fullscreen mode causes problems on some setups,
+  so just run 'supertux2 --window' and you should be set.
 
   The game uses OpenGL to render the graphics. You will either need a CPU
   with about 10 GHz or an accelerated video card with the vendor's drivers.
diff --git a/data/README b/data/README
new file mode 100644
index 000000000..c5904ca9f
--- /dev/null
+++ b/data/README
@@ -0,0 +1,11 @@
+This data has all been released by its authors under the GPLv3+
+as well as the CC-by-SA, making it dual-licensed. You may find
+a copy of the GPLv3 license in ../COPYING. 
+
+
+These works are also licensed under the Creative Commons
+Attribution-Share Alike 3.0 United States License. To
+view a copy of this license, visit 
+http://creativecommons.org/licenses/by-sa/3.0/us/ or send
+a letter to Creative Commons, 171 Second Street, Suite 300,
+San Francisco, California, 94105, USA.