Tesla Coil wrote:
Which, if any, is the ideal form among these examples?
1). [[Madrid]] redirects to [[Madrid, Spain]]. For other uses, see [[Madrid (disambiguation)]]
2). [[Paris, France]] redirects to [[Paris]]. For other uses, see [[Paris (disambiguation)]]
3). [[Athens, Greece]] redirects to [[Athens]]; disambiguation at the bottom of the page. (A note of irony here: Athens, Greece has received a less substantial article than [[Athens, Ohio]]).
Number 2 appears to be the standard, although many would still argue for Number 1.
Number 3 appears to have been set up before the recent debate, and should be upgraded. With that article still being quite short it's not a big problem for now. The argument for a disambiguation block at the "top" of the article is that it lets people know right away that they could or should be somewhere else. Eclecticology