git-submodule(1): update description and key names

When git-submodule was updated to allow mapping between submodule name and
submodule path, the documentation was left untouched.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index d76ae473bc27873ba6c3e3cfb1b4c22304bdb56c..2c48936fcd72c5276ae2fed217bd9b9564342f03 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -33,8 +33,8 @@ status::
 
 init::
        Initialize the submodules, i.e. register in .git/config each submodule
 
 init::
        Initialize the submodules, i.e. register in .git/config each submodule

-       path and url found in .gitmodules. The key used in git/config is
-       `submodule.$path.url`. This command does not alter existing information
+       name and url found in .gitmodules. The key used in .git/config is
+       `submodule.$name.url`. This command does not alter existing information

        in .git/config.
 
 update::
        in .git/config.
 
 update::


@@ -65,7 +65,7 @@ FILES
 When initializing submodules, a .gitmodules file in the top-level directory
 of the containing repository is used to find the url of each submodule.
 This file should be formatted in the same way as $GIR_DIR/config. The key
 When initializing submodules, a .gitmodules file in the top-level directory
 of the containing repository is used to find the url of each submodule.
 This file should be formatted in the same way as $GIR_DIR/config. The key

-to each submodule url is "module.$path.url".
+to each submodule url is "submodule.$name.url".

 
 
 AUTHOR
 
 
 AUTHOR