From 8e969e10f2b502ba92a7a4c4edc6c9293c9f9147 Mon Sep 17 00:00:00 2001 From: Dave Hunt Date: Tue, 24 Jan 2012 12:15:48 +0000 Subject: [PATCH] Updated license to MPL 2.0 --- README.md | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 2a5e77c..3dd8096 100644 --- a/README.md +++ b/README.md @@ -8,42 +8,8 @@ See the project's [wiki](https://github.com/mozilla/moz-grid-config/wiki). License ------- -This software is licensed under the [Mozilla Tri-License][MPL]: +This software is licensed under the [MPL](http://www.mozilla.org/MPL/2.0/) 2.0: - ***** BEGIN LICENSE BLOCK ***** - Version: MPL 1.1/GPL 2.0/LGPL 2.1 - - The contents of this file are subject to the Mozilla Public License Version - 1.1 (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.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS IS" basis, - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - for the specific language governing rights and limitations under the - License. - - The Original Code is Mozilla WebQA. - - The Initial Developer of the Original Code is Mozilla. - Portions created by the Initial Developer are Copyright (C) 2011 - the Initial Developer. All Rights Reserved. - - Contributor(s): - Dave Hunt - - Alternatively, the contents of this file may be used under the terms of - either the GNU General Public License Version 2 or later (the "GPL"), or - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - in which case the provisions of the GPL or the LGPL are applicable instead - of those above. If you wish to allow use of your version of this file only - under the terms of either the GPL or the LGPL, and not to allow others to - use your version of this file under the terms of the MPL, indicate your - decision by deleting the provisions above and replace them with the notice - and other provisions required by the GPL or the LGPL. If you do not delete - the provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. - - ***** END LICENSE BLOCK ***** - -[MPL]: http://www.mozilla.org/MPL/ + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/.