improved doc snippets
octdoc changes
Merge branch 'refs/heads/master' into grammar