Merge pull request #1372 from lonvia/raise-postgres-version

[nominatim.git] / CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efd5315d819c14a3a7185787df9608fb4fda2acf..cd8d1cc1bd7c16d042b356eb385f116d787052fa 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,16 +30,18 @@ Please make sure to add the following information:
 
 Please add the following information to your issue:
 
 
 Please add the following information to your issue:
 

- * hardware configuration: RAM size, kind of disks
- * Operating system (also mention if you are running on a cloud server)
+ * hardware configuration: RAM size, CPUs, kind and size of disks
+ * Operating system (also mention if you are running on a cloud service)

  * Postgres and Postgis version
  * Postgres and Postgis version

- * Nominatim version (commit id, if you run from the github repo)
- * (if applicable) exact command line of the command that was causing the issues
+ * list of settings you changed in your Postgres configuration
+ * Nominatim version (release version or,
+   if you run from the git repo, the output of `git rev-parse HEAD`)
+ * (if applicable) exact command line of the command that was causing the issue

 
 
 ## Workflow for Pull Requests
 
 
 
 ## Workflow for Pull Requests
 

-We love to get pull reuqests from you. We operate the "Fork & Pull" model
+We love to get pull requests from you. We operate the "Fork & Pull" model

 explained at
 
 https://help.github.com/articles/using-pull-requests
 explained at
 
 https://help.github.com/articles/using-pull-requests


@@ -63,7 +65,7 @@ that duplicate work can be avoided.
 ## Coding style
 
 Nominatim historically hasn't followed a particular coding style but we
 ## Coding style
 
 Nominatim historically hasn't followed a particular coding style but we

-are in process of consolodating the style. The following rules apply:
+are in process of consolidating the style. The following rules apply:

 
  * Python code uses the official Python style
  * indention
 
  * Python code uses the official Python style
  * indention


@@ -76,11 +78,13 @@ are in process of consolodating the style. The following rules apply:
    * no spaces after opening and before closing bracket
    * leave out space between a function name and bracket
      but add one between control statement(if, while, etc.) and bracket
    * no spaces after opening and before closing bracket
    * leave out space between a function name and bracket
      but add one between control statement(if, while, etc.) and bracket

+ * for PHP variables use CamelCase with a prefixing letter indicating the type
+   (i - integer, f - float, a - array, s - string, o - object)

 
 The coding style is enforced with PHPCS and can be tested with:
 
 ```
 
 The coding style is enforced with PHPCS and can be tested with:
 
 ```

-  phpcs --report-width=120 --colors */**.php
+  phpcs --report-width=120 --colors .

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