Update documentation that was pointing to deprecated or removed function.

This was reported by @abergeron
Update doc following code review.
Merge pull request #1472 from nouiz/fix_doc

Update documentation that was pointing to deprecated or removed function...