Create a sysconfdir variable, and use it for ETC_GITCONFIG

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 38831bc906056e0ac5a219268e6796b727941481..7e41ca6a0d3e4329d1efc10b4dcb90613975e5bd 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -411,11 +411,11 @@ gc.rerereunresolved::
        The default is 15 days.  See gitlink:git-rerere[1].
 
 gitcvs.enabled::
-       Whether the cvs pserver interface is enabled for this repository.
+       Whether the cvs server interface is enabled for this repository.
        See gitlink:git-cvsserver[1].
 
 gitcvs.logfile::
-       Path to a log file where the cvs pserver interface well... logs
+       Path to a log file where the cvs server interface well... logs
        various stuff. See gitlink:git-cvsserver[1].
 
 gitcvs.allbinary::
@@ -462,7 +462,7 @@ http.lowSpeedLimit, http.lowSpeedTime::
 
 http.noEPSV::
        A boolean which disables using of EPSV ftp command by curl.
-       This can helpful with some "poor" ftp servers which doesn't
+       This can helpful with some "poor" ftp servers which don't
        support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
        environment variable. Default is false (curl will use EPSV).