Merge branch 'master' into testsuite-work

* master:
  docs, tests: synchronize examples from docs to tests

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/README
Simple merge

diff --cc tests/specflg8.test
Simple merge

diff --cc tests/txinfo21.test
Simple merge