[release/v1.3] True up the documentation with the code. (#2100)

[release/v1.3] True up the documentation with the code. (#2100) #364