Index: win_installer/src/installer.nsi
===================================================================
diff -u -re7f53abc3e70079be453fc2d976fd7d365e3dd7c -rc2832ebbcc1c3cb9109667f969a3c305291b0b78
--- win_installer/src/installer.nsi	(.../installer.nsi)	(revision e7f53abc3e70079be453fc2d976fd7d365e3dd7c)
+++ win_installer/src/installer.nsi	(.../installer.nsi)	(revision c2832ebbcc1c3cb9109667f969a3c305291b0b78)
@@ -25,7 +25,9 @@
 /*
  * TODO: uninstaller option to keep database/lams.xml/repository
  * TODO: jsmath option to install as compressed war
- *
+ * TODO: custom lams admin user
+ * TODO: desktop icons, readme?
+ * TODO: detect LAMS 1 installation
  */
 
 # includes
@@ -58,8 +60,8 @@
 
 # set welcome page
 !define MUI_WELCOMEPAGE_TITLE "LAMS ${VERSION} Install Wizard"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of LAMS ${VERSION}.\r\n\r\n \
-    Please ensure you have a copy of MySQL 5.x installed and running, and Java JDK version 1.5.x.\r\n\r\n \
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of LAMS ${VERSION}.\r\n\r\n\
+    Please ensure you have a copy of MySQL 5.x installed and running, and Java JDK version 1.5.x.\r\n\r\n\
     Click Next to continue."
 
 # set components page type
@@ -70,13 +72,18 @@
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
+# display finish page stuff
+!define MUI_FINISHPAGE_LINK "Visit LAMS Community"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.lamscommunity.org"
+
 # installer screen progression
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "..\license.txt"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 Page custom PreMySQLConfig PostMySQLConfig
 Page custom PreLAMSConfig PostLAMSConfig
+Page custom PreLAMS2Config PostLAMS2Config
 Page custom PreWildfireConfig PostWildfireConfig
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
@@ -149,6 +156,7 @@
 # reserve files
 #
 ReserveFile "lams.ini"
+ReserveFile "lams2.ini"
 ReserveFile "mysql.ini"
 ReserveFile "wildfire.ini"
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
@@ -168,6 +176,8 @@
 Var LAMS_LOCALE
 Var LAMS_REPOSITORY
 Var LAMS_CONF
+Var LAMS_USER
+Var LAMS_PASS
 Var WILDFIRE_DOMAIN
 Var WILDFIRE_USER
 Var WILDFIRE_PASS
@@ -288,6 +298,7 @@
     
     # extract custom page display config
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams.ini"
+    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "lams2.ini"
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "mysql.ini"
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "wildfire.ini"
 FunctionEnd
@@ -317,7 +328,7 @@
 Function PreMySQLConfig
     Call CheckMySQL
     !insertmacro MUI_INSTALLOPTIONS_WRITE "mysql.ini" "Field 3" "State" "$MYSQL_DIR"
-    !insertmacro MUI_HEADER_TEXT "Setting Up MySQL Database Access" "Choose a MySQL database and user account for LAMS.  If unsure, use the default."
+    !insertmacro MUI_HEADER_TEXT "Setting Up MySQL Database Access (1/4)" "Choose a MySQL database and user account for LAMS.  If unsure, use the defaults."
     !insertmacro MUI_INSTALLOPTIONS_DISPLAY "mysql.ini"
 FunctionEnd
 
@@ -371,20 +382,17 @@
 Function PreLAMSConfig
     Call CheckJava
     !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 2" "State" "$JDK_DIR"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 10" "State" "$INSTDIR\repository"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 12" "State" "C:\lamsconf"
-    !insertmacro MUI_HEADER_TEXT "Setting Up LAMS" "Configure the LAMS Server.  If unsure, use the default."
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 4" "State" "$INSTDIR\repository"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "lams.ini" "Field 6" "State" "C:\lamsconf"
+    !insertmacro MUI_HEADER_TEXT "Setting Up LAMS (2/4)" "Configure the LAMS Server.  If unsure, use the defaults."
     !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams.ini"
 FunctionEnd
 
 
 Function PostLAMSConfig
     !insertmacro MUI_INSTALLOPTIONS_READ $JDK_DIR "lams.ini" "Field 2" "State"
