public marks

PUBLIC MARKS from tadeufilippini with tags wiki & gentoo