Fix typos on javascript documentation.
merge conflicts.