Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint

* ph/builtin-srcs-are-in-subdir-these-days:
fix "builtin-*" references to be "builtin/*"

diff --cc Documentation/git-log.txt
Simple merge

diff --cc Documentation/technical/api-builtin.txt
Simple merge

diff --cc Documentation/technical/api-parse-options.txt
Simple merge

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc builtin/help.c
Simple merge

diff --cc builtin/notes.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc transport.h
Simple merge