Traditional diplomacy is dealing with the interface of conflict and peace-making. ‘Evolution of diplomacy’ describes the history of diplomacy and shows that it has become much more than the diplomacy of states and governments. Modern diplomacy began with the Peace of Westphalia in 1648, which ended hostilities in the Thirty Years War. The creation of diplomatic relations between states, foreign ministries, legations, embassies, and the Havana Convention are described. The difference between official and public diplomacy is defined and the making of treaties and conventions discussed. International law, the Vienna Convention on the Law of Treaties, and the United Nations Charter are all considered.