[Bug 226124] Merge Review: man-pages-es