[PATCH 0/4] Random fixes to Documentation/config.txt

[PATCH 0/4] Random fixes to Documentation/config.txt

[Frank Lichtenheld]

Just some fixes to config.txt which I made when I wanted
to document the new gitcvs.* variables and which can go directly
to master (or maint even).

      config.txt: Document gitcvs.allbinary
      config.txt: Document core.autocrlf
      config.txt: Change pserver to server in description of gitcvs.*
      config.txt: Fix grammatical error in description of http.noEPSV

[PATCH 1/4] config.txt: Document gitcvs.allbinary

[Frank Lichtenheld]

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
 Documentation/config.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index cf1e040..061c585 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -408,6 +408,13 @@ gitcvs.logfile::
 	Path to a log file where the cvs pserver interface well... logs
 	various stuff. See gitlink:git-cvsserver[1].
 
+gitcvs.allbinary::
+	If true, all files are sent to the client in mode '-kb'. This
+	causes the client to treat all files as binary files which suppresses
+	any newline munging it otherwise might do. A work-around for the
+	fact that there is no way yet to set single files to mode '-kb'.
+	See gitlink:git-cvsserver[1].
+
 http.sslVerify::
 	Whether to verify the SSL certificate when fetching or pushing
 	over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
-- 
1.5.1.1

[PATCH 2/4] config.txt: Document core.autocrlf

[Frank Lichtenheld]

Text shamelessly stolen from the 1.5.1 release notes.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
 Documentation/config.txt |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 061c585..09c355b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -117,6 +117,16 @@ core.fileMode::
 	the working copy are ignored; useful on broken filesystems like FAT.
 	See gitlink:git-update-index[1]. True by default.
 
+core.autocrlf::
+	If true, makes git convert `CRLF` at the end of lines in text files to
+	`LF` when reading from the filesystem, and convert in reverse when
+	writing to the filesystem.  The variable can be set to
+	'input', in which case the conversion happens only while
+    	reading from the filesystem but files are written out with
+    	`LF` at the end of lines.  Currently, which paths to consider
+	"text" (i.e. be subjected to the autocrlf mechanism) is
+	decided purely based on the contents.
+
 core.symlinks::
 	If false, symbolic links are checked out as small plain files that
 	contain the link text. gitlink:git-update-index[1] and
-- 
1.5.1.1

[PATCH 3/4] config.txt: Change pserver to server in description of gitcvs.*

[Frank Lichtenheld]

These variables apply to the SSH access as well, so don't use
pserver here which might confuse users.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
 Documentation/config.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 09c355b..b6e6513 100644
--- 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::
-- 
1.5.1.1

[PATCH 4/4] config.txt: Fix grammatical error in description of http.noEPSV

[Frank Lichtenheld]

s/doesn't/don't/ since "ftp servers" is plural

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
---
 Documentation/config.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b6e6513..62168e6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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).
 
-- 
1.5.1.1