docs/config: avoid the term "expand" for includes
Using the word "expand" to refer to including the contents of another config file isn't really accurate, since it's a verbatim insertion. And it can cause confusion with the expanding of the path itself via things like "~". Let's clarify when we are referring to the contents versus the filename, and use appropriate verbs in each case. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 11, 2017 at 05:13 UTC
a076df2813a4f1c93b22ca586865b32b3e3a08a7
1 file changed
+4
-4
Documentation/config.txt
+4
-4
@@ -90,8 +90,8 @@ You can include a config file from another by setting the special
90
to be included. The variable takes a pathname as its value, and is
91
subject to tilde expansion. These variables can be given multiple times.
92
93
-The included file is expanded immediately, as if its contents had been
94
-found at the location of the include directive. If the value of the
93
+The contents of the included file are inserted immediately, as if they
94
+had been found at the location of the include directive. If the value of the
95
variable is a relative path, the path is considered to
96
be relative to the configuration file in which the include directive
97
was found. See below for examples.
@@ -172,8 +172,8 @@ Example
172
173
[include]
174
path = /path/to/foo.inc ; include by absolute path
175
- path = foo ; expand "foo" relative to the current file
176
- path = ~/foo ; expand "foo" in your `$HOME` directory
175
+ path = foo ; find "foo" relative to the current file
176
+ path = ~/foo ; find "foo" in your `$HOME` directory
177
178
; include if $GIT_DIR is /path/to/foo/.git
179
[includeIf "gitdir:/path/to/foo/.git"]