Index: trunk/linux/latest/usr/share/man/man1/josm-latest.1
===================================================================
--- trunk/linux/latest/usr/share/man/man1/josm-latest.1	(revision 7842)
+++ trunk/linux/latest/usr/share/man/man1/josm-latest.1	(revision 7843)
@@ -1,3 +1,3 @@
-.TH JOSM 1 "September  4, 2014"
+.TH JOSM 1 "December 20, 2014"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
@@ -62,4 +62,20 @@
 .B \-\-offline=<osm_api|josm_website|all>
 Disable access to the given resource(s), separated by comma
+.SH JAVA PROPERTIES
+The following options can be set by using Java system properties (i.e. \-Dkey=value
+passed to java, or specified inside JAVA_OPTS).
+.TP
+.B josm.pref=<path>
+Set the JOSM preferences directory.
+.TP
+.B josm.userdata=<path>
+Set the JOSM user data directory.
+.TP
+.B josm.cache=<path>
+Set the JOSM cache directory.
+.TP
+.B josm.home=<homedir>
+Relocate all 3 directories to homedir. Cache directory will be in homedir/cache.
+Default is ~/.josm/.
 .SH ENVIRONMENT
 .IP JAVA_HOME
@@ -100,4 +116,5 @@
 at http://josm.openstreetmap.de/svn/ for details. Use
 "josm-dev AT openstreetmap.org" to contact still active authors.
+The logo has been designed by Ilya Palikov.
 .PP
 This manual page was initially written by Andreas Putzo <andreas@putzo.net>,
Index: trunk/linux/tested/usr/share/man/man1/josm.1
===================================================================
--- trunk/linux/tested/usr/share/man/man1/josm.1	(revision 7842)
+++ trunk/linux/tested/usr/share/man/man1/josm.1	(revision 7843)
@@ -1,3 +1,3 @@
-.TH JOSM 1 "September  4, 2014"
+.TH JOSM 1 "December 20, 2014"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
@@ -62,4 +62,20 @@
 .B \-\-offline=<osm_api|josm_website|all>
 Disable access to the given resource(s), separated by comma
+.SH JAVA PROPERTIES
+The following options can be set by using Java system properties (i.e. \-Dkey=value
+passed to java, or specified inside JAVA_OPTS).
+.TP
+.B josm.pref=<path>
+Set the JOSM preferences directory.
+.TP
+.B josm.userdata=<path>
+Set the JOSM user data directory.
+.TP
+.B josm.cache=<path>
+Set the JOSM cache directory.
+.TP
+.B josm.home=<homedir>
+Relocate all 3 directories to homedir. Cache directory will be in homedir/cache.
+Default is ~/.josm/.
 .SH ENVIRONMENT
 .IP JAVA_HOME
@@ -100,4 +116,5 @@
 at http://josm.openstreetmap.de/svn/ for details. Use
 "josm-dev AT openstreetmap.org" to contact still active authors.
+The logo has been designed by Ilya Palikov.
 .PP
 This manual page was initially written by Andreas Putzo <andreas@putzo.net>,
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 7842)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 7843)
@@ -135,5 +135,10 @@
                 "\t--offline=<osm_api|josm_website|all>      "+tr("Disable access to the given resource(s), separated by comma")+"\n\n"+
                 tr("options provided as Java system properties")+":\n"+
-                "\t-Djosm.home="+tr("/PATH/TO/JOSM/FOLDER/         ")+tr("Change the folder for all user settings")+"\n\n"+
+                "\t-Djosm.pref="    +tr("/PATH/TO/JOSM/PREF    ")+tr("Set the preferences directory")+"\n\n"+
+                "\t-Djosm.userdata="+tr("/PATH/TO/JOSM/USERDATA")+tr("Set the user data directory")+"\n\n"+
+                "\t-Djosm.cache="   +tr("/PATH/TO/JOSM/CACHE   ")+tr("Set the cache directory")+"\n\n"+
+                "\t-Djosm.home="    +tr("/PATH/TO/JOSM/HOMEDIR ")+
+                tr("Relocate all 3 directories to homedir. Cache directory will be in homedir/cache")+"\n\n"+
+                tr("-Djosm.home has lower precedence, i.e. the specific setting overrides the general one")+"\n\n"+
                 tr("note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n" +
                         "      Java option to specify the maximum size of allocated memory in megabytes")+":\n"+
@@ -144,4 +149,5 @@
                         "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
                         "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
+                        "\tjava -Djosm.pref=$XDG_CONFIG_HOME -Djosm.userdata=$XDG_DATA_HOME -Djosm.cache=$XDG_CACHE_HOME -jar josm.jar\n"+
                         "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
                         "\tjava -Xmx1024m -jar josm.jar\n\n"+