Merge branch 'maint'

diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 40969f10980dbe829b748eaadb71644f28c65870..cca14b8cc365c021e8da629ebfd56acd66ee14ca 100644 (file)
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -504,7 +504,7 @@ repositories, you can configure Apache like this:
 
 The above configuration expects your public repositories to live under
 '/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`,
-both as cloneable Git URL and as browseable gitweb interface.  If you then
+both as clonable Git URL and as browseable gitweb interface.  If you then
 start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`
 then you can even use the `git://` URL with exactly the same path.