Merge branch 'maint'

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 5daf750d1942f3b97844b4ef378daf9346cb46d4..72a13d18e019ef00de0e8a79bbe5fe4651ab8dba 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -29,6 +29,9 @@ submodule.<name>.path::
 
 submodule.<name>.url::
        Defines an url from where the submodule repository can be cloned.
+       This may be either an absolute URL ready to be passed to
+       linkgit:git-clone[1] or (if it begins with ./ or ../) a location
+       relative to the superproject's origin repository.
 
 submodule.<name>.update::
        Defines what to do when the submodule is updated by the superproject.