ab847c44d0
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8' * commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8': fix some doc errors in the resources;