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]]).
#1 is outdated, this was how it was done before the policy change. When I see a case like this, I will change it to #2, but such changes have very low priority.
The difference between #2 and #3 has to be decided from case to case. If disambiguation takes little space, #3 is preferred, if it takes much space (because there are many alternatives, or because they take more than a few words to explain), #2 does.
Andre Engels