Fixes issue #50

licence_texts/cern_ohl_p_v2.tex

@@ -89,10 +89,11 @@ You may Convey modified Covered Source (with the effect that You shall also beco
 
 \item
 \label{subsec:sublicence-doc}
-You may Convey Covered Source or modified Covered Source under licence terms which differ from the terms of this Licence provided that:
+You may Convey Covered Source or modified Covered Source under licence terms
+which differ from the terms of this Licence provided that You:
 \begin{enumerate}[label=\alph*)]
-\item You comply at all times with subsection \ref*{subsec:convey-doc}; and
-\item You provide a copy of this Licence to anyone to whom You Convey Covered Source or modified Covered Source.
+\item comply at all times with subsection \ref*{subsec:convey-doc}; and
+\item provide a copy of this Licence to anyone to whom You Convey Covered Source or modified Covered Source.
 \end{enumerate}
 \end{enumerate}
 \section{Making and Conveying Products}
@@ -114,7 +115,7 @@ EXCLUSION AND LIMITATION OF LIABILITY – The Licensor shall, to the maximum ext
 \begin{enumerate}[label=\ref*{sec:patents}.\arabic*]
 \item
 
-Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section \ref*{sec:patents}, or where terminated by the Licensor for cause) patent license to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
+Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section \ref*{sec:patents}, or where terminated by the Licensor for cause) patent licence to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
 \item
 If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Covered Source or a Product constitutes direct or contributory patent infringement, or You seek any declaration that a patent licensed to You under this Licence is invalid or unenforceable then any rights granted to You under this Licence shall terminate as of the date such process is initiated.
 \end{enumerate}

licence_texts/cern_ohl_p_v2.txt

@@ -36,8 +36,8 @@ their development.
       application or processing of Covered Source.
 
   1.5 'Make' means to create or configure something, whether by
-     manufacture, assembly, compiling, loading or applying Covered
-     Source or another Product or otherwise.
+      manufacture, assembly, compiling, loading or applying Covered
+      Source or another Product or otherwise.
 
   1.6 'Notice' means copyright, acknowledgement and trademark notices,
       references to the location of any Notices, modification notices
@@ -95,11 +95,11 @@ their development.
 
   3.4 You may Convey Covered Source or modified Covered Source under
       licence terms which differ from the terms of this Licence
-      provided that:
+      provided that You:
 
-       a) You comply at all times with subsection 3.3; and
+       a) comply at all times with subsection 3.3; and
 
-       b) You provide a copy of this Licence to anyone to whom You
+       b) provide a copy of this Licence to anyone to whom You
           Convey Covered Source or modified Covered Source.
 
 
@@ -149,7 +149,7 @@ to the Product.
       Licensor hereby grants to You a perpetual, worldwide,
       non-exclusive, no-charge, royalty-free, irrevocable (except as
       stated in this section 6, or where terminated by the Licensor
-      for cause) patent license to Make, have Made, use, offer to
+      for cause) patent licence to Make, have Made, use, offer to
       sell, sell, import, and otherwise transfer the Covered Source
       and Products, where such licence applies only to those patent
       claims licensable by such Licensor that are necessarily

licence_texts/cern_ohl_s_v2.tex

@@ -145,7 +145,7 @@ EXCLUSION AND LIMITATION OF LIABILITY – The Licensor shall, to the maximum ext
 \begin{enumerate}[label=\ref*{sec:patents}.\arabic*]
 \item
 
-Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in subsections \ref*{subsec:patent_terminate} and \ref*{subsec:termination}) patent license to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
+Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in subsections \ref*{subsec:patent_terminate} and \ref*{subsec:termination}) patent licence to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
 \item
 \label{subsec:patent_terminate}
 If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Covered Source or a Product constitutes direct or contributory patent infringement, or You seek any declaration that a patent licensed to You under this Licence is invalid or unenforceable then any rights granted to You under this Licence shall terminate as of the date such process is initiated.

licence_texts/cern_ohl_s_v2.txt

@@ -225,7 +225,7 @@ subsection 3.2.
   7.1 Subject to the terms and conditions of this Licence, each
       Licensor hereby grants to You a perpetual, worldwide,
       non-exclusive, no-charge, royalty-free, irrevocable (except as
-      stated in subsections 7.2 and 8.4) patent license to Make, have
+      stated in subsections 7.2 and 8.4) patent licence to Make, have
       Made, use, offer to sell, sell, import, and otherwise transfer
       the Covered Source and Products, where such licence applies only
       to those patent claims licensable by such Licensor that are

licence_texts/cern_ohl_w_v2.tex

@@ -155,7 +155,7 @@ EXCLUSION AND LIMITATION OF LIABILITY – The Licensor shall, to the maximum ext
 \begin{enumerate}[label=\ref*{sec:patents}.\arabic*]
 \item
 
-Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in subsections \ref*{subsec:patent_terminate} and \ref*{subsec:termination}) patent license to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
+Subject to the terms and conditions of this Licence, each Licensor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in subsections \ref*{subsec:patent_terminate} and \ref*{subsec:termination}) patent licence to Make, have Made, use, offer to sell, sell, import, and otherwise transfer the Covered Source and Products, where such licence applies only to those patent claims licensable by such Licensor that are necessarily infringed by exercising rights under the Covered Source as Conveyed by that Licensor. 
 \item
 \label{subsec:patent_terminate}
 If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Covered Source or a Product constitutes direct or contributory patent infringement, or You seek any declaration that a patent licensed to You under this Licence is invalid or unenforceable then any rights granted to You under this Licence shall terminate as of the date such process is initiated.

licence_texts/cern_ohl_w_v2.txt

@@ -54,12 +54,12 @@ their development.
   1.7 'Available Component' means any part, sub-assembly, library or
       code which:
 
-      a) is licensed to You as Complete Source under a Compatible
-         Licence; or
+       a) is licensed to You as Complete Source under a Compatible
+          Licence; or
 
-      b) is available, at the time a Product or the Source containing
-         it is first Conveyed, to You and any other prospective
-         licensees
+       b) is available, at the time a Product or the Source containing
+          it is first Conveyed, to You and any other prospective
+          licensees
 
            i) with sufficient rights and information (including any
               configuration and programming files and information
@@ -71,13 +71,13 @@ their development.
 
   1.8 'External Material' means anything (including Source) which:
 
-      a) is only combined with Covered Source in such a way that it
-         interfaces with the Covered Source using a documented
-         interface which is described in the Covered Source; and
+       a) is only combined with Covered Source in such a way that it
+          interfaces with the Covered Source using a documented
+          interface which is described in the Covered Source; and
 
-      b) is not a derivative of or contains Covered Source, or, if it
-         is, it is solely to the extent necessary to facilitate such
-         interfacing.
+       b) is not a derivative of or contains Covered Source, or, if it
+          is, it is solely to the extent necessary to facilitate such
+          interfacing.
 
   1.9 'Complete Source' means the set of all Source necessary to Make
       a Product, in the preferred form for making modifications,
@@ -242,7 +242,7 @@ subsection 3.2.
   7.1 Subject to the terms and conditions of this Licence, each
       Licensor hereby grants to You a perpetual, worldwide,
       non-exclusive, no-charge, royalty-free, irrevocable (except as
-      stated in subsections 7.2 and 8.4) patent license to Make, have
+      stated in subsections 7.2 and 8.4) patent licence to Make, have
       Made, use, offer to sell, sell, import, and otherwise transfer
       the Covered Source and Products, where such licence applies only
       to those patent claims licensable by such Licensor that are