From 9689c5a5b781f25e3d6dac8849d053c9a3b8903d Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 18 Mar 2020 21:27:58 +0000 Subject: [PATCH] Fixed MULTIUSER_INSTALLMODE_FUNCTION and minor typos git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7159 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Readme.html | 2 +- Contrib/Modern UI/Readme.html | 2 +- Contrib/MultiUser/MultiUser.nsh | 2 +- Contrib/MultiUser/Readme.html | 2 +- Docs/src/basic.but | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Contrib/Modern UI 2/Readme.html b/Contrib/Modern UI 2/Readme.html index 77cc0efd..fcfa07d2 100644 --- a/Contrib/Modern UI 2/Readme.html +++ b/Contrib/Modern UI 2/Readme.html @@ -1034,7 +1034,7 @@ LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle" Function CustomPageFunction !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE) ... -FuctionEnd +FunctionEnd

diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index ce601a6a..1dddbe69 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -1026,7 +1026,7 @@ LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle" Function CustomPageFunction !insertmacro MUI_HEADER_TEXT $(PAGE_TITLE) $(PAGE_SUBTITLE) !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioFile.ini" -FuctionEnd +FunctionEnd

diff --git a/Contrib/MultiUser/MultiUser.nsh b/Contrib/MultiUser/MultiUser.nsh index cc55ea00..01738267 100644 --- a/Contrib/MultiUser/MultiUser.nsh +++ b/Contrib/MultiUser/MultiUser.nsh @@ -188,7 +188,7 @@ Installer/uninstaller initialization !macro MULTIUSER_INIT_QUIT UNINSTALLER_FUNCPREFIX !ifdef MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT - Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUCTIONQUIT} + Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT}" !else Quit !endif diff --git a/Contrib/MultiUser/Readme.html b/Contrib/MultiUser/Readme.html index 8ce6de48..586c2ce0 100644 --- a/Contrib/MultiUser/Readme.html +++ b/Contrib/MultiUser/Readme.html @@ -365,7 +365,7 @@ FunctionEnd MULTIUSER_INSTALLMODE_UNFUNCTION - A custom fuction to be called during the initialization of the installation mode + A custom function to be called during the initialization of the installation mode to set additional installer settings that depend on the mode diff --git a/Docs/src/basic.but b/Docs/src/basic.but index 98c1671b..c17268fb 100644 --- a/Docs/src/basic.but +++ b/Docs/src/basic.but @@ -40,7 +40,7 @@ Execute the specified program using ShellExecuteEx. Note that action is usually \c [/INVOKEIDLIST] action command [parameters] [SW_SHOWDEFAULT | SW_SHOWNORMAL | SW_SHOWMAXIMIZED | SW_SHOWMINIMIZED | SW_HIDE] -Execute the specified program using ExecShell and wait for executed process to quit. It will only wait for executable files and not other file types nor URLs. +Execute the specified program using ExecShell and wait for executed process to quit. It will only wait for executable files, not other file types nor URLs. \S2{execwait} ExecWait