git.txt: update description of the configuration mechanism

The old Git version where it appeared is now useful only to historians,
not to normal users. Also, the text was mentioning only the per-repo
config file, but this is a good place to teach that customization can
also be made per-user.

While at it, remove a now-defunct e-mail from an example.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git.txt b/Documentation/git.txt
index c7f211e81b6847ba2cc55e486c898f4405049501..4fe62df28ea105643fd7aa310b3265df9121a822 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -530,10 +530,9 @@ include::cmds-purehelpers.txt[]
 Configuration Mechanism
 -----------------------
 
 Configuration Mechanism
 -----------------------
 

-Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
-is used to hold per-repository configuration options.  It is a
-simple text file modeled after `.ini` format familiar to some
-people.  Here is an example:
+Git uses a simple text format to store customizations that are per
+repository and are per user.  Such a configuration file may look
+like this:

 
 ------------
 #
 
 ------------
 #


@@ -548,13 +547,13 @@ people.  Here is an example:
 ; user identity
 [user]
        name = "Junio C Hamano"
 ; user identity
 [user]
        name = "Junio C Hamano"

-       email = "junkio@twinsun.com"
+       email = "gitster@pobox.com"

 
 ------------
 
 Various commands read from the configuration file and adjust
 their operation accordingly.  See linkgit:git-config[1] for a
 
 ------------
 
 Various commands read from the configuration file and adjust
 their operation accordingly.  See linkgit:git-config[1] for a

-list.
+list and more details about the configuration mechanism.

 
 
 Identifier Terminology
 
 
 Identifier Terminology