Upgrade version number to 3.6.0

Also reorganize CHANGES file to respect historic sequence
notes.html is more oriented towards the average end user than CHANGES

CHANGES

@@ -8,36 +8,31 @@ most recent build should be at the top of this file.
 
 Thanks!
 
+3.6.0
+-----
+### ! 3.6 versions require OS X 10.11 (El Capitan) or later !
+- Universal build (support Apple Silicon processors as well as Intel processors) through Xcode 12.2
+- Refactor constants to be usable by Swift code
+- Tweak DirectoryMonitor code
+- Fix a warning
+- Change configuration of handling of stale Github issues
+
 3.6.0 Beta 5
 ------------
 - Silence some warnings
 - Remove unused code
 - Add GitHub workflow for testing
 
-3.6.0 Beta 4
-------------
-- Update to Xcode 12
-
-3.6.0 Beta 3
-------------
-- Configure Github configuration to close abandoned issues
-
-3.6.0 Beta 2
-------------
-- Replace deprecated methods
-
-3.6.0 Beta 1
-------------
-### ! For OS X 10.11 (El Capitan) or later only !
-- Lift deployment target to macOS 10.11 & start modernizing code
-- Replaced MASPreferences with Storyboard implementation (Preferences window)
-
 3.5.10
 ------
 - Fix application crashing on display of certain URLs (bug introduced by version 3.5.9) 
 - Fix a crash when both expansion tooltip and progress animation were triggered
 - Fix an annoyance with tooltip obscuring contextual menu in article list or folder list
 
+3.6.0 Beta 4
+------------
+- Update to Xcode 12
+
 3.5.9
 -----
 - Add toolbar icon for deleting articles
@@ -50,6 +45,10 @@ Thanks!
 - Update to MMTabBarView v/1.4.9
 - Fix running individual Xcode tests
 
+3.6.0 Beta 3
+------------
+- Configure Github configuration to close abandoned issues
+
 3.5.8
 -----
 - Fix crash related to macOS Big Sur Beta
@@ -61,6 +60,10 @@ Thanks!
 - Fix resetting of article pane when no article is selected anymore and "Use Web Pages for Articles" is enabled
 - Fix Vienna Tests target
 
+3.6.0 Beta 2
+------------
+- Replace deprecated methods
+
 3.5.7
 -----
 - Fix file being hidden at end of "Download image"
@@ -71,6 +74,12 @@ Thanks!
 - Increase to 1000 the limit of articles fetched at once from an Open Reader feed
 - Update Sparkle to v1.23.0 and MMTabBarView to v/1.4.7
 
+3.6.0 Beta 1
+------------
+### ! 3.6.x versions are for OS X 10.11 (El Capitan) or later only !
+- Lift deployment target to macOS 10.11 & start modernizing code
+- Replaced MASPreferences with Storyboard implementation (Preferences window)
+
 3.5.6
 -----
 - Vienna is now notarized (needed by macOS Catalina and later)

notes.html

@@ -108,45 +108,20 @@
 
 <h1 id="toc_0">Version Notes</h1>
 
-<h2 id="toc_1">3.6.0 Beta 5</h2>
+<h2 id="toc_1">3.6.0</h2>
 
-<ul>
-<li>Silence some warnings</li>
-<li>Remove unused code</li>
-<li>Add GitHub workflow for testing</li>
-</ul>
-
-<h2 id="toc_2">3.6.0 Beta 4</h2>
+<h3 id="toc_2">! 3.6 versions require OS X 10.11 (El Capitan) or later !</h3>
 
 <ul>
-<li>Update to Xcode 12</li>
-</ul>
-
-<h2 id="toc_3">3.6.0 Beta 3</h2>
-
-<ul>
-<li>Configure Github configuration to close abandoned issues</li>
-</ul>
-
-<h2 id="toc_4">3.6.0 Beta 2</h2>
-
-<ul>
-<li>Replace deprecated methods</li>
-</ul>
-
-<h2 id="toc_5">3.6.0 Beta 1</h2>
-
-<ul>
-<li>Lift deployment target to macOS 10.11 &amp; start modernizing code</li>
-<li>Replaced MASPreferences with Storyboard implementation (Preferences window)</li>
-</ul>
-
-<h2 id="toc_6">3.5.10</h2>
+<li>Universal build (support Apple Silicon processors as well as Intel processors) through Xcode 12.2</li>
+<li>Revamp Preferences window (use Storyboard implementation)</li>
+<li>Modernize code:
 
 <ul>
-<li>Fix application crashing on display of certain URLs (bug introduced by version 3.5.9) </li>
-<li>Fix a crash when both expansion tooltip and progress animation were triggered</li>
-<li>Fix an annoyance with tooltip obscuring contextual menu in article list or folder list</li>
+<li>remove deprecated methods</li>
+<li>improve coexistence of Swift and Objective-C</li>
+<li>improve development workflows</li>
+</ul></li>
 </ul>