Original: Pretoria is contained within the City of Tshwane Metropolitan Municipality as one of several constituent former administrations (among which also Centurion and Soshanguve).
Simplified: The war ended in Pretoria with the signing of the Peace of Vereeniging on May 31 1902.