Updated documentation

Author: RMerl

Changelog.txt

@@ -1,6 +1,39 @@
 Asuswrt-Merlin Changelog
 ========================
 
+380.70 (xx-xxx-xxxx)
+  - NOTE: This will be the final 380.xx release for
+          all models.  The RT-N66U and RT-AC66U
+          support will be dropped, and all other
+          models have been migrated to the new gen
+          branch, as of release 384.4.
+
+          People who wish to keep getting updates for
+          these two older models should look at the
+          john9527 fork: https://bit.ly/2EV5Oat
+
+  - CHANGED: Tightened security around some config files.
+  - CHANGED: Samba protocol support can now be set to
+             SMBv1, SMBv2, or SMBv1 + SMBv2 (the new default).
+             This will result in a performance drop on all
+             models, but will be more secure.
+             Ideally, people should change it to SMBv2 only,
+             and then reboot all their client devices to start
+             using only the new protocol.
+             If performance is more important than security to
+             you, then you can switch it back to SMBv1, which is
+             the old default behaviour.
+  - CHANGED: Switched to the new Entware repo for armv7 models.
+             To upgrade, run the following commands TWICE:
+
+             opkg update; opkg upgrade
+
+  - FIXED: Apply button not working on the OpenVPN
+           Client page.
+  - FIXED: Potential racing condition that could lead to two
+           instances of miniupnpd running at boot time.
+
+
 380.69_2 (28-Jan-2018)
   - NOTE: The official IRC channel has moved to
           Freenode (#asuswrt).

README-merlin.txt

@@ -33,11 +33,10 @@ 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)
 
-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.
-Development will gradually be abandoned for the legacy branch.
+The legacy 380.xx branch is no longer being actively developed.  
+Support for the RT-N66U and RT-AC66U is being dropped, as 
+these models will not be available on the new generation code base.
+
 
 
 Devices supported on the legacy branch (380.xx):
@@ -57,10 +56,13 @@ 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-AC68P, RT-AC68UF (including HW revision C1 and E1)
+ * RT-AC1900 & RT-AC1900P (use the RT-AC68U firmware)
+ * RT-AC87U
+ * RT-AC3200
  * RT-AC88U
  * RT-AC3100
+ * RT-AC5300
  * RT-AC86U
- * RT-AC1900 & RT-AC1900P (use the RT-AC68U firmware)
 
 No longer supported:
  * RT-N16
@@ -87,7 +89,7 @@ System:
    - Ability to turn off router LEDs
    - Entware easy setup script (alternative to Optware - the two are 
      mutually exclusive) (unavailable on RT-AC86U)
-   - SNMP support (based on experimental code from Asus)
+   - SNMP support (except for the RT-AC86U)
    - Nano text editor (for more user-friendly script editing)
 
 
@@ -110,7 +112,6 @@ Networking:
    - Support for new OpenVPN 2.4 features like NCP and LZ4
    - Netfilter ipset module, for efficient blacklist implementation
    - Configurable min/max UPNP ports
-   - IPSec kernel support (N66/AC66 only)
    - DNS-based Filtering, can be applied globally or per client
    - Custom DDNS (through a user script)
    - TOR support, individual client control (based on experimental code