Misc version adjustments

Author: dyemanov

builds/install/arch-specific/linux/README

@@ -1,4 +1,4 @@
-Firebird 3 Server for Linux
+Firebird 4 Server for Linux
 
 
 More information can be found about the Firebird 

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -382,7 +382,7 @@ for /R %FB_OUTPUT_DIR%\doc %%v in (.) do (
 :: This requires WiX 3.0 to be installed
 ::============
 :: This is only relevent if we are shipping packages built with Visual Studio 2010 (MSVC10)
-:: for Firebird 3.0 there are no plans to ship oficial builds with other MSVC runtimes. But we could.
+:: for Firebird 3.0 there are no plans to ship official builds with other MSVC runtimes. But we could.
 if %MSVC_VERSION% EQU 10 (
 if not exist %FB_OUTPUT_DIR%\system32\vccrt%MSVC_VERSION%_%FB_TARGET_PLATFORM%.msi (
     "%WIX%\bin\candle.exe" -v -sw1091 %FB_ROOT_PATH%\builds\win32\msvc%MSVC_VERSION%\VCCRT_%FB_TARGET_PLATFORM%.wxs -out %FB_GEN_DIR%\vccrt_%FB_TARGET_PLATFORM%.wixobj

builds/install/arch-specific/win32/FirebirdInstall_30.iss renamed to builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -666,8 +666,7 @@ begin
   { Create a page to grab the new SYSDBA password }
   AdminUserPage := CreateInputQueryPage(wpSelectTasks,
       'Create a password for the Database System Administrator'
-    , 'Or click through to use the default password of ''masterkey''. ' +  #13#10
-     ' *** Note - in Firebird 3 masterkey and masterke are different passwords. ***'
+    , 'Or click through to use the default password of ''masterkey''. '
     , ''
     );
   AdminUserPage.Add('SYSDBA Name:', False);

builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt

@@ -1,5 +1,5 @@
-Firebird Database Server $MAJOR.$MINOR.$RELEASE (Release Candidate 2)
-========================================================
+Firebird Database Server $MAJOR.$MINOR.$RELEASE
+===============================================
 
 Ovaj dokument je vodic za instalaciju ovog paketa
 Firebird-a $MAJOR.$MINOR za Windows platformu. Ovaj tekst
@@ -21,7 +21,7 @@ Sadrzaj
 o Prije instalacije
 o Deployment gds32.dll
 o Instalacija Guardian-a
-o Re-instalacija Firebird-a 3
+o Re-instalacija Firebird-a
 o Poznati problemi u vezi s instalacijom
 o Deinstalacija
 o Instalacija batch datotekom
@@ -37,8 +37,8 @@ fbclient.dll i gds32.dll uklonjeni iz <system32>.
 Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
 
 Ako ste instalirali beta ili alpha verziju 
-firebird-a 3, instalacija ce preimenovati firebid.conf i
-security3.fdb jer ove datoteke vise nisu kompatibilne.
+firebird-a, instalacija ce preimenovati firebird.conf i
+security4.fdb jer ove datoteke vise nisu kompatibilne.
 
 
 Deployment gds32.dll
@@ -64,12 +64,12 @@ SuperServer ili SuperClassic, onda je ponudjen
 ali nije izabran po default-u.
 
 
-Re-instalacija Firebird-a 3
------------------------------
+Re-instalacija Firebird-a
+-------------------------
 
 Instalacioni program radi sve sto moze da detektuje i 
 sacuva prethodnu instalaciju. Ako instalacija detektuje 
-firebird.conf ili security3.fdb onda nece ponuditi 
+firebird.conf ili security4.fdb onda nece ponuditi 
 opciju da instalira legacy_auth. Niti ce ponuditi 
 opciju da postavi SYSDBA username i password.
 
@@ -127,7 +127,7 @@ o Deinstalacija ostavlja 5 datoteka u install
   - firebird.conf
   - fbtrace.conf
   - firebird.log
-  - security3.fdb
+  - security4.fdb
 
   Ovo je uradjeno namjerno. Ove datoteke su sve
   potencijalno modifikovane od strane korisnika i mogu

builds/install/arch-specific/win32/fr/installation_lisezmoi.txt

@@ -28,7 +28,7 @@ Contenu
 o Avant l'installation
 o Déployement de gds32.dll
 o Installation du Guardian
-o Réinstallation de Firebird 3
+o Réinstallation de Firebird
 o Problèmes connus d'installation
 o Desinstallation
 o Installation depuis un fichier batch
@@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
 fbclient.dll et gds32.dll ont été retirés de <system32>.
 
 Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR,
-l'installeur va renommer firebird.conf et security3.fdb, car ces
+l'installeur va renommer firebird.conf et security4.fdb, car ces
 fichiers ne sont plus compatibles avec la version actuelle.
 
 
@@ -131,7 +131,7 @@ o La désinstallation laisse cinq fichiers dans le
   - firebird.conf
   - fbtrace.conf
   - firebird.log
-  - security3.fdb
+  - security4.fdb
 
   Ceci est intentionnel. Ces fichiers sont tous
   potentiellement modifiables par les utilisateurs et peuvent

builds/install/arch-specific/win32/i18n_readme.txt

@@ -40,9 +40,8 @@ an existing translation. The steps to follow are these:
 o The Win32 install files are located in install\arch-specific\win32.
   This sub-directory is located as follows:
 
-    Firebird 1.5  - firebird2\src
-    Firebird 2.n  - firebird2\builds
-    Firebird 3.n  - firebird2\builds
+    Firebird 1.5  			- firebird2\src
+    Firebird 2.n and newer  - firebird2\builds
 
 o You can use a tool such as TortoiseSVN to checkout the Win32 install 
   kit. Just open the SVN checkout dialogue and enter something similar 

builds/install/arch-specific/win32/installation_readme.txt

@@ -1,5 +1,5 @@
-Firebird Database Server $MAJOR.$MINOR.$RELEASE (Release Candidate 2)
-========================================================
+Firebird Database Server $MAJOR.$MINOR.$RELEASE
+===============================================
 
 
 This document is a guide to installing this package of
@@ -10,9 +10,9 @@ primarily aimed at users of the binary installer.
 
 It is assumed that readers of this document are already
 familiar with Firebird. If you are evaluating Firebird $MAJOR.$MINOR
-as part of a migration from Firebird 2.5 you are advised to
-review the Firebird $MAJOR.$MINOR documentation to understand
-the changes made between 2.5 and $MAJOR.$MINOR.
+as part of a migration from some older Firebird version you are advised
+to review the Firebird $MAJOR.$MINOR documentation to understand
+the changes made between your version and $MAJOR.$MINOR.
 
 
 Contents
@@ -37,7 +37,7 @@ fbclient.dll and gds32.dll are removed from <system32>.
 See the UNINSTALL section below for more info on this.
 
 If you have installed a beta or alpha version of Firebird $MAJOR.$MINOR
-the installer will rename firebird.conf and security3.fdb as
+the installer will rename firebird.conf and security4.fdb as
 these files are no longer compatible.
 
 
@@ -64,12 +64,12 @@ chosen. If SuperServer or SuperClassic are chosen
 it is offered but not selected by default.
 
 
-Re-installation of Firebird 3
------------------------------
+Re-installation of Firebird
+---------------------------
 
 The binary installer does its best to detect and 
 preserve a previous install. If the installer detects 
-firebird.conf or security3.fdb it will not offer the 
+firebird.conf or security4.fdb it will not offer the 
 option to install legacy_auth. Neither will it offer 
 the option to set the SYSDBA username and password.
 
@@ -129,7 +129,7 @@ o Uninstallation leaves five files in the install
   - firebird.conf
   - fbtrace.conf
   - firebird.log
-  - security3.fdb
+  - security4.fdb
 
   This is intentional. These files are all
   potentially modifiable by users and may be required

builds/install/arch-specific/win32/installation_scripted.txt

@@ -175,7 +175,7 @@ Parameters specific to Firebird uninstalls
     firebird.conf
     databases.conf
     firebird.log
-    security3.fdb
+    security4.fdb
 	fbtrace.conf
 
   The assumption is that these files will be useful to users

builds/install/arch-specific/win32/ru/installation_readme.txt

@@ -9,10 +9,10 @@
 
 Предполагается, что читатели данного документа уже
 знакомы с Firebird. Если же вы знакомитесь
-с Firebird $MAJOR.$MINOR в процессе миграции с версии 
-2.5, то рекомендуем вам обратиться к документации по 
-версии $MAJOR.$MINOR с целью ознакомиться с основными 
-отличиями между версиями 2.5 и $MAJOR.$MINOR.
+с Firebird $MAJOR.$MINOR в процессе миграции с 
+предыдущей версии, то рекомендуем вам обратиться к документации 
+по версии $MAJOR.$MINOR с целью ознакомиться с основными 
+отличиями между вашей версией и $MAJOR.$MINOR.
 
 
 Содержание
@@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла
 каталога <system32>.
 
 Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR,
-то программа установки переименует файлы firebird.conf и security3.fdb
+то программа установки переименует файлы firebird.conf и security4.fdb
 из-за их несовместимости с устанавливаемой версией.
 
 
@@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе.
 
 Программа установки пытается обнаружить и сохранить ранее установленную
 версию Firebird. Если программа установки обнаруживает файлы firebird.conf
-или security3.fdb, то некоторые настройки авторизации могут быть недоступны,    
+или security4.fdb, то некоторые настройки авторизации могут быть недоступны,    
 в частности возможность установить пароль пользователя SYSDBA.
 
 
@@ -123,7 +123,7 @@ o Деинсталлятор оставляет четыре файла в ка
   - firebird.conf
   - fbtrace.conf
   - firebird.log
-  - security3.fdb
+  - security4.fdb
 
   Это происходит намеренно. Эти файлы потенциально
   могут быть изменены пользователем и могут

builds/posix/make.defaults

@@ -194,14 +194,6 @@ SHRLIB_FOREIGN_EXT=	$(SHRLIB_EXT)
 # Include file with version variable definitions
 
 include $(ROOT)/gen/Make.Version
-#MajorVer = 2
-#MinorVer = 5
-#RevNo = 0
-#BuildNum = 28678
-#BuildType = T
-#BuildSuffix = Firebird 3.0 Unstable
-#PackageVersion = Unstable
-#FirebirdVersion = 2.5.0
 
 # Add windows dll to library patterns