Merge pull request #1341 from joto/update-manpage-pgsql-options

Update pgsql output options in manpage

Author: lonvia

docs/osm2pgsql.1

@@ -136,9 +136,8 @@ Example: \f[B]\-\-bbox\f[] \f[B]\-0.5,51.25,0.5,51.75\f[]
 .SH MIDDLE OPTIONS
 .TP
 .B \-i, \-\-tablespace\-index=TABLESPC
-Store all indexes in a separate PostgreSQL tablespace named by this
-parameter.
-This allows one to e.g.\ store the indexes on faster storage like SSDs.
+Store all indexes in the PostgreSQL tablespace \f[C]TABLESPC\f[].
+This option also affects the tables created by the pgsql output.
 .RS
 .RE
 .TP
@@ -294,30 +293,29 @@ no default.)
 .RE
 .SH PGSQL OUTPUT OPTIONS
 .TP
-.B \-i, \-\-tablespace\-index=TABLESPACENAME
-Store all indexes in a separate PostgreSQL tablespace named by this
-parameter.
-This allows one to e.g.\ store the indexes on faster storage like SSDs.
+.B \-i, \-\-tablespace\-index=TABLESPC
+Store all indexes in the PostgreSQL tablespace \f[C]TABLESPC\f[].
+This option also affects the middle tables.
 .RS
 .RE
 .TP
-.B \-\-tablespace\-main\-data=TABLESPACENAME
-Store the data tables (non slim) in the given tablespace.
+.B \-\-tablespace\-main\-data=TABLESPC
+Store the data tables in the PostgreSQL tablespace \f[C]TABLESPC\f[].
 .RS
 .RE
 .TP
-.B \-\-tablespace\-main\-index=TABLESPACENAME
-Store the indexes of the main tables (non slim) in the given tablespace.
+.B \-\-tablespace\-main\-index=TABLESPC
+Store the indexes in the PostgreSQL tablespace \f[C]TABLESPC\f[].
 .RS
 .RE
 .TP
 .B \-\-latlong
-Store data in degrees of latitude & longitude.
+Store coordinates in degrees of latitude & longitude.
 .RS
 .RE
 .TP
 .B \-m, \-\-merc
