Merged updates to DITA OT documentation