fixing more usage typos
merging more web files.Merge remote-tracking branch 'upstream/master'