[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5608+dfsg1-1-1-ge6dad03

[David Paleino]

The following commit has been merged in the master branch:
commit e6dad03b626f7c28d40d1a07ded31516fcfd9e24
Author: David Paleino <dapal at debian.org>
Date:   Thu Dec 27 11:06:27 2012 +0100

    Updated manpage (Closes: #696692).

diff --git a/debian/changelog b/debian/changelog
index 974ed7f..6bdd6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn5608+dfsg1-2) UNRELEASED; urgency=low
+
+  * Updated manpage (Closes: #696692).
+
+ -- David Paleino <dapal at debian.org>  Thu, 27 Dec 2012 11:06:15 +0100
+
 josm (0.0.svn5608+dfsg1-1) unstable; urgency=low
 
   * New tested snapshot (Closes: #695197).
diff --git a/debian/josm.1 b/debian/josm.1
index 580bcab..4a1a0b9 100644
--- a/debian/josm.1
+++ b/debian/josm.1
@@ -1,4 +1,4 @@
-.TH JOSM 1 "September  8, 2007"
+.TH JOSM 1 "December 26, 2012"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 josm \- Java OpenStreetMap Editor
@@ -6,60 +6,74 @@ josm \- Java OpenStreetMap Editor
 .B josm
 .SH DESCRIPTION
 .B josm 
-is an editor for OpenStreetMap written in Java 1.5. 
+is an extensible editor for OpenStreetMap written in Java 6.
 .PP
-.B OpenStreetMap 
-is a project aimed squarely at creating and providing free geographic data such as street maps to anyone
-who wants them. It allows you to view, edit and use geographical data in a collaborative way from 
-anywhere on earth.
-The project was started because most maps you think of as free actually have legal or technical 
-restrictions on their use, holding back people from using them in creative, productive or unexpected
-ways.
+\fBOpenStreetMap\fR is a project aimed squarely at creating and providing
+free geographic data such as street maps to anyone who wants them. It
+allows you to view, edit and use geographical data in a collaborative way
+from anywhere on Earth.
+.PP
+The project was started because most maps you think of as free actually
+have legal or technical restrictions on their use, holding back people
+from using them in creative, productive or unexpected ways.
 .SH OPTIONS
 .TP
 .B \-h, \-?, \-\-help
-Show help
+Show help.
+.TP
+.B \-\-version
+Display the JOSM version and exit.
+.TP
+\fB\-\-geometry=\fIwidth\fBx\fIheight\fB(+|-)x(+|-)y\fR
+Standard X geometry argument.
+.TP
+\fB[\-\-download=]\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,maxlon\fR
+Download the bounding box.
+.TP
+\fB[\-\-download=]\fIurl\fR
+Download the location at the url (with lat=x&lon=y&zoom=z).
 .TP
-.B \-\-geometry=<width>x<height>(+|-)x(+|-)y
-Standard X geometry argument
+\fB[\-\-download=]\fIfilename\fR
+Open a file (any filetype that can be opened with File/Open from the GUI).
 .TP
-.B [\-\-download=]minlat,minlon,maxlat,maxlon
-Download the bounding box
+\fB\-\-downloadgps=\fIminlat\fB,\fIminlon\fB,\fImaxlat\fB,\fImaxlon\fR
+Download the bounding box as raw GPS.
 .TP
-.B [\-\-download=]<url>
-Download the location at the url (with lat=x&lon=y&zoom=z)
+\fB\-\-selection=\fIsearchstring\fR
+Select with the given search.
 .TP
-.B [\-\-download=]<filename>
-Open file (as raw gps, if .gpx)
+.B \-\-[no\-]maximize
+Launch in maximized (or minimized) mode.
 .TP
-.B \-\-downloadgps=minlat,minlon,maxlat,maxlon
-Download the bounding box as raw gps
+.B \-\-reset\-preferences
+Reset the preferences to the default.
 .TP
-.B \-\-selection=<searchstring>
-Select with the given search
+\fB\-\-load\-preferences=\fIurl\fR
+Load preferences from the given \fIurl\fR (in XML format).
 .TP
-.B \-\-no\-fullscreen
-Don't launch in fullscreen mode
+\fB\-\-set=\fIkey\fB=\fIvalue\fR
+Set the preference \fIkey\fR to \fIvalue\fR.
 .TP
-.B \-\-reset-preferences
-Reset the preferences to the default
+\fB\-\-language=\fIlanguage\fR
+Set the language.
+.SH JAVA PROPERTIES
+The following options can be set by using Java system properties (i.e. -Dkey=value
+passed to \fBjava\fR, or specified inside \fBJAVA_OPTS\fR).
 .TP
-.B \-\-language=<language>
-Set the language
+\fBjosm.home=\fIpath\fR
+Set the JOSM home directory to \fIpath\fR. This will contain all user settings.
+Default is \fI~/.josm/\fR.
 .SH ENVIRONMENT
 .IP JAVA_HOME
 Specify an alternate Java environment.
 .IP JAVA_OPTS
 Specify Java options.
 For example, to use a HTTP proxy server with this program, set this environment variable
-to something like
-.I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"
-before starting josm.
-.SH SEE ALSO
-.BR josm-plugins (1).
+to something like \fIJAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"\fR before starting josm.
 .SH AUTHOR
 josm was written by Immanuel Scholz.
-The current maintainer is Frederik Ramm.
+The current maintainer is Dirk Stöcker.
 .PP
-This manual page was written by Andreas Putzo <andreas at putzo.net>,
-for the Debian project (but may be used by others).
+This manual page was written by Andreas Putzo <andreas at putzo.net> and David Paleino
+<dapal at debian.org>, and is licensed under the same terms of JOSM itself (currently,
+the GNU General Public License, version 3 or later).

-- 
Editor for OpenStreetMap