Merge pull request #548 from lonvia/query-ckeck-utf8

[nominatim.git] / docs / Installation.md

diff --git a/docs/Installation.md b/docs/Installation.md
index ddd0fc7b6dbaf802b75ce426fc00d4148344c47d..678f055669caaf1067b51a3623cf8734888dda39 100644 (file)
--- a/docs/Installation.md
+++ b/docs/Installation.md
@@ -1,4 +1,4 @@
-Nominatim Installation
+Nominatim installation
 ======================
 
 This page contains generic installation instructions for Nominatim and its
@@ -38,7 +38,7 @@ For running Nominatim:
 
   * [PostgreSQL](http://www.postgresql.org) (9.1 or later)
   * [PostGIS](http://postgis.refractions.net) (2.0 or later)
-  * [PHP](http://php.net)
+  * [PHP](http://php.net) (5.4 or later)
   * PHP-pgsql
   * [PEAR::DB](http://pear.php.net/package/DB)
   * a webserver (apache or nginx are recommended)
@@ -60,10 +60,10 @@ On a 6-core machine with 32GB RAM and SSDs the import of a full planet takes
 a bit more than 2 days. Without SSDs 7-8 days are more realistic.
 
 
-Setup of the Server
+Setup of the server
 -------------------
 
-### PostgreSQL Tuning
+### PostgreSQL tuning
 
 You might want to tune your PostgreSQL installation so that the later steps
 make best use of your hardware. You should tune the following parameters in
@@ -74,7 +74,7 @@ your `postgresql.conf` file.
     work_mem (50MB)
     effective_cache_size (24GB)
     synchronous_commit = off
-    checkpoint_segments = 100
+    checkpoint_segments = 100 # only for postgresql <= 9.4
     checkpoint_timeout = 10min
     checkpoint_completion_target = 0.9
 
@@ -103,7 +103,7 @@ directory and create an alias:
 
     <Directory "/srv/nominatim/build/website">
       Options FollowSymLinks MultiViews
-      AddTpe text/html   .php
+      AddType text/html   .php
       Require all granted
     </Directory>
     Alias /nominatim /srv/nominatim/build/website