Extend DocTypes script to handle more cases
Docfix: 6 Doc type fixes in Each