[PATCH 2/3] Consistency: Use "libcurl" instead of "cURL library" and "curl"
From: Johan Herland <hidden>
Date: 2016-06-15 22:44:46
Subsystem:
documentation, kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Jonathan Corbet, Nathan Chancellor, Nicolas Schier, Linus Torvalds
Signed-off-by: Johan Herland <redacted> --- Documentation/git-http-push.txt | 4 ++-- Documentation/howto/setup-git-server-over-http.txt | 2 +- Makefile | 2 +- configure.ac | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 8d32a92..d69b205 100644
--- 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. -*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
diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index b7d09c1..4032748 100644
--- 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 -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
diff --git a/Makefile b/Makefile
index 1937507..06ebebe 100644
--- 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_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. #
diff --git a/configure.ac b/configure.ac
index 82584e9..7c2856e 100644
--- 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) # -# 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],
--
1.5.6.rc2.128.gf64ae