add deprecation warnings for multi backend

lonvia · lonvia · commit 158307af68ab · 2020-02-07T22:05:52.000+01:00
diff --git a/docs/multi.md b/docs/multi.md
@@ -1,5 +1,8 @@
 # Multi Backend #
 
+**WARNING: the multi backend is deprecated and will be removed in future versions
+of osm2pgsql.**
+
 The multi backend is designed for custom table structures as an alternative
 to the standard [pgsql](pgsql.md) backend tables. It is intended to allow
 the configuration of a custom set of tables with hopefully fewer rows and fewer
diff --git a/docs/osm2pgsql.1 b/docs/osm2pgsql.1
@@ -152,14 +152,14 @@ Create a tile expiry list.
 Output file name for expired tiles list.
 .TP
 \fB\-O\fR|\-\-output
-Specifies the output back\-end or database schema to use. Currently
-osm2pgsql supports \fBpgsql\fR, \fBgazetteer\fR and \fBnull\fR. \fBpgsql\fR is
+Specifies the output back\-end or database schema to use. Currently osm2pgsql
+supports \fBpgsql\fR, \fBflex\fR, \fBgazetteer\fR and \fBnull\fR. \fBpgsql\fR is
 the default output back\-end / schema and is optimized for rendering with Mapnik.
 \fBgazetteer\fR is a db schema optimized for geocoding and is used by Nominatim.
-The \fBmulti\fR backend allows more customization of tables. The experimental
-\fBflex\fR backend allows more flexible configuration.
+The experimental \fBflex\fR backend allows more flexible configuration.
 \fBnull\fR does not write any output and is only useful for testing or with
-\-\-slim for creating slim tables.
+\-\-slim for creating slim tables. There is also a \fBmulti\fR backend. This is
+now deprecated and will be removed in future versions of osm2pgsql.
 .TP
 \fB\-x\fR|\-\-extra\-attributes
 Include attributes for each object in the database.
diff --git a/docs/usage.md b/docs/usage.md
@@ -15,8 +15,10 @@ use them.
 
 * `--output` specifies if the output backend is the default
   [`pgsql`](pgsql.md), the [`gazetteer`](gazetteer.md) output used by Nominatim,
-  the new [`multi`](multi.md) backend which allows more customization of tables,
+  the new [`flex`](flex.md) backend which allows more customization of tables,
   or `null`, which emits no output to the backend.
+  There also is a [`multi`](multi.md) backend. This is now deprecated and
+  will be removed in future versions of osm2pgsql.
 
   `null` will create slim tables if `--slim` is also used.
 
diff --git a/src/options.cpp b/src/options.cpp
@@ -435,6 +435,11 @@ options_t::options_t(int argc, char *argv[]) : options_t()
             break;
         case 'O':
             output_backend = optarg;
+            if (output_backend == "multi") {
+                fprintf(stderr,
+                        "WARNING: 'multi' output is deprecated and will be removed.\n"
+                        "         Please switch to the 'flex' output.\n");
+            }
             break;
         case 'x':
             extra_attributes = true;
