1 files changed, 42 insertions, 53 deletions

diff --git a/meta/files/common-licenses/Nokia b/meta/files/common-licenses/Nokia
index ea5912ecb0..0037716dff 100644
--- a/meta/files/common-licenses/Nokia
+++ b/meta/files/common-licenses/Nokia
@@ -1,7 +1,7 @@
 
 Nokia Open Source License (NOKOS
 License) Version 1.0a
-1. DEFINITIONS.
+ 1. DEFINITIONS.
 
 "Affiliates" of a party shall mean an entity
 
@@ -20,38 +20,38 @@ composition of its board of directors or equivalent body.
 "Commercial Use" shall mean distribution or otherwise making
 the Covered Software available to a third party.
 
-''Contributor'' shall mean each entity that creates or contributes
+``Contributor`` shall mean each entity that creates or contributes
 to the creation of Modifications.
 
-''Contributor Version'' shall mean in case of any Contributor
+``Contributor Version`` shall mean in case of any Contributor
 the combination of the Original Software, prior Modifications used by a
-Contributor, and the Modifications made by that particular Contributor
+Contributor, and the Modifications made by that particular Contributor 
 and in case of Nokia in addition the Original Software in any form, including
 the form as Exceutable.
 
-''Covered Software'' shall mean the Original Software or Modifications
+``Covered Software`` shall mean the Original Software or Modifications
 or the combination of the Original Software and Modifications, in each
 case including portions thereof.
 
-''Electronic Distribution Mechanism'' shall mean a mechanism
+``Electronic Distribution Mechanism`` shall mean a mechanism
 generally accepted in the software development community for the electronic
 transfer of data.
 
-''Executable'' shall mean Covered Software in any form other
+``Executable`` shall mean Covered Software in any form other
 than Source Code.
 
-''Nokia'' shall mean Nokia Corporation and its Affiliates.
+``Nokia`` shall mean Nokia Corporation and its Affiliates.
 
-''Larger Work'' shall mean a work, which combines Covered Software
+``Larger Work`` shall mean a work, which combines Covered Software
 or portions thereof with code not governed by the terms of this License.
 
-''License'' shall mean this document.
+``License`` shall mean this document.
 
 "Licensable" shall mean having the right to grant, to the maximum
 extent possible, whether at the time of the initial grant or subsequently
 acquired, any and all of the rights conveyed herein.
 
-''Modifications'' shall mean any addition to or deletion from
+``Modifications`` shall mean any addition to or deletion from
 the substance or structure of either the Original Software or any previous
 Modifications. When Covered Software is released as a series of files,
 a Modification is:
@@ -62,7 +62,7 @@ Original Software or previous Modifications.
 b) Any new file that contains any part of the Original Software or
 previous Modifications.
 
-''Original Software'' shall mean the Source Code of computer
+``Original Software`` shall mean the Source Code of computer
 software code which is described in the Source Code notice required by
 Exhibit A as Original Software, and which, at the time of its release under
 this License is not already Covered Software governed by this License.
@@ -71,19 +71,19 @@ this License is not already Covered Software governed by this License.
 or hereafter acquired, including without limitation, method, process, and
 apparatus claims, in any patent Licensable by grantor.
 
-''Source Code'' shall mean the preferred form of the Covered
+``Source Code`` shall mean the preferred form of the Covered
 Software for making modifications to it, including all modules it contains,
 plus any associated interface definition files, scripts used to control
 compilation and installation of an Executable, or source code differential
 comparisons against either the Original Software or another well known,
