[SCM] osm2pgsql branch, master, updated. debian/0.80.0+r27899-1-6-gb26f08b

[Andrew Harvey]

The following commit has been merged in the master branch:
commit b26f08bdf198dfeb8f2649839ab13d6e78e3c340
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sun Sep 23 11:04:06 2012 +1000

    Update manpage

diff --git a/debian/changelog b/debian/changelog
index 0f3c369..5cb109b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osm2pgsql (0.81.0+r28712-1) UNRELEASED; urgency=low
   * Patches refreshed to apply to new source
   * Update debian/rules get-orig-source to not bother trying to remove the
     gazetteer as it is no longer included upstream
+  * Update manpage
 
  -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sun, 23 Sep 2012 10:03:25 +1000
 
diff --git a/debian/osm2pgsql.1 b/debian/osm2pgsql.1
index 637408f..5f008ec 100644
--- a/debian/osm2pgsql.1
+++ b/debian/osm2pgsql.1
@@ -1,4 +1,4 @@
-.TH OSM2PGSQL 1 "May 26, 2009"
+.TH OSM2PGSQL 1 "September 23, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 osm2pgsql \- Openstreetmap data to PostgreSQL converter.
@@ -7,7 +7,7 @@ osm2pgsql \- Openstreetmap data to PostgreSQL converter.
 .RI [ options ] " planet.osm"
 .br
 .B osm2pgsql
-.RI [ options ] " planet.osm.{gz,bz2}"
+.RI [ options ] " planet.osm.{gz,bz2,pbf}"
 .br
 .B osm2pgsql
 .RI [ options ] " file1.osm file2.osm file3.osm"
@@ -45,6 +45,26 @@ default if \fB\-\-append\fR is not specified.
 The name of the PostgreSQL database to connect
 to (default: \fIgis\fR).
 .TP
+\fB\-i\fR, \fB\-\-tablespace\-index
+The name of the PostreSQL tablespace where all indexes will be created.
+If unset, use db's default; \fB\-i\fR is equivalent to setting
+\fB\-\-tablespace\-main\-index\fR and \fB\-\-tablespace\-slim\-index\fR
+.br
+.br
+The following options allow more fine-grained control:
+.br
+\fB\-\-tablespace\-main\-data\fR
+tablespace for main tables
+.br
+\fB\-\-tablespace\-main\-index\fR
+tablespace for main table indexes
+.br
+\fB\-\-tablespace\-slim\-data\fR
+tablespace for slim mode tables
+.br
+\fB\-\-tablespace\-slim\-index\fR
+tablespace for slim mode indexes
+.TP
 \fB\-l\fR, \fB\-\-latlong
 Store data in degrees of latitude & longitude.
 .TP
@@ -66,18 +86,24 @@ Prefix for table names (default \fIplanet_osm\fR)
 .TP
 \fB\-s\fR, \fB\-\-slim
 Store temorary data in the database. This greatly reduces the RAM usage but is much slower.
+This switch is required if you want to update with \fB\-\-append\fR later.
+.TP
+\fB\-\-drop
+Used with \fB\-\-slim\fR option to drop temporary tables after import, eliminating the
+ability to apply updates.
 .TP
 \fB\-S\fR, \fB\-\-style
 Location of the style file. Default to \fI/usr/share/osm2pgsql/default.style\fR
 .TP
 \fB\-C\fR, \fB\-\-cache
-Only for slim mode: Use up to this this many MB for caching nodes. Default is 800MB.
+Use up to this this many MB for caching nodes. Default is 800MB.
 .TP
 \fB\-U\fR, \fB\-\-username
 Postgresql user name.
 .TP
 \fB\-W\fR, \fB\-\-password
 Force password prompt.
+If omitted, password will be sourced from prompt or PGPASS environment variable.
 .TP
 \fB\-H\fR, \fB\-\-host
 Database server hostname or socket location.
@@ -105,6 +131,8 @@ Output backend.
 .br
 \fIpgsql\fR - Output to a PostGIS database. (default)
 .br
+\fIgazetteer\fR - Output to a PostGIS database suitable for gazetteer.
+.br
 \fInull\fR - No output. Useful for testing.
 .TP
 \fB\-x\fR, \fB\-\-extra-attributes
@@ -115,11 +143,18 @@ This includes the username, userid, timestamp and version.
 \fINote\fR: this option also requires additional entries in your style file.
 .TP
 \fB\-k\fR, \fB\-\-hstore
-Generate an additional hstore (key/value) column to postgresql tables
+Add tags without column to an additional hstore (key/value) column to postgresql tables
+.TP
+\fB\-\-hstore\-match\-only\fR
+Only keep objects that have a value in one of the columns (normal action with
+\fB\-\-hstore\fR is to keep all objects)
+.TP
+\fB-j\fR, \fB\-\-hstore\-all
+Add all tags to an additional hstore (key/value) column in postgresql tables
 .TP
 \fB\-z\fR, \fB\-\-hstore-column
-Generate an additional hstore (key/value) column to containing all tags
-that start with the specified string, for example \-\-hstore-column "name:" will
+Add an additional hstore (key/value) column to containing all tags
+that start with the specified string, for example \fB\-\-hstore\-column\fR "name:" will
 produce an extra hstore column that contains all name:xx tags
 .TP
 \fB\-G\fR, \fB\-\-multi-geometry
@@ -131,6 +166,34 @@ Keep coastline data rather than filtering it out.
 By default \fInatural=coastline\fR tagged data will be discarded based on the
 assumption that post-processed Coastline Checker shapefiles will be used.
 .TP
+\fB\-\-number\-processes\fR \fInum_processes\fR
+Specifies the number of parallel processes used for certain operations
+Default is 1
+.TP
+\fB\-I\fR, \fB\-\-disable\-parallel\-indexing\fR
+Disable indexing all tables concurrently.
+.TP
+\fB\-\-unlogged\fR
+Use unlogged tables (lost on crash but faster). Requires PostgreSQL 9.1.
+.TP
+\fB\-\-cache\-strategy\fR
+Specifies the method used to cache nodes in ram. Available options are:
+.br
+\fIdense\fR - caching strategy optimised for full planet import
+.br
+\fIchunked\fR - caching strategy optimised for non-contigouse memory allocation
+.br
+\fIsparse\fR - caching strategy optimised for small extracts
+.br
+\fIoptimized\fR - automatically combines dense and sparse strategies for optimal storage efficiency.
+optimized may use twice as much virtual memory, but no more physical memory (default)
+.TP
+\fB\-\-flat\-nodes\fR
+Specifies the flat file to use to persistently store node information in slim
+mode instead of in pgsql.This file is a single > 16Gb large file. This method
+is only recomended for full planet imports as it doesn't work well with small
+extracts. The default is disabled.
+.TP
 \fB\-h\fR, \fB\-\-help
 Help information.
 .br

-- 
OpenStreetMap data to PostgreSQL converter