Merge branch 'jc/delta' into next

diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt
index 5dc9dbdd78af931e7c0a69d2b2425287e0614687..387b4354843f44a0d883f7bcdea1ee50d8285153 100644 (file)
--- a/Documentation/git-fsck-objects.txt
+++ b/Documentation/git-fsck-objects.txt
@@ -8,7 +8,9 @@ git-fsck-objects - Verifies the connectivity and validity of the objects in the
 
 SYNOPSIS
 --------
-'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]
+[verse]
+'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache]
+                [--standalone | --full] [--strict] [<object>*]
 
 DESCRIPTION
 -----------
@@ -33,7 +35,7 @@ index file and all SHA1 references in .git/refs/* as heads.
        Report tags.
 
 --cache::
-       Consider any object recorded in the cache also as a head node for
+       Consider any object recorded in the index also as a head node for
        an unreachability trace.
 
 --standalone::
@@ -68,7 +70,7 @@ that aren't readable from any of the specified head nodes.
 
 So for example
 
-       git-fsck-objects --unreachable $(cat .git/HEAD .git/refs/heads/*)
+       git-fsck-objects --unreachable HEAD $(cat .git/refs/heads/*)
 
 will do quite a _lot_ of verification on the tree. There are a few
 extra validity tests to be added (make sure that tree objects are
@@ -125,7 +127,7 @@ GIT_OBJECT_DIRECTORY::
        used to specify the object database root (usually $GIT_DIR/objects)
 
 GIT_INDEX_FILE::
-       used to specify the index file of the cache
+       used to specify the index file of the index
 
 GIT_ALTERNATE_OBJECT_DIRECTORIES::
        used to specify additional object database roots (usually unset)