summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-04-23 02:38:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-23 12:53:32 -0700
commit66e35fcb79cad5a2ec2366da956db55da855b20d (patch)
treedd8007fabfc4a505404369f87ae06119ddcdb83c /Documentation
parentconfig.txt: clarify sentences in the configuration and syntax sections (diff)
downloadtgif-66e35fcb79cad5a2ec2366da956db55da855b20d.tar.xz
config.txt: Make configuration paragraph more consistent
By renaming 'information' to 'configuration' we capture more clearly what a configuration file holds. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 01b752cd3e..31885690f0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3,10 +3,10 @@ CONFIGURATION FILE
The git configuration file contains a number of variables that affect
the git command's behavior. The `.git/config` file in each repository
-is used to store the information for that repository, and
-`$HOME/.gitconfig` is used to store per user information as
+is used to store the configuration for that repository, and
+`$HOME/.gitconfig` is used to store a per-user configuration as
fallback values for the `.git/config` file. The file `/etc/gitconfig`
-can be used to store system-wide defaults.
+can be used to store a system-wide default configuration.
The configuration variables are used by both the git plumbing
and the porcelains. The variables are divided into sections, wherein