diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt index 80b14eb589..8b7e5fbf8d 100644 --- a/Documentation/user-review-ui.txt +++ b/Documentation/user-review-ui.txt @@ -186,10 +186,6 @@ change is merged into the destination branch. The `Submit` button is available if the change is submittable and the link:access-control.html#category_submit[Submit] access right is assigned. -+ -It is also possible to submit changes that have merge conflicts. This -allows to do the conflict resolution for a change series in a single -merge commit and submit the changes in reverse order. ** [[abandon]]`Abandon`: + diff --git a/Documentation/user-search.txt b/Documentation/user-search.txt index eda4b5d93d..b2b361485a 100644 --- a/Documentation/user-search.txt +++ b/Documentation/user-search.txt @@ -299,7 +299,7 @@ is:closed:: + True if the change is either merged or abandoned. -is:submitted, is:merged, is:abandoned:: +is:merged, is:abandoned:: + Same as <>. @@ -320,10 +320,6 @@ Same as 'is:reviewed', matches if any user has commented on the change more recently than the last update (comment or patch set) from the change owner. -status:submitted:: -+ -Change has been submitted, but is waiting for a dependency. - status:closed:: + True if the change is either 'merged' or 'abandoned'.