Merge branch 'doc-custom-hooks' into 'master'

Fix typo and explain the precedence of STDERR and STDOUT ## What does this MR do? Addresses comments https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5088#note_12884564 See merge request !5169

Merge branch 'doc-custom-hooks' into 'master'
8a6a3529 · Achilleas Pipinellis · 440345bd · d9c49435 · 8a6a3529
Commit 8a6a3529 authored Jul 09, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

custom_hooks.md doc/administration/custom_hooks.md +2 -1

No files found.
--- a/doc/administration/custom_hooks.md
+++ b/doc/administration/custom_hooks.md
@@ -48,7 +48,8 @@ as appropriate.
 This feature was [introduced][5073] in GitLab 8.10.

 If the commit is declined or an error occurs during the Git hook check,
-the STDERR and/or SDOUT message of the hook will be present in GitLab's UI.
+the STDERR or STDOUT message of the hook will be present in GitLab's UI.
+STDERR takes precedence over STDOUT.

 ![Custom message from custom Git hook](img/custom_hooks_error_msg.png)