Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #8 from typekit/bs-fix-license

Clarify licensing
  • Loading branch information...
commit 4dc360995bce7bc8ee526e32859455cd383e0685 2 parents 1df3430 + d879217
Bram Stein authored July 27, 2013

Showing 2 changed files with 8 additions and 26 deletions. Show diff stats Hide diff stats

  1. 25  LICENSE
  2. 9  README.md
25  LICENSE
@@ -174,28 +174,3 @@
174 174
       of your accepting any such warranty or additional liability.
175 175
 
176 176
    END OF TERMS AND CONDITIONS
177  
-
178  
-   APPENDIX: How to apply the Apache License to your work.
179  
-
180  
-      To apply the Apache License to your work, attach the following
181  
-      boilerplate notice, with the fields enclosed by brackets "[]"
182  
-      replaced with your own identifying information. (Don't include
183  
-      the brackets!)  The text should be enclosed in the appropriate
184  
-      comment syntax for the file format. We also recommend that a
185  
-      file or class name and description of purpose be included on the
186  
-      same "printed page" as the copyright notice for easier
187  
-      identification within third-party archives.
188  
-
189  
-   Copyright [2010] [Small Batch Inc]
190  
-
191  
-   Licensed under the Apache License, Version 2.0 (the "License");
192  
-   you may not use this file except in compliance with the License.
193  
-   You may obtain a copy of the License at
194  
-
195  
-       http://www.apache.org/licenses/LICENSE-2.0
196  
-
197  
-   Unless required by applicable law or agreed to in writing, software
198  
-   distributed under the License is distributed on an "AS IS" BASIS,
199  
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200  
-   See the License for the specific language governing permissions and
201  
-   limitations under the License.
9  README.md
Source Rendered
@@ -78,7 +78,14 @@ It should return
78 78
 
79 79
 Matt Colyer / matt@typekit.com
80 80
 
81  
-Copyright (c) 2010 Typekit. Licensed under the Apache 2.0 license.
  81
+## Copyright and License
82 82
 
  83
+Copyright (c) 2010 Adobe Systems Incorporated. Licensed under the Apache 2.0 license
  84
+
  85
+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
  86
+
  87
+    http://www.apache.org/licenses/LICENSE-2.0
  88
+
  89
+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.
83 90
 
84 91
 [iana]: http://www.iana.org/assignments/language-subtag-registry

0 notes on commit 4dc3609

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