Make license rules more specific

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/licensedcode/data/rules/elastic-license-v2_or_mongodb-sspl-1.0_1.RULE

@@ -11,6 +11,6 @@ ignorable_holders:
 
 * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the {{Elastic License}}
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * 2.0 and the {{Server Side Public License, v 1}}; you may not use this file except
  * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
+ * Side Public License, v 1.

src/licensedcode/data/rules/elastic-license-v2_or_mongodb-sspl-1.0_2.RULE

@@ -1,10 +1,7 @@
 ---
-license_expression: (elastic-license-v2 OR mongodb-sspl-1.0) AND apache-2.0 AND other-permissive
-    AND elastic-license-v2
+license_expression: (elastic-license-v2 OR mongodb-sspl-1.0) AND apache-2.0 AND elastic-license-v2
 is_license_notice: yes
 relevance: 100
-referenced_filenames:
-    - licenses/ELASTIC-LICENSE-2.0.txt
 notes: See https://github.com/elastic/elasticsearch/commit/a92a647b9f17d1bddf5c707490a19482c273eda3
 ---
 
@@ -14,4 +11,4 @@ Side Public License, v 1 and the Elastic License 2.0 or (ii) an Apache License
 case, as noted in the applicable header. The default throughout the repository
 is a dual license under the Server Side Public License, v 1 and the Elastic
 License 2.0, unless the header specifies another license. Code that is licensed
-solely under the Elastic License 2.0 is found only in the x-pack folder.
+solely under the Elastic License 2.0 is found only in the x-pack folder.

src/licensedcode/data/rules/lgpl-2.0-plus_or_cc-sa-1.0_1.RULE

@@ -1,8 +1,9 @@
 ---
-license_expression: lgpl-2.0-plus AND cc-by-sa-3.0 AND other-copyleft
+license_expression: lgpl-2.0-plus OR cc-sa-1.0
 is_license_notice: yes
 relevance: 100
+minimum_coverage: 100
 ---
 
 licenced on the terms of (inter alia)
-LGPL and Creative Commons ShareAlike.
+LGPL and Creative Commons ShareAlike.

src/licensedcode/data/rules/mit_or_cecill-c_1.RULE

@@ -6,5 +6,5 @@ referenced_filenames:
     - LICENSE-CECILL-C.txt
 ---
 
-available either under the terms of the MIT License (see LICENSE-MIT.txt) of the Cecill-C License (see LICENSE-CECILL-C.txt).
-You as the user are entitled to choose the terms under which to adopt.
+available either under the terms of the {{MIT License}} (see LICENSE-MIT.txt) of the {{Cecill-C License}} (see LICENSE-CECILL-C.txt).
+You as the user {{are entitled to choose the terms}} under which to adopt.

src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0-plus_7.RULE

@@ -1,14 +1,14 @@
 ---
-license_expression: mpl-1.1 OR gpl-1.0-plus
+license_expression: mpl-1.1 OR gpl-2.0-plus
 is_license_notice: yes
 ---
 
-Alternatively, the contents of this file may be used under the terms of the
-GNU General Public License Version 2 or later (the "GPL"), in which case
+{{Alternatively, the contents of this file may be used under the terms of the
+GNU General Public License Version 2 or later"" (the "GPL"), in which case
 the provisions of the GPL are applicable instead of those above.
 If you wish to allow use of your version of this file only under the terms
 of the GPL and not to allow others to use your version of this file
 under the MPL, indicate your decision by deleting the provisions above and
 replace them with the notice and other provisions required by the GPL.
 If you do not delete the provisions above, a recipient may use your version
-of this file under either the MPL or the GPL.
+of this file under either {{the MPL or the GPL}}.