diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index f82566b..489254b 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2666,7 +2666,7 @@
 +
 Elasticsearch server port.
 +
-Defauls to `9200`.
+Defaults to `9200`.
 
 [[index.prefix]]index.prefix::
 +
@@ -3497,7 +3497,7 @@
 
 [[receiveemail.port]]receiveemail.port::
 +
-The port the email server exposes for receving emails.
+The port the email server exposes for receiving emails.
 +
 Defaults to the industry standard for a given protocol and encryption:
 POP3: 110; POP3S: 995; IMAP: 143; IMAPS: 995.
diff --git a/Documentation/config-validation.txt b/Documentation/config-validation.txt
index 0d0717e..c54717b 100644
--- a/Documentation/config-validation.txt
+++ b/Documentation/config-validation.txt
@@ -50,7 +50,7 @@
 
 
 Plugins implementing the `OnSubmitValidationListener` interface can
-perform additional validation checks against ref operations resuling
+perform additional validation checks against ref operations resulting
 from execution of submit operation before they are applied to any git
 repositories (there could be more than one in case of topic submits).
 
diff --git a/Documentation/database-setup.txt b/Documentation/database-setup.txt
index 8c69972..8667f43 100644
--- a/Documentation/database-setup.txt
+++ b/Documentation/database-setup.txt
@@ -115,7 +115,7 @@
 
 ----
 [database]
-        password = secret_pasword
+        password = secret_password
 ----
 
 [[createdb_maxdb]]
@@ -204,7 +204,7 @@
 
 ----
 [database]
-        password = secret_pasword
+        password = secret_password
 ----
 
 [[createdb_hana]]
diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index f36fcb3..490bc55 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -2518,7 +2518,7 @@
 Gerrit provides an extension point that enables Plugins to discard incoming
 messages and prevent further processing by Gerrit.
 
-This can be used to implement spam checks, signature validations or organisation
+This can be used to implement spam checks, signature validations or organization
 specific checks like IP filters.
 
 [source, java]
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index 8cad33c..cb72519b 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -972,7 +972,7 @@
 - `h` / `j` / `k` / `l` moves the cursor left / down / up / right
 - `0` / `$` moves the cursor to the start / end of the line
 - `gg` / `G` moves to cursor to the start / end of the file
-- `Ctrl-D` / `Ctrl-U` scolls downwards / upwards
+- `Ctrl-D` / `Ctrl-U` scrolls downwards / upwards
 
 Please check the link:http://www.vim.org/docs.php[Vim documentation]
 for further information.
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java
index 322484a..dc8c0d8 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java
@@ -24,7 +24,7 @@
 import org.junit.Test;
 
 public class RegexListSearcherTest {
-  private static final List<String> EMPTY = ImmutableList.of();
+  private static final ImmutableList<String> EMPTY = ImmutableList.of();
 
   @Test
   public void emptyList() {
diff --git a/plugins/reviewnotes b/plugins/reviewnotes
index 5761ad4..7070ce2 160000
--- a/plugins/reviewnotes
+++ b/plugins/reviewnotes
@@ -1 +1 @@
-Subproject commit 5761ad491a90c6a3b54d77346008211002a6d2dd
+Subproject commit 7070ce225267cd024d0a2f06d0c03f8011774def