git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 2/3] Consistency: Use "libcurl" instead of "cURL library" and "curl"
Date: Sun, 15 Jun 2008 12:14:12 +0200	[thread overview]
Message-ID: <200806151214.12525.johan@herland.net> (raw)
In-Reply-To: <200806120920.31161.johan@herland.net>

Signed-off-by: Johan Herland <johan@herland.net>
---
 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

  parent reply	other threads:[~2008-06-15 10:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-12  7:20 Cleaning up INSTALL before 1.5.6 Johan Herland
2008-06-15 10:13 ` [PATCH 1/3] cpio is no longer used by git-clone Johan Herland
2008-06-15 10:14 ` Johan Herland [this message]
2008-06-15 10:16 ` [PATCH 3/3] The "curl" executable is no longer required Johan Herland
2008-06-15 10:52   ` David Symonds
2008-06-15 10:55     ` Johan Herland
2008-06-15 10:59       ` David Symonds
2008-06-15 11:23       ` Matthieu Moy
2008-06-15 11:40         ` [PATCH 3/3 v2] " Johan Herland
2008-06-15 11:42     ` [PATCH 3/3] " Jakub Narebski
2008-06-15 11:47       ` Johan Herland
2008-06-15 12:04         ` Matthieu Moy
2008-06-15 13:33           ` Jakub Narebski
2008-06-15 13:53             ` Johan Herland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200806151214.12525.johan@herland.net \
    --to=johan@herland.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).