update the cli / man page docs based on what is in master right now

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Merge pull request #7604 from SvenDowideit/docs-update

update the cli / man page docs based on what is in master right now