1 files changed, 22 insertions, 12 deletions
diff --git a/git-config.html b/git-config.html
index 3c638629a..8431ba803 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1588,9 +1588,10 @@ variables may appear multiple times; we say then that the variable is
 multivalued.</p></div>
 <div class="sect2">
 <h3 id="_syntax">Syntax</h3>
-<div class="paragraph"><p>The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored.  The <em>#</em> and <em>;</em> characters begin comments to the end of line,
-blank lines are ignored.</p></div>
+<div class="paragraph"><p>The syntax is fairly flexible and permissive.  Whitespace characters,
+which in this context are the space character (SP) and the horizontal
+tabulation (HT), are mostly ignored.  The <em>#</em> and <em>;</em> characters begin
+comments to the end of line.  Blank lines are ignored.</p></div>
 <div class="paragraph"><p>The file consists of sections and variables.  A section begins with
 the name of the section in square brackets and continues until the next
 section begins.  Section names are case-insensitive.  Only alphanumeric
@@ -1622,15 +1623,16 @@ header) are recognized as setting variables, in the form
 the variable is the boolean "true").
 The variable names are case-insensitive, allow only alphanumeric characters
 and <code>-</code>, and must start with an alphabetic character.</p></div>
-<div class="paragraph"><p>A line that defines a value can be continued to the next line by
-ending it with a <code>\</code>; the backslash and the end-of-line are
-stripped.  Leading whitespaces after <em>name =</em>, the remainder of the
-line after the first comment character <em>#</em> or <em>;</em>, and trailing
-whitespaces of the line are discarded unless they are enclosed in
-double quotes.  Internal whitespaces within the value are retained
-verbatim.</p></div>
-<div class="paragraph"><p>Inside double quotes, double quote <code>"</code> and backslash <code>\</code> characters
-must be escaped: use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
+<div class="paragraph"><p>Whitespace characters surrounding <code>name</code>, <code>=</code> and <code>value</code> are discarded.
+Internal whitespace characters within <em>value</em> are retained verbatim.
+Comments starting with either <code>#</code> or <code>;</code> and extending to the end of line
+are discarded.  A line that defines a value can be continued to the next
+line by ending it with a backslash (<code>\</code>);  the backslash and the end-of-line
+characters are discarded.</p></div>
+<div class="paragraph"><p>If <code>value</code> needs to contain leading or trailing whitespace characters,
+it must be enclosed in double quotation marks (<code>"</code>).  Inside double quotation
+marks, double quote (<code>"</code>) and backslash (<code>\</code>) characters must be escaped:
+use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
 <div class="paragraph"><p>The following escape sequences (beside <code>\"</code> and <code>\\</code>) are recognized:
 <code>\n</code> for newline character (NL), <code>\t</code> for horizontal tabulation (HT, TAB)
 and <code>\b</code> for backspace (BS).  Other char escape sequences (including octal
@@ -2148,6 +2150,14 @@ implicitIdentity
 </p>
 </dd>
 <dt class="hdlist1">
+mergeConflict
+</dt>
+<dd>
+<p>
+                Shown when various commands stop because of conflicts.
+</p>
+</dd>
+<dt class="hdlist1">
 nestedTag
 </dt>
 <dd>