What is the difference between osmosis and diffusion?

Both osmosis and diffusion are processes that involve the movement of molecules from an area of high concentration to an area of low concentration. Neither process requires energy.
Osmosis and diffusion differ in the folowing ways:
- Osmosis requires a partially permeable membrane and is the movement of water molecules only.
- Diffusion does not require a partially permeable membrane and is the movement of any gas or liquid molecules.