Relicense to MIT

fredemmott · fredemmott · commit 463d0a803ac9 · 2018-08-02T14:51:23.000-07:00
t32051431
diff --git a/LICENSE b/LICENSE
@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For vim-hack software
+Copyright (c) 2014-present, Facebook, Inc.
 
-Copyright (c) 2013, Facebook, Inc. All rights reserved.
+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:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-* Neither the name Facebook nor the names of its contributors may be used to
-endorse or promote products derived from this software without specific
-prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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/PATENTS b/PATENTS
diff --git a/README.md b/README.md
@@ -99,8 +99,7 @@ This binds `K` to 'show type in the gutter', and both `gd` and meta-click ('comm
 License
 =======
 
-vim-hack is BSD licensed, as found in the LICENSE file. We also provide an
-additional patent grant.
+HHAST is MIT-licensed, as found in the LICENSE file.
 
 [ALE]: https://github.com/w0rp/ale
 [HHAST]: https://github.com/hhvm/hhast
diff --git a/after/syntax/php.vim b/after/syntax/php.vim
@@ -6,10 +6,8 @@
 "
 " Copyright: (c) 2014, Facebook Inc.  All rights reserved.
 "
-" This source code is licensed under the BSD-style license found in the
-" LICENSE file in the toplevel directory of this source tree.  An additional
-" grant of patent rights can be found in the PATENTS file in the same
-" directory.
+" This source code is licensed under the MIT license found in the
+" LICENSE file in the toplevel directory of this source tree.
 
 
 " We clear templatizable PHP keywords because keyword always takes precedence
diff --git a/ftdetect/hack.vim b/ftdetect/hack.vim
@@ -6,10 +6,8 @@
 "
 " Copyright: (c) 2014, Facebook Inc.  All rights reserved.
 "
-" This source code is licensed under the BSD-style license found in the
-" LICENSE file in the toplevel directory of this source tree.  An additional
-" grant of patent rights can be found in the PATENTS file in the same
-" directory.
+" This source code is licensed under the MIT license found in the
+" LICENSE file in the top level directory of this source tree.
 
 au BufRead,BufNewFile *.hhi
   \ setl filetype=hack |

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`	`"`
`7`	`7`	`" Copyright: (c) 2014, Facebook Inc. All rights reserved.`
`8`	`8`	`"`
`9`		`-" This source code is licensed under the BSD-style license found in the`
`10`		`-" LICENSE file in the toplevel directory of this source tree. An additional`
`11`		`-" grant of patent rights can be found in the PATENTS file in the same`
`12`		`-" directory.`
	`9`	`+" This source code is licensed under the MIT license found in the`
	`10`	`+" LICENSE file in the toplevel directory of this source tree.`
`13`	`11`
`14`	`12`
`15`	`13`	`" We clear templatizable PHP keywords because keyword always takes precedence`