add notice recommending --public-server option
merge