-    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_DOMAIN "lams.ini" "Field 4" "State"
-    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PORT "lams.ini" "Field 6" "State"
-    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_LOCALE "lams.ini" "Field 8" "State"
-    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_REPOSITORY "lams.ini" "Field 10" "State"
-    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_CONF "lams.ini" "Field 12" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_REPOSITORY "lams.ini" "Field 4" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_CONF "lams.ini" "Field 6" "State"
 
     # check java version using given dir
     nsExec::ExecToStack '$JDK_DIR\bin\javac -version'
@@ -398,8 +406,23 @@
 FunctionEnd
 
 
+Function PreLAMS2Config
+    !insertmacro MUI_HEADER_TEXT "Setting Up LAMS (3/4)" "Configure the LAMS Server, and choose an admin username and password."
+    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "lams2.ini"
+FunctionEnd
+
+
+Function PostLAMS2Config
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_DOMAIN "lams2.ini" "Field 8" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PORT "lams2.ini" "Field 9" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_LOCALE "lams2.ini" "Field 12" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_USER "lams2.ini" "Field 2" "State"
+    !insertmacro MUI_INSTALLOPTIONS_READ $LAMS_PASS "lams2.ini" "Field 5" "State"
+FunctionEnd
+
+
 Function PreWildfireConfig
-    !insertmacro MUI_HEADER_TEXT "Setting Up Wildfire Chat Server" "Configure Wildfire, chat server for LAMS.  If unsure, use the default."
+    !insertmacro MUI_HEADER_TEXT "Setting Up Wildfire Chat Server (4/4)" "Configure Wildfire, chat server for LAMS.  If unsure, use the default."
     !insertmacro MUI_INSTALLOPTIONS_DISPLAY "wildfire.ini"
 FunctionEnd
 
@@ -773,7 +796,7 @@
 Var UNINSTALL_DB
 
 Function un.onInit
-    !insertmacro MUI_LANGDLL_DISPLAY
+    ;!insertmacro MUI_LANGDLL_DISPLAY
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "uninstall.ini"
     
     # check if LAMS is stopped
Index: win_installer/src/lams.ini
===================================================================
diff -u -rae13f2caa2572e368b592d80912e09782ce5a56a -rc2832ebbcc1c3cb9109667f969a3c305291b0b78
--- win_installer/src/lams.ini	(.../lams.ini)	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
+++ win_installer/src/lams.ini	(.../lams.ini)	(revision c2832ebbcc1c3cb9109667f969a3c305291b0b78)
@@ -1,5 +1,5 @@
 [Settings]
-NumFields=13
+NumFields=8
 
 [Field 1]
 Type=GroupBox
@@ -12,104 +12,59 @@
 [Field 2]
 Type=DirRequest
 Left=7
-Top=22
+Top=37
 Right=152
-Bottom=35
+Bottom=50
 
 [Field 3]
 Type=Label
 Left=7
-Top=12
+Top=26
 Right=152
-Bottom=21
+Bottom=35
 Text=Java JDK directory...
 
 [Field 4]
-Type=Text
-Left=7
-Top=51
-Right=129
-Bottom=64
-State=localhost
-MinLen=1
-ValidateText=Please specify your server's domain name.
-
-[Field 5]
-Type=Label
-Left=7
-Top=41
-Right=129
-Bottom=50
-Text=Domain name...
-
-[Field 6]
-Type=Text
-Left=141
-Top=51
-Right=263
-Bottom=64
-State=8080
-MaxLen=5
-MinLen=1
-ValidateText=Please specify a port number.
-
-[Field 7]
-Type=Label
-Left=140
-Top=41
-Right=263
-Bottom=50
-Text=Port number...
-
-[Field 8]
-Type=DropList
-Left=7
-Top=82
-Right=106
-Bottom=180
-ListItems=en_AU - English (Australia)|es_ES - Espa�ol|mi_NZ - Maori|de_DE - Deutsch|zh_CN - Chinese(Simplified)|fr_FR - Fran�ais|it_IT - Italiano|no_NO - Norsk|sv_SE - Svenska|ko_KR - Korean|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|hu_HU - Magyar|bg_BG - Bulgarian|cy_GB - Cymraeg (Cymru)|th_TH - Thai|el_GR - Greek|nl_BE - Nederlands (Belgium)|ar_JO - Arabic (Jordan)|da_DK - Dansk|ru_RU - Russian
-State=en_AU - English (Australia)
-
-[Field 9]
-Type=Label
-Left=7
-Top=73
-Right=106
-Bottom=82
-Text=Default locale...
-
-[Field 10]
 Type=DirRequest
 Left=7
