correct old FAQ answers, sync with HEAD