Faq revision

Started with #1691.