Merge branch 'maint'

diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index c8a4c5a4d9d2bead8686f1b582e985531a7f3591..93e9a60330797070fc50c0df6c0767b7b81f79c0 100644 (file)
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -29,7 +29,7 @@ OPTIONS
 -u <exec>, --upload-pack=<exec>::
        Specify the full path of gitlink:git-upload-pack[1] on the remote
        host. This allows listing references from repositories accessed via
-       SSH and where the SSH deamon does not use the PATH configured by the
+       SSH and where the SSH daemon does not use the PATH configured by the
        user. Also see the '--exec' option for gitlink:git-peek-remote[1].
 
 <repository>::
@@ -70,4 +70,3 @@ Written by Junio C Hamano <junkio@cox.net>
 GIT
 ---
 Part of the gitlink:git[7] suite
-