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 b72964947afcc39af3b97c5b9eeb1969b44e0d05..c243ee552bb4bc715b8903163b0136b32097af04 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -190,7 +190,7 @@ commit for each submodule.
 sync::
        Synchronizes submodules' remote URL configuration setting
        to the value specified in .gitmodules. It will only affect those
 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.
        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 4040941e55e88114b70d3d0ae7ecb644794fc8b3..4e1fd52e7d230c8f5e55960e960a68ef5875fe76 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -28,7 +28,7 @@ submodule.<name>.path::
        be unique within the .gitmodules file.
 
 submodule.<name>.url::
        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.
        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 @@ Consider the following .gitmodules file:
 
 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
 
 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
 --------
 
 SEE ALSO
 --------

diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt
index 2933056120bf0a0d6249c6951ab1e964ae40674b..1ae8d1214ec0e8db1979a7770cf7602403358636 100644 (file)
--- a/Documentation/howto/using-merge-subtree.txt
+++ b/Documentation/howto/using-merge-subtree.txt
@@ -25,7 +25,7 @@ What you want is the 'subtree' merge strategy, which helps you in such a
 situation.
 
 In this example, let's say you have the repository at `/path/to/B` (but
 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.
 
 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 2dd27ceb0e41c81faa12d44468b46316fa07b32f..1128ab2ce46c42c5b5c9bf2adb3425ebc2720944 100644 (file)
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -51,7 +51,7 @@ as committer, where 'user' is the value of the `svn:author` property
 and 'UUID' the repository's identifier.
 
 To support incremental imports, 'svn-fe' puts a `git-svn-id` line at
 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
 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 8ac8eb6c38e21bdb347f59ec41162270ebe82c04..f3f83d70cd2e13a774d208206af20181dd39d8af 100644 (file)
--- a/http.c
+++ b/http.c
@@ -829,7 +829,7 @@ int http_get_strbuf(const char *url, struct strbuf *result, int options)
 }
 
 /*
 }
 
 /*

- * 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.
  *
  * 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 0b61653894eff606980427ee26770fa088438b94..915c2862a65bdbf42472099f9ed53ca68c2ccfd9 100644 (file)
--- a/http.h
+++ b/http.h
@@ -127,7 +127,7 @@ extern char *get_remote_object_url(const char *url, const char *hex,
 #define HTTP_NOAUTH    5
 
 /*
 #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.
  */
  *
  * 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 f7ce511bbbfbff5a479200f2814ad87b96f16791..497f420178a73061901393f8c21a9feb17054b6d 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -691,7 +691,7 @@ sub get_color {
 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>
 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
 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 181f8f24d14e91c106b1d36133292a7ee99333fb..ea9dcb6612d92c123c66c2eee03bc933ccb2b13a 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1154,7 +1154,7 @@ int transport_disconnect(struct transport *transport)
 }
 
 /*
 }
 
 /*

- * 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)
  * it in a newly allocated string.
  */
 char *transport_anonymize_url(const char *url)