Merge pull request #1460 from joto/remove-multi

Remove multi output

Author: lonvia

docs/multi.md

@@ -279,9 +279,6 @@ The experimental \f[B]flex\f[] backend allows more flexible
 configuration.
 \f[B]null\f[] does not write any output and is only useful for testing
 or with \f[B]\-\-slim\f[] for creating slim tables.
-There is also a \f[B]multi\f[] backend.
-This is now deprecated and will be removed in future versions of
-osm2pgsql.
 .RS
 .RE
 .TP
@@ -405,8 +402,8 @@ different projection is used for the geometries.
 .TP
 .B \-\-output\-pgsql\-schema=SCHEMA
 Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
-the pgsql and multi outputs (default is no schema, i.e.\ the
-\f[C]public\f[] schema is used).
+the pgsql output (default is no schema, i.e.\ the \f[C]public\f[] schema
+is used).
 .RS
 .RE
 .SH EXPIRE OPTIONS

docs/osm2pgsql.1

@@ -192,8 +192,7 @@ mandatory for short options too.
     **gazetteer** is intended for geocoding with Nominatim.
     The experimental **flex** backend allows more flexible configuration.
     **null** does not write any output and is only useful for testing or with
-    **\--slim** for creating slim tables. There is also a **multi** backend. This is
-    now deprecated and will be removed in future versions of osm2pgsql.
+    **\--slim** for creating slim tables.
 
 -S, \--style=FILE
 :   The style file. This specifies how the data is imported into the database,
@@ -275,7 +274,7 @@ mandatory for short options too.
 
 \--output-pgsql-schema=SCHEMA
 :   Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in
-    the pgsql and multi outputs (default is no schema, i.e. the `public` schema
+    the pgsql output (default is no schema, i.e. the `public` schema
     is used).
 
 # EXPIRE OPTIONS