This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osmium-tool.

commit 7a5015da75c27f808d233b8e1276084e626d19d3
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Mar 31 22:56:46 2015 +0200

    Imported Upstream version 1.0.1
---
 .gitignore                           |  4 ----
 .ycm_extra_conf.py                   |  6 +++++-
 CHANGELOG.md                         | 18 ++++++++++++++++
 CMakeLists.txt                       | 41 +++++++++++++++++-------------------
 README.md                            | 12 ++---------
 debian/.gitignore                    |  4 ----
 debian/changelog                     |  5 -----
 debian/compat                        |  1 -
 debian/control                       | 25 ----------------------
 debian/copyright                     | 18 ----------------
 debian/dirs                          |  1 -
 debian/docs                          |  1 -
 debian/osmium.install                |  1 -
 debian/rules                         |  8 -------
 doc/.gitignore                       |  2 --
 doc/Makefile                         | 32 ----------------------------
 fix-formatting.sh                    |  7 ++++++
 {doc => man}/manpage.template        |  4 +---
 {doc => man}/osmium-apply-changes.md | 36 +++++++++++++++----------------
 {doc => man}/osmium-cat.md           | 38 ++++++++++++++++-----------------
 {doc => man}/osmium-file-formats.md  | 11 ++++++----
 {doc => man}/osmium-fileinfo.md      | 10 ++++-----
 {doc => man}/osmium-merge-changes.md | 34 ++++++++++++++----------------
 {doc => man}/osmium-time-filter.md   | 34 ++++++++++++++----------------
 {doc => man}/osmium.md               |  8 +++----
 src/main.cpp                         |  2 +-
 26 files changed, 134 insertions(+), 229 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6b3cb91..72053c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
 .*.swp
