Merge branch 'maint'

* maint:
  help: improve text about automatically-distributed files
  refactor: split 'usage' subroutine in automake

diff --cc ChangeLog
Simple merge

diff --cc automake.in
index 782768022d60a07d86572bc242eacc0a48a75008,d0d986e4cfce871c28b8b49ed02772b75cda810c..517eea99d9bc88e2f9610c74f32f24f763b10614
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/autodist-subdir.test
Simple merge

diff --cc tests/autodist.test
Simple merge