fix merge issues

[nominatim.git] / settings / taginfo.lua

diff --git a/settings/taginfo.lua b/settings/taginfo.lua
index 0eaa96e51ed43d960bfec83be3d371a0e65112b1..ef2ad2a60a1094aeee62e3436db6ad0d5de66511 100644 (file)
--- a/settings/taginfo.lua
+++ b/settings/taginfo.lua
@@ -35,7 +35,7 @@ function print_taginfo()
     for _, k in ipairs(flex.TAGINFO_MAIN.keys) do
         local desc = get_key_description(k, 'POI/feature in the search database')
         if flex.TAGINFO_MAIN.delete_tags[k] ~= nil then
-            desc.description = string.format('%s(except for values: %s).', desc.description,
+            desc.description = string.format('%s (except for values: %s).', desc.description,
                                 table.concat(flex.TAGINFO_MAIN.delete_tags[k], ', '))
         end
         table.insert(tags, desc)
@@ -52,12 +52,12 @@ function print_taginfo()
 
     local format = {
         data_format = 1,
-        data_url = 'http://nominatim.openstreetmap.org/taginfo.json',
+        data_url = 'https://nominatim.openstreetmap.org/taginfo.json',
         project = {
             name = 'Nominatim',
             description = 'OSM search engine.',
-            project_url = 'http://nominatim.openstreetmap.org',
-            doc_url = 'http://wiki.osm.org/wiki/Nominatim',
+            project_url = 'https://nominatim.openstreetmap.org',
+            doc_url = 'https://nominatim.org/release-docs/develop/',
             contact_name = 'Sarah Hoffmann',
             contact_email = 'lonvia@denofr.de'
         }