What's the difference between diffusion and osmosis?

Osmosis is the net movement of water from an area of high water potential to low water potential through a semi-permeable membrane, while diffusion is the net movement of any liquid or gas from an area of high concentration to low concentration. I would also check that the student understands the terms 'net', 'water potential', and 'semi-permeable membrane'.