Index: C:/development/lazarus/tools/install/win/create_installer.bat
===================================================================
--- C:/development/lazarus/tools/install/win/create_installer.bat	(revision 39439)
+++ C:/development/lazarus/tools/install/win/create_installer.bat	(working copy)
@@ -18,7 +18,7 @@
 SET RELEASE_PPC=%4
 
 ::---------------------------------------------------------------------
-:: Optional parameter to indicate the LCL Widget set used by the IDE
+:: Optional parameter to indicate the LCL Widgetset used by the IDE
 IF [%5]==[] GOTO EMPTY5
 IF [%5]==[""] GOTO EMPTY5
 SET IDE_WIDGETSET=%5
@@ -53,12 +53,12 @@
 if not exist %ISCC% GOTO ERROR_INNO
 
 ::---------------------------------------------------------------------
-:: Path to the svn executable
+:: Path to the svn executable; make sure it has quotes
 SET SVN="%SVN%"
 SET SVN=%SVN:"=%
 SET SVN="%SVN%"
 if not [%SVN%]==[""] GOTO SVN_BY_USER
-:: set Subversion if no exist try TortoiseSVN 32bits and 64bits else error info
+:: set Subversion; if it doesn't exist try TortoiseSVN 32bits and 64bits else error info
 SET SVN="%ProgramFiles%\subversion\bin\svn.exe"
 if not exist %SVN% SET SVN="%ProgramFiles%\TortoiseSVN\bin\svn.exe"
 if not exist %SVN% SET SVN="%ProgramFiles32bits%\subversion\bin\svn.exe"
@@ -67,12 +67,12 @@
 if not exist %SVN% GOTO ERROR_SVN
 
 ::---------------------------------------------------------------------
-:: Path to the svnversion executable
+:: Path to the svnversion executable; make sure it has quotes
 SET SVNVER="%SVNVER%"
 SET SVNVER=%SVNVER:"=%
 SET SVNVER="%SVNVER%"
 if not [%SVNVER%]==[""] GOTO SVNVER_BY_USER
-:: set Subversion if no exist try TortoiseSVN 32bits and 64bits else error info
+:: set Subversion if it doesn't exist try TortoiseSVN 32bits and 64bits else error info
 SET SVNVER="%ProgramFiles%\subversion\bin\svnversion.exe"
 if not exist %SVNVER% SET SVNVER="%ProgramFiles%\TortoiseSVN\bin\svnversion.exe"
 if not exist %SVNVER% SET SVNVER="%ProgramFiles32bits%\subversion\bin\svnversion.exe"
@@ -144,7 +144,7 @@
 del %INSTALL_BINDIR%\gdb.exe
 
 :: exit if no compiler has been made
-if not exist %INSTALL_BINDIR%\fpc.exe goto END
+if not exist %INSTALL_BINDIR%\fpc.exe goto WARNING_NO_COMPILER_MADE
 
 %INSTALL_BINDIR%\fpcmkcfg.exe -d "basepath=%INSTALL_BASE%" -o %INSTALL_BINDIR%\fpc.cfg
 
@@ -155,8 +155,8 @@
 del %INSTALL_BINDIR%\fpc.cfg
 
 :: do not create installer, if the required executables are not there
-if not exist %BUILDDIR%\lazarus.exe goto END
-if not exist %BUILDDIR%\startlazarus.exe goto END
+if not exist %BUILDDIR%\lazarus.exe goto WARNING_NO_LAZARUS
+if not exist %BUILDDIR%\startlazarus.exe goto WARNING_NO_LAZARUS
 
 ::---------------------------------------------------------------------
 :: copy gdb into build dir
@@ -181,7 +181,7 @@
 %ISCC% lazarus.iss >> installer.log
 
 :: do not delete build dir, if installer failed.
-if not exist "output\%OutputFileName%.exe" goto END
+if not exist "output\%OutputFileName%.exe" goto WARNING_INSTALLER_FAILED
 
 :: delete build dir
 rd /s /q %BUILDDIR% > NUL
@@ -202,15 +202,27 @@
 
 goto STOP
 
