Merge branch 'patch-28' into 'master'

Correcting documentation about project hooks settings

See merge request gitlab-org/gitlab-ce!17332

doc/api/projects.md

@@ -1224,7 +1224,7 @@ POST /projects/:id/hooks
 | `note_events` | boolean | no | Trigger hook on note events |
 | `job_events` | boolean | no | Trigger hook on job events |
 | `pipeline_events` | boolean | no | Trigger hook on pipeline events |
-| `wiki_events` | boolean | no | Trigger hook on wiki events |
+| `wiki_page_events` | boolean | no | Trigger hook on wiki events |
 | `enable_ssl_verification` | boolean | no | Do SSL verification when triggering the hook |
 | `token` | string | no | Secret token to validate received payloads; this will not be returned in the response |