trellis: fix typos in examples
Merge branch 'maint'