Merge branch 'jk/doc-config-include' into maint
authorJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:21:02 +0000 (10:21 +0900)
committerJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:21:02 +0000 (10:21 +0900)
Clarify documentation for include.path and includeIf.<condition>.path
configuration variables.

* jk/doc-config-include:
  docs/config: consistify include.path examples
  docs/config: avoid the term "expand" for includes
  docs/config: give a relative includeIf example
  docs/config: clarify include/includeIf relationship


Trivial merge
git clone https://git.99rst.org/PROJECT