Merge branch 'dunlap' (Randy's Documentation patches)