This paper describes the ALPHA-2 apparatus, used at the CERN Antiproton Decelerator facility for the study of trapped antihydrogen atoms. Details of both the construction and performance are included. Prominence is given to both the new and the improved features, with respect to the original ALPHA assembly, of the apparatus including a stand-alone antiproton catching trap, the traps used to mix antiparticles to produce the anti-atoms, the magnetic atom trap used to hold some of them, and access for laser light to facilitate excitation of the antihydrogen 1S-2P and 1S-2S transitions.