edit docs
Merge remote-tracking branch 'origin/wordnut' into wordnut