diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-11-05 02:30:03 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-11-05 02:30:03 +0000 |
commit | 648b4ba7f548d99fd57ca60a2fefd68256d0c392 (patch) | |
tree | 466493afc0c17c76ce4bb235bb9f220d59775db7 /licenses/CeCILL-2 | |
parent | Use Ubuntu patch to workaround the localization and other profile problems. B... (diff) | |
download | gentoo-2-648b4ba7f548d99fd57ca60a2fefd68256d0c392.tar.gz gentoo-2-648b4ba7f548d99fd57ca60a2fefd68256d0c392.tar.bz2 gentoo-2-648b4ba7f548d99fd57ca60a2fefd68256d0c392.zip |
Fix various licenses, encoding should be UTF-8, bug 389395.
Diffstat (limited to 'licenses/CeCILL-2')
-rw-r--r-- | licenses/CeCILL-2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/licenses/CeCILL-2 b/licenses/CeCILL-2 index fcc8df26b07f..f5985c07da09 100644 --- a/licenses/CeCILL-2 +++ b/licenses/CeCILL-2 @@ -19,7 +19,7 @@ the two main principles guiding its drafting: The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) license are: -Commissariat à l'Energie Atomique - CEA, a public scientific, technical +Commissariat à l'Energie Atomique - CEA, a public scientific, technical and industrial research establishment, having its principal place of business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. @@ -127,7 +127,7 @@ These expressions may be used both in singular and plural form. The purpose of the Agreement is the grant by the Licensor to the Licensee of a non-exclusive, transferable and worldwide license for the Software as set forth in Article 5 hereinafter for the whole term of the -protection granted by the rights over said Software. +protection granted by the rights over said Software. Article 3 - ACCEPTANCE @@ -327,7 +327,7 @@ The Licensee expressly undertakes: The Licensee undertakes not to directly or indirectly infringe the intellectual property rights of the Holder and/or Contributors on the -Software and to take, where applicable, vis-à-vis its staff, any and all +Software and to take, where applicable, vis-à -vis its staff, any and all measures required to ensure respect of said intellectual property rights of the Holder and/or Contributors. @@ -394,7 +394,7 @@ rights set forth in Article 5). 9.3 The Licensee acknowledges that the Software is supplied "as is" by the Licensor without any other express or tacit warranty, other than -that provided for in Article 9.2 and, in particular, without any warranty +that provided for in Article 9.2 and, in particular, without any warranty as to its commercial value, its secured, safe, innovative or relevant nature. |