-available Covered Software of the Contributor's choice. The Source Code
+available Covered Software of the Contributor`s choice. The Source Code
 can be in a compressed or archival form, provided the appropriate decompression
 or de-archiving software is widely available for no charge.
 
-"You'' (or "Your") shall mean an individual or a legal
+"You`` (or "Your") shall mean an individual or a legal
 entity exercising rights under, and complying with all of the terms of,
 this License or a future version of this License issued under Section 6.1.
-For legal entities, "You'' includes Affiliates of such entity.
+For legal entities, "You`` includes Affiliates of such entity.
 
 2. SOURCE CODE LICENSE.
 
@@ -129,8 +129,7 @@ or selling of Modifications made by that Contributor either alone and/or
 in combination with its Contributor Version (or portions of such combination),
 to make, use, sell, offer for sale, have made, and/or otherwise dispose
 of: 1) Modifications made by that Contributor (or portions thereof); and
-2) the combination of Modifications made by that Contributor with its
-Contributor
+2) the combination of Modifications made by that Contributor with its Contributor
 Version (or portions of such combination).
 
 c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
@@ -157,7 +156,7 @@ the terms of this License or a future version of this License released
 under Section 6.1, and You must include a copy of this License with every
 copy of the Source Code You distribute. You may not offer or impose any
 terms on any Source Code version that alters or restricts the applicable
-version of this License or the recipients' rights hereunder. However, You
+version of this License or the recipients` rights hereunder. However, You
 may include an additional document offering the additional rights described
 in Section 3.5.
 
@@ -185,14 +184,14 @@ provided by Nokia and including the name of Nokia in (a) the Source Code,
 and (b) in any notice in an Executable version or related documentation
 in which You describe the origin or ownership of the Covered Software.
 
-3.4 Intellectual Property Matters
+3.4  Intellectual Property Matters
 
 (a) Third Party Claims.
 
-If Contributor has knowledge that a license under a third party's intellectual
+If Contributor has knowledge that a license under a third party`s intellectual
 property rights is required to exercise the rights granted by such Contributor
 under Sections 2.1 or 2.2, Contributor must include a text file with the
-Source Code distribution titled "LEGAL'' which describes the claim and
+Source Code distribution titled "LEGAL`` which describes the claim and
 the party making the claim in sufficient detail that a recipient will know
 whom to contact. If Contributor obtains such knowledge after the Modification
 is made available as described in Section 3.2, Contributor shall promptly
@@ -203,7 +202,7 @@ Software that new knowledge has been obtained.
 
 (b) Contributor APIs.
 
-If Contributor's Modifications include an application programming interface
+If Contributor`s Modifications include an application programming interface
 and Contributor has knowledge of patent licenses which are reasonably necessary
 to implement that API, Contributor must also include this information in
 the LEGAL file.
@@ -211,8 +210,8 @@ the LEGAL file.
 (c) Representations.
 
 Contributor represents that, except as disclosed pursuant to Section
-3.4(a) above, Contributor believes that Contributor's Modifications are
-Contributor's original creation(s) and/or Contributor has sufficient rights
+3.4(a) above, Contributor believes that Contributor`s Modifications are
+Contributor`s original creation(s) and/or Contributor has sufficient rights
 to grant the rights conveyed by this License.
 
 3.5 Required Notices.
@@ -224,7 +223,7 @@ file due to its structure, then You must include such notice in a location
 such a notice. If You created one or more Modification(s) You may add your
 name as a Contributor to the notice described in Exhibit A. You must also
 duplicate this License in any documentation for the Source Code where You
-describe recipients' rights or ownership rights relating to Covered Software.
+describe recipients` rights or ownership rights relating to Covered Software.
 You may choose to offer, and to charge a fee for, warranty, support, indemnity
 or liability obligations to one or more recipients of Covered Software.
 However, You may do so only on Your own behalf, and not on behalf of Nokia
@@ -242,12 +241,12 @@ and if You include a notice stating that the Source Code version of the
 Covered Software is available under the terms of this License, including
 a description of how and where You have fulfilled the obligations of Section
 3.2. The notice must be conspicuously included in any notice in an Executable
-version, related documentation or collateral in which You describe recipients'
+version, related documentation or collateral in which You describe recipients`
 rights relating to the Covered Software. You may distribute the Executable
 version of Covered Software or ownership rights under a license of Your
 choice, which may contain terms different from this License, provided that
 You are in compliance with the terms of this License and that the license
