Merge branch 'lk/rebase-i-x'

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index c83a856574667e2e1fdac01244139bd2d56217ec..fbbbcb282cc8d6b2fd9c0ea8aea28d4a584646ea 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -43,9 +43,9 @@ if you choose to go that route.
 Submodules are composed from a so-called `gitlink` tree entry
 in the main repository that refers to a particular commit object
 within the inner repository that is completely separate.
-A record in the `.gitmodules` file at the root of the source
-tree assigns a logical name to the submodule and describes
-the default URL the submodule shall be cloned from.
+A record in the `.gitmodules` (see linkgit:gitmodules[5]) file at the
+root of the source tree assigns a logical name to the submodule and
+describes the default URL the submodule shall be cloned from.
 The logical name can be used for overriding this URL within your
 local repository configuration (see 'submodule init').
 
@@ -140,7 +140,7 @@ update::
        checkout the commit specified in the index of the containing repository.
        This will make the submodules HEAD be detached unless `--rebase` or
        `--merge` is specified or the key `submodule.$name.update` is set to
-       `rebase`, `merge` or `none`. `none` can be overriden by specifying
+       `rebase`, `merge` or `none`. `none` can be overridden by specifying
        `--checkout`.
 +
 If the submodule is not yet initialized, and you just want to use the