From a7793a749115ead3b8f7447ce1e96572ea5d8ea3 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 28 Mar 2012 10:41:54 +0200 Subject: [PATCH] correct spelling: an URL -> a URL Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano --- Documentation/git-submodule.txt | 2 +- Documentation/gitmodules.txt | 4 ++-- Documentation/howto/using-merge-subtree.txt | 2 +- contrib/svn-fe/svn-fe.txt | 2 +- http.c | 2 +- http.h | 2 +- perl/Git.pm | 2 +- transport.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b72964947a..c243ee552b 100644 --- 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 - 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 4040941e55..4e1fd52e7d 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -28,7 +28,7 @@ submodule..path:: be unique within the .gitmodules file. submodule..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 @@ 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 -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 2933056120..1ae8d1214e 100644 --- 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 -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 2dd27ceb0e..1128ab2ce4 100644 --- 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 -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 8ac8eb6c38..f3f83d70cd 100644 --- 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. diff --git a/http.h b/http.h index 0b61653894..915c2862a6 100644 --- 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 /* - * 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 f7ce511bbb..497f420178 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -691,7 +691,7 @@ The hash is in the format C hash>. For tags, the C entry contains the tag object while a C entry gives the tagged objects. C has the same meaning as the appropriate C -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 is an optional arrayref that can contain 'tags' to return all the tags and/or 'heads' to return all the heads. C 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 181f8f24d1..ea9dcb6612 100644 --- 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)