The author has expanded the information found in his practical 1995 tutorial. Achromats are covered in more detail, with an updated discussion of beam expanders. Ball lens, gradient optics, and three mirror configurations have been added to the chapter on Special Optical Surfaces and Components. A new section discusses wave aberrations, with a comparison of the spherical aberration to the Seidel coefficient. A new chapter on thermal effects examines the design of athermats-lenses that compensate for undesired results caused by temperature excursions. Also new is an application and summary chapter, Design Examples. As diamond turning is especially suitable for producing aspheres and diffractive infrared elements, a chapter has been added describing this method of manufacture.