Fix:maptool:Improve online help and manpage for maptool.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5813 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 9 insertions, 10 deletions

diff --git a/man/maptool.1 b/man/maptool.1
index a812a75a..88191095 100644
--- a/man/maptool.1
+++ b/man/maptool.1
@@ -4,12 +4,13 @@ maptool \- parse osm textfile and convert to Navit binfile format
 .SH SYNOPSIS
 .B For OSM XML data:
 .B bzcat planet.osm.bz2 | maptool mymap.bin
-[\-h] [\-2] [\-5 <file>] [\-6] [\-a <level>] [\-c] -[\-d <connect string] 
+[\-h] [\-5 <file>] [\-6] [\-a <level>] [\-c] -[\-d <connect string]
 [\-e <phase>] [\-i <file>] [\-k] [\-M] [\-N] [\-o] [\-r <file>] [\-s <phase>]
 [\-S <size>] [\-w] [\-W] [\-U] [\-z <level>]
+
 .B For OSM Protobuf/PBF data:
 .B maptool \-\-protobuf \-i planet.osm.pbf planet.bin
-[\-h] [\-2] [\-5 <file>] [\-6] [\-a <level>] [\-c] [\-e <phase>] 
+[\-h] [\-5 <file>] [\-6] [\-a <level>] [\-c] [\-e <phase>]
 [\-i <file>] [\-k] [\-M] [\-N] [\-o] [\-P] [\-r <file>] [\-s <phase>]
 [\-S <size>] [\-w] [\-W] [\-U] [\-z <level>]
 .SH DESCRIPTION
@@ -19,9 +20,6 @@ maptool parses osm textfile and converts it to Navit binfile format
 \-h (\-\-help)
 display a short help message
 .TP
-\-2 (\-\-dowai2poi)
-convert ways and polygons to POIs when applicable
-.TP
 \-4 (\-\-md5)
 set file where to write md5 sum
 .TP
@@ -50,8 +48,8 @@ do not delete tmp files after processing. useful to reuse them
 process only nodes
 .TP
 \-o (\-\-coverage)
-converts every street to street_converage, resulting in a big fat black line. 
-You can overlay this map with another vector map or image map, and every street 
+converts every street to street_coverage, resulting in a big fat black line.
+You can overlay this map with another vector map or image map, and every street
 you will still see is missing in the \-o map
 .TP
 \-P (\-\-protobuf)
@@ -64,7 +62,8 @@ read mapping rules from specified file
 start at specified phase
 .TP
 \-S (\-\-slice-size) <phrase>
-defines the amount of memory to use, in bytes. Default is 1GB
+limit memory to use for some large internal buffers, in bytes. Default is 1 GB.
+Smaller slices reduce peak memory usage, at the cost of increased processing time.
 .TP
 \-w (\-\-dedupe-ways)
 ensure no duplicate ways or nodes. useful when using several input files
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 3a323e00..ec800db5 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -195,14 +195,14 @@ usage(FILE *f)
 	fprintf(f,"-E (--experimental)               : Enable experimental features (%s)\n",
 		experimental_feature_description ? experimental_feature_description : "-not available in this version-");
 	fprintf(f,"-i (--input-file) <file>          : specify the input file name (OSM), overrules default stdin\n");
-	fprintf(f,"-k (--keep-tmpfiles)              : do not delete tmp files after processing. useful to reuse them\n\n");
+	fprintf(f,"-k (--keep-tmpfiles)              : do not delete tmp files after processing. useful to reuse them\n");
 	fprintf(f,"-M (--o5m)                        : input file os o5m\n");
 	fprintf(f,"-N (--nodes-only)                 : process only nodes\n");
 	fprintf(f,"-o (--coverage)                   : map every street to item coverage\n");
 	fprintf(f,"-P (--protobuf)                   : input file is protobuf\n");
 	fprintf(f,"-r (--rule-file) <file>           : read mapping rules from specified file\n");
 	fprintf(f,"-s (--start) <phase>              : start at specified phase\n");
-	fprintf(f,"-S (--slice-size) <size>          : defines the amount of memory to use, in bytes. Default is %dGB\n", SLIZE_SIZE_DEFAULT_GB);
+	fprintf(f,"-S (--slice-size) <size>          : limit memory to use for some large internal buffers, in bytes. Default is %dGB.\n", SLIZE_SIZE_DEFAULT_GB);
 	fprintf(f,"-t (--timestamp) y-m-dTh:m:s      : Set zip timestamp\n");
 	fprintf(f,"-w (--dedupe-ways)                : ensure no duplicate ways or nodes. useful when using several input files\n");
 	fprintf(f,"-W (--ways-only)                  : process only ways\n");