syncing docs from 3.0 tree (thanks jelmer).