tweak doc comments about API and keys
Merge remote-tracking branch 'refs/remotes/origin/master'