Merge branch 'doc/untrack-geany.html'