* Re-apply changes from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666
* Update the wordings accordingly for the current revision
* Update the example to make it less confusing