em/emx: Update man page
Merge branch 'master' into gsocdrm_jfree