Merge branch 'am/maint-push-doc' into maint

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index a969b3fbc3efc99ce490455b93c8bfb912994e2e..1befca98d49583b42e652b4ce21fccb89b5b5cdb 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -134,7 +134,8 @@ hooks::
        Hooks are customization scripts used by various git
        commands.  A handful of sample hooks are installed when
        'git-init' is run, but all of them are disabled by
-       default.  To enable, they need to be made executable.
+       default.  To enable, the `.sample` suffix has to be
+       removed from the filename by renaming.
        Read linkgit:githooks[5] for more details about
        each hook.