Skip to content

Commit

Permalink
Merge branch 'ds/doc-config-reflow' into seen
Browse files Browse the repository at this point in the history
Reflow a paragraph in the documentation source without any effect
to the formatted text.

* ds/doc-config-reflow:
  config.txt: perform some minor reformatting
  • Loading branch information
gitster committed May 7, 2024
2 parents 6f612c7 + 2b65364 commit 94174b4
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ compared case sensitively. These subsection names follow the same
restrictions as section names.

All the other lines (and the remainder of the line after the section
header) are recognized as setting variables, in the form
'name = value' (or just 'name', which is a short-hand to say that
the variable is the boolean "true").
The variable names are case-insensitive, allow only alphanumeric characters
and `-`, and must start with an alphabetic character.
header) are recognized as setting variables, in the form 'name = value'
(or just 'name', which is a short-hand to say that the variable is the
boolean "true"). The variable names are case-insensitive, allow only
alphanumeric characters and `-`, and must start with an alphabetic
character.

Whitespace characters surrounding `name`, `=` and `value` are discarded.
Internal whitespace characters within 'value' are retained verbatim.
Expand Down Expand Up @@ -97,10 +97,10 @@ to be included. The variable takes a pathname as its value, and is
subject to tilde expansion. These variables can be given multiple times.

The contents of the included file are inserted immediately, as if they
had been found at the location of the include directive. If the value of the
variable is a relative path, the path is considered to
be relative to the configuration file in which the include directive
was found. See below for examples.
had been found at the location of the include directive. If the value of
the variable is a relative path, the path is considered to be relative to
the configuration file in which the include directive was found. See
below for examples.

Conditional includes
~~~~~~~~~~~~~~~~~~~~
Expand Down

0 comments on commit 94174b4

Please sign in to comment.