merged the two Logging sections
Merge pull request #891 from collinanderson/mergelogging

merged the two Logging sections