Merge branch 'bc/connect-plink' into maint

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 19c7661fac081a02aeb88fbbacfb2842e19af003..5221f950ce06cda1a764424ec217760d044a5ac3 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -85,7 +85,7 @@ configuration variable documented in linkgit:git-config[1].
        only changes to the commits stored in the superproject are shown (this was
        the behavior before 1.7.0). Using "all" hides all changes to submodules
        (and suppresses the output of submodule summaries when the config option
-       `status.submodulesummary` is set).
+       `status.submoduleSummary` is set).
 
 --ignored::
        Show ignored files as well.
@@ -215,7 +215,7 @@ If the config variable `status.relativePaths` is set to false, then all
 paths shown are relative to the repository root, not to the current
 directory.
 
-If `status.submodulesummary` is set to a non zero number or true (identical
+If `status.submoduleSummary` is set to a non zero number or true (identical
 to -1 or an unlimited number), the submodule summary will be enabled for
 the long format and a summary of commits for modified submodules will be
 shown (see --summary-limit option of linkgit:git-submodule[1]). Please note