Skip to content

Commit b828c09

Browse files
committed
Updated documentation
1 parent d43f358 commit b828c09

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

README-merlin.txt

+18-15
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@ performance, and performance over features.
2626

2727
Asuswrt-Merlin is available in two separate branches:
2828

29-
- The original Asuswrt-Merlin (up to version 380.xxx)
30-
- The new branch (version 382.xxx and newer)
29+
- The original (legacy) Asuswrt-Merlin (up to version 380.xxx)
30+
- The new generation (current) branch (version 382.xxx and newer)
3131

3232

3333
Supported Devices
3434
-----------------
3535
Each branch supports different models. As Asus upgrades models
36-
to the new 382_xxxx code base, Asuswrt-Merlin will also migrate
37-
them to the new branch.
36+
to the new 382/384 code base, they will gradually be migrated to
37+
Asuswrt-Merlin's new gen branch, with the exception of the
38+
RT-N66U and RT-AC66U which will remain on the legacy 380 branch.
3839

3940

4041
Supported devices on version 380:
@@ -50,13 +51,15 @@ Supported devices on version 380:
5051
* RT-AC5300
5152
* RT-AC1900 & RT-AC1900P (use the RT-AC68U firmware)
5253

53-
Supported devices on version 382:
54-
* RT-AC86U
54+
Supported devices on version 382 and newer:
55+
* RT-AC56U
5556
* RT-AC68U
57+
* RT-AC3200
5658
* RT-AC88U
5759
* RT-AC3100
60+
* RT-AC86U
5861

59-
Devices that are no longer supported:
62+
No longer supported:
6063
* RT-N16
6164

6265

@@ -87,7 +90,6 @@ System:
8790

8891
Disk sharing:
8992
- Enable/disable the use of shorter share names
90-
- Disk spindown after user-configurable inactivity timeout
9193
- NFS sharing (through webui)
9294
- Allow or disable WAN access to the FTP server
9395
- Updated Samba version (3.6), with SMB2.0 support
@@ -152,6 +154,7 @@ integrated/enabled/re-implemented in the official firmware:
152154
- SSHD
153155
- Improved compatibility with 3TB+ and Advanced Format HDDs
154156
- Display the Ethernet port states
157+
- Disk spindown after user-configurable inactivity timeout
155158

156159

157160

@@ -197,13 +200,13 @@ https://github.com/RMerl/asuswrt-merlin/wiki
197200

198201
Source code
199202
-----------
200-
The buildable source code can be found on Github.
203+
The source code can be found on Github.
201204

202-
Original branch:
205+
Original legacy branch:
203206
https://github.com/RMerl/asuswrt-merlin
204207

205-
New 382 branch:
206-
https://github.com/RMerl/asuswrt-merlin.382
208+
New generation/current branch (382.xx and newer):
209+
https://github.com/RMerl/asuswrt-merlin.ng
207210

208211

209212
Contact information
@@ -213,7 +216,7 @@ Website: https://asuswrt.lostrealm.ca/
213216
Github: https://github.com/RMerl
214217
215218
Twitter: https://twitter.com/RMerlinDev
216-
IRC: #asuswrt on DALnet
219+
IRC: #asuswrt on Freenode
217220
Download: https://asuswrt.lostrealm.ca/download
218221

219222
Development news will be posted on Twitter and the support forums.
@@ -266,8 +269,8 @@ of Good Will.
266269
Concerning privacy:
267270

268271
The only call back made by this firmware to me is when it checks for the
269-
availability of a new version, which can be disabled if desired. More info
270-
on the Wiki:
272+
availability of a new version. The automated check can be disabled if desired.
273+
More info on the Wiki:
271274

272275
https://github.com/RMerl/asuswrt-merlin/wiki/RMerl/asuswrt-merlin/wiki/Privacy-disclosure
273276

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ asuswrt-merlin
33

44
Notes
55
-----
6-
This is the legacy 380.xx branch - future development is being gradually moved to the new 382 branch:
6+
This is the legacy 380.xx branch - future development is being gradually moved to the new NG (New Generation) branch:
77

8-
[https://github.com/RMerl/asuswrt-merlin.382](https://github.com/RMerl/asuswrt-merlin.382)
8+
[https://github.com/RMerl/asuswrt-merlin.ng](https://github.com/RMerl/asuswrt-merlin.ng)
99

1010

1111
#### Please do not use Github's Issue tracker for support requests. Use the support forums at [SNBForums](https://www.snbforums.com/forums/asuswrt-merlin.42/) instead. The issue tracker is for development/bug tracking purposes only!

0 commit comments

Comments
 (0)