Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Replace "the the" occurences with "the" (wrong repetition) Change-Id: Id14f6873b81883c93d60725a22bda38567d94ad3
diff --git a/Documentation/cmd-stream-events.txt b/Documentation/cmd-stream-events.txt index a75f610..93250c6 100644 --- a/Documentation/cmd-stream-events.txt +++ b/Documentation/cmd-stream-events.txt
@@ -264,7 +264,7 @@ === Work In Progress State Changed -Sent when the the link:intro-user.html#wip[WIP] state of the change has changed. +Sent when the link:intro-user.html#wip[WIP] state of the change has changed. type:: wip-state-changed @@ -277,7 +277,7 @@ === Private State Changed -Sent when the the link:intro-user.html#private-changes[private] state of the +Sent when he link:intro-user.html#private-changes[private] state of the change has changed. type:: private-state-changed
diff --git a/Documentation/user-submodules.txt b/Documentation/user-submodules.txt index 13d0755..a2a080b 100644 --- a/Documentation/user-submodules.txt +++ b/Documentation/user-submodules.txt
@@ -27,7 +27,7 @@ .. a url that starts with the link:config-gerrit.html#gerrit.canonicalWebUrl[`gerrit.canonicalWebUrl`] When a commit in a project is merged, Gerrit checks for superprojects -that are subscribed to the the project and automatically updates those +that are subscribed to the project and automatically updates those superprojects with a commit that updates the gitlink for the project. This feature is enabled by default and can be disabled
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java index 1b95778d..d368ed4 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/config/ExternalIncludedIn.java
@@ -23,8 +23,8 @@ /** * Returns additional entries for IncludedInInfo as multimap where the key is the row title and - * the the values are a list of systems that include the given commit (e.g. names of servers on - * which this commit is deployed). + * the values are a list of systems that include the given commit (e.g. names of servers on which + * this commit is deployed). * * <p>The tags and branches in which the commit is included are provided so that a RevWalk can be * avoided when a system runs a certain tag or branch.
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java index e6918f70..b8b0bc8 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java
@@ -106,7 +106,7 @@ throws IOException, ServletException { while (itr.hasNext()) { AllRequestFilter filter = itr.next(); - // To avoid {@code synchronized} on the the whole filtering (and + // To avoid {@code synchronized} on the whole filtering (and // thereby killing concurrency), we start the below disjunction // with an unsynchronized check for containment. This // unsynchronized check is always correct if no filters got
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java index 88bf893..658c91c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java
@@ -146,7 +146,7 @@ * <li>after = commits with time >= target.getCommitTime() * </ul> * - * Each of the before/after lists is sorted by the the commit time. + * Each of the before/after lists is sorted by the commit time. * * @param before * @param after