diff --git a/Documentation/error-you-are-not-author.txt b/Documentation/error-you-are-not-author.txt index 47a76528fc..5613a1089d 100644 --- a/Documentation/error-you-are-not-author.txt +++ b/Documentation/error-you-are-not-author.txt @@ -95,7 +95,7 @@ author should be rewritten. When the rebase stops at such a commit you have to amend the commit with explicitly setting the author before continuing the rebase. -Here is an exmaple that shows how the interactive rebase is used to +Here is an example that shows how the interactive rebase is used to update the author for the last 3 commits: ---- diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.vm index 20529b222a..57f4f63c28 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.vm index 5b74453450..f2f0fc76db 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.vm index 24cc23cf0c..a67c38cb1c 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.vm index 4ad355b86a..547c1b47f3 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergeFail.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergeFail.vm index dfe3d92f3a..6ded2524ed 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergeFail.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergeFail.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.vm index 296a37a215..bcbc7bdd4c 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.vm index ec7028b993..5ab1860283 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.vm index 34682f29ea..0e42e01825 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.vm index 457596581e..cdc5bfc77f 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.vm index c0e6b914f1..afcbcc50ba 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.vm b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.vm index a2350d849d..a0aedd645b 100644 --- a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.vm +++ b/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.vm @@ -23,7 +23,7 @@ ## Gerrit will use templates ending in ".vm" but will ignore templates ending ## in ".vm.example". If a .vm template does not exist, the default internal ## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.exmaple file to a .vm +## want to override the default template, copy the .vm.example file to a .vm ## file and edit it appropriately. ## ## This Template: