config.txt: add missing 'the's and make words plural
Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd committed
Apr 23, 2009 at 02:38 UTC
773002a78c69b91a3e5904137c23cae5363d6059
1 file changed
+17
-17
Documentation/config.txt
+17
-17
@@ -2,10 +2,10 @@ CONFIGURATION FILE
2
------------------
3
4
The git configuration file contains a number of variables that affect
5
-the git command's behavior. `.git/config` file for each repository
5
+the git command's behavior. The `.git/config` file in each repository
6
is used to store the information for that repository, and
7
-`$HOME/.gitconfig` is used to store per user information to give
8
-fallback values for `.git/config` file. The file `/etc/gitconfig`
7
+`$HOME/.gitconfig` is used to store per user information as
8
+fallback values for the `.git/config` file. The file `/etc/gitconfig`
9
can be used to store system-wide defaults.
10
11
They can be used by both the git plumbing
@@ -26,28 +26,28 @@ The file consists of sections and variables. A section begins with
26
the name of the section in square brackets and continues until the next
27
section begins. Section names are not case sensitive. Only alphanumeric
28
characters, `-` and `.` are allowed in section names. Each variable
29
-must belong to some section, which means that there must be section
30
-header before first setting of a variable.
29
+must belong to some section, which means that there must be a section
30
+header before the first setting of a variable.
31
32
Sections can be further divided into subsections. To begin a subsection
33
put its name in double quotes, separated by space from the section name,
34
-in the section header, like in example below:
34
+in the section header, like in the example below:
35
36
--------
37
[section "subsection"]
38
39
--------
40
41
-Subsection names can contain any characters except newline (doublequote
41
+Subsection names can contain any character except newline (doublequote
42
`"` and backslash have to be escaped as `\"` and `\\`,
43
-respectively) and are case sensitive. Section header cannot span multiple
43
+respectively) and are case sensitive. Section headers cannot span multiple
44
lines. Variables may belong directly to a section or to a given subsection.
45
You can have `[section]` if you have `[section "subsection"]`, but you
46
don't need to.
47
48
-There is also (case insensitive) alternative `[section.subsection]` syntax.
49
-In this syntax subsection names follow the same restrictions as for section
50
-name.
48
+There is also a case insensitive alternative `[section.subsection]` syntax.
49
+In this syntax, subsection names follow the same restrictions as for section
50
+names.
51
52
All the other lines are recognized as setting variables, in the form
53
'name = value'. If there is no equal sign on the line, the entire line
@@ -66,10 +66,10 @@ converting value to the canonical form using '--bool' type specifier;
66
'git-config' will ensure that the output is "true" or "false".
67
68
String values may be entirely or partially enclosed in double quotes.
69
-You need to enclose variable value in double quotes if you want to
70
-preserve leading or trailing whitespace, or if variable value contains
71
-beginning of comment characters (if it contains '#' or ';').
72
-Double quote `"` and backslash `\` characters in variable value must
69
+You need to enclose variable values in double quotes if you want to
70
+preserve leading or trailing whitespace, or if the variable value contains
71
+comment characters (i.e. it contains '#' or ';').
72
+Double quote `"` and backslash `\` characters in variable values must
73
be escaped: use `\"` for `"` and `\\` for `\`.
74
75
The following escape sequences (beside `\"` and `\\`) are recognized:
@@ -77,10 +77,10 @@ The following escape sequences (beside `\"` and `\\`) are recognized:
77
and `\b` for backspace (BS). No other char escape sequence, nor octal
78
char sequences are valid.
79
80
-Variable value ending in a `\` is continued on the next line in the
80
+Variable values ending in a `\` are continued on the next line in the
81
customary UNIX fashion.
82
83
-Some variables may require special value format.
83
+Some variables may require a special value format.
84
85
Example
86
~~~~~~~