Merge remote-tracking branch 'upstream/master' into collect_os_info.sh

[nominatim.git] / CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 552d1da1d285d0676509e385d982e3f1802574b5..e031cd91116df9030c0e82f4f1dd1eebcbcfe37b 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Nominatim historically hasn't followed a particular coding style but we
 are in process of consolidating the style. The following rules apply:
 
  * Python code uses the official Python style
 are in process of consolidating the style. The following rules apply:
 
  * Python code uses the official Python style

- * indention
+ * indentation

    * SQL use 2 spaces
    * all other file types use 4 spaces
    * [BSD style](https://en.wikipedia.org/wiki/Indent_style#Allman_style) for braces
    * SQL use 2 spaces
    * all other file types use 4 spaces
    * [BSD style](https://en.wikipedia.org/wiki/Indent_style#Allman_style) for braces


@@ -53,7 +53,7 @@ The coding style is enforced with PHPCS and pylint. It can be tested with:
 
 ```
 phpcs --report-width=120 --colors .
 
 ```
 phpcs --report-width=120 --colors .

-pylint3 nominatim
+pylint3 --extension-pkg-whitelist=osmium nominatim

 ```
 
 ## Testing
 ```
 
 ## Testing