[PATCH] various tweaks and updates for CSI doc