doc: Fixed order of option.

fixes: #4046

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc: Removed unnecessary/contradictory options.

fixes: #4058

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Merge git://github.com/ceph/ceph