Fixes for documentation of --server and --watch options