[DebianGIS-dev] [SCM] osm2pgsql branch, master, updated. upstream/0.70.5+r25090-26-g02f5fed

[David Paleino]

The following commit has been merged in the master branch:
commit 02f5fedfe763339d1564f4f82ced5050152087c1
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 18 21:32:11 2011 +0100

    Make a prettier manpage

diff --git a/debian/osm2pgsql.1 b/debian/osm2pgsql.1
index 30e7404..15bb87a 100644
--- a/debian/osm2pgsql.1
+++ b/debian/osm2pgsql.1
@@ -28,109 +28,117 @@ These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
 .TP
-\fB\-a\fR|\-\-append
+\fB\-a\fR, \fB\-\-append
 Add the OSM file into the database without removing
 existing data.
 .TP
-\fB\-b\fR|\-\-bbox
+\fB\-b\fR, \fB\-\-bbox
 Apply a bounding box filter on the imported data
 Must be specified as: minlon,minlat,maxlon,maxlat
-e.g. \fB\-\-bbox\fR \fB\-0\fR.5,51.25,0.5,51.75
+e.g. \fB\-\-bbox\fR \-0.5,51.25,0.5,51.75
 .TP
-\fB\-c\fR|\-\-create
+\fB\-c\fR, \fB\-\-create
 Remove existing data from the database. This is the
 default if \fB\-\-append\fR is not specified.
 .TP
-\fB\-d\fR|\-\-database
+\fB\-d\fR, \fB\-\-database
 The name of the PostgreSQL database to connect
-to (default: gis).
+to (default: \fIgis\fR).
 .TP
-\fB\-l\fR|\-\-latlong
+\fB\-l\fR, \fB\-\-latlong
 Store data in degrees of latitude & longitude.
 .TP
-\fB\-m\fR|\-\-merc
+\fB\-m\fR, \fB\-\-merc
 Store data in proper spherical mercator (default)
 .TP
-\fB\-M\fR|\-\-oldmerc
+\fB\-M\fR, \fB\-\-oldmerc
 Store data in the legay OSM mercator format
 .TP
-\fB\-E\fR|\-\-proj num
-Use projection EPSG:num
+\fB\-E\fR, \fB\-\-proj num
+Use projection \fIEPSG:num\fR
 .TP
-\fB\-u\fR|\-\-utf8\-sanitize
+\fB\-u\fR, \fB\-\-utf8\-sanitize
 Repair bad UTF8 input data (present in planet
 dumps prior to August 2007). Adds about 10% overhead.
 .TP
-\fB\-p\fR|\-\-prefix
-Prefix for table names (default planet_osm)
+\fB\-p\fR, \fB\-\-prefix
+Prefix for table names (default \fIplanet_osm\fR)
 .TP
-\fB\-s\fR|\-\-slim
+\fB\-s\fR, \fB\-\-slim
 Store temorary data in the database. This greatly reduces the RAM usage but is much slower.
 .TP
-\fB\-S\fR|\-\-style
-Location of the style file. Default to /usr/share/osm2pgsql/default.style
+\fB\-S\fR, \fB\-\-style
+Location of the style file. Default to \fI/usr/share/osm2pgsql/default.style\fR
 .TP
-\fB\-C\fR|\-\-cache
+\fB\-C\fR, \fB\-\-cache
 Only for slim mode: Use up to this this many MB for caching nodes. Default is 800MB.
 .TP
-\fB\-U\fR|\-\-username
+\fB\-U\fR, \fB\-\-username
 Postgresql user name.
 .TP
-\fB\-W\fR|\-\-password
+\fB\-W\fR, \fB\-\-password
 Force password prompt.
 .TP
-\fB\-H\fR|\-\-host
+\fB\-H\fR, \fB\-\-host
 Database server hostname or socket location.
 .TP
-\fB\-P\fR|\-\-port
+\fB\-P\fR, \fB\-\-port
 Database server port.
 .TP
-\fB\-e\fR|\-\-expire-tiles [min_zoom-]max_zoom
+\fB\-e\fR, \fB\-\-expire-tiles \fR[\fImin_zoom\fR-]\fImax_zoom\fR
 Create a tile expiry list.
 .TP
-\fB\-o\fR|\-\-expire-output filename
+\fB\-o\fR, \fB\-\-expire-output filename
 Output filename for expired tiles list.
 .TP
-\fB\-r\fR|\-\-input-reader
+\fB\-r\fR, \fB\-\-input-reader
 Input frontend.
-libxml2 - Parse XML using libxml2. (default)
-primitive - Primitive XML parsing.
-pbf - OSM binary format.
+.br
+\fIlibxml2\fR - Parse XML using libxml2. (default)
+.br
+\fIprimitive\fR - Primitive XML parsing.
+.br
+\fIpbf\fR - OSM binary format.
 .TP
-\fB\-O\fR|\-\-output
+\fB\-O\fR, \fB\-\-output
 Output backend.
-pgsql - Output to a PostGIS database. (default)
-null - No output. Useful for testing.
+.br
+\fIpgsql\fR - Output to a PostGIS database. (default)
+.br
+\fInull\fR - No output. Useful for testing.
 .TP
-\fB\-x\fR|\-\-extra-attributes
+\fB\-x\fR, \fB\-\-extra-attributes
 Include attributes for each object in the database.
+.br
 This includes the username, userid, timestamp and version.
-Note: this option also requires additional entries in your style file.
+.br
+\fINote\fR: this option also requires additional entries in your style file.
 .TP
-\fB\-k\fR|\-\-hstore
-Generate an additional hstore (key/value) column to  postgresql tables
+\fB\-k\fR, \fB\-\-hstore
+Generate an additional hstore (key/value) column to postgresql tables
 .TP
-\fB\-z\fR|\-\-hstore-column
+\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
 produce an extra hstore column that contains all name:xx tags
 .TP
-\fB\-G\fR|\-\-multi-geometry
+\fB\-G\fR, \fB\-\-multi-geometry
 Generate multi-geometry features in postgresql tables.
 .TP
-\fB\-K\fR|\-\-keep-coastlines
+\fB\-K\fR, \fB\-\-keep-coastlines
 Keep coastline data rather than filtering it out.
-By default natural=coastline tagged data will be discarded based on the
+.br
+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\-h\fR|\-\-help
+\fB\-h\fR, \fB\-\-help
 Help information.
 .br
 Add \fB\-vh\fR to display supported projections.
 .br
 Use \fB\-E\fR to access any espg projections (usually in /usr/share/proj/epsg)
 .TP
-\fB\-v\fR|\-\-verbose
+\fB\-v\fR, \fB\-\-verbose
 Verbose output.
 .PP
 .SH SUPPORTED PROJECTIONS

-- 
OpenStreetMap data to PostgreSQL converter