Merge branch 'ta/format-user-manual-as-an-article'