Prepare for 1.7.3 rc1

[git.git] / Documentation / howto / setup-git-server-over-http.txt

diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index b7d09c1ec69ac0e76302cef44d5f6884d05a0e0f..622ee5c8dd7c384794a21baa6093d85a47f89a54 100644 (file)
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -143,7 +143,7 @@ Then, add something like this to your httpd.conf
        Require valid-user
     </Location>
 
        Require valid-user
     </Location>
 

-    Debian automatically reads all files under /etc/apach2/conf.d.
+    Debian automatically reads all files under /etc/apache2/conf.d.

 
 The password file can be somewhere else, but it has to be readable by
 Apache and preferably not readable by the world.
 
 The password file can be somewhere else, but it has to be readable by
 Apache and preferably not readable by the world.


@@ -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