Merge branch 'js/cvsexportcommit'

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index 69391300944438576e11cff19b4ce1aa2215b97b..7fd187be8a34a3ebc6d8d543c868f1ca932990af 100644 (file)
--- a/Documentation/repository-layout.txt
+++ b/Documentation/repository-layout.txt
@@ -3,7 +3,10 @@ git repository layout
 
 You may find these things in your git repository (`.git`
 directory for a repository associated with your working tree, or
-`'project'.git` directory for a public 'bare' repository).
+`'project'.git` directory for a public 'bare' repository. It is
+also possible to have a working tree where `.git` is a plain
+ascii file containing `gitdir: <path>`, i.e. the path to the
+real git repository).
 
 objects::
        Object store associated with this repository.  Usually
@@ -121,7 +124,7 @@ hooks::
        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.
-       Read link:hooks.html[hooks] for more details about
+       Read linkgit:githooks[5][hooks] for more details about
        each hook.
 
 index::