Merge branch 'bc/object-id'

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index ec6bacfcdfa8418b5e24a09c04091e6b92119d46..5e074545729fbd938efaa65311f8437b2ca1bcdf 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2134,7 +2134,7 @@ browsing the repository using gitweb. The default server when using
 instaweb is lighttpd.
 
 See the file gitweb/INSTALL in the Git source tree and
-linkgit:gitweb[1] for instructions on details setting up a permament
+linkgit:gitweb[1] for instructions on details setting up a permanent
 installation with a CGI or Perl capable server.
 
 [[how-to-get-a-git-repository-with-minimal-history]]