aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2012-02-11 12:04:12 (GMT)
committerJouni Malinen <j@w1.fi>2012-02-11 17:39:31 (GMT)
commit331f89ff5bee365e1229fc25878791dea52f8d6e (patch)
treed2cb0ce20e1a93391cd91bfad3352c95536ec9d3 /doc
parent5ea93947ca67ba83529798b806a15b247cdb2e93 (diff)
downloadhostap-331f89ff5bee365e1229fc25878791dea52f8d6e.zip
hostap-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.gz
hostap-331f89ff5bee365e1229fc25878791dea52f8d6e.tar.bz2
Select the BSD license terms as the only license alternative
Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'doc')
-rw-r--r--doc/mainpage.doxygen8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/mainpage.doxygen b/doc/mainpage.doxygen
index 690b7d6..09d2550 100644
--- a/doc/mainpage.doxygen
+++ b/doc/mainpage.doxygen
@@ -8,10 +8,10 @@ modified, how new drivers can be supported, and how the source code
can be ported to other operating systems. If any information is
missing, feel free to contact Jouni Malinen <j@w1.fi> for more
information. Contributions as patch files are also very welcome at the
-same address. Please note that this software is licensed under dual
-license, GPLv2 or BSD at user's choice. All contributions to
-%wpa_supplicant and hostapd are expected to use compatible licensing
-terms.
+same address. Please note that this software is licensed under the
+BSD license (the one with advertisement clause removed). All
+contributions to %wpa_supplicant and hostapd are expected to use
+compatible licensing terms.
The source code and read-only access to the combined %wpa_supplicant
and hostapd Git repository is available from the project home page at