Feature #2858: update some guides, mark with todo the rest