What is the definition of osmosis? How is it different from diffusion?

Osmosis is the net movement of water molecules from a high water potential to a low water potential through a semi-permeable membrane. It is different from diffusion as it is through a semi-permeable membrane and only deals with water molecules, whereas diffusion can occur with any molecules.