Use within the text

[[Aragorn]] promised [[Boromir (son of Denethor II)|Boromir]] he would go with him to [[Minas Tirith (Gondor)|Minas Tirith]]

Typing the following instead would be much simpler:

[[Aragorn]] promised [[Boromir]] he would go with him to [[Minas Tirith]]

But it is important that proper disambiguation happens. The purpose of Tolkien Gateway is to service the reader over the editor. Though readers can, in general, deduce which of the offered options is the one they were sent to, correct linking is one of the Standards for Featured Articles at least. For all articles that need to be disambiguated, see: Category:Disambiguation.

Disambiguation page

Disambiguation pages should be made when there are three articles with the name, or that have the name in them. In the case of two articles, the most popular of the two gets the main aritcle as a redirect, with a notification (see below) at the top. This could also be applied to disambiguation pages: if one of the three is the most popular (such as Minas Tirith), it redirects to the main article. If not, the "naked" term is redirected to a an article of the same name, with "(disambiguation)" added behind the name.

Layout

The first line of the template should be the same as other articles: the page name bolded, with a arbitrary sentence saying something like "Subject can refer to the following characters" or whatever is appropriate.

Templates

In the case of three or more articles, use {{disambig-more}} at the top of the page that is redirected from the naked term - unless that is the redirect page. Note that all these templates have parameters.