-Top=116
+Top=76
 Right=152
-Bottom=129
+Bottom=89
 State=
 MinLen=1
 ValidateText=Please specify a directory for the content repository.
 
-[Field 11]
+[Field 5]
 Type=Label
 Left=7
-Top=106
+Top=65
 Right=152
-Bottom=115
+Bottom=74
 Text=Content repository directory...
 
-[Field 12]
+[Field 6]
 Type=DirRequest
 Left=165
-Top=116
+Top=76
 Right=-7
-Bottom=129
+Bottom=89
 State=
 MinLen=1
 Flags=DISABLED
 
-[Field 13]
+[Field 7]
 Type=Label
 Left=165
-Top=106
+Top=65
 Right=293
-Bottom=115
+Bottom=74
 Text=Configuration file directory...
+
+[Field 8]
+Type=Link
+Left=7
+Top=117
+Right=152
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-lams
Index: win_installer/src/lams2.ini
===================================================================
diff -u
--- win_installer/src/lams2.ini	(revision 0)
+++ win_installer/src/lams2.ini	(revision c2832ebbcc1c3cb9109667f969a3c305291b0b78)
@@ -0,0 +1,107 @@
+[Settings]
+NumFields=12
+
+[Field 1]
+Type=GroupBox
+Left=0
+Top=1
+Right=299
+Bottom=137
+Text=Configure LAMS...
+
+[Field 2]
+Type=Text
+Left=8
+Top=82
+Right=130
+Bottom=94
+State=sysadmin
+Flags=DISABLED
+
+[Field 3]
+Type=Label
+Left=8
+Top=71
+Right=130
+Bottom=79
+Text=Admin username...
+
+[Field 4]
+Type=Label
+Left=142
+Top=71
+Right=264
+Bottom=79
+Text=Admin password...
+
+[Field 5]
+Type=Text
+Left=142
+Top=82
+Right=264
+Bottom=93
+State=sysadmin
+Flags=DISABLED
+
+[Field 6]
+Type=Link
+Left=8
+Top=116
+Right=135
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-lams2
+
+[Field 7]
+Type=Label
+Left=8
+Top=22
+Right=127
+Bottom=30
+Text=Domain name...
+
+[Field 8]
+Type=Text
+Left=7
+Top=33
+Right=131
+Bottom=46
+State=localhost
+MinLen=1
+ValidateText=Please specify your server's domain name.
+
+[Field 9]
+Type=Text
+Left=137
+Top=33
+Right=172
+Bottom=46
+State=8080
+MaxLen=5
+MinLen=1
+ValidateText=Please specify a port number.
+
+[Field 10]
+Type=Label
+Left=138
+Top=22
+Right=174
+Bottom=30
+Text=Port...
+
+[Field 11]
+Type=Label
+Left=184
+Top=22
+Right=291
+Bottom=30
+Text=Default locale...
+
+[Field 12]
+Type=DropList
+Left=183
+Top=33
+Right=290
+Bottom=131
+State=en_AU - English (Australia)
+ListItems=en_AU - English (Australia)|es_ES - Espa�ol|mi_NZ - Maori|de_DE - Deutsch|zh_CN - Chinese(Simplified)|fr_FR - Fran�ais|it_IT - Italiano|no_NO - Norsk|sv_SE - Svenska|ko_KR - Korean|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|hu_HU - Magyar|bg_BG - Bulgarian|cy_GB - Cymraeg (Cymru)|th_TH - Thai|el_GR - Greek|nl_BE - Nederlands (Belgium)|ar_JO - Arabic (Jordan)|da_DK - Dansk|ru_RU - Russian
Index: win_installer/src/mysql.ini
===================================================================
diff -u -rae13f2caa2572e368b592d80912e09782ce5a56a -rc2832ebbcc1c3cb9109667f969a3c305291b0b78
--- win_installer/src/mysql.ini	(.../mysql.ini)	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
+++ win_installer/src/mysql.ini	(.../mysql.ini)	(revision c2832ebbcc1c3cb9109667f969a3c305291b0b78)
@@ -5,47 +5,47 @@
 
 
 [Settings]
-NumFields=12
+NumFields=13
 
 [Field 1]
 Type=GroupBox
 Left=0
 Top=0
 Right=-1
-Bottom=46
+Bottom=44
 Text=About your MySQL database...
 
 [Field 2]
 Type=GroupBox
 Left=0
