Merge branch 'maint'

diff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt
index c8899d528adfe37459b9301e16faab90e7a7e63d..f22041a9dc3965b4a4f704e84ec7700a5993d5c6 100644 (file)
--- a/Documentation/git-write-tree.txt
+++ b/Documentation/git-write-tree.txt
@@ -8,6 +8,7 @@ git-write-tree - Create a tree object from the current index
 
 SYNOPSIS
 --------
+[verse]
 'git write-tree' [--missing-ok] [--prefix=<prefix>/]
 
 DESCRIPTION
@@ -17,17 +18,17 @@ tree object is printed to standard output.
 
 The index must be in a fully merged state.
 
-Conceptually, 'git-write-tree' sync()s the current index contents
+Conceptually, 'git write-tree' sync()s the current index contents
 into a set of tree files.
 In order to have that match what is actually in your directory right
-now, you need to have done a 'git-update-index' phase before you did the
-'git-write-tree'.
+now, you need to have done a 'git update-index' phase before you did the
+'git write-tree'.
 
 
 OPTIONS
 -------
 --missing-ok::
-       Normally 'git-write-tree' ensures that the objects referenced by the
+       Normally 'git write-tree' ensures that the objects referenced by the
        directory exist in the object database.  This option disables this
        check.
 
@@ -36,15 +37,6 @@ OPTIONS
        `<prefix>`.  This can be used to write the tree object
        for a subproject that is in the named subdirectory.
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite