summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2014-03-28 23:01:27 +0000
committerLars Wirzenius <liw@liw.fi>2014-03-28 23:01:27 +0000
commit6d27c778c2c51129d5882c2c5adf2aeac9d36e06 (patch)
tree6904ab3f6036970601bae68670086054b419b213 /README
parentc64d15db68d8fcf244b789c23d7bb1f8c5a1ac0f (diff)
downloadobnam-6d27c778c2c51129d5882c2c5adf2aeac9d36e06.tar.gz
Dual-license the manual
Diffstat (limited to 'README')
-rw-r--r--README44
1 files changed, 28 insertions, 16 deletions
diff --git a/README b/README
index 45b34048..11be4c31 100644
--- a/README
+++ b/README
@@ -146,19 +146,31 @@ Legal stuff
Most of the code is written by Lars Wirzenius. (Please provide patches
so that can change.)
-The code is covered by the GNU General Public License, version 3 or later.
-
-Copyright 2010-2013 Lars Wirzenius
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+This entire work is covered by the GNU General Public
+License, version 3 or later.
+
+> Copyright 2010-2013 Lars Wirzenius
+>
+> This program is free software: you can redistribute it and/or modify
+> it under the terms of the GNU General Public License as published by
+> the Free Software Foundation, either version 3 of the License, or
+> (at your option) any later version.
+>
+> This program is distributed in the hope that it will be useful,
+> but WITHOUT ANY WARRANTY; without even the implied warranty of
+> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+> GNU General Public License for more details.
+>
+> You should have received a copy of the GNU General Public License
+> along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+A copy of the GPL is included in the file `COPYING` in the source tree.
+
+The manual (all the contents of the `manual` subdirectory) is
+additionally licensed under a Creative Commons Attribution 4.0
+International License. You can choose whether to use the GPL or the CC
+license for the manual.
+
+A copy of the Creative Commons license is included in the file
+`CC-BY-SA-4.0.txt` in the source tree, and can be viewed online
+at <http://creativecommons.org/licenses/by-sa/4.0/legalcode>.