Merge pull request python-mode#390 from bmease/fix-spelling

klen · klen · commit 8f2b5f8e153e · 2014-02-26T16:11:10.000+07:00
Fix spelling and grammatical errors in documentation
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -43,7 +43,7 @@ refactoring, and some other useful things.
 This plugin allows you to create python code in vim very easily. There is no
 need to install the pylint or rope libraries on your system.
 
-Python-mode containts all you need to develop python applications in Vim.
+Python-mode contains all you need to develop python applications in Vim.
 
 Features:                                                      *pymode-features*
 
@@ -70,7 +70,7 @@ Features:                                                      *pymode-features*
 2. Common functionality ~
                                                                  *pymode-common*
 
-This script provides the following options that can customise the behaviour of
+This script provides the following options that can customizes the behavior of
 PythonMode. These options should be set in your |vimrc|.
 
         Bellow shows the default values.
@@ -80,7 +80,7 @@ Turn on the whole plugin                                            *'g:pymode'*
 >
     let g:pymode = 1
 
-Trun off plugin's warnings                                 *'g:pymode_warnings'*
+Turn off plugin's warnings                                 *'g:pymode_warnings'*
 >
     let g:pymode_warnings = 1
 
@@ -89,7 +89,7 @@ Value is list of path's strings.
 >
     let g:pymode_paths = []
 
-Trim unused whitespaces on save                    *'g:pymode_trim_whitespaces'*
+Trim unused white spaces on save                    *'g:pymode_trim_whitespaces'*
 >
     let g:pymode_trim_whitespaces = 1
 
@@ -280,7 +280,7 @@ Check code on every save (every)                    *'g:pymode_lint_unmodified'*
 >
     let g:pymode_lint_unmodified = 0
 
-Check code when editting (onfly)                        *'g:pymode_lint_on_fly'*
+Check code when editing (on the fly)                        *'g:pymode_lint_on_fly'*
 >
     let g:pymode_lint_on_fly = 0
 
@@ -295,7 +295,7 @@ Default code checkers (you could set several)         *'g:pymode_lint_checkers'*
 Values may be chosen from: `pylint`, `pep8`, `mccabe`, `pep257`, `pyflakes`.
 
 Skip errors and warnings                                *'g:pymode_lint_ignore'*
-E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors startswith E2) and etc
+E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors that starts with E2) and etc
 >
     let g:pymode_lint_ignore = "E501,W"
 
@@ -306,7 +306,7 @@ By example you disable all warnings starting from 'W', but want to see warning
     let g:pymode_lint_select = "E501,W0011,W430"
 
 Sort errors by relevance                                  *'g:pymode_lint_sort'*
-If not emply, errors will be sort by defined relevance
+If not empty, errors will be sort by defined relevance
 E.g. let g:pymode_lint_sort = ['E', 'C', 'I']  " Errors first 'E',
 after them 'C' and ...
 >
@@ -442,7 +442,7 @@ Leave empty for disable key binding.      *'g:pymode_rope_goto_definition_bind'*
 >
     let g:pymode_rope_goto_definition_bind = '<C-c>g'
 
-Command for open window when definition has been finded
+Command for open window when definition has been found
 Values are (`e`, `new`, `vnew`)                  *'g:pymode_rope_goto_definition_cmd'*
 >
     let g:pymode_rope_goto_definition_cmd = 'new'
@@ -559,7 +559,7 @@ docstrings. Consider disabling this on slower hardware.
 >
     let g:pymode_syntax_slow_sync = 1
 
-Enable all python highlightings                          *'g:pymode_syntax_all'*
+Enable all python highlights                          *'g:pymode_syntax_all'*
 >
     let g:pymode_syntax_all = 1
 
@@ -587,7 +587,7 @@ Highlight space's errors                        *'g:pymode_syntax_space_errors'*
 >
     let g:pymode_syntax_space_errors = g:pymode_syntax_all
 
-Highlight string formatting                 *'g:pymode_syntax_string_formating'*
+Highlight string formatting                 *'g:pymode_syntax_string_formatting'*
                                                *'g:pymode_syntax_string_format'*
                                             *'g:pymode_syntax_string_templates'*
                                                     *'g:pymode_syntax_doctests'*
@@ -651,7 +651,7 @@ Pylint check is very slow
 -------------------------
 
 In some projects pylint may check slowly, because it also scans imported
-modules if possible. Try using another code checkiers: see
+modules if possible. Try using another code checker: see
 |'g:pymode_lint_checkers'|.
 
 You may set |exrc| and |secure| in your |vimrc| to auto-set custom settings

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ refactoring, and some other useful things.`
`43`	`43`	`This plugin allows you to create python code in vim very easily. There is no`
`44`	`44`	`need to install the pylint or rope libraries on your system.`
`45`	`45`
`46`		`-Python-mode containts all you need to develop python applications in Vim.`
	`46`	`+Python-mode contains all you need to develop python applications in Vim.`
`47`	`47`
`48`	`48`	`Features: pymode-features`
`49`	`49`
`@@ -70,7 +70,7 @@ Features: pymode-features`
`70`	`70`	`2. Common functionality ~`
`71`	`71`	`pymode-common`
`72`	`72`
`73`		`-This script provides the following options that can customise the behaviour of`
	`73`	`+This script provides the following options that can customizes the behavior of`
`74`	`74`	`PythonMode. These options should be set in your \|vimrc\|.`
`75`	`75`
`76`	`76`	`Bellow shows the default values.`
`@@ -80,7 +80,7 @@ Turn on the whole plugin 'g:pymode'`
`80`	`80`	`>`
`81`	`81`	`let g:pymode = 1`
`82`	`82`
`83`		`-Trun off plugin's warnings 'g:pymode_warnings'`
	`83`	`+Turn off plugin's warnings 'g:pymode_warnings'`
