Merge remote-tracking branch 'upstream/master'

[nominatim.git] / settings / env.defaults

diff --git a/settings/env.defaults b/settings/env.defaults
index 64a160c7197b9c7593a10670c439d66de3c7fab1..f4c33e7720abda310c95fd5012a4aaf5000a5baa 100644 (file)
--- a/settings/env.defaults
+++ b/settings/env.defaults
@@ -123,9 +123,9 @@ NOMINATIM_TABLESPACE_ADDRESS_DATA=
 # Tablespace for indexes used during address computation. Used for import and update only.
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=
 
 # Tablespace for indexes used during address computation. Used for import and update only.
 NOMINATIM_TABLESPACE_ADDRESS_INDEX=
 

-# Tablespace for tables for auxilary data, e.g. TIGER data, postcodes.
+# Tablespace for tables for auxiliary data, e.g. TIGER data, postcodes.

 NOMINATIM_TABLESPACE_AUX_DATA=
 NOMINATIM_TABLESPACE_AUX_DATA=

-# Tablespace for indexes for auxilary data, e.g. TIGER data, postcodes.
+# Tablespace for indexes for auxiliary data, e.g. TIGER data, postcodes.

 NOMINATIM_TABLESPACE_AUX_INDEX=
 
 
 NOMINATIM_TABLESPACE_AUX_INDEX=
 
 


@@ -183,7 +183,7 @@ NOMINATIM_SEARCH_BATCH_MODE=no
 
 # Threshold for searches by name only.
 # Threshold where the lookup strategy in the database is switched. If there
 
 # Threshold for searches by name only.
 # Threshold where the lookup strategy in the database is switched. If there

-# are less occurences of a tem than given, the search does the lookup only
+# are less occurrences of a tem than given, the search does the lookup only

 # against the name, otherwise it uses indexes for name and address.
 NOMINATIM_SEARCH_NAME_ONLY_THRESHOLD=500
 
 # against the name, otherwise it uses indexes for name and address.
 NOMINATIM_SEARCH_NAME_ONLY_THRESHOLD=500
 


@@ -210,8 +210,8 @@ NOMINATIM_API_POOL_SIZE=10
 NOMINATIM_QUERY_TIMEOUT=10
 
 # Maximum time a single request is allowed to take. When the timeout is
 NOMINATIM_QUERY_TIMEOUT=10
 
 # Maximum time a single request is allowed to take. When the timeout is

-# exceeeded, the available results are returned.
-# When empty, then timouts are disabled.
+# exceeded, the available results are returned.
+# When empty, then timeouts are disabled.

 NOMINATIM_REQUEST_TIMEOUT=60
 
 # Search elements just within countries
 NOMINATIM_REQUEST_TIMEOUT=60
 
 # Search elements just within countries