Skip to content
Browse files

Make the license more explicit.

  • Loading branch information...
1 parent 3985201 commit 06f4acb14ec7d932ff29303c9f2c28de5f856629 @jlouis committed Sep 18, 2012
Showing with 15 additions and 19 deletions.
  1. +10 −17 LICENSE
  2. +5 −2 README.md
View
27 LICENSE
@@ -1,20 +1,13 @@
-Copyright (C) 2012 Jesper Louis Andersen
+Copyright 2012 Erlang Solutions Ltd. (ESL)
-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:
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+ http://www.apache.org/licenses/LICENSE-2.0
-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.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
View
7 README.md
@@ -82,7 +82,10 @@ The result value `Res` will either be the output of the `work/0`
function or the tuple `{error, Reason}` if there is some overload
condition preventing it from running.
-# License
+# License and Copyright
-MIT
+The source code is Copyright Erlang Solutions Ltd.
+
+It is licensed under the Apache 2.0 License. See the file `LICENSE`
+in the repository for the details of this license.

0 comments on commit 06f4acb

Please sign in to comment.
Something went wrong with that request. Please try again.