-src/*.o
-doc/*.1
-doc/*.html
-build*
 .ycm_extra_conf.pyc
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index cdff62b..39be220 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -6,6 +6,10 @@
 #
 #-----------------------------------------------------------------------------
 
+from os.path import realpath, dirname
+
+basedir = dirname(realpath(__file__))
+
 # some default flags
 # for more information install clang-3.2-doc package and
 # check UsersManual.html
@@ -26,7 +30,7 @@ flags = [
 'c++',
 
 # libosmium include dirs
-'-I../libosmium/include',
+'-I%s/../libosmium/include' % basedir,
 
 ]
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..3412cc6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,18 @@
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [unreleased] -
+
+## [1.0.1] - 2015-03-31
+
+### Changed
+
+- Minor updates to documentation and build system
+
+
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.0.1...HEAD
+[1.0.1]: https://github.com/osmcode/osmium-tool/compare/v1.0.0...v1.0.1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b6296..8546a16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,12 +25,14 @@ project(osmium)
 
 set(OSMIUM_VERSION_MAJOR 1)
 set(OSMIUM_VERSION_MINOR 0)
-set(OSMIUM_VERSION_PATCH 0)
+set(OSMIUM_VERSION_PATCH 1)
 
 set(OSMIUM_VERSION 
${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
 
 add_definitions(-DOSMIUM_VERSION="${OSMIUM_VERSION}")
 
+set(AUTHOR "Jochen Topf <joc...@topf.org>")
+
 
 #-----------------------------------------------------------------------------
 #
@@ -78,10 +80,16 @@ find_program(PANDOC pandoc)
 function(add_man_page _section _name)
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man/man${_section})
     set(_output_file 
${CMAKE_BINARY_DIR}/man/man${_section}/${_name}.${_section})
-    set(_source_file ${CMAKE_SOURCE_DIR}/doc/${_name}.md)
+    set(_source_file ${CMAKE_SOURCE_DIR}/man/${_name}.md)
     set(_install_dir "share/man/man{$_section}")
+    string(TOUPPER ${_name} _name_upcase)
     add_custom_command(OUTPUT ${_output_file}
-        COMMAND ${PANDOC} ${PANDOC_MAN_OPTIONS} -o ${_output_file} 
${_source_file}
+        COMMAND ${PANDOC}
+            ${PANDOC_MAN_OPTIONS}
+            --variable "title=${_name_upcase}"
+            --variable "section=${_section}"
+            -o ${_output_file}
+            ${_source_file}
         DEPENDS ${_source_file}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         COMMENT "Building manpage ${_name}.${_section}"
@@ -94,7 +102,14 @@ if(PANDOC)
     message(STATUS "Looking for pandoc - found")
     message(STATUS "  Manual pages will be built")
     execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE 
OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(PANDOC_MAN_OPTIONS -s -t man --template 
${CMAKE_CURRENT_SOURCE_DIR}/doc/manpage.template --variable 
"description=osmium/${OSMIUM_VERSION}" --variable "date=${PUBDATE}")
+        set(PANDOC_MAN_OPTIONS
+        -s
+        -t man
+        --template ${CMAKE_CURRENT_SOURCE_DIR}/man/manpage.template
+        --variable "description=osmium/${OSMIUM_VERSION}"
+        --variable "date=${PUBDATE}"
+        --variable "author=${AUTHOR}"
+    )
     set(PANDOC_HTML_OPTIONS -s -t html)
 
     add_man_page(1 osmium)
@@ -116,24 +131,6 @@ endif(PANDOC)
 
 #-----------------------------------------------------------------------------
 #
-#  Optional "format" target that formats C++ code
-#
-#-----------------------------------------------------------------------------
-message(STATUS "Looking for astyle")
-find_program(ASTYLE astyle)
-
-if(ASTYLE)
-    add_custom_target(format astyle --style=java --indent-namespaces 
--indent-switches --pad-header --lineend=linux --suffix=none --recursive 
src/*pp)
-    message(STATUS "Looking for astyle - found")
-    message(STATUS "  Adding 'indent' target")
-else()
-    message(STATUS "Looking for astyle - not found")
-    message(STATUS "  No 'indent' target available")
-endif(ASTYLE)
-
-
-#-----------------------------------------------------------------------------
-#
 #  Decide which C++ version to use (Minimum/default: C++11).
 #
 #-----------------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9762fff..74be243 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ later are known to work. You also need the following 
libraries:
         http://www.cmake.org/
         Debian/Ubuntu: cmake
 
-    Pandoc (optional, do build documentation)
+    Pandoc (optional, to build documentation)
         http://johnmacfarlane.net/pandoc/
         Debian/Ubuntu: pandoc
 
@@ -74,19 +74,11 @@ defaults is RelWithDebInfo.
 
 ## Documentation
 
-There are man pages in the 'doc' directory. To build them you need 'pandoc'.
+There are man pages in the 'man' directory. To build them you need 'pandoc'.
 If the `pandoc` command was found during the CMake config step, the manpages
 will be built, if not they will not be built.
 
 
-## Building Debian Package
-
-A `debian` directory is provided for building (unofficial) Debian packages.
-Call `make deb` or `debuild -I -us -uc` to build the package. Note that there
-currently is no libosmium package with the new libosmium version needed for the
-Osmium tool, so the build dependencies are not complete.
-
-
 ## License
 
 Copyright (C) 2013-2015  Jochen Topf <joc...@topf.org>
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index a520ed4..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-files
-osmium
-osmium.debhelper.log
-osmium.substvars
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index e0fbeea..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-osmium (0.0.1) jessie; urgency=low
-
-  * Initial standalone debian package
-
- -- Jochen Topf <joc...@topf.org>  Wed, 27 Nov 2013 13:42:00 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index a52d9a1..0000000
--- a/debian/control
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: osmium
-Section: utils
-Priority: optional
-Maintainer: Jochen Topf <joc...@topf.org>
-Build-Depends: debhelper (>= 9),
-               cmake (>= 2.8),
-               libboost-program-options-dev,
-               libbz2-dev,
-               libcrypto++-dev,
-               libexpat1-dev,
-               libosmpbf-dev,
-               libprotobuf-c-dev | libprotobuf-c0-dev (>= 0.14),
-               pandoc,
-               zlib1g-dev
-Standards-Version: 3.9.5
-Homepage: http://osmcode.org/osmium/
-
-Package: osmium
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: 
-Description: Command line tool for working with OpenStreetMap data.
- A versatile command line tool that makes manipulating
- OpenStreetMap data easy.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index e5743ab..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright 2013 Jochen Topf <joc...@topf.org>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 3 of the License, or (at your
-option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-The GNU General Public License version 3 may be found on Debian systems
-in /usr/share/common-licenses/GPL-3.
-
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/osmium.install b/debian/osmium.install
deleted file mode 100644
index a1b43ae..0000000
--- a/debian/osmium.install
+++ /dev/null
@@ -1 +0,0 @@
-zsh_completion/_osmium usr/share/zsh/vendor-completions
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 9861256..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-       dh $@
-
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 8c7bbbe..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.1
-*.5
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 9a55a06..0000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#  Makefile for Osmium command line tool documentation.
-#
-#  You need 'pandoc' for this to work.
-#
-
-OSMIUM_VERSION := 0.0.1
-
-PANDOC := pandoc
-
-MARKDOWN_FILES := $(wildcard *.md)
-MAN_PAGES_1 := osmium.1 osmium-apply-changes.1 osmium-cat.1 osmium-fileinfo.1 
osmium-merge-changes.1 osmium-time-filter.1
-MAN_PAGES_5 := osmium-file-formats.5
-
-PUBDATE := `date +%Y-%m-%d`
-PANDOC_MAN_OPTIONS := -s -t man --template manpage.template --variable 
"description=osmium/$(OSMIUM_VERSION)" --variable "date=$(PUBDATE)"
-PANDOC_HTML_OPTIONS := -s -t html
-
-all: $(MAN_PAGES_1) $(MAN_PAGES_5)
-
-%.1: %.md
-       $(PANDOC) $(PANDOC_MAN_OPTIONS) -o $@ $<
-
-%.5: %.md
-       $(PANDOC) $(PANDOC_MAN_OPTIONS) -o $@ $<
-
-%.html: %.md
-       $(PANDOC) $(PANDOC_HTML_OPTIONS) -o $@ $<
-
-clean:
-       rm -f *.1 *.5 *.html
-
diff --git a/fix-formatting.sh b/fix-formatting.sh
new file mode 100755
index 0000000..41ae193
--- /dev/null
+++ b/fix-formatting.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+#  fix-formatting
+#
+
+exec astyle --style=java --indent-namespaces --indent-switches --pad-header 
--lineend=linux --suffix=none src/*pp
+
diff --git a/doc/manpage.template b/man/manpage.template
similarity index 77%
rename from doc/manpage.template
rename to man/manpage.template
index be7bbaa..a786f37 100644
--- a/doc/manpage.template
+++ b/man/manpage.template
@@ -22,9 +22,7 @@ This is free software: you are free to change and 
redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 .SH CONTACT
 .PP
-Developers can be contacted through the OSM dev mailinglist
-(https://lists.openstreetmap.org/listinfo/dev).
-Bugs should be reported to https://github.com/osmcode/osmium-tool.
+http://osmcode.org/contact.html
 .SH AUTHORS
 $for(author)$$author$$sep$; $endfor$.
 $endif$
diff --git a/doc/osmium-apply-changes.md b/man/osmium-apply-changes.md
similarity index 85%
rename from doc/osmium-apply-changes.md
rename to man/osmium-apply-changes.md
index 8cc21a2..a8eacda 100644
--- a/doc/osmium-apply-changes.md
+++ b/man/osmium-apply-changes.md
@@ -1,14 +1,12 @@
-% OSMIUM-APPLY-CHANGES(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-apply-changes - Apply OSM change file(s) to OSM data file.
+osmium-apply-changes - apply OSM change file(s) to OSM data file
 
 
 # SYNOPSIS
 
-**osmium apply-changes** \[OPTIONS\] *INPUT-FILE* *CHANGE-FILE...*
+**osmium apply-changes** \[*OPTIONS*\] *INPUT-FILE* *CHANGE-FILE*...
 
 
 # DESCRIPTION
@@ -25,37 +23,37 @@ data has to fit in there!
 
 # OPTIONS
 
---generator NAME
-:   The name and version of the program generating the output file. It will be
-    added to the header of the output file. Default is "*osmium/*" and the 
version
-    of osmium.
+-f, --output-format=FORMAT
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name.
+    See **osmium-file-formats**(5) or the libosmium manual for details.
 
---input-format, -F FORMAT
+-F, --input-format=FORMAT
 :   The format of the input files. Can be used to set the input format if it
     can't be autodetected from the file names. This will set the format for
     all input files, there is no way to set the format for some input files
     only. See **osmium-file-formats**(5) or the libosmium manual for details.
 
---output, -o FILE
-:   Name of the output file. Default is '-' (*stdout*).
+--generator=NAME
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is "*osmium/*" and the 
version
+    of osmium.
 
---output-format, -f FORMAT
-:   The format of the output file. Can be used to set the output file format
-    if it can't be autodetected from the output file name.
-    See **osmium-file-formats**(5) or the libosmium manual for details.
+-o, --output=FILE
+:   Name of the output file. Default is '-' (*stdout*).
 
---overwrite, -O
+-O, --overwrite
 :   Allow an existing output file to be overwritten. Normally **osmium** will
     refuse to write over an existing file.
 
---remove-deleted, -r
+-r, --remove-deleted
 :   Remove deleted objects from the output. If this is not set, deleted objects
     will be in the output with the visible flag set to false.
 
---simplify, -s
+-s, --simplify
 :   Only write the last version of any object to the output.
 
---verbose, -v
+-v, --verbose
 :   Set verbose mode. The program will output information about what it is
     doing to *stderr*.
 
diff --git a/doc/osmium-cat.md b/man/osmium-cat.md
similarity index 87%
rename from doc/osmium-cat.md
rename to man/osmium-cat.md
index 0ad81ca..67dd19a 100644
--- a/doc/osmium-cat.md
+++ b/man/osmium-cat.md
@@ -1,14 +1,12 @@
-% OSMIUM-CAT(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-cat - Concatenate OSM files and convert to different formats.
+osmium-cat - concatenate OSM files and convert to different formats
 
 
 # SYNOPSIS
 
-**osmium cat** \[OPTIONS\] \[**-o** *OUTPUT-FILE*\] *INPUT-FILE...*
+**osmium cat** \[*OPTIONS*\] *INPUT-FILE*...
 
 
 # DESCRIPTION
@@ -22,38 +20,38 @@ can be used to convert OSM files from one format into 
another.
 
 # OPTIONS
 
---generator NAME
-:   The name and version of the program generating the output file. It will be
-    added to the header of the output file. Default is "*osmium/*" and the 
version
-    of osmium.
+-f, --output-format=FORMAT
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name.
+    **See osmium-file-formats**(5) or the libosmium manual for details.
 
---input-format, -F FORMAT
+-F, --input-format=FORMAT
 :   The format of the input files. Can be used to set the input format if it
     can't be autodetected from the file names. This will set the format for
     all input files, there is no way to set the format for some input files
     only. See **osmium-file-formats**(5) or the libosmium manual for details.
 
---output, -o FILE
+--generator=NAME
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is "*osmium/*" and the 
version
+    of osmium.
+
+-o, --output=FILE
 :   Name of the output file. Default is '-' (*stdout*).
 
---output-format, -f FORMAT
-:   The format of the output file. Can be used to set the output file format
-    if it can't be autodetected from the output file name.
-    **See osmium-file-formats**(5) or the libosmium manual for details.
+-O, --overwrite
+:   Allow an existing output file to be overwritten. Normally **osmium** will
+    refuse to write over an existing file.
 
 --output-header OPTION
 :   Add output header option. This option can be given several times. See the
     *libosmium manual* for a list of allowed header options.
 
---overwrite, -O
-:   Allow an existing output file to be overwritten. Normally **osmium** will
-    refuse to write over an existing file.
-
---object-type, -t TYPE
+-t, --object-type=TYPE
 :   Read only objects of given type (*node*, *way*, *relation*, *changeset*).
     By default all types are read. This option can be given multiple times.
 
---verbose, -v
+-v, --verbose
 :   Set verbose mode. The program will output information about what it is
     doing to *stderr*.
 
diff --git a/doc/osmium-file-formats.md b/man/osmium-file-formats.md
similarity index 87%
rename from doc/osmium-file-formats.md
rename to man/osmium-file-formats.md
index b799be1..0abfb59 100644
--- a/doc/osmium-file-formats.md
+++ b/man/osmium-file-formats.md
@@ -1,9 +1,7 @@
-% OSMIUM-FILE-FORMATS(5)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-file-formats - OSM file formats known to Osmium.
+osmium-file-formats - OSM file formats known to Osmium
 
 # FORMATS
 
@@ -42,7 +40,7 @@ force_visible_flag=true/false (*default: false*)
 :   Force writing of visible flag, even for normal OSM XML files.
 
 pbf_dense_nodes=true/false (*default: true*)
-:   Enable/disable DenseNodes format for PBF files. 
+:   Enable/disable DenseNodes format for PBF files.
 
 pbf_compression=true/false (*default: true*)
 :   Enable/disable compression in PBF files. Disabling this will make writing
@@ -52,6 +50,11 @@ pbf_add_metadata=true/false (*default: true*)
 :   Enable/disable writing of object metadata such as changeset id, username,
     etc. Disabling this will make files a bit smaller.
 
+pbf_sort_stringtables=true/false (*default: true*)
+:   Specify whether the string tables in the PBF data blocks should be sorted.
+    Writing the PBF files is slightly faster without sorting.
+
+
 # EXAMPLES
 
 Here are some examples:
diff --git a/doc/osmium-fileinfo.md b/man/osmium-fileinfo.md
similarity index 91%
rename from doc/osmium-fileinfo.md
rename to man/osmium-fileinfo.md
index 5ab3ab8..ecf1b26 100644
--- a/doc/osmium-fileinfo.md
+++ b/man/osmium-fileinfo.md
@@ -1,14 +1,12 @@
-% OSMIUM-FILEINFO(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-fileinfo - Show information about an OpenStreetMap file.
+osmium-fileinfo - show information about an OpenStreetMap file
 
 
 # SYNOPSIS
 
-**osmium fileinfo** \[OPTIONS\] *FILE*
+**osmium fileinfo** \[*OPTIONS*\] *FILE*
 
 
 # DESCRIPTION
@@ -46,10 +44,10 @@ Data
 
 # OPTIONS
 
---extended, -e
+-e, --extended
 :   Read the complete file and show additional information.
 
---input-format, -f
+-f, --input-format=FORMAT
 :   The format of the input file. Can be used to set the input file format
     if it can't be autodetected from the file name.
     See **osmium-file-formats**(5) or the libosmium manual for details.
diff --git a/doc/osmium-merge-changes.md b/man/osmium-merge-changes.md
similarity index 85%
rename from doc/osmium-merge-changes.md
rename to man/osmium-merge-changes.md
index 4212f49..fc17a55 100644
--- a/doc/osmium-merge-changes.md
+++ b/man/osmium-merge-changes.md
@@ -1,14 +1,12 @@
-% OSMIUM-MERGE-CHANGES(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-merge-changes - Merge several OSM change files into one.
+osmium-merge-changes - merge several OSM change files into one
 
 
 # SYNOPSIS
 
-**osmium merge-changes** \[OPTIONS\] *CHANGE-FILE...*
+**osmium merge-changes** \[*OPTIONS*\] *CHANGE-FILE*...
 
 
 # DESCRIPTION
@@ -22,33 +20,33 @@ in what order the change files are given or in what order 
they contain the data.
 
 # OPTIONS
 
---generator NAME
-:   The name and version of the program generating the output file. It will be
-    added to the header of the output file. Default is "*osmium/*" and the 
version
-    of osmium.
+-f, --output-format=FORMAT
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name.
+    See **osmium-file-formats**(5) or the libosmium manual for details.
 
---input-format, -F FORMAT
+-F, --input-format=FORMAT
 :   The format of the input files. Can be used to set the input format if it
     can't be autodetected from the file names. This will set the format for
     all input files, there is no way to set the format for some input files
     only. See **osmium-file-formats**(5) or the libosmium manual for details.
 
---output, -o FILE
-:   Name of the output file. Default is '-' (*stdout*).
+--generator=NAME
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is "*osmium/*" and the 
version
+    of osmium.
 
---output-format, -f FORMAT
-:   The format of the output file. Can be used to set the output file format
-    if it can't be autodetected from the output file name.
-    See **osmium-file-formats**(5) or the libosmium manual for details.
+-o, --output=FILE
+:   Name of the output file. Default is '-' (*stdout*).
 
---overwrite, -O
+-O, --overwrite
 :   Allow an existing output file to be overwritten. Normally **osmium** will
     refuse to write over an existing file.
 
---simplify, -s
+-s, --simplify
 :   Only write the last version of any object to the output.
 
---verbose, -v
+-v, --verbose
 :   Set verbose mode. The program will output information about what it is
     doing to *stderr*.
 
diff --git a/doc/osmium-time-filter.md b/man/osmium-time-filter.md
similarity index 86%
rename from doc/osmium-time-filter.md
rename to man/osmium-time-filter.md
index a6e201c..b704552 100644
--- a/doc/osmium-time-filter.md
+++ b/man/osmium-time-filter.md
@@ -1,15 +1,13 @@
-% OSMIUM-TIME-FILTER(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
 
-osmium-time-filter - Filter OSM data by time from a history file.
+osmium-time-filter - filter OSM data by time from a history file
 
 
 # SYNOPSIS
 
-**osmium time-filter** \[OPTIONS\] *INPUT-FILE* \[*TIME*\]\
-**osmium time-filter** \[OPTIONS\] *INPUT-FILE* *FROM-TIME* *TO-TIME*
+**osmium time-filter** \[*OPTIONS*\] *INPUT-FILE* \[*TIME*\]\
+**osmium time-filter** \[*OPTIONS*\] *INPUT-FILE* *FROM-TIME* *TO-TIME*
 
 
 # DESCRIPTION
@@ -30,29 +28,29 @@ The format for the timestamps is "yyyy-mm-ddThh:mm::ssZ".
 
 # OPTIONS
 
---generator
-:   The name and version of the program generating the output file. It will be
-    added to the header of the output file. Default is "*osmium/*" and the 
version
-    of osmium.
+-f, --output-format=FORMAT
+:   The format of the output file. Can be used to set the output file format
+    if it can't be autodetected from the output file name.
+    **See osmium-file-formats**(5) or the libosmium manual for details.
 
---input-format, -F
+-F, --input-format=FORMAT
 :   The format of the input file. Can be used to set the input file format
     if it can't be autodetected from the file name.
     **See osmium-file-formats**(5) or the libosmium manual for details.
 
---output-file, -o
-:   Name of the output file. Default is '-' (*stdout*).
+--generator=NAME
+:   The name and version of the program generating the output file. It will be
+    added to the header of the output file. Default is "*osmium/*" and the 
version
+    of osmium.
 
---output-format, -f
-:   The format of the output file. Can be used to set the output file format
-    if it can't be autodetected from the output file name.
-    **See osmium-file-formats**(5) or the libosmium manual for details.
+-o, --output-file=FILE
+:   Name of the output file. Default is '-' (*stdout*).
 
---overwrite, -O
+-O, --overwrite
 :   Allow an existing output file to be overwritten. Normally **osmium** will
     refuse to write over an existing file.
 
---verbose, -v
+-v, --verbose
 :   Set verbose mode. The program will output information about what it is
     doing to *stderr*.
 
diff --git a/doc/osmium.md b/man/osmium.md
similarity index 86%
rename from doc/osmium.md
rename to man/osmium.md
index a38fd79..2393f9e 100644
--- a/doc/osmium.md
+++ b/man/osmium.md
@@ -1,13 +1,11 @@
-% OSMIUM(1)
-% Jochen Topf <joc...@topf.org>
 
 # NAME
-osmium - Multipurpose tool for working with OpenStreetMap data.
+osmium - multipurpose tool for working with OpenStreetMap data
 
 
 # SYNOPSIS
 
-**osmium** *COMMAND* \[ARGS\]\
+**osmium** *COMMAND* \[*ARGS*\]\
 **osmium** --help\
 **osmium** --version
 
@@ -21,7 +19,7 @@ Run **osmium help** *COMMAND* to get more information about a 
command.
 
 # OPTIONS
 
---help, -h
+-h, --help
 :   Show usage and list of commands.
 
 --version
diff --git a/src/main.cpp b/src/main.cpp
index c65119e..0482645 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[]) {
 
     std::vector<std::string> arguments;
 
-    for (int i=1; i < argc; ++i) {
+    for (int i = 1; i < argc; ++i) {
         arguments.push_back(argv[i]);
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osmium-tool.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to