From fe9063708c49f4c65b8b007c3d056307d91d6c9c Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 9 Feb 2003 14:11:10 +0000 Subject: [PATCH] Some fixes, typos, and additions git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2136 212acab6-be3b-0410-9dea-997c60f758d6 --- Docs/src/attributes.but | 2 +- Docs/src/file.but | 2 +- Docs/src/flowcontrol.but | 2 +- Docs/src/generalpurpose.but | 4 ++-- Docs/src/misc.but | 2 +- Docs/src/var.but | 6 ++---- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Docs/src/attributes.but b/Docs/src/attributes.but index ca74a60c..af4fca24 100644 --- a/Docs/src/attributes.but +++ b/Docs/src/attributes.but @@ -190,7 +190,7 @@ Sets the name of the installer. The name is usually simply the product name such \c path_to_icon.ico -Sets the icon of the installer. Every icon in the icon file will be included in the installer. Note that if you use different icons for installer and uninstaller the file size and structure of the icons has to match otherwise the built of the installer will fail. +Sets the icon of the installer. Every icon in the icon file will be included in the installer. Note that if you use different icons for installer and uninstaller the file size and structure of the icons has to match otherwise the build of your installer will fail. \S2{aoutfile} OutFile diff --git a/Docs/src/file.but b/Docs/src/file.but index 1f4f27b6..7c79e093 100644 --- a/Docs/src/file.but +++ b/Docs/src/file.but @@ -40,7 +40,7 @@ Writes a string to a file opened with FileOpen. If an error occurs writing, the \c handle string -Writes the integer interpretation of 'string' to a file opened with FileOpen. Of course you can enter the integer value directly. The following code writes an "Carriage Return / Line Feed" - Enter to the file. +Writes the integer interpretation of 'string' to a file opened with FileOpen. Of course you can enter the integer value directly. The following code writes a "Carriage Return / Line Feed" - Enter to the file. \c FileWriteByte file_handle "13" \c FileWriteByte file_handle "10" diff --git a/Docs/src/flowcontrol.but b/Docs/src/flowcontrol.but index 7ac71ba8..3c842423 100644 --- a/Docs/src/flowcontrol.but +++ b/Docs/src/flowcontrol.but @@ -42,7 +42,7 @@ If label is specified, goto the label 'label_to_jump_to:'. If +offset or -offset is specified, jump is relative by offset instructions. Goto +1 goes to the next instruction, Goto -1 goes to the previous instruction, etc. -If a user variable is specified, jumps to absolute address (generally you will want to get this value from a function like GetLabelAddress. Compiler flag commands and SectionIn aren't instructions so jumping over them has no effect. +If a user variable is specified, jumps to absolute address (generally you will want to get this value from a function like GetLabelAddress). Compiler flag commands and SectionIn aren't instructions so jumping over them has no effect. \S2{iferrors} IfErrors diff --git a/Docs/src/generalpurpose.but b/Docs/src/generalpurpose.but index 1f4b5286..0d10fe8b 100644 --- a/Docs/src/generalpurpose.but +++ b/Docs/src/generalpurpose.but @@ -33,9 +33,9 @@ The error flag is set if the shortcut cannot be created (i.e. the path does not \c filename user_var(high dword output) user_var(low dword output) -Gets the version information from the DLL in "filename". Sets the user output variables with the high and low dwords of version information on success; on failure the outputs are empty and the error flag is set. The following example reads the DLLVersion and makes it readable. +Gets the version information from the DLL (or any other executable containing version information) in "filename". Sets the user output variables with the high and low dwords of version information on success; on failure the outputs are empty and the error flag is set. The following example reads the DLL version and copies a human readable version of it into $0: -\c GetDllVersion "$EXEDIR\ScummVM.exe" $R0 $R1 +\c GetDllVersion "$INSTDIR\MyDLL.dll" $R0 $R1 \c IntOp $R2 $R0 / 0x00010000 \c IntOp $R3 $R0 & 0x0000FFFF \c IntOp $R4 $R1 / 0x00010000 diff --git a/Docs/src/misc.but b/Docs/src/misc.but index 2b3d03db..b6b838f9 100644 --- a/Docs/src/misc.but +++ b/Docs/src/misc.but @@ -8,7 +8,7 @@ Initializes the plugins dir ($PLUGINSDIR, see \k{var2}) if not initialized alrea \c \\current\\|all -Sets the context of $SMPROGRAMS and other shell folders. If set to 'current' (the default), the current user's shell folders are used. If set to 'all', the 'all users' shell folder is used. The all users folder may not be supported on all OSes. If the all users folder is not found, the current user folder will be used. Please take into consideration that a "normal user" has no rights to write in the all users area. Only admins have full access rights to the all users area. You can check this by using the isadmin.dll Plugin. You can download it in the \W{http://nsis.sourceforge.net/archive/}{NSIS Archiv}. +Sets the context of $SMPROGRAMS and other shell folders. If set to 'current' (the default), the current user's shell folders are used. If set to 'all', the 'all users' shell folder is used. The all users folder may not be supported on all OSes. If the all users folder is not found, the current user folder will be used. Please take into consideration that a "normal user" has no rights to write in the all users area. Only admins have full access rights to the all users area. You can check this by using the UserInfo Plugin. See Contrib\\UserInfo\\UserInfo.nsi for an example. \S2{sleep} Sleep diff --git a/Docs/src/var.but b/Docs/src/var.but index 8334c782..e25ca95f 100644 --- a/Docs/src/var.but +++ b/Docs/src/var.but @@ -22,9 +22,7 @@ The command line of the installer. The format of the command line can be one of \b installer.exe PARAMETER PARAMETER PARAMETER -\b For parsing out the PARAMETER portion, see GetParameters on the utility functions page. It's worth noting that if /D= is specified on the command line (to override the install directory), it won't be in $CMDLINE. - -If you want to deal with parameters you should take a look at the GetParameters Function (See \k{getparameters}). +\b For parsing out the PARAMETER portion, see GetParameters on the useful functions appendix (See \k{getparameters}). It's worth noting that if /D= is specified on the command line (to override the install directory), it won't be in $CMDLINE. \e{$LANGUAGE} @@ -105,7 +103,7 @@ Where SYMBOL is the name of something globally defined, this will be replaced wi \c Name "Test Program ${VERSION}" \c !define VERSION "V.1.0" -This code will set the name of the installer to "Test Program ${VERSION}". The Same happens if the Symbol has not been defined. +This code will set the name of the installer to "Test Program $\{VERSION\}". The Same happens if the Symbol has not been defined. \c !define VERSION "V.1.0" \c Name "Test Program ${VERSION}"