From e5c8b8d15928e889b84beb3c1fa7ec0397ee84f0 Mon Sep 17 00:00:00 2001
From: Dimitri Fontaine <dim@tapoueh.org>
Date: Sun, 13 Nov 2016 21:54:09 +0100
Subject: [PATCH] Fix Advanced Howto for Geolite.

The example was still using a very old syntax for per-field options, and
even the current debian package doesn't support this syntax anymore...
Update the docs to use current syntax.

Fix #475.
---
 docs/howto/geolite.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/howto/geolite.html b/docs/howto/geolite.html
index c39b954..17cd683 100644
--- a/docs/howto/geolite.html
+++ b/docs/howto/geolite.html
@@ -121,18 +121,18 @@ LOAD ARCHIVE
  
    LOAD CSV  
         FROM FILENAME MATCHING ~/GeoLiteCity-Location.csv/  
-             WITH ENCODING iso-8859-1  
-             (  
-                locId,  
-                country,  
-                region     null if blanks,  
-                city       null if blanks,  
-                postalCode null if blanks,  
-                latitude,  
-                longitude,  
-                metroCode  null if blanks,  
-                areaCode   null if blanks  
-             )  
+             WITH ENCODING iso-8859-1
+             (
+                locId,
+                country,
+                region     [ null if blanks ],
+                city       [ null if blanks ],
+                postalCode [ null if blanks ],
+                latitude,
+                longitude,
+                metroCode  [ null if blanks ],
+                areaCode   [ null if blanks ]
+             )
         INTO postgresql:///ip4r?geolite.location  
              (  
                 locid,country,region,city,postalCode,