Index: /applications/editors/josm/nsis/README.txt
===================================================================
--- /applications/editors/josm/nsis/README.txt	(revision 4469)
+++ /applications/editors/josm/nsis/README.txt	(revision 4470)
@@ -1,3 +1,3 @@
-This is the Win32 installer generator for OpenStreetMap, to create a Windows 
+This is the Win32 installer generator for JOSM, to create a Windows 
 like installer. This should ease installation and provides a reasonable set of 
 default preferences for Windows users.
@@ -26,5 +26,5 @@
 - josm icons to the desktop and quick launch bar
 - josm file associations to .osm and .gpx files
-- some plugins to the current user profile (more to follow)
+- some assorted plugins into "C:\Program Files\JOSM\plugins" (more to follow?)
 - default preferences to the current user profile (if not already existing)
 - default bookmarks to the current user profile (if not already existing)
@@ -62,3 +62,3 @@
 - some way of automatic installer generation on the server (e.g. nightly build)?
 - install all josm plugins by default and only enable them according to user wishes?
-- make installation of icons and file extensions optional?
+- make installation of icons and file extensions optional
Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 4469)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 4470)
@@ -266,5 +266,5 @@
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "HelpLink" "mailto:newbies@openstreetmap.org."
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLInfoAbout" "http://www.openstreetmap.org/"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLUpdateInfo" "http://www.openstreetmap.org/"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "URLUpdateInfo" "http://wiki.openstreetmap.org/index.php/JOSM"
 WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "NoModify" 1
 WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM" "NoRepair" 1
@@ -333,4 +333,6 @@
 SetOutPath $INSTDIR
 File "josm.exe"
+
+; XXX - should be provided/done by josm.jar itself and not here!
 SetShellVarContext current
 SetOutPath "$APPDATA\JOSM"
@@ -366,9 +368,7 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\mappaint.jar"
-;SetOutPath $APPDATA\JOSM\plugins\mappaint
-;File "downloads\elemstyles.xml"
 SectionEnd
 
@@ -376,7 +376,9 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\osmarender.jar"
+; XXX - should be done inside the plugin and not here!
+SetShellVarContext current
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "osmarender.firefox" "$PROGRAMFILES\Mozilla Firefox\firefox.exe"
 SectionEnd
@@ -385,5 +387,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\wmsplugin.jar"
@@ -393,5 +395,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\namefinder.jar"
@@ -401,5 +403,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\validator.jar"
@@ -409,5 +411,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext current
+SetShellVarContext all
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\tways-0.2.jar"
@@ -419,4 +421,5 @@
 ;-------------------------------------------
 ;MessageBox MB_OK "PluginSetting!" IDOK 0
+; XXX - should better be handled inside JOSM (recent plugin manager is going in the right direction)
 SetShellVarContext current
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin,namefinder,validator,tways-0.2"
@@ -435,4 +438,10 @@
 Delete "$INSTDIR\josm.exe"
 Delete "$INSTDIR\uninstall.exe"
+Delete "$INSTDIR\plugins\wmsplugin.jar"
+Delete "$INSTDIR\plugins\osmarender.jar"
+Delete "$INSTDIR\plugins\mappaint.jar"
+Delete "$INSTDIR\plugins\namefinder.jar"
+Delete "$INSTDIR\plugins\validator.jar"
+Delete "$INSTDIR\plugins\tways-0.2.jar"
 IfErrors 0 NoJOSMErrorMsg
 	MessageBox MB_OK "Please note: josm.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if josm.exe removed
@@ -472,7 +481,8 @@
 Delete "$APPDATA\JOSM\de-streets.xml"
 RMDir "$APPDATA\JOSM"
-SectionEnd
-
-Section /o "Un.Plugins" un.SecPlugins
+RMDir "$APPDATA\JOSM\plugins\mappaint"
+SectionEnd
+
+Section /o "Un.Personal Plugins" un.SecPlugins
 ;-------------------------------------------
 SectionIn 2
@@ -486,8 +496,6 @@
 Delete "$APPDATA\JOSM\plugins\validator.jar"
 Delete "$APPDATA\JOSM\plugins\tways-0.2.jar"
-;Delete "$APPDATA\JOSM\plugins\mappaint\elemstyles.xml"
 RMDir "$APPDATA\JOSM\plugins\osmarender"
 RMDir "$APPDATA\JOSM\plugins\validator"
-;RMDir "$APPDATA\JOSM\plugins\mappaint"
 RMDir "$APPDATA\JOSM\plugins"
 RMDir "$APPDATA\JOSM"