Merge two different descriptions of siteurl and home options. fixes #22771.

git-svn-id: http://core.svn.wordpress.org/trunk@23363 1a063a9b-81f0-0310-95a4-ce76da25c4cd