-for the Executable version does not attempt to limit or alter the recipient's
+for the Executable version does not attempt to limit or alter the recipient`s
 rights in the Source Code version from the rights set forth in this License.
 If You distribute the Executable version under a different license You
 must make it absolutely clear that any terms which differ from this License
@@ -267,8 +266,7 @@ of this License are fulfilled for the Covered Software.
 If it is impossible for You to comply with any of the terms of this
 License with respect to some or all of the Covered Software due to statute,
 judicial order, or regulation then You must: (a) comply with the terms
-of this License to the maximum extent possible; and (b) describe the
-limitations
+of this License to the maximum extent possible; and (b) describe the limitations
 and the code they affect. Such description must be included in the LEGAL
 file described in Section 3.4 and must be included with all distributions
 of the Source Code.
@@ -301,15 +299,14 @@ created under this License.
 
 7. DISCLAIMER OF WARRANTY.
 
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS,
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS`` BASIS,
 WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
-MERCHANTABLE,
+LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE,
 FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
 QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
 COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT NOKIA, ITS LICENSORS
 OR AFFILIATES OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF  WARRANTY CONSTITUTES
 AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED
 HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
@@ -324,17 +321,15 @@ the termination of this License shall survive.
 
 8.2 If You initiate litigation by asserting a patent infringement claim
 (excluding declatory judgment actions) against Nokia or a Contributor (Nokia
-or Contributor against whom You file such action is referred to as
-"Participant")
+or Contributor against whom You file such action is referred to as "Participant")
 alleging that:
 
-a) such Participant's Contributor Version directly or indirectly infringes
+a) such Participant`s Contributor Version directly or indirectly infringes
 any patent, then any and all rights granted by such Participant to You
 under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
 from Participant terminate prospectively, unless if within 60 days after
 receipt of notice You either: (i) agree in writing to pay Participant a
-mutually agreeable reasonable royalty for Your past and future use of
-Modifications
+mutually agreeable reasonable royalty for Your past and future use of Modifications
 made by such Participant, or (ii) withdraw Your litigation claim with respect
 to the Contributor Version against such Participant. If within 60 days
 of notice, a reasonable royalty and payment arrangement are not mutually
@@ -343,14 +338,14 @@ the rights granted by Participant to You under Sections 2.1 and/or 2.2
 automatically terminate at the expiration of the 60 day notice period specified
 above.
 
-b) any software, hardware, or device, other than such Participant's
+b) any software, hardware, or device, other than such Participant`s
 Contributor Version, directly or indirectly infringes any patent, then
 any rights granted to You by such Participant under Sections 2.1(b) and
 2.2(b) are revoked effective as of the date You first made, used, sold,
 distributed, or had made, Modifications made by that Participant.
 
 8.3 If You assert a patent infringement claim against Participant alleging
-that such Participant's Contributor Version directly or indirectly infringes
+that such Participant`s Contributor Version directly or indirectly infringes
 any patent where such claim is resolved (such as by license or settlement)
 prior to the initiation of patent infringement litigation, then the reasonable
 value of the licenses granted by such Participant under Sections 2.1 or
@@ -373,10 +368,10 @@ DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION,
 OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL
 HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION
 OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS
+RESULTING FROM SUCH PARTY`S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS
 SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION
 OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, BUT MAY ALLOW LIABILITY TO BE LIMITED;
-IN SUCH CASES, A PARTY's, ITS EMPLOYEES, LICENSORS OR AFFILIATES' LIABILITY
+IN SUCH CASES, A PARTY`s, ITS EMPLOYEES, LICENSORS OR AFFILIATES` LIABILITY
 SHALL BE LIMITED TO U.S. $50. Nothing contained in this License shall prejudice
 the statutory rights of any party dealing as a consumer.
 
@@ -405,17 +400,16 @@ of rights under this License and You agree to work with Nokia and Contributors
 to distribute such responsibility on an equitable basis. Nothing herein
 is intended or shall be deemed to constitute any admission of liability.
 
-
+ 
 
 EXHIBIT A
 
 The contents of this file are subject to the NOKOS License Version 1.0
-(the "License"); you may not use this file except in compliance with
-the
+(the "License"); you may not use this file except in compliance with the
 License.
 
 Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+basis, WITHOUT WARRANTY OF  ANY KIND, either express or implied. See
 the License for the specific language governing rights and limitations
 under the License.
 
@@ -423,12 +417,7 @@ The Original Software is
 
 ______________________________________.
 
-Copyright © <year> Nokia and others. All Rights Reserved.
+Copyright &#169; <year> Nokia and others. All Rights Reserved.
 
 Contributor(s): ______________________________________.
 
-
-
-
-
-