Consistency: Use "libcurl" instead of "cURL library" and "curl"

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 8d32a9204978897ae2ddbf7289b763a9d994a4a7..d69b20549bf956a5c7c3f64f5315a17ec71af038 100644 (file)
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -15,8 +15,8 @@ DESCRIPTION
 Sends missing objects to remote repository, and updates the
 remote branch.
 
 Sends missing objects to remote repository, and updates the
 remote branch.
 

-*NOTE*: This command is temporarily disabled if your cURL
-library is older than 7.16, as the combination has been reported
+*NOTE*: This command is temporarily disabled if your libcurl
+is older than 7.16, as the combination has been reported

 not to work and sometimes corrupts repository.
 
 OPTIONS
 not to work and sometimes corrupts repository.
 
 OPTIONS

diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index b7d09c1ec69ac0e76302cef44d5f6884d05a0e0f..40327486084ac02874faff70fd100b619af83214 100644 (file)
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -186,7 +186,7 @@ Step 3: setup the client
 ------------------------
 
 Make sure that you have HTTP support, i.e. your git was built with
 ------------------------
 
 Make sure that you have HTTP support, i.e. your git was built with

-curl (version more recent than 7.10). The command 'git http-push' with
+libcurl (version more recent than 7.10). The command 'git http-push' with

 no argument should display a usage message.
 
 Then, add the following to your $HOME/.netrc (you can do without, but will be
 no argument should display a usage message.
 
 Then, add the following to your $HOME/.netrc (you can do without, but will be

diff --git a/Makefile b/Makefile
index 1937507593ad12b56c25f6f8e6479682f16758c7..06ebebe4b57d48b1ecb88123bdf0d214ecd303a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all::
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 # This also implies MOZILLA_SHA1.
 #
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 # This also implies MOZILLA_SHA1.
 #

-# Define NO_CURL if you do not have curl installed.  git-http-pull and
+# Define NO_CURL if you do not have libcurl installed.  git-http-pull and

 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 #
 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 #

diff --git a/configure.ac b/configure.ac
index 82584e91532264790bac7efd953f9f5da09576c1..7c2856efc92ca55e3cf03fcf1c72ffb70318f7c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ AC_CHECK_LIB([crypto], [SHA1_Init],
 AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
 AC_SUBST(NO_OPENSSL)
 #
 AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
 AC_SUBST(NO_OPENSSL)
 #

-# Define NO_CURL if you do not have curl installed.  git-http-pull and
+# Define NO_CURL if you do not have libcurl installed.  git-http-pull and

 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 AC_CHECK_LIB([curl], [curl_global_init],
 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 AC_CHECK_LIB([curl], [curl_global_init],