Documentation review

For review and merge
Keep URI