8 files changed, 32 insertions, 13 deletions
diff --git a/src/win32/CheckReqs.ini b/src/win32/CheckReqs.ini
index 74b193de7..392cd8445 100644
--- a/src/win32/CheckReqs.ini
+++ b/src/win32/CheckReqs.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="Erlang OTP R9C-1 (version 5.3.6.2) or newer is required to install Ejabberd.\r\n\r\nIt is not found on your computer.\r\n\r\nPlease install Erlang OTP R9C-1 or newer before installing Ejabberd.\r\n\r\nIt can be downloaded from"
+Text="Erlang OTP R9C-1 (version 5.3.6.2) or newer is required to install Ejabberd.\r\n\r\nIt is not found on your computer.\r\n\r\nPlease install Erlang OTP R9C-1 or newer before installing Ejabberd.\r\n\r\nIts installer can be downloaded from"
 
 [Field 2]
 Type=link
diff --git a/src/win32/CheckReqs1.ini b/src/win32/CheckReqs1.ini
index d475ede35..fe7ae1ff4 100644
--- a/src/win32/CheckReqs1.ini
+++ b/src/win32/CheckReqs1.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nEjabberd includes required SSL libraries but if you don't have SSL certificate then without installed OpenSSL you will not be able to create your own SSL certificate and use SSL-enabled connections.\r\n\r\nOpenSLL can be downloaded from"
+Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
 
 [Field 2]
 Type=link
@@ -24,5 +24,5 @@ Left=0
 Right=-1
 Top=93
 Bottom=-10
-Text="If you want to continue installation anyway, click Next."
+Text="If you want to continue installing Ejabberd anyway, click Next."
 
diff --git a/src/win32/CheckReqs1H.ini b/src/win32/CheckReqs1H.ini
index 15c4ecf7f..f8cd05e01 100644
--- a/src/win32/CheckReqs1H.ini
+++ b/src/win32/CheckReqs1H.ini
@@ -7,7 +7,7 @@ Left=0
 Right=-1
 Top=10
 Bottom=70
-Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nEjabberd includes required SSL libraries but if you don't have SSL certificate then without installed OpenSSL you will not be able to create your own SSL certificate and use SSL-enabled connections.\r\n\r\nOpenSLL can be downloaded from"
+Text="OpenSLL 0.9.7c or newer is not found on your computer.\r\n\r\nTo use SSL and TLS encryption you need an SSL certificate. You can create a selfsigned certificate with OpenSSL.\r\n\r\nOpenSLL installer can be downloaded from"
 
 [Field 2]
 Type=link
@@ -24,6 +24,6 @@ Left=0
 Right=-1
 Top=93
 Bottom=105
-Text="Proceed with install"
+Text="I want to continue installing Ejabberd anyway"
 State=0
 Flags=NOTIFY
diff --git a/src/win32/CheckService.ini b/src/win32/CheckService.ini
new file mode 100644
index 000000000..764832469
--- /dev/null
+++ b/src/win32/CheckService.ini
@@ -0,0 +1,19 @@
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=label
+Left=0
+Right=-1
+Top=10
+Bottom=50
+Text="You are installing Ejabberd as Administrator.\r\n\r\nEjabberd will be installed as a Windows service."
+
+[Field 2]
+Type=checkbox
+Left=0
+Right=-1
+Top=50
+Bottom=62
+Text="Configure ejabberd service to start automatically"
+State=1
diff --git a/src/win32/CheckUser.ini b/src/win32/CheckUser.ini
index 1bedaddd1..3352d69d2 100644
--- a/src/win32/CheckUser.ini
+++ b/src/win32/CheckUser.ini
@@ -7,5 +7,5 @@ Left=0
 Right=-1
 Top=10
 Bottom=-10
-Text="Administrator privileges are recommended for Ejabberd install.\r\n\r\nOtherwise installing Ejabberd as a service will be impossible.\r\n\r\nIf you want to continue installation anyway, click Next."
+Text="Administrator privileges are recommended for Ejabberd install.\r\n\r\nOtherwise installing Ejabberd as a service will be impossible.\r\n\r\nIf you want to continue installing Ejabberd anyway, click Next."
 
diff --git a/src/win32/CheckUserH.ini b/src/win32/CheckUserH.ini
index 8cd9ffc42..741bada22 100644
--- a/src/win32/CheckUserH.ini
+++ b/src/win32/CheckUserH.ini
@@ -15,6 +15,6 @@ Left=0
 Right=-1
 Top=50
 Bottom=62
-Text="Proceed with install"
+Text="I want to continue installing Ejabberd anyway"
 State=0
 Flags=NOTIFY
diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg
index 8f88ca485..7325056df 100644
--- a/src/win32/ejabberd.cfg
+++ b/src/win32/ejabberd.cfg
@@ -98,20 +98,21 @@
   {5222, ejabberd_c2s,     [{access, c2s},
                             {shaper, c2s_shaper}]},
 
-% To create selfsigned certificate run the following command form the
+% To create selfsigned certificate run the following command from the
 % command prompt:
 %
 % openssl req -new -x509 -days 365 -nodes -out ejabberd.pem -keyout ejabberd.pem
 %
 % and answer the questions.
 %  {5222, ejabberd_c2s,     [{access, c2s},
-%                            starttls, {certfile, "./ejabberd.pem"}
+%                            starttls, {certfile, "./ejabberd.pem"},
 %                            {shaper, c2s_shaper}]},
 
 % When using SSL/TLS ssl option is not recommended (it requires patching
 % erlang ssl application). Use tls option instead (as shown below).
 %  {5223, ejabberd_c2s,     [{access, c2s},
-%                            tls, {certfile, "./ejabberd.pem"}]},
+%                            tls, {certfile, "./ejabberd.pem"},
+%                            {shaper, c2s_shaper}]},
 
   {5269, ejabberd_s2s_in,  [{shaper, s2s_shaper}]},
 
@@ -139,7 +140,6 @@
   {mod_announce,  [{access, announce}]},
   {mod_private,   []},
   {mod_irc,       []},
-  {mod_muc,       []},
 % Default options for mod_muc:
 %   host: "conference." ++ ?MYNAME
 %   access: all
diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi
index d91d3ea49..63a803cc4 100644
--- a/src/win32/ejabberd.nsi
+++ b/src/win32/ejabberd.nsi
@@ -170,7 +170,7 @@ SectionIn 1 RO
     CreateDirectory "$0"
     CreateShortCut "$0\Start Ejabberd.lnk" "$ERLANG_PATH\bin\werl.exe" \
 	'-sname ejabberd -pa ebin \
-	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH msgs \
+	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
 	-env EJABBERD_LOG_PATH log/ejabberd.log \
 	-s ejabberd -ejabberd config \"ejabberd.cfg\" -mnesia dir \"spool\" \
 	-sasl sasl_error_logger {file,\"log/sasl.log\"}' \
@@ -207,7 +207,7 @@ SectionIn 1 RO
 	-onfail restart -workdir "$INSTDIR" \
 	-args "-s ejabberd -pa ebin \
 	-ejabberd config \\\"ejabberd.cfg\\\" \
-	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH msgs \
+	-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
 	-env EJABBERD_LOG_PATH log/ejabberd.log \
 	-sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
 	-mnesia dir \\\"spool\\\"" -d'