Preparing for the 4.0.0 release.

8 files changed, 25 insertions, 20 deletions

diff --git a/cocoa/ScintillaFramework/Info.plist b/cocoa/ScintillaFramework/Info.plist
index 9e2be308c..6c0ddb5b3 100644
--- a/cocoa/ScintillaFramework/Info.plist
+++ b/cocoa/ScintillaFramework/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.5</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.7.5</string>
+	<string>4.0.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/doc/ScintillaDownload.html b/doc/ScintillaDownload.html
index 10172e74e..818a45717 100644
--- a/doc/ScintillaDownload.html
+++ b/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="http://www.scintilla.org/scintilla375.zip">
+          <font size="4"> <a href="http://www.scintilla.org/scintilla400.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="http://www.scintilla.org/scintilla375.tgz">
+	<a href="http://www.scintilla.org/scintilla400.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 3.7.5
+       Release 4.0.0
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="http://www.scintilla.org/scintilla375.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="http://www.scintilla.org/scintilla375.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="http://www.scintilla.org/scintilla400.zip">zip format</a> (1600K) commonly used on Windows</li>
+       <li><a href="http://www.scintilla.org/scintilla400.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 0a718c637..b006b9b00 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -527,7 +527,7 @@
     </h3>
     <ul>
 	<li>
-	Released 26 July 2017.
+	Released 15 August 2017.
 	</li>
 	<li>
 	Uses C++14 features. Requires Microsoft Visual C++ 2017, GCC 7, and Clang 4.0 or newer.
diff --git a/doc/index.html b/doc/index.html
index f8efe4df1..4d7e2cbe6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20170526" />
+    <meta name="Date.Modified" content="20170815" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 3.7.5<br />
-           Site last modified May 26 2017</font>
+          <font color="#FFCC99" size="3"> Release version 4.0.0<br />
+           Site last modified August 15 2017</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,14 +72,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.0.0 is an unstable major release with changes to some internal and external interfaces.</li>
+      <li>Version 3.7.6 was a minor long term release.</li>
       <li>Version 3.7.5 adds a Reverse Selected Lines command.
       MSVC 2013 is no longer supported.</li>
       <li>Version 3.7.4 restores performance on GTK+.
       C++11 now required to build and Windows NT 4 is no longer supported.</li>
-      <li>Version 3.7.3 fixes problems with GTK+ on Wayland.</li>
-      <li>Version 3.7.2 fixes some crashes on GTK+ and Cocoa, commonly at destruction.</li>
-      <li>Version 3.7.1 supports accessibility on GTK+ and Cocoa.
-      The Scintilla namespace is not exposed in Scintilla.h and some deprecated APIs were removed.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="http://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
@@ -114,6 +112,13 @@ if (!IsRemote()) { //if NOT remote...
        colours and multiple fonts.
     </p>
     <p>
+       Current development occurs on the default branch as 4.0.x which is unstable - interfaces may change before being
+       declared stable in a future 4.1.0. 4.* requires a recent C++ compiler that supports C++14 and some of C++17.
+    </p>
+    <p>
+       For projects that need to work with older systems, a LongTerm3 branch is available which uses only features from C++11.
+    </p>
+    <p>
        <a href="http://www.scintilla.org/SciTE.html">SciTE</a> is a SCIntilla based Text Editor. Originally built to
       demonstrate Scintilla, it has grown to be a generally useful editor with facilities for
       building and running programs. It is best used for jobs with simple configurations - I use it
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 651b4fed3..0fef53cd2 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++14
 
-VERSION = 3.7.5
+VERSION = 4.0.0
 
 win32 {
         QMAKE_CXXFLAGS += -std:c++latest
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 26dba021f..d56290859 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++14
 
-VERSION = 3.7.5
+VERSION = 4.0.0
 
 win32 {
         QMAKE_CXXFLAGS += -std:c++latest
diff --git a/version.txt b/version.txt
index d9061d95d..d411bb7c1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-375
+400
diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc
index a4648f4b1..e0b186588 100644
--- a/win32/ScintRes.rc
+++ b/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "3.7.5"
-#define VERSION_WORDS 3, 7, 5, 0
+#define VERSION_SCINTILLA "4.0.0"
+#define VERSION_WORDS 4, 0, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS