master: better doc file
Merge branch 'master' into omega

* master:
  master: better doc file