`84`	`84`	`>`
`85`	`85`	`let g:pymode_warnings = 1`
`86`	`86`
`@@ -89,7 +89,7 @@ Value is list of path's strings.`
`89`	`89`	`>`
`90`	`90`	`let g:pymode_paths = []`
`91`	`91`
`92`		`-Trim unused whitespaces on save 'g:pymode_trim_whitespaces'`
	`92`	`+Trim unused white spaces on save 'g:pymode_trim_whitespaces'`
`93`	`93`	`>`
`94`	`94`	`let g:pymode_trim_whitespaces = 1`
`95`	`95`
`@@ -280,7 +280,7 @@ Check code on every save (every) 'g:pymode_lint_unmodified'`
`280`	`280`	`>`
`281`	`281`	`let g:pymode_lint_unmodified = 0`
`282`	`282`
`283`		`-Check code when editting (onfly) 'g:pymode_lint_on_fly'`
	`283`	`+Check code when editing (on the fly) 'g:pymode_lint_on_fly'`
`284`	`284`	`>`
`285`	`285`	`let g:pymode_lint_on_fly = 0`
`286`	`286`
`@@ -295,7 +295,7 @@ Default code checkers (you could set several) 'g:pymode_lint_checkers'`
`295`	`295`	Values may be chosen from: `pylint`, `pep8`, `mccabe`, `pep257`, `pyflakes`.
`296`	`296`
`297`	`297`	`Skip errors and warnings 'g:pymode_lint_ignore'`
`298`		`-E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors startswith E2) and etc`
	`298`	`+E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors that starts with E2) and etc`
`299`	`299`	`>`
`300`	`300`	`let g:pymode_lint_ignore = "E501,W"`
`301`	`301`
`@@ -306,7 +306,7 @@ By example you disable all warnings starting from 'W', but want to see warning`
`306`	`306`	`let g:pymode_lint_select = "E501,W0011,W430"`
`307`	`307`
`308`	`308`	`Sort errors by relevance 'g:pymode_lint_sort'`
`309`		`-If not emply, errors will be sort by defined relevance`
	`309`	`+If not empty, errors will be sort by defined relevance`
`310`	`310`	`E.g. let g:pymode_lint_sort = ['E', 'C', 'I'] " Errors first 'E',`
`311`	`311`	`after them 'C' and ...`
`312`	`312`	`>`
`@@ -442,7 +442,7 @@ Leave empty for disable key binding. 'g:pymode_rope_goto_definition_bind'`
`442`	`442`	`>`
`443`	`443`	`let g:pymode_rope_goto_definition_bind = '<C-c>g'`
`444`	`444`
`445`		`-Command for open window when definition has been finded`
	`445`	`+Command for open window when definition has been found`
`446`	`446`	Values are (`e`, `new`, `vnew`) 'g:pymode_rope_goto_definition_cmd'
`447`	`447`	`>`
`448`	`448`	`let g:pymode_rope_goto_definition_cmd = 'new'`
`@@ -559,7 +559,7 @@ docstrings. Consider disabling this on slower hardware.`
`559`	`559`	`>`
`560`	`560`	`let g:pymode_syntax_slow_sync = 1`
`561`	`561`
`562`		`-Enable all python highlightings 'g:pymode_syntax_all'`
	`562`	`+Enable all python highlights 'g:pymode_syntax_all'`
`563`	`563`	`>`
`564`	`564`	`let g:pymode_syntax_all = 1`
`565`	`565`
`@@ -587,7 +587,7 @@ Highlight space's errors 'g:pymode_syntax_space_errors'`
`587`	`587`	`>`
`588`	`588`	`let g:pymode_syntax_space_errors = g:pymode_syntax_all`
`589`	`589`
`590`		`-Highlight string formatting 'g:pymode_syntax_string_formating'`
	`590`	`+Highlight string formatting 'g:pymode_syntax_string_formatting'`
`591`	`591`	`'g:pymode_syntax_string_format'`
`592`	`592`	`'g:pymode_syntax_string_templates'`
`593`	`593`	`'g:pymode_syntax_doctests'`
`@@ -651,7 +651,7 @@ Pylint check is very slow`
`651`	`651`	`-------------------------`
`652`	`652`
`653`	`653`	`In some projects pylint may check slowly, because it also scans imported`
`654`		`-modules if possible. Try using another code checkiers: see`
	`654`	`+modules if possible. Try using another code checker: see`
`655`	`655`	`\|'g:pymode_lint_checkers'\|.`
`656`	`656`
`657`	`657`	`You may set \|exrc\| and \|secure\| in your \|vimrc\| to auto-set custom settings`