Merge branch 'master' into fancynoteq

Author: tbastos

README.md

@@ -16,8 +16,8 @@ for disabling is currently not supported -- just don't set the option at all to
 keep it disabled).
 
 - `g:lua_syntax_nosymboloperator` disables highlighting of the Lua symbol
-  operators (that is, all operators except for the keyword operators and and
-  or).
+  operators (that is, all operators except for the keyword operators `and` and
+  `or`).
 - `g:lua_syntax_fancynotequal` enables displaying Lua's `~=` operator with
   Unicode character `≠`.
 - `g:lua_syntax_nofold` disables code folding. If this option is set, you can
@@ -27,7 +27,7 @@ keep it disabled).
   instead of groups. Look in the source code for the second argument of `call
   s:FoldableRegion` for all options, but note that the names are subject to
   change in later versions.
-- `g:lua_syntax_nostdlib` disables highlighing of all standard library names
+- `g:lua_syntax_nostdlib` disables highlighting of all standard library names
   like, `io`, `print` and even `require`, `error` etc. If that is too much you
   can use `g:lua_syntax_noextendedstdlib` instead to keep `_G`, `module`,
   `require`, `assert`, `error`, `pcall` and `xpcall` highlighted.