The difference between osmosis and diffusion is that osmosis is the spreading of water from a high to low concentration while diffusion is the spreading of molecules or particles from a high to low concentration.
yes - diffusion is a broad term that may be applied to a vast number of substances and is not limited to liquids ( gases can diffuse too). osmosis refers to the diffusion of liquid water down the water potential gradient