I updated the man page and resolved a commit conflict

I also made the master-resources_header[] uniform with the rest of the headers since they turned {NULL,} into {0,0,...,0}.