summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-07-09 16:54:46 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-07-09 16:54:46 +0300
commitd9c49435a743fab3eb475cf2930245ea3f934fbd (patch)
tree88081fe4a812697ac952ebbb0694966dc2fd336e /doc/administration
parent062c7a30742d617d8d0939c3bb6ba733919fe00b (diff)
downloadgitlab-ce-d9c49435a743fab3eb475cf2930245ea3f934fbd.tar.gz
Fix typo and explain the precedence of STDERR and STDOUT
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/custom_hooks.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md
index 9fd7b71d2dc..e3306c22d3f 100644
--- 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)