Permalink
Browse files

Updated LICENSE.

  • Loading branch information...
1 parent 8055dfd commit 49fb04067d8ed945bf70c9766152d4f99737f575 @donnemartin committed Jul 15, 2015
Showing with 36 additions and 18 deletions.
  1. +14 −17 LICENSE
  2. +22 −1 README.md
View
@@ -1,20 +1,17 @@
-Copyright Mathias Bynens <https://mathiasbynens.be/>
+This repository contains a variety of content; some developed by Donne Martin, and some from third-parties. The third-party content is distributed under the license provided by those parties.
-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:
+The content developed by Donne Martin is distributed under the following license:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Copyright 2015 Donne Martin
-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.
+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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+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
@@ -88,6 +88,7 @@ This repo builds on the awesome work from [Mathias Bynens](https://github.com/ma
* [Contributions](#contributions)
* [Credits](#credits)
+* [License](#license)
## Section 1: Installation
@@ -799,4 +800,24 @@ Bug reports and suggestions are [welcome](https://github.com/donnemartin/dev-set
This repo builds on the awesome work from the following repos:
* [dotfiles](https://github.com/mathiasbynens/dotfiles) by Mathias Bynens
-* [mac-dev-setup](https://github.com/nicolashery/mac-dev-setup) by Nicolas Hery
+* [mac-dev-setup](https://github.com/nicolashery/mac-dev-setup) by Nicolas Hery
+
+### License
+
+This repository contains a variety of content; some developed by Donne Martin, and some from third-parties. The third-party content is distributed under the license provided by those parties.
+
+The content developed by Donne Martin is distributed under the following license:
+
+ Copyright 2015 Donne Martin
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.

0 comments on commit 49fb040

Please sign in to comment.