Update doc and fix typos
Merge branch 'snort-dev'