Besides the description of the geometric part of the author's 1965 proof of desingularization of algebraic surfaces and solids in nonzero characteristic, this new edition provides a self-contained introduction to birational algebraic geometry, based only on commutative algebra. It also gives a short proof of analytic desingularization in characteristic zero for any dimension found in 1996.