Porting changes from other docs to here

Syncing the doc changes from other documentation.