Merge branch 'rr/maint-tilde-markup-in-doc'