What is the difference between osmosis and diffusion?

These two processes can often be confused very easily. To begin with both processes are based on the principle of molecules moving from an area of high concentration to an area of lower concentration. With diffusion this is the movement of any molecule. Whereas with osmosis this is specifically the movement of water molecules from an area of high concentration to low concentration across a partially permeable membrane.