From 547b40d6b59c438a10ec60cbb13c54f11f138edc Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 29 Jan 2004 19:34:32 +0000
Subject: [PATCH] fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3433 212acab6-be3b-0410-9dea-997c60f758d6
---
 Docs/src/defines.but | 16 ++++++++--------
 Docs/src/pages.but   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Docs/src/defines.but b/Docs/src/defines.but
index 328f1b02..41ebe092 100644
--- a/Docs/src/defines.but
+++ b/Docs/src/defines.but
@@ -14,6 +14,12 @@ Define/conditional compilation related commands:
 
 This command will add 'gflag' to the global define list. This will have a similar effect as using the /D switch on the command line (only the define only becomes effective after the !define command).
 
+\S1{undef} !undef
+
+\c gflag
+
+Removes an item from the global define list. Note that $\{SYMBOL\} where SYMBOL is undefined will be translated to "$\{SYMBOL\}".
+
 \S1{ifdef} !ifdef
 
 \c gflag [bcheck [gflag [...]]]
@@ -24,7 +30,7 @@ This command, when paired with an !endif command, will tell the compiler whether
 
 \c gflag [bcheck [gflag [...]]]
 
-The opposite of !ifmacrodef. The lines will be compiled when the gflag has not been defined.
+The opposite of !ifdef. The lines will be compiled when the gflag has not been defined.
 
 \S1{ifmacrodef} !ifmacrodef
 
@@ -42,7 +48,7 @@ The opposite of !ifmacrodef. The lines will be compiled when the macro gflag doe
 
 \c [ifdef|ifndef|ifmacrodef|ifmacrondef [...]]
 
-This command is the opposite of !ifdef (If 'gflag' is not globally defined, the lines contained will be compiled). Note that when using boolean operators (& or |), 'gflag' is treated as true if it is undefined. e.g. '!ifndef X | Y' means "if either X or Y is undefined" and '!ifndef X & Y' means "if X and Y are both undefined".
+This command allows to easily insert different code when different defines or macros are set. You can create blocks like !ifdef/!else/!endif, !ifdef/!else ifdef/!else/!endif etc.
 
 \S1{endif} !endif
 
@@ -63,9 +69,3 @@ Creates a macro named 'macro_name'. All lines between the !macro and the !macroe
 \S1{macroend} !macroend
 
 Ends a macro that was started with !macro.
-
-\S1{undef} !undef
-
-\c gflag
-
-Removes an item from the global define list. Note that $\{SYMBOL\} where SYMBOL is undefined will be translated to "$\{SYMBOL\}".
\ No newline at end of file
diff --git a/Docs/src/pages.but b/Docs/src/pages.but
index f9ae842a..9ace2a86 100644
--- a/Docs/src/pages.but
+++ b/Docs/src/pages.but
@@ -80,13 +80,13 @@ Examples:
 \c  Page instfiles
 \c
 \c  Function skipLicense
-\c    MessageBox MB_YES "Do you want to skip the license page?" IDNO no
+\c    MessageBox MB_YESNO "Do you want to skip the license page?" IDNO no
 \c      Abort
 \c    no:
 \c  FunctionEnd
 \c
 \c  Function stayInLicense
-\c    MessageBox MB_YES "Do you want to stay in the license page?" IDNO no
+\c    MessageBox MB_YESNO "Do you want to stay in the license page?" IDNO no
 \c      Abort
 \c    no:
 \c  FunctionEnd