diff --git a/Contrib/AdvSplash/advsplash.txt b/Contrib/AdvSplash/advsplash.txt index 92f333f6..b574bb43 100644 --- a/Contrib/AdvSplash/advsplash.txt +++ b/Contrib/AdvSplash/advsplash.txt @@ -14,7 +14,7 @@ Function .onInit File /oname=spltmp.bmp "my_splash.bmp" ; optional -; File /oname=spltmp.wav "my_splashshit.wav" +; File /oname=spltmp.wav "my_splashsound.wav" advsplash::show 1000 600 400 -1 $TEMP\spltmp diff --git a/Contrib/ExDLL/exdll.c b/Contrib/ExDLL/exdll.c index 44de5ced..3cd640ff 100644 --- a/Contrib/ExDLL/exdll.c +++ b/Contrib/ExDLL/exdll.c @@ -18,9 +18,9 @@ void __declspec(dllexport) myFunction(HWND hwndParent, int string_size, // note if you want parameters from the stack, pop them off in order. - // i.e. if you are called via exdll::myFunction file.dat poop.dat + // i.e. if you are called via exdll::myFunction file.dat read.txt // calling popstring() the first time would give you file.dat, - // and the second time would give you poop.dat. + // and the second time would give you read.txt. // you should empty the stack of your parameters, and ONLY your // parameters. diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index d204ccb3..799a01c0 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -1465,7 +1465,7 @@ void WINAPI showCfgDlg() } // we don't save settings on cancel since that means your installer will likely - // quit soon, which means the ini might get flushed late and cause crap. :) anwyay. + // quit soon, which means the ini might get flushed late and cause delete issues? if (!g_is_cancel) SaveSettings(); SetWindowLongPtr(hMainWindow,DWLP_DLGPROC,(LONG_PTR)lpWndProcOld); diff --git a/Contrib/InstallOptions/test.ini b/Contrib/InstallOptions/test.ini index b51497c8..ce70eb1d 100644 --- a/Contrib/InstallOptions/test.ini +++ b/Contrib/InstallOptions/test.ini @@ -41,12 +41,12 @@ Flags=NOTABSTOP [Field 5] Type=FileRequest -State=C:\poop.poop +State=C:\dummy.xyz Left=10 Right=-10 Top=56 Bottom=68 -Filter=Poop Files|*.poop|All files|*.* +Filter=XYZ Files|*.xyz|All files|*.* Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY [Field 6] diff --git a/Contrib/InstallOptions/testnotify.ini b/Contrib/InstallOptions/testnotify.ini index 56d9231d..a0c45b39 100644 --- a/Contrib/InstallOptions/testnotify.ini +++ b/Contrib/InstallOptions/testnotify.ini @@ -41,8 +41,8 @@ Bottom=51 [Field 5] Type=FileRequest Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY -State=C:\poop.poop -Filter=Poop Files|*.poop|All files|*.* +State=C:\dummy.xyz +Filter=XYZ Files|*.xyz|All files|*.* Left=10 Right=-10 Top=56 diff --git a/Contrib/Math/Math.txt b/Contrib/Math/Math.txt index e304b343..f351f75a 100644 --- a/Contrib/Math/Math.txt +++ b/Contrib/Math/Math.txt @@ -16,7 +16,7 @@ How to use it? Simple: Strcpy $0 "Brainsucker" Math::Script "a = 'Math'; B = 'Script'; r0 += ' wants to use ' + a + '::' + b +'!'" DetailPrint "$0" -That string will fill r0 with some shit. +That string will fill r0 with some stuff. Here are some other samples: 10! (factorial, r0 will contain '10! = 362880'): @@ -103,7 +103,7 @@ other. All sub-expressions separated by (;) are the part of one expression, and the result of the last one of these sub-exprs gives you the result of expression. -All the shit (like variables and functions) will be saved between calls. +All the stuff (like variables and functions) will be saved between calls. Functions: type conversions: diff --git a/Contrib/Splash/splash.txt b/Contrib/Splash/splash.txt index e69e073f..44fc0e9d 100644 --- a/Contrib/Splash/splash.txt +++ b/Contrib/Splash/splash.txt @@ -15,7 +15,7 @@ Function .onInit File /oname=spltmp.bmp "my_splash.bmp" ; optional -; File /oname=spltmp.wav "my_splashshit.wav" +; File /oname=spltmp.wav "my_splashsound.wav" splash::show 1000 $TEMP\spltmp diff --git a/Docs/src/attributes.but b/Docs/src/attributes.but index c45d11cf..e4654f26 100644 --- a/Docs/src/attributes.but +++ b/Docs/src/attributes.but @@ -215,7 +215,7 @@ Sets the default installation directory. See the \R{variables}{variables section \c root_key subkey key_name -This attribute tells the installer to check a string in the registry, and use it for the install dir if that string is valid. If this attribute is present, it will override the \R{ainstalldir}{InstallDir} attribute if the registry key is valid, otherwise it will fall back to the \R{ainstalldir}{InstallDir} default. When querying the registry, this command will automatically remove any quotes. If the string ends in ".exe", it will automatically remove the filename component of the string (i.e. if the string is "C:\\program files\\poop\\poop.exe", it will know to use "C:\\program files\\poop"). For more advanced install directory configuration, set $INSTDIR in .onInit. +This attribute tells the installer to check a string in the registry, and use it for the install dir if that string is valid. If this attribute is present, it will override the \R{ainstalldir}{InstallDir} attribute if the registry key is valid, otherwise it will fall back to the \R{ainstalldir}{InstallDir} default. When querying the registry, this command will automatically remove any quotes. If the string ends in ".exe", it will automatically remove the filename component of the string (i.e. if the string is "C:\\Program Files\\Foo\\app.exe", it will know to use "C:\\Program Files\\Foo"). For more advanced install directory configuration, set $INSTDIR in .onInit. Language strings and variables cannot be used with \R{ainstalldirregkey}{InstallDirRegKey}.