+:WARNING_INSTALLER_FAILED
+echo Installer was not created in output\%OutputFileName%.exe. Ending now.
+GOTO END
+
+:WARNING_NO_COMPILER_MADE
+echo Could not find compiler at %INSTALL_BINDIR%\fpc.exe. Ending now.
+GOTO END
+
+:WARNING_NO_LAZARUS
+echo Could not find %BUILDDIR%\lazarus.exe or %BUILDDIR%\startlazarus.exe. Ending now.
+GOTO END
+
 :ERROR_INNO
-echo Inno setup instalation %ISCC% no exist.
-echo Please download and install this program is required to create installer.
+echo Inno setup instalation %ISCC% does not exist.
+echo Please download and install this program; it is required to create the installer.
 echo http://www.jrsoftware.org
 GOTO STOP
 
 :ERROR_SVN
-echo Subversion or TortoiseSVN instalation %SVN% no exist.
-echo Please download and install this program is required to create installer.
+echo Subversion or TortoiseSVN instalation %SVN% does not exist.
+echo Please download and install this program; it is required to create the installer.
 echo http://subversion.apache.org/packages.html or http://tortoisesvn.net/downloads.html
 GOTO STOP
 
Index: C:/development/lazarus/tools/install/win/readme.txt
===================================================================
--- C:/development/lazarus/tools/install/win/readme.txt	(revision 39439)
+++ C:/development/lazarus/tools/install/win/readme.txt	(working copy)
@@ -12,14 +12,15 @@
 A.2 Subversion
 The build script assumes you have the Subversion client installed. You can download it from http://subversion.tigris.org/, you can use the package with setup in name.
 
-A.3 FPC sources
-The build script assumes you have a svn version of the fpcbuild sources. For information about getting the fpc sources from svn see: http://www.freepascal.org/
+A.3 FPC build sources
+The build script assumes you have a svn version of the fpcbuild sources (this repository includes the regular FPC sources). For information about getting the fpc sources from svn see: http://www.freepascal.org/
 
 A.4 Lazarus sources
-A Lazarus svn tree, containing the lazarus sources.
+A Lazarus svn tree, containing the Lazarus sources.
 
 A.5 Lazarus binaries
 Some binaries from a lazarus/binaries svn tree. These binaries (like gdb and the qt interface dll) are distributed with Lazarus, but are not built from source.
+Your directory should have i386-win32, x86_64-win64 etc subdirectories; the URL is currently http://svn.freepascal.org/svn/lazarus/binaries/
 
 A.6. The latest release of the fpc compiler
 Currently the latest release is fpc 2.6.0. You need just the ppcXXX.exe (ppc386.exe for win32 and ppcx64.exe for win64) to bootstrap compilation of the current fpc version.
@@ -31,16 +32,20 @@
 
 Open the create_installer.bat in a text editor and check the variables, to see if they match your configuration:
 ISCC: Path to the Inno Setup Compiler .exe file.
-BUILDDIR: Path to build directory.
+BUILDDIR: Path to build directory (this directory should not yet exist).
 SVN: Path to the Subversion .exe file.
+SVNVER: Path to the Subversion svnversion .exe file
 
 Alternatively, you can set these as environment variables before you run the batch script, e.g.:
 SET ISCC="C:\Program Files (x86)\Inno Setup 5\ISCC.exe"
 SET LAZTEMPBUILDDIR="c:\temp\lazarusbuild"
 SET SVN="C:\Program Files\Subversion\bin\svn.exe"
+SET SVNVER="C:\Program Files\Subversion\bin\svnversion.exe"
 
 C Run create_installer.bat
 
+If not already done, change to the directory where create_installer.bat is. This is needed because the script calls other scripts which it otherwise won't find.
+
 Run the script:
 
 create_installer.bat FPCSVNDIR LAZSVNDIR LAZSVNBINDIR RELEASE_PPC
Index: C:/development/lazarus/tools/install/win/lazarus.iss
===================================================================
--- C:/development/lazarus/tools/install/win/lazarus.iss	(revision 39439)
+++ C:/development/lazarus/tools/install/win/lazarus.iss	(working copy)
@@ -47,7 +47,7 @@
 TimeStampRounding=0
 PrivilegesRequired=none
 ChangesAssociations=yes
-; prevent chekbox pre-set (for delete user conf). Latest inno supports unchecked checkedonce
+; prevent checkbox pre-set (for delete user conf). Latest inno supports unchecked checkedonce
 UsePreviousTasks=no
 UninstallDisplayIcon={app}\lazarus.exe