Edinburgh, Treaty of, ended the civil war in Scotland between Scottish Protestants and Scottish Roman Catholics backed by France. The war, which took place from 1558 to 1560, was part of the Scottish Reformation, which resulted in Protestantism replacing Roman Catholicism as the national religion of Scotland. The treaty is sometimes called the Treaty of Leith for a port that was the scene of some of the fighting.