From 161e81c2f505301db021c7fae32e9ac3546059bc Mon Sep 17 00:00:00 2001 From: anders_k Date: Mon, 11 Feb 2019 17:45:47 +0000 Subject: [PATCH] Minor documentation fixes git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7081 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/System/System.html | 4 ++-- Docs/src/attributes.but | 2 +- Docs/src/misc.but | 2 +- Include/WinVer.nsh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Contrib/System/System.html b/Contrib/System/System.html index aa0d3b2e..baa6b4d0 100644 --- a/Contrib/System/System.html +++ b/Contrib/System/System.html @@ -187,7 +187,7 @@ DetailPrint $4

PARAMS, RETURN and OPTIONS can be repeated many times in one Get/Call line. When repeating, a lot can be omitted, and only what you wish to change can be used. Type, source and/or destination can be omitted for each parameter, even the return value. Options can be added or removed. This allows you to define function prototypes and save on some typing. The last two examples show this.

-

PROC can also be repeated but must be prefixed with a hash sign (`#') except if the hash sign is preceded by a double colon (shell32::#18).

+

PROC can also be repeated but it must be prefixed with a hash sign (`#') except if the hash sign is preceded by a double colon (shell32::#18) in which case it is interpreted as a function ordinal.

Possible PROC Values and Meanings

@@ -617,7 +617,7 @@ System::Call "${MB}(,'another message',,) i.r0" MessageBox MB_OK "last call returned $0" 
-System::Call "user32::SendMessage(p $HWNDPARENT, t 'test', t 'test', p 0) p.s ? \
+System::Call "user32::SendMessage(p $HWNDPARENT, t 'test', t 'test', p 0) p.s ? \
 	e (,t'test replacement',,) i.r0 ? !e #user32::MessageBox"
 DetailPrint $0
 ClearErrors
diff --git a/Docs/src/attributes.but b/Docs/src/attributes.but
index eac5e351..a0c28ac0 100644
--- a/Docs/src/attributes.but
+++ b/Docs/src/attributes.but
@@ -331,7 +331,7 @@ Specifies the output file that the MakeNSIS should write the installer to. This
 
 \c [/OVERWRITE|/REPLACE] file restype resname [reslang]
 
-Adds \cw{file} as a resource to the installer and uninstaller. \cw{restype} specifies the resource type and can be any string or # followed by a standard type or number. \cw{resname} must be # followed by a number. \cw{reslang} is optional and specifies the language id of the resource. Replacing standard NSIS resource are not supported, you should use \R{aicon}{Icon} and \R{achangeui}{ChangeUI} instead.
+Adds \cw{file} as a resource to the installer and uninstaller. \cw{restype} specifies the resource type and can be any string or # followed by a standard type or number. \cw{resname} must be # followed by a number. \cw{reslang} is optional and specifies the language id of the resource. Replacing standard NSIS resource is not supported, you should use \R{aicon}{Icon} and \R{achangeui}{ChangeUI} instead.
 
 \c PEAddResource "myimage.bmp" "#2" "#1337"
 \c PEAddResource "mybonus.ico" "#Icon" "#200"
diff --git a/Docs/src/misc.but b/Docs/src/misc.but
index da449c21..3cdc8fe5 100644
--- a/Docs/src/misc.but
+++ b/Docs/src/misc.but
@@ -83,7 +83,7 @@ Note that, if used in installer code, this will only affect the installer, and i
 
 \c sleeptime_in_ms
 
-Pauses execution in the installer for sleeptime_in_ms milliseconds. sleeptime_in_ms can be a variable, e.g. "$0" or a number, i.e. "666".
+Pauses execution in the installer for sleeptime_in_ms milliseconds. sleeptime_in_ms can be a variable, e.g. "$0" or a number, i.e. "4321".
 
 \c DetailPrint "sleeping..."
 \c Sleep 3000
diff --git a/Include/WinVer.nsh b/Include/WinVer.nsh
index ff22bedd..a6bd650c 100644
--- a/Include/WinVer.nsh
+++ b/Include/WinVer.nsh
@@ -81,7 +81,7 @@
 ;   check if running on the NT family.
 ;
 ;     ${If} ${AtLeastWin95}
-;     ${And} ${AtMostWinME}
+;     ${AndIf} ${AtMostWinME}
 ;       DetailPrint "Running 95, 98 or ME."
 ;       DetailPrint "Actually, maybe it's NT4?"
 ;       ${If} ${IsNT}