diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 8bdf06e016..048808521c 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1176,7 +1176,7 @@ Default is false.
 
 [[change.cacheAutomerge]]change.cacheAutomerge::
 +
-When reviewing diff commits, the left-hand side shows the output of the
+When reviewing merge commits, the left-hand side shows the output of the
 result of JGit's automatic merge algorithm. This option controls whether
 this output is cached in the change repository, or if only the diff is
 cached in the persistent `diff` cache.
diff --git a/Documentation/rest-api-groups.txt b/Documentation/rest-api-groups.txt
index f84d91a0ad..c4ba97347b 100644
--- a/Documentation/rest-api-groups.txt
+++ b/Documentation/rest-api-groups.txt
@@ -126,13 +126,13 @@ client so they are generally disabled by default. Optional fields are:
 
 ==== Find groups that are owned by another group
 
-By setting `ownedBy` and specifying the link:#group-id[\{group-id\}] of another
+By setting `owned-by` and specifying the link:#group-id[\{group-id\}] of another
 group, it is possible to find all the groups for which the owning group is the
 given group.
 
 .Request
 ----
-  GET /groups/?ownedBy=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0
+  GET /groups/?owned-by=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0
 ----
 
 .Response
diff --git a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
index 14baf01671..ce037a73c9 100644
--- a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
+++ b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
@@ -1,3 +1,17 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.google.gerrit.acceptance.rest;
 
 import com.google.common.collect.ImmutableList;
diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java
index d583b8e3b3..1802ea636f 100644
--- a/java/com/google/gerrit/server/restapi/group/ListGroups.java
+++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java
@@ -206,7 +206,10 @@ public class ListGroups implements RestReadView<TopLevelResource> {
     options.addAll(ListOption.fromBits(ListGroupsOption.class, Integer.parseInt(hex, 16)));
   }
 
-  @Option(name = "--owned-by", usage = "list groups owned by the given group uuid")
+  @Option(
+      name = "--owned-by",
+      aliases = {"--ownedby"},
+      usage = "list groups owned by the given group uuid")
   public void setOwnedBy(String ownedBy) {
     this.ownedBy = ownedBy;
   }