Merge branch 'ap/svn'

diff --git a/Documentation/repository-layout.txt b/Documentation/repository-layout.txt
index 4c92e375fed4592f7190086dd40ef6dd1241d238..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
@@ -19,7 +22,7 @@ trees this way, for example.  A repository with this kind of
 incomplete object store is not suitable to be published to the
 outside world but sometimes useful for private repository.
 . You also could have an incomplete but locally usable repository
-by cloning shallowly.  See gitlink:git-clone[1].
+by cloning shallowly.  See linkgit:git-clone[1].
 . You can be using `objects/info/alternates` mechanism, or
 `$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
 objects from other object stores.  A repository with this kind
@@ -89,7 +92,7 @@ refs/remotes/`name`::
 packed-refs::
        records the same information as refs/heads/, refs/tags/,
        and friends record in a more efficient way.  See
-       gitlink:git-pack-refs[1].
+       linkgit:git-pack-refs[1].
 
 HEAD::
        A symref (see glossary) to the `refs/heads/` namespace
@@ -106,7 +109,7 @@ HEAD::
 HEAD can also record a specific commit directly, instead of
 being a symref to point at the current branch.  Such a state
 is often called 'detached HEAD', and almost all commands work
-identically as normal.  See gitlink:git-checkout[1] for
+identically as normal.  See linkgit:git-checkout[1] for
 details.
 
 branches::
@@ -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::
@@ -155,7 +158,7 @@ info/exclude::
        exclude pattern list. `.gitignore` is the per-directory
        ignore file.  `git status`, `git add`, `git rm` and `git
        clean` look at it but the core git commands do not look
-       at it.  See also: gitlink:gitignore[5].
+       at it.  See also: linkgit:gitignore[5].
 
 remotes::
        Stores shorthands to be used to give URL and default
@@ -176,4 +179,4 @@ logs/refs/tags/`name`::
 shallow::
        This is similar to `info/grafts` but is internally used
        and maintained by shallow clone mechanism.  See `--depth`
-       option to gitlink:git-clone[1] and gitlink:git-fetch[1].
+       option to linkgit:git-clone[1] and linkgit:git-fetch[1].