Merge branch 'stable-2.16' * stable-2.16: Include 'submit' hook in listing of hooks run synchronously Fix typo on hooks listing page Change-Id: I84dd4e400229da55cacceefd6ec8474715453de6
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md index 1e5502a..9303587 100644 --- a/src/main/resources/Documentation/config.md +++ b/src/main/resources/Documentation/config.md
@@ -10,11 +10,12 @@ Make sure your hook scripts are executable if running on *nix. -With the exception of the `commit-received` and `ref-update` hooks, hooks are -run in the background after the relevant change has taken place so are unable -to affect the outcome of any given change. Because of the fact the hooks are -run in the background after the activity, a hook might not be notified about -an event if the server is shutdown before the hook can be invoked. +With the exception of the `commit-received`, `ref-update` and `submit` hooks, +hooks are run in the background after the relevant change has taken place so +are unable to affect the outcome of any given change. Because of the fact the +hooks are run in the background after the activity, a hook might not be +notified about an event if the server is shutdown before the hook can be +invoked. Configuration -------------
diff --git a/src/main/resources/Documentation/hooks.md b/src/main/resources/Documentation/hooks.md index 324f842..b7e092c 100644 --- a/src/main/resources/Documentation/hooks.md +++ b/src/main/resources/Documentation/hooks.md
@@ -40,7 +40,7 @@ be rejected. If the hook exits with non-zero return code the submit will be rejected and the -ouput from the hook will be returned to the user. +output from the hook will be returned to the user. ``` submit --project <project name> --branch <branch> --submitter <submitter> --patchset <patchset id> --commit <sha1>