diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.html
index e2d782fc974..46ed9df247d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.html
@@ -28,6 +28,4 @@ <h2>Compliant Solution</h2>
 public void testDoTheThing() {
   // ...
 </pre>
-<h2>Exceptions</h2>
-<p>None</p>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.json
index be32285115c..e1c6919d9ff 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S1607_java.json
@@ -9,6 +9,8 @@
   "tags": [
     "junit",
     "tests",
+    "bad-practice",
+    "confusing",
     "suspicious"
   ],
   "defaultSeverity": "Major",
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
index ea6c9b98acc..af1be60862b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S2589_java.html
@@ -32,12 +32,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> MISRA C:2004, 13.7 - Boolean operations whose results are invariant shall not be permitted. </li>
-  <li> MISRA C:2012, 14.3 - Controlling expressions shall not be invariant </li>
   <li> <a href="http://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
   <li> <a href="http://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/489">MITRE, CWE-489</a> - Leftover Debug Code </li>
-  <li> <a href="https://www.securecoding.cert.org/confluence/x/NYA5">CERT, MSC12-C.</a> - Detect and remove code that has no effect or is never
-  executed </li>
 </ul>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4818_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4818_java.html
index c786e0762ea..cbc114a980d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4818_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S4818_java.html
@@ -111,7 +111,7 @@ <h2>See</h2>
   </li>
   <li> <a href="http://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
   <li> <a href="http://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
-  <li> <a href="http://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Information Exposure </li>
+  <li> <a href="http://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html
index 3360322934c..f1935889e4e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.html
@@ -1,5 +1,5 @@
-<p>Assertions of dissimilar types always fail, and negative assertions always pass. At best, negative assertions are useless. At worst, the developer
-loses time trying to fix his code logic before noticing wrong assertions.</p>
+<p>Assertions comparing incompatible types always fail, and negative assertions always pass. At best, negative assertions are useless. At worst, the
+developer loses time trying to fix his code logic before noticing wrong assertions.</p>
 <p>Dissimilar types are:</p>
 <ul>
   <li> comparing a primitive with null </li>
@@ -15,7 +15,7 @@
 <ul>
   <li> JUnit4 </li>
   <li> JUnit5 </li>
-  <li> AsserJ </li>
+  <li> AssertJ </li>
 </ul>
 <h2>Noncompliant Code Example</h2>
 <pre>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json
index d6740e342cc..91392fab0c6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5845_java.json
@@ -1,5 +1,5 @@
 {
-  "title": "Assertions of dissimilar types should not be made",
+  "title": "Assertions comparing incompatible types should not be made",
   "type": "BUG",
   "status": "ready",
   "remediation": {
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html
index 1e75f1b40ac..aa74b017349 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/java/S5846_java.html
@@ -39,6 +39,6 @@ <h2>Compliant Solution</h2>
 
 // ...
 System.out.println(containsEmptyLines("a\n\nb")); // correctly prints 'true'
-System.out.println(containsEmptyLines("")); // also correctly prints 'false'
+System.out.println(containsEmptyLines("")); // also correctly prints 'true'
 </pre>
 
diff --git a/sonarpedia.json b/sonarpedia.json
index c8cbc8f2365..6a27e055aa2 100644
--- a/sonarpedia.json
+++ b/sonarpedia.json
@@ -3,7 +3,7 @@
   "languages": [
     "JAVA"
   ],
-  "latest-update": "2020-07-15T12:00:39.489532200Z",
+  "latest-update": "2020-08-27T14:58:46.476813600Z",
   "options": {
     "no-language-in-filenames": false,
     "preserve-filenames": false