-Top=56
+Top=48
 Right=-1
 Bottom=-4
 Text=Specify a database name and user account...
 
 [Field 3]
 Type=DirRequest
-Left=8
-Top=22
-Right=153
-Bottom=35
+Left=7
+Top=23
+Right=152
+Bottom=36
 ValidateText=Please specify your MySQL directory.
 Text=
 
 [Field 4]
 Type=Label
-Left=8
+Left=7
 Top=12
-Right=130
+Right=129
 Bottom=21
-Text=MySQL directory
+Text=MySQL directory...
 
 [Field 5]
 Type=Password
 Left=169
-Top=22
+Top=23
 Right=291
-Bottom=35
+Bottom=36
 ValidateText=
 
 [Field 6]
@@ -54,58 +54,67 @@
 Top=12
 Right=291
 Bottom=21
-Text=Root password
+Text=Root password...
 
 [Field 7]
 Type=Text
 Left=8
-Top=80
+Top=70
 Right=130
-Bottom=93
+Bottom=83
 State=lams2
 ValidateText=Please choose a database name.
 MinLen=1
 
 [Field 8]
 Type=Label
 Left=8
-Top=70
+Top=60
 Right=130
-Bottom=79
-Text=Database name
+Bottom=69
+Text=Database name...
 
 [Field 9]
 Type=Text
 Left=8
-Top=110
+Top=100
 Right=130
-Bottom=123
+Bottom=113
 State=lams2
 ValidateText=Please choose a username.
 MinLen=1
 
 [Field 10]
 Type=Text
 Left=169
-Top=110
+Top=100
 Right=291
-Bottom=123
+Bottom=113
 State=lamsdemo
 ValidateText=Please specify a password.
 MinLen=1
 
 [Field 11]
 Type=Label
 Left=8
-Top=100
+Top=90
 Right=130
-Bottom=109
-Text=MySQL Username
+Bottom=99
+Text=MySQL Username...
 
 [Field 12]
 Type=Label
 Left=169
-Top=100
+Top=90
 Right=291
-Bottom=109
-Text=MySQL Password
+Bottom=99
+Text=MySQL Password...
+
+[Field 13]
+Type=Link
+Left=8
+Top=121
+Right=153
+Bottom=131
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-mysql
Index: win_installer/src/wildfire.ini
===================================================================
diff -u -rae13f2caa2572e368b592d80912e09782ce5a56a -rc2832ebbcc1c3cb9109667f969a3c305291b0b78
--- win_installer/src/wildfire.ini	(.../wildfire.ini)	(revision ae13f2caa2572e368b592d80912e09782ce5a56a)
+++ win_installer/src/wildfire.ini	(.../wildfire.ini)	(revision c2832ebbcc1c3cb9109667f969a3c305291b0b78)
@@ -1,57 +1,66 @@
 [Settings]
-NumFields=7
+NumFields=8
 
 [Field 1]
 Type=GroupBox
 Left=0
 Top=0
 Right=-1
 Bottom=-4
-Text=Configure Wildfire...
+Text=About your Wildfire server...
 
 [Field 2]
 Type=Text
 Left=7
-Top=22
+Top=36
 Right=129
-Bottom=35
+Bottom=49
 State=localhost
 
 [Field 3]
 Type=Label
 Left=7
-Top=12
+Top=26
 Right=129
-Bottom=21
+Bottom=35
 Text=Domain name...
 
 [Field 4]
 Type=Label
 Left=7
-Top=52
+Top=65
 Right=129
-Bottom=61
-Text=Administrator's username...
+Bottom=74
+Text=Admin username...
 
 [Field 5]
 Type=Text
 Left=7
-Top=62
+Top=75
 Right=129
-Bottom=75
+Bottom=88
 State=admin
 
 [Field 6]
 Type=Label
-Left=7
-Top=94
-Right=129
-Bottom=103
-Text=Administrator's password...
+Left=157
+Top=65
+Right=279
+Bottom=74
+Text=Admin password...
 
 [Field 7]
 Type=Password
+Left=157
+Top=75
+Right=279
+Bottom=88
+
+[Field 8]
+Type=Link
 Left=7
-Top=103
-Right=129
-Bottom=116
+Top=116
+Right=134
+Bottom=126
+Text=Click to get online help for these options
+State=http://wiki.lamsfoundation.org/display/lamsdocs/Windows+Installer+Help#WindowsInstallerHelp-wildfire