summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2010-12-09 13:59:11 +0100
committerRob Crittenden <rcritten@redhat.com>2010-12-20 17:19:53 -0500
commit7493d781dfcaa7995f7864a09ad39ba6a89f1a9c (patch)
tree4e7ff4188d2f8105679369e58d6a2734b4872998 /doc
parentffd467bd7e12faad3f1574fe3c1e505820bdf459 (diff)
downloadfreeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.gz
freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.xz
freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.zip
Change FreeIPA license to GPLv3+
The changes include: * Change license blobs in source files to mention GPLv3+ not GPLv2 only * Add GPLv3+ license text * Package COPYING not LICENSE as the license blobs (even the old ones) mention COPYING specifically, it is also more common, I think https://fedorahosted.org/freeipa/ticket/239
Diffstat (limited to 'doc')
-rw-r--r--doc/examples/examples.py10
-rwxr-xr-xdoc/examples/python-api.py19
2 files changed, 24 insertions, 5 deletions
diff --git a/doc/examples/examples.py b/doc/examples/examples.py
index 9bef1a02f..b59dc908f 100644
--- a/doc/examples/examples.py
+++ b/doc/examples/examples.py
@@ -4,9 +4,10 @@
# Copyright (C) 2010 Red Hat
# see file 'COPYING' for use and warranty information
#
-# 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; version 2 only
+# 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
@@ -14,8 +15,7 @@
# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
Example plugins
"""
diff --git a/doc/examples/python-api.py b/doc/examples/python-api.py
index 17f00db3d..004134704 100755
--- a/doc/examples/python-api.py
+++ b/doc/examples/python-api.py
@@ -1,4 +1,23 @@
#!/usr/bin/env python
+# Authors:
+# Jason Gerard DeRose <jderose@redhat.com>
+#
+# Copyright (C) 2009 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# 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/>.
+#
from ipalib import api