- Lots of small fixes

- b1 history complete


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2129 212acab6-be3b-0410-9dea-997c60f758d6

Docs/src/compiler.but

@@ -8,7 +8,13 @@ These commands are similar to the C preprocessor in terms of purpose and functio
 
 \c file
 
-This command will include 'file' as if it was part of the original script. Note that if a file is included in another directory, the current directory is still where the script was compiled from (not where the included file resides).
+This command will include 'file' as if it was part of the original script. Note that if a file is included in another directory, the current directory is still where the script was compiled from (not where the included file resides). If the compiler can't find the file it will look for it in every include directory. See !addincludedir for more information.
+
+\S1{addincludedir} !addincludedir
+
+\c directory
+
+Adds another include directory to the include directories list. This list is searched when !include is used. This list's initial value is $\{NSISDIR\}\\Include alone.
 
 \S1{cd} !cd
 

Docs/src/config.but

@@ -12,6 +12,8 @@
 
 \preamble NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge.
 
+\preamble To talk with others in the NSIS community set your browser to \W{http://forums.winamp.com/forumdisplay.php?s=&forumid=65}{the NSIS forum}.
+
 \preamble For more useful functions, NSIS related software, example scripts, plugins and tutorials: visit the \W{http://nsis.sourceforge.net/archive/}{the NSIS Archive}.
 
 \copyright Copyright (c) 2002 Nullsoft, Inc.

Docs/src/credits.but

@@ -8,7 +8,7 @@
 
 \e{Amir "make me stop" Szekely aka KiCHiK}
 
-\b Making NSIS multilingual
+\b Multilingual NSIS
 
 \b RTF license text
 
@@ -18,7 +18,7 @@
 
 \b Branding image
 
-\b Making the UI more customizable
+\b Customizable UI
 
 \b One makensis.exe for both zlib and bzip2
 
@@ -28,7 +28,7 @@
 
 \e{Robert Rainwater}
 
-\b MakeNSISW
+\b MakeNSISw
 
 \b New documentation format
 

Docs/src/history.but

@@ -10,9 +10,31 @@
 
 \b InstallOptions 2.0 with support for custom font and DPI settings, groupboxes, grouped controls, lots of bugfixes etc.
 
-\b Include dirs
+\b No more random compression ratios
 
-\b All !if/!else/!endif problems should be solved now 
+\b SetOutPath now sets the working directory
+
+\b File names are validated, directory given by the user will now always work
+
+\b $QUICKLAUNCH now works with SetShellVarContext all
+
+\b Automatically appended directory name in the directory selection dialog will no longer contain squares if not all characters are ASCII.
+
+\b Fixed a bug with remote drives and available space (\\\\remote\\drive)
+
+\b LangStrings now work as function, can be used before defined
+
+\b Plug-in function's names are now case insensitive
+
+\b Fixed a bug with specifying Icon twice
+
+\b Include dirs (!addincludedir)
+
+\b On leave function for pages
+
+\b Installers can now really contain more than one branding image
+
+\b All !if/!else/!endif problems should be solved now
 
 \b SetFont "MS Shell Dlg" adds the DS_SHELLFONT style 
 
@@ -26,10 +48,20 @@
 
 \b Banner.dll compatible with Modern UI
 
+\b Fixed focus problems in MakeNSISw
+
 \b Updated and new translations
 
+\b Some new bitmaps for the MUI by Virtlink
+
+\b Faster and better MakeNSISw integration
+
+\b New .NET Framework detection function in \k{detect.netframework}
+
 \b Minor bugfixes
 
+\b Code clean-ups (compiles on VC7)
+
 
 \e{v2.0b0}
 

Docs/src/intro.but

@@ -45,7 +45,7 @@ Here's a short list of some of NSIS' features.
 
 \b Easy to use plug-in system (includes plug-ins for generic dialog construction and user interaction, as well as HTTP downloading)
 
-\b Fully multilingual. 25 translations available including German, French, Spanish, Italian, Dutch, Chinese and more...
+\b Fully multilingual. 28 translations available including German, French, Spanish, Italian, Dutch, Chinese and more...
 
 \b Installers can be as large as 2GB (theoretically -- when building on Win9x the limit seems to be around 500MB, however building on NT then installing on Win9x works with larger sizes)
 

Docs/src/langs.but

@@ -12,9 +12,9 @@ For ease of use LoadLanguageFile defines $\{LANG_language_file\} as the language
 
 \c [un.]name language_id string
 
-Defines a multilingual string and spares the comparing of $LANGUAGE to every possible string you have. This also allows you to make section names and install types multilingual. To use in the uninstaller make sure you define the string with the un. prefix before its name.
+Defines a multilingual string and spares the comparing of $LANGUAGE to every language you have in your installer for every string you use. This also allows you to make section names and install types multilingual. To use in the uninstaller make sure you name the string with the un. prefix before.
 
-LangStrings can you only be used on their own. You can't include them in other strings. "look at my $(string)! isn't it beautiful?" will be seen exactly as written, $(string) will not be expanded.
+LangStrings can you only be used on their own. You can't include them in other strings. "look at my $(string)! isn't it beautiful?" will be seen exactly as written, $(string) will not be expanded. If you want to use LangStrings in other strings you can first copy the LangString to a variable and then use the variable wherever you want. This is a temporary situation, it will be changed before NSIS 2 final.
 
 Note that unlike defines that use curly braces - \{\}, multilingual strings use parenthesis - ().
 

Docs/src/pages.but

@@ -21,15 +21,15 @@ If you don't use any Page command the installer pages order will be just as in o
 
 \S{pagecallbacks} Callbacks
 
-Each built-in page has two callback functions. The pre-function and the post-creation function. The pre-function is called right before the page is created and the post-function is called right after it is created and before it is showed so you can tweak its user interface with CreateFont (\K{createfont}), SetStaticBkColor (\K{setstaticbkcolor}) and SendMessage (\K{sendmessage}).
+Each built-in page has three callback functions. The pre-function, the show-creation function and the leave-function. The pre-function is called right before the page is created, the show-function is called right after it is created and before it is showen so you can tweak its user interface with CreateFont (\K{createfont}), SetStaticBkColor (\K{setstaticbkcolor}) and SendMessage (\K{sendmessage}); the leave-function is called right after the user has pressed the next button and before the page is left.
 
 A custom page has only one callback function that creates it but unlike the built-in pages this function is mandatory.
 
-Use Abort (see \K{abort}) from a built-in page pre-function to skip the page.
+Use Abort (see \K{abort}) from a built-in page's pre-function to skip the page, and from a built-in page's leave-function to stay in the page.
 
 Examples:
 
-\c  Page license skipLicense
+\c  Page license skipLicense "" stayInLicense
 \c  Page custom customPage ": custom page"
 \c  Page instfiles
 \c
@@ -39,6 +39,12 @@ Examples:
 \c    no:
 \c  FunctionEnd
 \c
+\c  Function stayInLicense
+\c    MessageBox MB_YES "Do you want to stay in the license page?" IDNO no
+\c      Abort
+\c    no:
+\c  FunctionEnd
+\c
 \c  Function customPage
 \c    GetTempFileName $R0
 \c    File /oname=$R0 customPage.ini
@@ -53,12 +59,12 @@ Examples:
 
 \S{page} Page
 
-\c (custom function [caption]) | ((license|components|directory|instfiles) [pre_function] [post_function])
+\c (custom function [caption]) | ((license|components|directory|instfiles) [pre_function] [show_function] [leave_function]) [define_if_last]
 
-Adds an installer page. See the above sections for more information about built-in versus custom pages and about callback functions.
+Adds an installer page. See the above sections for more information about built-in versus custom pages and about callback functions. If define_if_last is specified, the parameter will be !defined if the page turns out to be the last page before a instfiles page. This helps you decide on dynamic scripts (such as the Modern UI script) what to put in this page's text, "click the install button to start installation" or "click next to continue" for example.
 
 \S{uninstpage} UninstPage
 
-\c (custom function [caption]) | ((uninstConfirm|instfiles) [pre_function] [post_function])
+\c (custom function [caption]) | ((uninstConfirm|instfiles) [pre_function] [show_function] [leave_function]) [define_if_last]
 
-Adds an uninstaller page. See the above sections for more information about built-in versus custom pages and about callback functions.
+Adds an uninstaller page. See the above sections for more information about built-in versus custom pages and about callback functions. See Page for an explanation about define_if_last.