Non-equilibrium Thermodynamics and the Production of Entropy