correct spelling: an URL -> a URL Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b729649..c243ee5 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt
@@ -190,7 +190,7 @@ sync:: Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules. It will only affect those - submodules which already have an url entry in .git/config (that is the + submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly.
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 4040941..4e1fd52 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt
@@ -28,7 +28,7 @@ be unique within the .gitmodules file. submodule.<name>.url:: - Defines an url from where the submodule repository can be cloned. + Defines a URL from which 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. @@ -84,7 +84,7 @@ This defines two submodules, `libfoo` and `libbar`. These are expected to be checked out in the paths 'include/foo' and 'include/bar', and for both -submodules an url is specified which can be used for cloning the submodules. +submodules a URL is specified which can be used for cloning the submodules. SEE ALSO --------
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt index 2933056..1ae8d12 100644 --- a/Documentation/howto/using-merge-subtree.txt +++ b/Documentation/howto/using-merge-subtree.txt
@@ -25,7 +25,7 @@ situation. In this example, let's say you have the repository at `/path/to/B` (but -it can be an URL as well, if you want). You want to merge the 'master' +it can be a URL as well, if you want). You want to merge the 'master' branch of that repository to the `dir-B` subdirectory in your current branch.
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt index 2dd27ce..1128ab2 100644 --- a/contrib/svn-fe/svn-fe.txt +++ b/contrib/svn-fe/svn-fe.txt
@@ -51,7 +51,7 @@ and 'UUID' the repository's identifier. To support incremental imports, 'svn-fe' puts a `git-svn-id` line at -the end of each commit log message if passed an url on the command +the end of each commit log message if passed a URL on the command line. This line has the form `git-svn-id: URL@REVNO UUID`. The resulting repository will generally require further processing
diff --git a/http.c b/http.c index 8ac8eb6..f3f83d7 100644 --- a/http.c +++ b/http.c
@@ -829,7 +829,7 @@ } /* - * Downloads an url and stores the result in the given file. + * Downloads a URL and stores the result in the given file. * * If a previous interrupted download is detected (i.e. a previous temporary * file is still around) the download is resumed.
diff --git a/http.h b/http.h index 0b61653..915c286 100644 --- a/http.h +++ b/http.h
@@ -127,7 +127,7 @@ #define HTTP_NOAUTH 5 /* - * Requests an url and stores the result in a strbuf. + * Requests a URL and stores the result in a strbuf. * * If the result pointer is NULL, a HTTP HEAD request is made instead of GET. */
diff --git a/perl/Git.pm b/perl/Git.pm index f7ce511..497f420 100644 --- a/perl/Git.pm +++ b/perl/Git.pm
@@ -691,7 +691,7 @@ contains the tag object while a C<refname^{}> entry gives the tagged objects. C<REPOSITORY> has the same meaning as the appropriate C<git-ls-remote> -argument; either an URL or a remote name (if called on a repository instance). +argument; either a URL or a remote name (if called on a repository instance). C<GROUPS> is an optional arrayref that can contain 'tags' to return all the tags and/or 'heads' to return all the heads. C<REFGLOB> is an optional array of strings containing a shell-like glob to further limit the refs returned in
diff --git a/transport.c b/transport.c index 181f8f2..ea9dcb6 100644 --- a/transport.c +++ b/transport.c
@@ -1154,7 +1154,7 @@ } /* - * Strip username (and password) from an url and return + * Strip username (and password) from a URL and return * it in a newly allocated string. */ char *transport_anonymize_url(const char *url)