-Store data in Spherical Mercator (Web Mercator, EPSG:3857) (the
+Store coordinates in Spherical Mercator (Web Mercator, EPSG:3857) (the
 default).
 .RS
 .RE
@@ -334,37 +332,37 @@ This option affects the middle as well as the pgsql output table names.
 .RE
 .TP
 .B \-\-tag\-transform\-script=SCRIPT
-Specify a lua script to handle tag filtering and normalisation.
+Specify a Lua script to handle tag filtering and normalisation.
 The script contains callback functions for nodes, ways and relations,
 which each take a set of tags and returns a transformed, filtered set of
 tags which are then written to the database.
 .RS
 .RE
 .TP
 .B \-x, \-\-extra\-attributes
-Include attributes for each object in the database.
-This includes the username, userid, timestamp and version.
-Note: this option also requires additional entries in your style file.
+Include attributes (user name, user id, changeset id, timestamp and
+version).
+This also requires additional entries in your style file.
 .RS
 .RE
 .TP
 .B \-k, \-\-hstore
-Add tags without column to an additional hstore (key/value) column to
-database tables.
+Add tags without column to an additional hstore (key/value) column in
+the database tables.
 .RS
 .RE
 .TP
 .B \-j, \-\-hstore\-all
-Add all tags to an additional hstore (key/value) column in database
+Add all tags to an additional hstore (key/value) column in the database
 tables.
 .RS
 .RE
 .TP
-.B \-z, \-\-hstore\-column=KEY_PREFIX
-Add an additional hstore (key/value) column containing all tags that
-start with the specified string, eg \-\-hstore\-column \[lq]name:\[rq]
-will produce an extra hstore column that contains all \f[C]name:xx\f[]
-tags.
+.B \-z, \-\-hstore\-column=PREFIX
+Add an additional hstore (key/value) column named \f[C]PREFIX\f[]
+containing all tags that have a key starting with \f[C]PREFIX\f[], eg
+\f[C]\\\-\-hstore\-column\ "name:"\f[] will produce an extra hstore
+column that contains all \f[C]name:xx\f[] tags.
 .RS
 .RE
 .TP
@@ -382,7 +380,7 @@ Create indexes for all hstore columns after import.
 .B \-G, \-\-multi\-geometry
 Normally osm2pgsql splits multi\-part geometries into separate database
 rows per part.
-A single OSM id can therefore have several rows.
+A single OSM object can therefore use several rows in the output tables.
 With this option, osm2pgsql instead generates multi\-geometry features
 in the PostgreSQL tables.
 .RS
@@ -397,7 +395,8 @@ based on the assumption that Shapefiles generated by OSMCoastline
 .RE
 .TP
 .B \-\-reproject\-area
-Compute area column using spherical mercator coordinates.
+Compute area column using spherical mercator coordinates even if a
+different projection is used for the geometries.
 .RS
 .RE
 .TP

docs/osm2pgsql.md

@@ -104,8 +104,8 @@ mandatory for short options too.
 # MIDDLE OPTIONS
 
 -i, \--tablespace-index=TABLESPC
-:   Store all indexes in a separate PostgreSQL tablespace named by this parameter.
-    This allows one to e.g. store the indexes on faster storage like SSDs.
+:   Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
+    also affects the tables created by the pgsql output.
 
 \--tablespace-slim-data=TABLESPC
 :   Store the slim mode tables in the given tablespace.
@@ -201,21 +201,22 @@ mandatory for short options too.
 
 # PGSQL OUTPUT OPTIONS
 
--i, \--tablespace-index=TABLESPACENAME
-:   Store all indexes in a separate PostgreSQL tablespace named by this parameter.
-    This allows one to e.g. store the indexes on faster storage like SSDs.
+-i, \--tablespace-index=TABLESPC
+:   Store all indexes in the PostgreSQL tablespace `TABLESPC`. This option
+    also affects the middle tables.
 
-\--tablespace-main-data=TABLESPACENAME
-:   Store the data tables (non slim) in the given tablespace.
+\--tablespace-main-data=TABLESPC
+:   Store the data tables in the PostgreSQL tablespace `TABLESPC`.
 
-\--tablespace-main-index=TABLESPACENAME
-:   Store the indexes of the main tables (non slim) in the given tablespace.
+\--tablespace-main-index=TABLESPC
+:   Store the indexes in the PostgreSQL tablespace `TABLESPC`.
 
 \--latlong
-:   Store data in degrees of latitude & longitude.
+:   Store coordinates in degrees of latitude & longitude.
 
 -m, \--merc
-:   Store data in Spherical Mercator (Web Mercator, EPSG:3857) (the default).
+:   Store coordinates in Spherical Mercator (Web Mercator, EPSG:3857)
+    (the default).
 
 -E, \--proj=SRID
 :   Use projection EPSG:SRID.
@@ -225,26 +226,27 @@ mandatory for short options too.
     middle as well as the pgsql output table names.
 
 \--tag-transform-script=SCRIPT
-:   Specify a lua script to handle tag filtering and normalisation. The script
+:   Specify a Lua script to handle tag filtering and normalisation. The script
     contains callback functions for nodes, ways and relations, which each take
     a set of tags and returns a transformed, filtered set of tags which are
     then written to the database.
 
 -x, \--extra-attributes
-:   Include attributes for each object in the database.
-    This includes the username, userid, timestamp and version.
-    Note: this option also requires additional entries in your style file.
+:   Include attributes (user name, user id, changeset id, timestamp and version).
+    This also requires additional entries in your style file.
 
 -k, \--hstore
-:   Add tags without column to an additional hstore (key/value) column to database tables.
+:   Add tags without column to an additional hstore (key/value) column in
+    the database tables.
 
 -j, \--hstore-all
-:   Add all tags to an additional hstore (key/value) column in database tables.
+:   Add all tags to an additional hstore (key/value) column in the database
+    tables.
 
--z, \--hstore-column=KEY_PREFIX
-:   Add an additional hstore (key/value) column containing all tags
-    that start with the specified string, eg \--hstore-column "name:" will
-    produce an extra hstore column that contains all `name:xx` tags.
+-z, \--hstore-column=PREFIX
+:   Add an additional hstore (key/value) column named `PREFIX` containing all
+    tags that have a key starting with `PREFIX`, eg `\--hstore-column "name:"`
+    will produce an extra hstore column that contains all `name:xx` tags.
 
 \--hstore-match-only
 :   Only keep objects that have a value in at least one of the non-hstore
@@ -254,9 +256,10 @@ mandatory for short options too.
 :   Create indexes for all hstore columns after import.
 
 -G, \--multi-geometry
-:   Normally osm2pgsql splits multi-part geometries into separate database rows per part.
-    A single OSM id can therefore have several rows. With this option, osm2pgsql instead
-    generates multi-geometry features in the PostgreSQL tables.
+:   Normally osm2pgsql splits multi-part geometries into separate database rows
+    per part. A single OSM object can therefore use several rows in the output
+    tables. With this option, osm2pgsql instead generates multi-geometry
+    features in the PostgreSQL tables.
 
 -K, \--keep-coastlines
 :   Keep coastline data rather than filtering it out. By default objects
@@ -265,7 +268,8 @@ mandatory for short options too.
     will be used for the coastline data.
 
 \--reproject-area
-:   Compute area column using spherical mercator coordinates.
+:   Compute area column using spherical mercator coordinates even if a
+    different projection is used for the geometries.
 
 \--output-pgsql-schema=SCHEMA
 :   Use PostgreSQL schema SCHEMA for all tables, indexes, and functions in