categories in documentation
Merge branch 'cursor'