Neutron and x-ray diffraction studies of liquids and glasses