Merged gtk-doc conversion

2014-02-10, Ankit Vani