The theory of water waves has been a source of intriguing mathematical problems for at least 150 years. This text considers the classical problems in linear and non-linear water-wave theory, as well as more modern aspects - problems that give rise to soliton-type equations. Lastly it examines the effects of viscosity.