Merge branch 'sp/maint-fd-limit' into maint

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 6c93202e735e7b7caad89120245050e0a06e5537..68977943e7bba092f5e55e6ad1b9ede83f4c2b67 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -49,7 +49,7 @@ submodule.<name>.fetchRecurseSubmodules::
        submodule. If this option is also present in the submodules entry in
        .git/config of the superproject, the setting there will override the
        one found in .gitmodules.
-       Both settings can be overriden on the command line by using the
+       Both settings can be overridden on the command line by using the
        "--[no-]recurse-submodules" option to "git fetch" and "git pull"..
 
 submodule.<name>.ignore::