This issue of the Journal of Synchrotron Radiation is a special issue including papers from the PhotonDiag2015 workshop. Here, a brief introduction is given.
Keywords: PhotonDiag2015 workshop; beamline design; beamline instrumentation; free-electron laser (FEL); photon diagnostics.