This second edition now includes chapters on spatial and temporal resolution, alternative measurement modes including resonant inelastic x-ray scattering (RIXS) and high-energy resolution fluorescence detection (HERFD), and an expanded chapter on experimental design.