Docworks import

This one actually has the changes Huw suggested earlier.