[SCM] osmctools branch, master, updated. debian/0.1-1-4-gc8e47e6

[Pierre Blanc]

The following commit has been merged in the master branch:
commit c8e47e6ce60f2294414c76b880fe3aa5142093c5
Author: Pierre Blanc <pierreblanc75 at gmail.com>
Date:   Sun Sep 15 10:13:33 2013 +0200

    Docs: fix man-pages mistakes.

diff --git a/debian/docs/osmconvert.1 b/debian/docs/osmconvert.1
index d0d83ac..c1ec169 100644
--- a/debian/docs/osmconvert.1
+++ b/debian/docs/osmconvert.1
@@ -2,15 +2,14 @@
 .SH NAME
 osmconvert \- Converter of OSM files
 .SH "SYNOPSIS"
-\&\fBosmconvert\fR \fIoptions\fR [\fIinput file\fR]
+\&\fBosmconvert\fR \fIoptions\fR [\fIinput file\fR]
 .SH DESCRIPTION
 .PP
 This program reads different file formats of the OpenStreetMap
 project and converts the data to the selected output file format.
 .SS These formats can be read:
 .TP
-\&.osm
-\&.osc .osc.gz .osh .o5m .o5c .pbf
+\&.osm .osc .osc.gz .osh .o5m .o5c .pbf
 .SS "These formats can be written:"
 .TP
 \&.osm (default) .osc .osh .o5m .o5c .pbf
@@ -313,26 +312,6 @@ diagnosis data will be displayed.
 If \fB\-v\fR resp. \fB\-\-verbose\fR is the first parameter in the line,
 osmconvert will display all input parameters.
 .PP
-.SH EXAMPLES
-.PP
-\tosmconvert europe.pbf \fB\-\-drop\-author\fR >europe.osm
-.br
-\tosmconvert europe.pbf |gzip >europe.osm.gz
-.br
-\tbzcat europe.osm.bz2 |./osmconvert \fB\-\-out\-pbf\fR >europe.pbf
-.br
-\tosmconvert europe.pbf \fB\-B\fR=\fIch\fR.poly >switzerland.osm
-.br
-\tosmconvert switzerland.osm \fB\-\-out\-o5m\fR >switzerland.o5m
-.br
-\tosmconvert june_july.osc \fB\-\-out\-o5c\fR >june_july.o5c
-.br
-\tosmconvert june.o5m june_july.o5c.gz \fB\-\-out\-o5m\fR >july.o5m
-.br
-\tosmconvert sep.osm sep_oct.osc oct_nov.osc >nov.osm
-.br
-\tosmconvert northamerica.osm southamerica.osm >americas.osm
-.PP
 .SH TUNING
 .PP
 To speed\-up the process, the program uses some main memory for a
@@ -400,12 +379,33 @@ osmconvert will display an error message if this sequence is broken.
 .PP
 If a polygon file for borders is supplied, the maximum number of
 polygon points is about 40,000.
+.SH NOTES
 .PP
 This program is for experimental use. Expect malfunctions and data
 loss. Do not use the program in productive or commercial systems.
 .PP
 There is NO WARRANTY, to the extent permitted by law.
 Please send any bug reports to markus.weber at gmx.com
+.PP
+.SH EXAMPLE
+.PP
+\tosmconvert europe.pbf \fB\-\-drop\-author\fR >europe.osm
+.br
+\tosmconvert europe.pbf |gzip >europe.osm.gz
+.br
+\tbzcat europe.osm.bz2 |./osmconvert \fB\-\-out\-pbf\fR >europe.pbf
+.br
+\tosmconvert europe.pbf \fB\-B\fR=\fIch\fR.poly >switzerland.osm
+.br
+\tosmconvert switzerland.osm \fB\-\-out\-o5m\fR >switzerland.o5m
+.br
+\tosmconvert june_july.osc \fB\-\-out\-o5c\fR >june_july.o5c
+.br
+\tosmconvert june.o5m june_july.o5c.gz \fB\-\-out\-o5m\fR >july.o5m
+.br
+\tosmconvert sep.osm sep_oct.osc oct_nov.osc >nov.osm
+.br
+\tosmconvert northamerica.osm southamerica.osm >americas.osm
 .SH "SEE ALSO"
 osmfilter(1), osmupdate(1)
 .SH AUTHORS
diff --git a/debian/docs/osmfilter.1 b/debian/docs/osmfilter.1
index 6bc90f4..bb42d02 100644
--- a/debian/docs/osmfilter.1
+++ b/debian/docs/osmfilter.1
@@ -2,7 +2,7 @@
 .SH NAME
 osmfilter \- The experimental OSM filters data 
 .SH "SYNOPSIS"
-\&\fBosmfilter\fR \fIoptions\fR [\fIinput file\fR]
+\&\fBosmfilter\fR \fIoptions\fR [\fIinput file\fR]
 .SH DESCRIPTION
 .PP
 THIS PROGRAM IS FOR EXPERIMENTAL USE ONLY.
@@ -292,14 +292,6 @@ deleted, nor the remaining tags. If you want to drop every
 tag which is not mentioned in a list, use this example:
 .br
 all highway= amenity= name=
-.SH EXAMPLES
-osmfilter europe.o5m \-\-keep=amenity=bar \-o=new.o5m
-.br
-osmfilter a.osm \-\-keep\-nodes=lit=yes \-\-drop\-ways \-o=light.osm
-.br
-osmfilter a.osm \-\-keep="place=city or ( place=town and population>=10000 )" \-o=b.osm
-.br
-osmfilter region.o5m \-\-keep="bridge=yes and layer>=2" \-o=r.o5m
 .SH TUNING
 To speed\-up the process, the program uses some main memory for a
 hash table. By default, it uses 480 MB for storing a flag for every
@@ -344,9 +336,21 @@ will display an error message if this sequence is broken.
 .PP
 The number of key/val pairs in each filter parameter is limited to
 1000, the length of each key or val is limited to 100.
+.SH NOTES
+.PP
+This program is for experimental use. Expect malfunctions and data
+loss. Do not use the program in productive or commercial systems.
 .PP
 There is NO WARRANTY, to the extent permitted by law.
 Please send any bug reports to markus.weber at gmx.com
+.SH EXAMPLE
+osmfilter europe.o5m \-\-keep=amenity=bar \-o=new.o5m
+.br
+osmfilter a.osm \-\-keep\-nodes=lit=yes \-\-drop\-ways \-o=light.osm
+.br
+osmfilter a.osm \-\-keep="place=city or ( place=town and population>=10000 )" \-o=b.osm
+.br
+osmfilter region.o5m \-\-keep="bridge=yes and layer>=2" \-o=r.o5m
 .SH "SEE ALSO"
 osmconvert(1), osmupdate(1)
 .SH AUTHORS
diff --git a/debian/docs/osmupdate.1 b/debian/docs/osmupdate.1
index a8144e7..b6e043a 100644
--- a/debian/docs/osmupdate.1
+++ b/debian/docs/osmupdate.1
@@ -122,7 +122,7 @@ loss. Do not use the program in productive or commercial systems.
 .PP
 There is NO WARRANTY, to the extent permitted by law.
 Please send any bug reports to markus.weber at gmx.com
-.SH EXAMPLES
+.SH EXAMPLE
 osmupdate old_file.o5m new_file.o5m
 .br
 osmupdate old_file.pbf new_file.pbf

-- 
Some tools to manipulate OpenStreetMap files