relicense to MIT

*sigh*
toml-lang · Jul 30, 2018 · fb20d7a · fb20d7a
1 parent 6aa27cd
commit fb20d7a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 40 deletions.
diff --git a/COPYING b/COPYING
@@ -1,14 +1,21 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
+The MIT License (MIT)
 
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+Copyright (c) 2018 TOML authors
 
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/json.go b/json.go
@@ -1,10 +1,3 @@
-/*
- * This work is free. You can redistribute it and/or modify it under the
- * terms of the Do What The Fuck You Want To Public License, Version 2,
- * as published by Sam Hocevar. See the COPYING file or http://www.wtfpl.net/ 
- * for more details.
- */
-
 package main
 
 import (

diff --git a/main.go b/main.go
@@ -1,10 +1,3 @@
-/*
- * This work is free. You can redistribute it and/or modify it under the
- * terms of the Do What The Fuck You Want To Public License, Version 2,
- * as published by Sam Hocevar. See the COPYING file or http://www.wtfpl.net/ 
- * for more details.
- */
-
 package main
 
 import (
@@ -75,8 +68,8 @@ func usage() {
 		path.Base(os.Args[0]))
 	log.Println(`
 parser-cmd should be a program that accepts TOML data on stdin until EOF,
-and outputs the corresponding JSON encoding on stdout. Please see 'README.md' 
-for details on how to satisfy the interface expected by 'toml-test' with your 
+and outputs the corresponding JSON encoding on stdout. Please see 'README.md'
+for details on how to satisfy the interface expected by 'toml-test' with your
 own parser.
 
 The 'testdir' directory should have two sub-directories: 'invalid' and 'valid'.

diff --git a/results.go b/results.go
@@ -1,10 +1,3 @@
-/*
- * This work is free. You can redistribute it and/or modify it under the
- * terms of the Do What The Fuck You Want To Public License, Version 2,
- * as published by Sam Hocevar. See the COPYING file or http://www.wtfpl.net/ 
- * for more details.
- */
-
 package main
 
 import (

diff --git a/toml.go b/toml.go
@@ -1,10 +1,3 @@
-/*
- * This work is free. You can redistribute it and/or modify it under the
- * terms of the Do What The Fuck You Want To Public License, Version 2,
- * as published by Sam Hocevar. See the COPYING file or http://www.wtfpl.net/ 
- * for more details.
- */
-
 package main
 
 import (