/* Jamyn Shanley - September 16th, 2005 This just fixes various typos I ran across in the documentation. I caught a few obvious typos in some of the source files as well by accident, using grep. Anyway, I haven't really looked over the source files for typos yet; I'll have to do that later. If this is not the proper format to submit a large number of documentation fixes, please let me know. Thanks! */ diff -u -r NSIS/Contrib/AdvSplash/advsplash.txt NSIS.FIXED/Contrib/AdvSplash/advsplash.txt --- NSIS/Contrib/AdvSplash/advsplash.txt 2003-11-16 07:52:38.000000000 -0600 +++ NSIS.FIXED/Contrib/AdvSplash/advsplash.txt 2005-09-16 03:43:21.940814400 -0500 @@ -19,7 +19,7 @@ advsplash::show 1000 600 400 -1 $TEMP\spltmp Pop $0 ; $0 has '1' if the user closed the splash screen early, - ; '0' if everything closed normal, and '-1' if some error occured. + ; '0' if everything closed normal, and '-1' if some error occurred. Delete $TEMP\spltmp.bmp ; Delete $TEMP\spltmp.wav diff -u -r NSIS/Contrib/AdvSplash/Example.nsi NSIS.FIXED/Contrib/AdvSplash/Example.nsi --- NSIS/Contrib/AdvSplash/Example.nsi 2005-06-19 16:39:03.000000000 -0500 +++ NSIS.FIXED/Contrib/AdvSplash/Example.nsi 2005-09-16 03:43:56.480480000 -0500 @@ -16,7 +16,7 @@ advsplash::show 1000 600 400 -1 $PLUGINSDIR\splash Pop $0 ; $0 has '1' if the user closed the splash screen early, - ; '0' if everything closed normal, and '-1' if some error occured. + ; '0' if everything closed normal, and '-1' if some error occurred. MessageBox MB_OK "Transparency" File /oname=$PLUGINSDIR\splash.bmp "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp" diff -u -r NSIS/Contrib/InstallOptions/Changelog.txt NSIS.FIXED/Contrib/InstallOptions/Changelog.txt --- NSIS/Contrib/InstallOptions/Changelog.txt 2005-01-22 10:14:36.000000000 -0600 +++ NSIS.FIXED/Contrib/InstallOptions/Changelog.txt 2005-09-16 03:56:24.456016000 -0500 @@ -109,7 +109,7 @@ * Still 44k * Added the "FileRequest" and "DirRequest" control types (thanks Schultz) * Added "MinLen", "MaxLen", and "ValidateText" properties to fields -* Added "Flags" as a way to specifiy additional parameters for controls +* Added "Flags" as a way to specify additional parameters for controls * Few more changes to the documentation * Cleaned the code in a few places...still trying to make it smaller diff -u -r NSIS/Contrib/Makensisw/jnetlib/connection.h NSIS.FIXED/Contrib/Makensisw/jnetlib/connection.h --- NSIS/Contrib/Makensisw/jnetlib/connection.h 2005-06-19 05:56:42.000000000 -0500 +++ NSIS.FIXED/Contrib/Makensisw/jnetlib/connection.h 2005-09-16 03:44:46.161918400 -0500 @@ -15,7 +15,7 @@ ** so you can tell how much has been send/received. You want to do this a lot, while: ** 4. check get_state() to check the state of the connection. The states are: ** JNL_Connection::STATE_ERROR -** - an error has occured on the connection. the connection has closed, +** - an error has occurred on the connection. the connection has closed, ** and you can no longer write to the socket (there still might be ** data in the receive buffer - use recv_bytes_available()). ** JNL_Connection::STATE_NOCONNECTION diff -u -r NSIS/Contrib/Math/Math.txt NSIS.FIXED/Contrib/Math/Math.txt --- NSIS/Contrib/Math/Math.txt 2003-09-22 17:56:52.000000000 -0500 +++ NSIS.FIXED/Contrib/Math/Math.txt 2005-09-16 03:58:21.864841600 -0500 @@ -83,8 +83,8 @@ item, stack), and * will convert it back to original variable. For example (a=&b; *a=10) will set b to 10. Expression (*&a) is equal to simple (a). -Script is set of expressions (mathematical in general) delimeted with ';'. -Processing is mathematicaly right (2+2*2 will give 6), operations are performed +Script is set of expressions (mathematical in general) delimited with ';'. +Processing is mathematically right (2+2*2 will give 6), operations are performed in a C like order (precedence). Flow control: @@ -188,7 +188,7 @@ register R0, any of the user variables (beside the variable with the same name:), but never the constant. -Another may-be-useful posibility is to redeclare the function (the usual +Another may-be-useful possibility is to redeclare the function (the usual declaration at the time when function already defined will simply call that function). For such task you could use "#name", like "func()(1); #func()(2);". But beware, function declaration occurs at time of parsing, so it's not possible diff -u -r NSIS/Contrib/Modern UI/Changelog.txt NSIS.FIXED/Contrib/Modern UI/Changelog.txt --- NSIS/Contrib/Modern UI/Changelog.txt 2005-09-04 16:24:27.000000000 -0500 +++ NSIS.FIXED/Contrib/Modern UI/Changelog.txt 2005-09-16 03:55:38.930553600 -0500 @@ -11,7 +11,7 @@ * Fixed state of Finish page Cancel button when both an installer and uninstaller page is included 1.71 - October 14, 2004 -* The selected language is only stored in the registry when installation was succesful +* The selected language is only stored in the registry when installation was successful 1.70 - February 6, 2004 * Improved documentation @@ -37,7 +37,7 @@ * Support for uninstaller abort warning * Setting for 3 line text on Welcome and Finish page (NOTE: New settings have been introduced in version 1.68) -* Langauge file backwards compatibility: English for missing strings +* Language file backwards compatibility: English for missing strings * Support for different uninstaller header image * Language selection dialog not displayed if installer is silent * Cancel button on Finish page when there are options @@ -49,7 +49,7 @@ * Support for multiple pages of the same type * New position for interface settings * Changed macro, setting names -* Updated langauge system, new language files and settings +* Updated language system, new language files and settings * Removed MUI_BRANDINGTEXT. You can use the standard BrandingText instruction. * Removed MUI_PRODUCT and MUI VERSION. You can use the standard Name instruction. @@ -155,7 +155,7 @@ * SetPage function should be set using defines * Different NextPage/PrevPage/FinishHeader macros for install/uninstall (NOTE: These macros have been removed in version 1.4) -* Interface settings can be definend (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore +* Interface settings can be defined (for example, MUI_ICON), no parameters for MUI_INTERFACE anymore * New Install Options macros to read/write IO INI file value 1.21 - September 30, 2002 @@ -177,30 +177,30 @@ (for example, MUI_PREVPAGE SetPage) * Examples use ReserveFile for faster startup -1.19 - Semtember 19, 2002 +1.19 - September 19, 2002 * Renamed some macros * Custom code can be used between page start/stop macros (NOTE: These macros have been removed in version 1.4) -1.18 - Semtember 13, 2002 +1.18 - September 13, 2002 * Uses the new Sendmessage string option -1.17 - Semtember 10, 2002 +1.17 - September 10, 2002 * Win9x font weight bug fixed (font of title in white rect) -1.16 - Semtember 6, 2002 +1.16 - September 6, 2002 * Change text 'Scroll down' on license page to 'Press Page Down', because the RichEdit control has focus by default now -1.15 - Semtember 4, 2002 +1.15 - September 4, 2002 * Multilanguage example: changed LangDialog to LangDLL::LangDialog (using the DLL name is now required) (NOTE: A new macro for the language selection dialog has been introduced in version 1.63) -1.14 - Semtember 3, 2002 +1.14 - September 3, 2002 * Small grammar fix (thanks eccles) * UI files updated by Justin for better RichEdit usage -1.13 - Semtember 2, 2002 +1.13 - September 2, 2002 * Added 16 color icons 1.12 - August 30, 2002 diff -u -r NSIS/Contrib/Modern UI/Readme.html NSIS.FIXED/Contrib/Modern UI/Readme.html --- NSIS/Contrib/Modern UI/Readme.html 2005-09-15 13:37:16.000000000 -0500 +++ NSIS.FIXED/Contrib/Modern UI/Readme.html 2005-09-16 03:06:49.938870400 -0500 @@ -745,7 +745,7 @@ Finish page without MUI_(UN)FINISHPAGE_NOAUTOCLOSE).

MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT text
-Subext to display on the header of the installation page when the +Subtext to display on the header of the installation page when the installation has been completed (won't be displayed when using a Finish page without MUI_(UN)FINISHPAGE_NOAUTOCLOSE).

MUI_INSTFILESPAGE_ABORTHEADER_TEXT

To set a description for a section, you have to add an -additional parameter to the Section commmand with a name for the +additional parameter to the Section command with a name for the define that should contain the section number.

 Section "Section Name 1" Section1
@@ -1041,7 +1041,7 @@
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "..\ioFile.ini" "ioFile.ini"
 FunctionEnd
-

You can call Instal Options in the function defined with the +

You can call Install Options in the function defined with the Page or UninstPage command using the MUI_INSTALLOPTIONS_DISPLAY macro. Use the MUI_HEADER_TEXT macro to set the text on the page header:

diff -u -r NSIS/Contrib/NSIS Menu/src/msw/app.cpp NSIS.FIXED/Contrib/NSIS Menu/src/msw/app.cpp --- NSIS/Contrib/NSIS Menu/src/msw/app.cpp 2003-05-26 12:53:58.000000000 -0500 +++ NSIS.FIXED/Contrib/NSIS Menu/src/msw/app.cpp 2005-09-16 03:46:02.742035200 -0500 @@ -1001,7 +1001,7 @@ HWND hwnd = msg->hwnd; wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); - // this may happen if the event occured in a standard modeless dialog (the + // this may happen if the event occurred in a standard modeless dialog (the // only example of which I know of is the find/replace dialog) - then call // IsDialogMessage() to make TAB navigation in it work if ( !wndThis ) diff -u -r NSIS/Contrib/NSISdl/connection.h NSIS.FIXED/Contrib/NSISdl/connection.h --- NSIS/Contrib/NSISdl/connection.h 2002-08-02 04:59:25.000000000 -0500 +++ NSIS.FIXED/Contrib/NSISdl/connection.h 2005-09-16 03:47:01.276203200 -0500 @@ -15,7 +15,7 @@ ** so you can tell how much has been send/received. You want to do this a lot, while: ** 4. check get_state() to check the state of the connection. The states are: ** JNL_Connection::STATE_ERROR -** - an error has occured on the connection. the connection has closed, +** - an error has occurred on the connection. the connection has closed, ** and you can no longer write to the socket (there still might be ** data in the receive buffer - use recv_bytes_available()). ** JNL_Connection::STATE_NOCONNECTION diff -u -r NSIS/Contrib/NSISdl/ReadMe.txt NSIS.FIXED/Contrib/NSISdl/ReadMe.txt --- NSIS/Contrib/NSISdl/ReadMe.txt 2004-09-02 16:07:12.000000000 -0500 +++ NSIS.FIXED/Contrib/NSISdl/ReadMe.txt 2005-09-16 03:59:00.740742400 -0500 @@ -5,7 +5,7 @@ This plugin can be used from NSIS to download files via http. -To connect to the internet, use the Dialer pluin. +To connect to the internet, use the Dialer plugin. USAGE ----- @@ -22,7 +22,7 @@ "success" if success otherwise, an error string describing the error -If you don't want the progess window to appear use NSISdl::download_quiet. +If you don't want the progress window to appear, use NSISdl::download_quiet. Example of usage: diff -u -r NSIS/Contrib/Splash/Example.nsi NSIS.FIXED/Contrib/Splash/Example.nsi --- NSIS/Contrib/Splash/Example.nsi 2005-06-19 16:39:03.000000000 -0500 +++ NSIS.FIXED/Contrib/Splash/Example.nsi 2005-09-16 03:47:57.016353600 -0500 @@ -14,7 +14,7 @@ splash::show 1000 $PLUGINSDIR\splash Pop $0 ; $0 has '1' if the user closed the splash screen early, - ; '0' if everything closed normal, and '-1' if some error occured. + ; '0' if everything closed normal, and '-1' if some error occurred. FunctionEnd Section diff -u -r NSIS/Contrib/Splash/splash.txt NSIS.FIXED/Contrib/Splash/splash.txt --- NSIS/Contrib/Splash/splash.txt 2002-11-08 10:16:00.000000000 -0600 +++ NSIS.FIXED/Contrib/Splash/splash.txt 2005-09-16 03:48:28.201195200 -0500 @@ -20,7 +20,7 @@ splash::show 1000 $TEMP\spltmp Pop $0 ; $0 has '1' if the user closed the splash screen early, - ; '0' if everything closed normal, and '-1' if some error occured. + ; '0' if everything closed normal, and '-1' if some error occurred. Delete $TEMP\spltmp.bmp ; Delete $TEMP\spltmp.wav diff -u -r NSIS/Contrib/System/WhatsNew.txt NSIS.FIXED/Contrib/System/WhatsNew.txt --- NSIS/Contrib/System/WhatsNew.txt 2004-07-23 12:23:34.000000000 -0500 +++ NSIS.FIXED/Contrib/System/WhatsNew.txt 2005-09-16 04:04:48.941430400 -0500 @@ -3,7 +3,7 @@ 2. Int64 full support (conversion/operations/comparison) 3. Structures support 4. Callbacks support, including multilevel callbacks -5. Some useful rountines (Alloc, Free, Copy) +5. Some useful routines (Alloc, Free, Copy) 6. CDecl and StdCall calling conventions release 3, 22 march 2003. @@ -30,12 +30,12 @@ 5. Automatic A-letter at proc name discovery. 6. COM optimized: new proc specification "x->y", where x is interface ptr, and y is vtable member index. For such procs Interface pointer passed as first arg -automaticaly. +automatically. release 5, 11 september 2003. 1. u flag - unload dll after procedure call. 2. some changes to asm to turn on Whole Program Optimization. -3. Dll shrinked for 1 kb. +3. Dll shrunk by 1 kb. bug-fix-release, 4.06.2004 1. System::Copy /SIZE fixed (Kichik). diff -u -r NSIS/Contrib/VPatch/Readme.html NSIS.FIXED/Contrib/VPatch/Readme.html --- NSIS/Contrib/VPatch/Readme.html 2005-06-20 11:03:56.000000000 -0500 +++ NSIS.FIXED/Contrib/VPatch/Readme.html 2005-09-16 03:52:22.217694400 -0500 @@ -102,7 +102,7 @@

Introduction

VPatch allows to create a patch file to update previous versions - of your software. The GenPat utitily generates the patch file. The + of your software. The GenPat utility generates the patch file. The plug-in can use the patch to update a file. Using a patch, you can reduce the download size of your updates, because only the differences between the files are included in the patch file.

@@ -135,7 +135,7 @@ @@ -144,7 +144,7 @@

Multiple patches in one file

GenPat appends a patch to the file you specified. If there is already - a patch for the same orginal file in the patch file, the patch will + a patch for the same original file in the patch file, the patch will be replaced. For example, if you want to be able to upgrade version 1 and 2 to version 3, you can put a 1 > 3 and 2 > 3 patch in one file.

@@ -158,7 +158,7 @@

In version 2.1 support was added for exit codes (known as error levels in the DOS period) to GenPat. GenPat will return an exit code based - on succes of the patch generation. Here is a list of the possible + on success of the patch generation. Here is a list of the possible exit codes:

@@ -222,8 +222,8 @@

Patch Generator (Delphi)

The most interesting part of VPatch, the actual patch generation - algoritm, can be found in Source\GenPat\PatchGenerator.pas. The header - of that file contains a brief explanation of the algoritm as well.

+ algorithm, can be found in Source\GenPat\PatchGenerator.pas. The header + of that file contains a brief explanation of the algorithm as well.

User interface (Delphi)

diff -u -r NSIS/Contrib/VPatch/Source/Plugin/vpatchdll.c NSIS.FIXED/Contrib/VPatch/Source/Plugin/vpatchdll.c --- NSIS/Contrib/VPatch/Source/Plugin/vpatchdll.c 2005-04-16 12:09:56.000000000 -0500 +++ NSIS.FIXED/Contrib/VPatch/Source/Plugin/vpatchdll.c 2005-09-16 03:50:17.237982400 -0500 @@ -78,7 +78,7 @@ if ((result != PATCH_SUCCESS)) { if (result == PATCH_ERROR) - pushstring("An error occured while patching"); + pushstring("An error occurred while patching"); else if (result == PATCH_CORRUPT) pushstring("Patch data is invalid or corrupt"); else if (result == PATCH_NOMATCH) diff -u -r NSIS/Docs/src/attributes.but NSIS.FIXED/Docs/src/attributes.but --- NSIS/Docs/src/attributes.but 2005-06-28 14:18:14.000000000 -0500 +++ NSIS.FIXED/Docs/src/attributes.but 2005-09-16 03:21:41.871406400 -0500 @@ -32,7 +32,7 @@ \S2{abgfont} BGFont -\c [font_face [height [wieght] [/ITALIC] [/UNDERLINE] [/STRIKE]]] +\c [font_face [height [weight] [/ITALIC] [/UNDERLINE] [/STRIKE]]] Specifies the font used to show the text on the background gradient. To set the color use \R{abggradient}{BGGradient}. If no parameters are specified, the default font will be used. The default font is bold and italic Times New Roman. @@ -64,7 +64,7 @@ \c dialog ui_file.exe -Replaces dialog (\e{IDD_LICENSE}, \e{IDD_DIR}, \e{IDD_SELCOM}, \e{IDD_INST}, \e{IDD_INSTFILES}, \e{IDD_UNINST} or \e{IDD_VERIFY}) by a dialog with the same resource ID in ui_file.exe. You can also specify 'all' as the dialog if you wish to load replace all 7 of the dialogs at once from the same UI file. For some example UIs look at Contrib\\UIs under your NSIS directory. +Replaces dialog (\e{IDD_LICENSE}, \e{IDD_DIR}, \e{IDD_SELCOM}, \e{IDD_INST}, \e{IDD_INSTFILES}, \e{IDD_UNINST} or \e{IDD_VERIFY}) by a dialog with the same resource ID in ui_file.exe. You can also specify 'all' as the dialog if you wish to replace all 7 of the dialogs at once from the same UI file. For some example UIs look at Contrib\\UIs under your NSIS directory. \b \e{IDD_LICENSE} must contain \e{IDC_EDIT1} (RICHEDIT control). diff -u -r NSIS/Docs/src/compiler.but NSIS.FIXED/Docs/src/compiler.but --- NSIS/Docs/src/compiler.but 2005-07-29 10:08:32.000000000 -0500 +++ NSIS.FIXED/Docs/src/compiler.but 2005-09-16 03:33:55.225918400 -0500 @@ -137,8 +137,8 @@ Date & time of the last modification to the script file according to the current locale. -\S0{compenvvarread} Read enviroment variables +\S0{compenvvarread} Read environment variables \S1{compenvvar} $%envVarName% -$%envVarName% will be replaced on compile time by the enviroment variable envVarName. +$%envVarName% will be replaced on compile time by the environment variable envVarName. diff -u -r NSIS/Docs/src/flowcontrol.but NSIS.FIXED/Docs/src/flowcontrol.but --- NSIS/Docs/src/flowcontrol.but 2005-07-15 05:45:29.000000000 -0500 +++ NSIS.FIXED/Docs/src/flowcontrol.but 2005-09-16 03:22:27.016321600 -0500 @@ -13,7 +13,7 @@ \c function_name | :label_name | user_var(input) -Calls the function named \e{function_name}, the label named \e{label_name}, or a variable that specifies an address. An address is returned by \R{getcurrentaddress}{GetCurrentAddress}, \R{getfunctionaddress}{GetFunctionAddress} or \R{getlabeladdress}{GetLabelAddress}. A call returns when it encouters a \R{return}{Return} instruction. Sections and functions are automatically ended with a \R{return}{Return} instruction. Uninstall functions cannot be called from installer functions and sections, and vice-versa. +Calls the function named \e{function_name}, the label named \e{label_name}, or a variable that specifies an address. An address is returned by \R{getcurrentaddress}{GetCurrentAddress}, \R{getfunctionaddress}{GetFunctionAddress} or \R{getlabeladdress}{GetLabelAddress}. A call returns when it encounters a \R{return}{Return} instruction. Sections and functions are automatically ended with a \R{return}{Return} instruction. Uninstall functions cannot be called from installer functions and sections, and vice-versa. \c Function func \c Call :label diff -u -r NSIS/Docs/src/headers.but NSIS.FIXED/Docs/src/headers.but --- NSIS/Docs/src/headers.but 2005-07-21 12:01:31.000000000 -0500 +++ NSIS.FIXED/Docs/src/headers.but 2005-09-16 03:40:06.209366400 -0500 @@ -898,7 +898,7 @@ \S1{} RefreshShellIcons -\b After changing file associations, you can call this function to refresh the shell immediatly. +\b After changing file associations, you can call this function to refresh the shell immediately. \\Syntax:\\ @@ -944,7 +944,7 @@ \S1{} LineFind -\b Find specified lines in text file and edit or view this lines in callback function. +\b Find specified lines in text file, and edit or view these lines in callback function. \\Syntax:\\ @@ -1938,7 +1938,7 @@ \S1{} WordFind3X -\b Find word, that contain string, between two delimiters. +\b Find a word that contains a string, between two delimiters. \\Syntax:\\ diff -u -r NSIS/Docs/src/langs.but NSIS.FIXED/Docs/src/langs.but --- NSIS/Docs/src/langs.but 2004-10-10 13:41:43.000000000 -0500 +++ NSIS.FIXED/Docs/src/langs.but 2005-09-16 03:30:13.547160000 -0500 @@ -12,7 +12,7 @@ \c name language_id string -Defines a multilingual string. This means the its value will be different (or not, it's up to you) for every language. It allows you to easily make your installer multilingual without the need to add massive switches to the script. +Defines a multilingual string. This means it's value may be different (or not, it's up to you) for every language. It allows you to easily make your installer multilingual without the need to add massive switches to the script. Each language string has a name that identifies it and a value for each language used by the installer. They can be used in any runtime string in the script. To use a language string all you need to add to the string is $(LangString_name_here) where you want the LangString to be inserted. @@ -20,9 +20,9 @@ \b Unlike defines that use curly braces - \{\}, language strings use parenthesis - (). -\b If you change the langauge in the .onInit function, note that language strings in .onInit will still use the detected language based on the user's default Windows language, because the language is initialized after .onInit. +\b If you change the language in the .onInit function, note that language strings in .onInit will still use the detected language based on the user's default Windows language, because the language is initialized after .onInit. -\b Always set langauge strings for every language in your script. +\b Always set language strings for every language in your script. \b If you set the language ID to 0 the last used language by LangString or \R{loadlanguagefile}{LoadLanguageFile} will be used. @@ -50,15 +50,15 @@ As of version 2 NSIS fully supports multiple languages. The interface of one installer can support multiple languages. -Use \R{loadlanguagefile}{LoadLanguageFile} for every langauge to load the default interface texts and language properties. +Use \R{loadlanguagefile}{LoadLanguageFile} for every language to load the default interface texts and language properties. The default interface texts can easily be changed using instructions like \R{acomponenttext}{ComponentText} etc. -You can also use the contents of the standard language strings in your own strings (for example, $(^Name) contains the installer's name set using the \R{aname}{Name} instruction). The names of all standard langauges strings are listed as comments just above the strings in the language files. The language files are located in \L{../Contrib/Language files}{Contrib\\Language Files}. +You can also use the contents of the standard language strings in your own strings (for example, $(^Name) contains the installer's name set using the \R{aname}{Name} instruction). The names of all standard languages strings are listed as comments just above the strings in the language files. The language files are located in \L{../Contrib/Language files}{Contrib\\Language Files}. -To create your own langauge strings, use \R{langstring}{LangString}. +To create your own language strings, use \R{langstring}{LangString}. -For an example of an installer with multiple langauges, see \L{../Examples/languages.nsi}{languages.nsi}. +For an example of an installer with multiple languages, see \L{../Examples/languages.nsi}{languages.nsi}. \S1{langselection} Language Selection @@ -66,13 +66,13 @@ \n Get user's default Windows language -\n Find a perfect match for the langauge +\n Find a perfect match for the language \n If there is no perfect match, find a primary language match \n If there is no match, use the first language defined in the script (make sure your first language is a common one like English) -\n If the langauge variable \R{varconstant}{$LANGUAGE} has changed during .onInit, NSIS goes through steps 2 to 4 again. +\n If the language variable \R{varconstant}{$LANGUAGE} has changed during .onInit, NSIS goes through steps 2 to 4 again. \S1{langdll} LangDLL Plug-in @@ -82,4 +82,4 @@ \S1{rtl} RTL Languages -RTL languages are languages that are written from the right to the left (like Arabic and Hebrew). NSIS fully supports RTL languages. In the language file there is a place to specify if the language is RTL or not. To find out on runtime if the the current langauge is RTL or not check the value of the $(^RTL) language string. It will be 1 if the language is RTL and 0 otherwise. This can be useful when using plug-ins that create dialogs, they usually have RTL settings too. +RTL languages are languages that are written from the right to the left (like Arabic and Hebrew). NSIS fully supports RTL languages. In the language file there is a place to specify if the language is RTL or not. To find out at runtime if the current language is RTL or not, check the value of the $(^RTL) language string. It will be 1 if the language is RTL and 0 otherwise. This can be useful when using plug-ins that create dialogs, they usually have RTL settings too. diff -u -r NSIS/Docs/src/pages.but NSIS.FIXED/Docs/src/pages.but --- NSIS/Docs/src/pages.but 2005-06-20 11:03:57.000000000 -0500 +++ NSIS.FIXED/Docs/src/pages.but 2005-09-16 03:18:15.855169600 -0500 @@ -65,7 +65,7 @@ \S{pagecallbacks_explain} Callbacks -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 shown and the leave-function is called right after the user has pressed the next button and before the page is left. +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 shown and the leave-function is called right after the user has pressed the next button and before the page is left. \b The pre-function allows you to skip the page using \R{abort}{Abort}. diff -u -r NSIS/Docs/src/sections.but NSIS.FIXED/Docs/src/sections.but --- NSIS/Docs/src/sections.but 2005-03-22 11:54:12.000000000 -0600 +++ NSIS.FIXED/Docs/src/sections.but 2005-09-16 03:19:26.767136000 -0500 @@ -6,7 +6,7 @@ \b Sections are executed in order by the resulting installer, and if ComponentText is set, the user will have the option of disabling/enabling each visible section. -\b If a section's name is 'Uninstall' or is prefixed with 'un.', then it is a an uninstaller section. +\b If a section's name is 'Uninstall' or is prefixed with 'un.', then it is an uninstaller section. \S1{ssectioncommands} Section Commands diff -u -r NSIS/Docs/src/silent.but NSIS.FIXED/Docs/src/silent.but --- NSIS/Docs/src/silent.but 2005-05-24 15:43:05.000000000 -0500 +++ NSIS.FIXED/Docs/src/silent.but 2005-09-16 03:33:31.391646400 -0500 @@ -1,6 +1,6 @@ \S0{silent} Silent Installers/Uninstallers -Silent installers are installers which require no user intervention and have no user interface. The user doesn't see any dialog and isn't ask any questions. This is useful for network administrators who wish to install or uninstall something without user intervention so they can preform the operation quickly over multiple number of computers. It is also useful for other developers who wish to embed another installer in their own and collect all of the required information on their installer instead of showing two installers. +Silent installers are installers which require no user intervention and have no user interface. The user doesn't see any dialog and isn't asked any questions. This is useful for network administrators who wish to install or uninstall something without user intervention so they can perform the operation quickly over any number of computers. It is also useful for other developers who wish to embed another installer in their own and collect all of the required information on their installer instead of showing two installers. NSIS installers and uninstallers can be both silent and not silent. When an installer or an uninstaller is silent, not all callback functions are called. \R{onguiinit}{.onGUIInit}, \R{onguiend}{.onGUIEnd}, their uninstaller equivalents and any callback related to a specific page or page type will not be called. diff -u -r NSIS/Docs/src/tutorial.but NSIS.FIXED/Docs/src/tutorial.but --- NSIS/Docs/src/tutorial.but 2005-07-29 10:08:32.000000000 -0500 +++ NSIS.FIXED/Docs/src/tutorial.but 2005-09-16 03:14:32.564092800 -0500 @@ -110,7 +110,7 @@ In addition there is a Stack, which can also be used for temporary storage. To access the stack use the commands \R{Push}{Push} and \R{Pop}{Pop}. Push adds a value to the stack, Pop removes one and sets the variable. -For shared code, there are \R{varother}{20 registers avaibable} (like $0 and $R0). These static variables don't have to be declared and you won't get any name conflicts. If you want to use these variables in shared code, store the original values on the stack and restore the original values afterwards. +For shared code, there are \R{varother}{20 registers available} (like $0 and $R0). These static variables don't have to be declared and you won't get any name conflicts. If you want to use these variables in shared code, store the original values on the stack and restore the original values afterwards. After calling the function, the variables contain the same value as before. Note the order when using multiple variables (last-in first-out): diff -u -r NSIS/Docs/src/ui.but NSIS.FIXED/Docs/src/ui.but --- NSIS/Docs/src/ui.but 2005-07-15 05:45:29.000000000 -0500 +++ NSIS.FIXED/Docs/src/ui.but 2005-09-16 03:26:00.403156800 -0500 @@ -4,7 +4,7 @@ Makes the installer window visible and brings it to the top of the window list. If an application was executed that shows itself in front of the installer, a BringToFront would bring the installer back in focus. -Recent Windows versions restrict the setting of foreground windows. If the user is working with another application during installation, the user may be notifed using a different method. +Recent Windows versions restrict the setting of foreground windows. If the user is working with another application during installation, the user may be notified using a different method. \S2{createfont} CreateFont @@ -75,7 +75,7 @@ \c on|off -\e{LockWindow on} makes the main window not to redraw itself upon changes. When \e{LockWindow off} is used, all controls that weren't redrawn since \e{LockWindow on} will be redrawn. This makes the pages flickering look nicer because now it flickers a group of controls at the same time, instead of one control at a time. The individual control flickering is more noticiable on older computers. +\e{LockWindow on} makes the main window not to redraw itself upon changes. When \e{LockWindow off} is used, all controls that weren't redrawn since \e{LockWindow on} will be redrawn. This makes the pages flickering look nicer because now it flickers a group of controls at the same time, instead of one control at a time. The individual control flickering is more noticeable on older computers. \S2{sendmessage} SendMessage @@ -147,7 +147,7 @@ \c hwnd show_state -Sets the visability of a window. Possible show_states are the same as \W{http://msdn.microsoft.com/library/en-us/winui/winui/windowsuserinterface/windowing/windows/windowreference/windowfunctions/showwindow.asp}{Windows ShowWindow} function. SW_* constants are defined in \L{../Include/WinMessages.nsh}{Include\\WinMessages.nsh}. +Sets the visibility of a window. Possible show_states are the same as \W{http://msdn.microsoft.com/library/en-us/winui/winui/windowsuserinterface/windowing/windows/windowreference/windowfunctions/showwindow.asp}{Windows ShowWindow} function. SW_* constants are defined in \L{../Include/WinMessages.nsh}{Include\\WinMessages.nsh}. \c !include WinMessages.nsh \c GetDlgItem $0 $HWNDPARENT 1 diff -u -r NSIS/Docs/src/var.but NSIS.FIXED/Docs/src/var.but --- NSIS/Docs/src/var.but 2005-08-06 11:04:16.000000000 -0500 +++ NSIS.FIXED/Docs/src/var.but 2005-09-16 03:16:44.243438400 -0500 @@ -27,7 +27,7 @@ \e{$0, $1, $2, $3, $4, $5, $6, $7, $8, $9, $R0, $R1, $R2, $R3, $R4, $R5, $R6, $R7, $R8, $R9} -Registers. These variables can be used just like user variables, but are usually used in shared functions or macro's. You don't have to declare these variables, so you won't get any name conflicts when using them in shared code. When using these variables in shared code, it's recommended that you use the stack to save and restore their original values. These variables can also be used for communication with plug-ins, because they can be read and written by the plug-in DLL's. +Registers. These variables can be used just like user variables, but are usually used in shared functions or macros. You don't have to declare these variables, so you won't get any name conflicts when using them in shared code. When using these variables in shared code, it's recommended that you use the stack to save and restore their original values. These variables can also be used for communication with plug-ins, because they can be read and written by the plug-in DLL's. \e{$INSTDIR} diff -u -r NSIS/Examples/StrFunc.nsi NSIS.FIXED/Examples/StrFunc.nsi --- NSIS/Examples/StrFunc.nsi 2004-10-22 18:52:01.000000000 -0500 +++ NSIS.FIXED/Examples/StrFunc.nsi 2005-09-16 04:06:01.615931200 -0500 @@ -224,7 +224,7 @@ StrCmp $0 "example" 0 strsorterror ${StrSort} $0 "This is just an example" " " "le" " " "1" "0" "0" StrCmp $0 " examp" 0 strsorterror - ${StrSort} $0 "an error has occured" " " "e" " " "0" "1" "0" + ${StrSort} $0 "an error has occurred" " " "e" " " "0" "1" "0" StrCmp $0 "error" 0 strsorterror ${StrSort} $0 "" " " "something" " " "0" "1" "0" StrCmp $0 "" 0 strsorterror @@ -240,7 +240,7 @@ StrCmp $0 "This is jst " 0 strsorterror ${StrSort} $0 "This is just an example" " " "just" " " "1" "0" "1" StrCmp $0 " " 0 strsorterror - ${StrSort} $0 "an error has occured" " " "e" "h" "1" "0" "0" + ${StrSort} $0 "an error has occurred" " " "e" "h" "1" "0" "0" StrCmp $0 " rror " 0 strsorterror ${StrSort} $0 "" " " "something" " " "1" "0" "1" StrCmp $0 "" 0 strsorterror @@ -503,7 +503,7 @@ StrCmp $0 "example" 0 strsorterror ${UnStrSort} $0 "This is just an example" " " "le" " " "1" "0" "0" StrCmp $0 " examp" 0 strsorterror - ${UnStrSort} $0 "an error has occured" " " "e" " " "0" "1" "0" + ${UnStrSort} $0 "an error has occurred" " " "e" " " "0" "1" "0" StrCmp $0 "error" 0 strsorterror ${UnStrSort} $0 "" " " "something" " " "0" "1" "0" StrCmp $0 "" 0 strsorterror @@ -519,7 +519,7 @@ StrCmp $0 "This is jst " 0 strsorterror ${UnStrSort} $0 "This is just an example" " " "just" " " "1" "0" "1" StrCmp $0 " " 0 strsorterror - ${UnStrSort} $0 "an error has occured" " " "e" "h" "1" "0" "0" + ${UnStrSort} $0 "an error has occurred" " " "e" "h" "1" "0" "0" StrCmp $0 " rror " 0 strsorterror ${UnStrSort} $0 "" " " "something" " " "1" "0" "1" StrCmp $0 "" 0 strsorterror diff -u -r NSIS/Include/StrFunc.txt NSIS.FIXED/Include/StrFunc.txt --- NSIS/Include/StrFunc.txt 2004-10-22 18:52:01.000000000 -0500 +++ NSIS.FIXED/Include/StrFunc.txt 2005-09-16 04:03:17.199512000 -0500 @@ -40,17 +40,17 @@ 2. Defines ---------- - This header file contains defines that automatizes the life of some who - fear of a lot of changes sometimes imposed in this header file or who have + This header file contains defines that automate the life of some who + fear a lot of changes sometimes imposed in this header file, or who have applications that put it to work at maximum capacity. Before you try - these, give a look on the information below: + these, take a look at the information below: - Every item on a define value is separated by a "|", and every subitem (items in an item) is separated by " ". - Use ${StrTok} $var "${DefineName}" "|" "$counter" "0" to get every item inside the define. For subitems, use ${StrTok} $var2 "$var" " " - "$counter2" "0" after getting the value for a desidered item. + "$counter2" "0" after getting the value for a desired item. - ${StrFunc_List} is automatically made by the header file. The rest is manually added to the header. @@ -70,7 +70,7 @@ - Output - Needs a variable to output a function result. - - Text - Needs text or number to be inputed. + - Text - Needs text or number to be input. - Mixed - Needs text, number or option to be inputed. Each subitem following the "Mixed" word is an @@ -315,7 +315,7 @@ Result Value -> ResultVar: - "String" with all occurences of "StringToReplace" replaced with + "String" with all occurrences of "StringToReplace" replaced with "ReplacementString". Example: @@ -452,8 +452,8 @@ including the original execution. Default is "0" (1 code execution). CaseSensitive(0|1) - If "1" the search will be case-sensitive (diferenciates between cases). - If "0" it is case-insensitive (does not diferenciate between cases). + If "1" the search will be case-sensitive (differentiates between cases). + If "0" it is case-insensitive (does not differentiate between cases). Default is "0" (Case-Insensitive). @@ -612,7 +612,7 @@ functions commands like ${UnStrStr} to be supported by uninstall functions and sections. - Added case-sensitive comparation option for StrStrAdv. -- StrCase now uses System.dll which makes case convertions effective with +- StrCase now uses System.dll which makes case conversions effective with all latin letters (i.e. ê). - Added switch case and original case for StrCase. - StrClbSet and StrClbGet removed, added StrClb. diff -u -r NSIS/Scripts/release.py NSIS.FIXED/Scripts/release.py --- NSIS/Scripts/release.py 2005-09-08 14:17:18.000000000 -0500 +++ NSIS.FIXED/Scripts/release.py 2005-09-16 04:06:50.416102400 -0500 @@ -93,7 +93,7 @@ open('release.log', 'a').write(msg + '\n') def exit(log_dir = '.'): - log('\nerror occured, exiting', log_dir) + log('\nerror occurred, exiting', log_dir) def run(command, log_name, err, wanted_ret = 0, log_dir = '.'): log('running %s' % command, log_dir) diff -u -r NSIS/Source/mmap.cpp NSIS.FIXED/Source/mmap.cpp --- NSIS/Source/mmap.cpp 2004-10-02 10:17:00.000000000 -0500 +++ NSIS.FIXED/Source/mmap.cpp 2005-09-16 04:07:31.344955200 -0500 @@ -189,7 +189,7 @@ } } - m_hFileDesc = -1; // some error occured, bail + m_hFileDesc = -1; // some error occurred, bail #endif #ifdef _WIN32