Permalink
Browse files

Cleaned up the readme.txt. VSIX was displaying the correct information

but I missed a few other places when I switched the license a while back
  • Loading branch information...
1 parent ba3716c commit dadbc5c7de35bcc33426a6c056f117a8abea506e @jaredpar committed Dec 30, 2011
Showing with 12 additions and 36 deletions.
  1. +10 −33 License.txt
  2. +2 −3 README.txt
View
@@ -1,36 +1,13 @@
-All code here is released under the MS-PL license
+Copyright 2010 Jared Parsons
-Recent Link:
- http://msdn.microsoft.com/en-us/library/cc707818.aspx
+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
-Text of License:
+ http://www.apache.org/licenses/LICENSE-2.0
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
-
-1. Definitions
-
-The terms �reproduce,� �reproduction,� �derivative works,� and �distribution� have the same meaning here as under U.S. copyright law.
-
-A �contribution� is the original software, or any additions or changes to the software.
-
-A �contributor� is any person that distributes its contribution under this license.
-
-�Licensed patents� are a contributor�s patent claims that read directly on its contribution.
-
-2. Grant of Rights
-
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
-
-3. Conditions and Limitations
-
-(A) No Trademark License- This license does not grant you rights to use any contributors� name, logo, or trademarks.
-
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
-
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
-
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
-
-(E) The software is licensed �as-is.� You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+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
@@ -1,7 +1,7 @@
Welcome to VsVim
====
-All code in this project is covered under the MS-PL license a copy of which is available in the same directory under the name License.txt.
+All code in this project is covered under the Apache 2 license a copy of which is available in the same directory under the name License.txt.
Building
===
@@ -15,5 +15,4 @@ Branching Structure
===
- master: This is the branch used for the majority of feature development.
- - release: Release staging branch. All releases come from this branch
- - next: Used for very long lead features
+ - refactor: Used for longer term refactoring

0 comments on commit dadbc5c

Please sign in to comment.