Updated documentation

Author: RMerl

Changelog.txt

@@ -1,6 +1,23 @@
 Asuswrt-Merlin Changelog
 ========================
 
+380.69_2 (28-Jan-2018)
+  - NOTE: The official IRC channel has moved to
+          Freenode (#asuswrt).
+
+  - CHANGED: Quantenna watchdog is less likely now to
+             incorrectly assume the QTN CPU has crashed
+             (which can lead to router reboots). (RT-AC87U)
+  - FIXED: IE11 field validation issues on OpenVPN and
+           DHCP pages.
+  - FIXED: Router crash when importing an OpenVPN certificate
+           longer than 3499 characters (the supported limit)
+  - FIXED: Users were allowed to enter invalid characters on
+           some of the OpenVPN client page fields.
+  - FIXED: CVE-2018-5999 in httpd (backport from 384_10007)
+  - FIXED: CVE-2018-5721 in httpd (Merlin & theMIROn)
+
+
 380.69 (11-Dec-2017)
   - NEW: Added option to disable the Asus NAT tunnel service under
          Other Settings -> Tweak.  Not quite sure what this

README-merlin.txt

@@ -24,21 +24,23 @@ This more conservative approach will also help ensuring the highest
 level of stability possible.  Priority is given to stability over 
 performance, and performance over features.
 
+
+
+Supported Devices
+-----------------
 Asuswrt-Merlin is available in two separate branches:
 
 - The original (legacy) Asuswrt-Merlin (up to version 380.xxx)
 - The new generation (current) branch (version 382.xxx and newer)
 
-
-Supported Devices
------------------
 Each branch supports different models.  As Asus upgrades models
-to the new 382/384 code base, they will gradually be migrated to 
-Asuswrt-Merlin's new gen branch, with the exception of the 
-RT-N66U and RT-AC66U which will remain on the legacy 380 branch.
+to the new 382/384 code base, they will gradually be migrated to
+Asuswrt-Merlin's new gen branch, with the exception of the RT-N66U
+and RT-AC66U which will remain on the legacy 380 branch.
+Development will gradually be abandoned for the legacy branch.
 
 
-Supported devices on version 380:
+Devices supported on the legacy branch (380.xx):
  * RT-N66U
  * RT-AC66U
  * RT-AC66U_B1 (use the RT-AC68U firmware)
@@ -51,13 +53,14 @@ Supported devices on version 380:
  * RT-AC5300
  * RT-AC1900 & RT-AC1900P (use the RT-AC68U firmware)
 
-Supported devices on version 382 and newer:
+Devices supported on the new generation/current branch (382.xx and newer):
+ * RT-AC66U_B1 (use the RT-AC68U firmware)
  * RT-AC56U
- * RT-AC68U
- * RT-AC3200
+ * RT-AC68U, RT-AC68P, RT-AC68UF (including HW revision C1 and E1)
  * RT-AC88U
  * RT-AC3100
  * RT-AC86U
+ * RT-AC1900 & RT-AC1900P (use the RT-AC68U firmware)
 
 No longer supported:
  * RT-N16