瀏覽代碼

Update README to reflect new repository

Richard Wackerbarth 9 年之前
父節點
當前提交
aa1d38613a
共有 1 個檔案被更改,包括 9 行新增5 行删除
  1. 9
    5
      README.md

+ 9
- 5
README.md 查看文件

@@ -3,22 +3,26 @@
3 3
 
4 4
  Documentation has moved to [marlinfirmware.org](http://www.marlinfirmware.org).
5 5
 
6
-## Development Branch
6
+## Development Only
7 7
 
8 8
 __Not for production use – use with caution!__
9 9
 
10
-The Development branch contains the most up-to-date Marlin code. When reporting any issues, please check to see if they are resolved in this branch first. But let us know if issues exist in tagged releases so that we can document and patch them.
10
+The [dev branch](https://github.com/MarlinFirmware/MarlinDev/tree/dev) contains the most up-to-date Marlin code. When reporting any issues, please check to see if they are resolved in this branch first. But let us know if issues exist in tagged releases so that we can document and patch them.
11 11
 
12
-There is now also an ["Integration" branch](https://github.com/MarlinFirmware/Marlin/tree/Integration) which will be used in development to migrate changes for wider testing from the Development branch on their way to Release. It's a nascent branch, so for now please rely on Development and Release for issues and features under most active discussion.
12
+## Testing
13
+The [RC branch](https://github.com/MarlinFirmware/MarlinDev/tree/RC) will contain the latest pre-release candidate.
13 14
 
14
-For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release branch](https://github.com/MarlinFirmware/Marlin/tree/Release).
15
+## Submitting Patches
16
+Development patches should be submitted as a Pull Request against the [master](https://github.com/MarlinFirmware/MarlinDev/tree/master) branch
17
+ 
18
+For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release Repository](https://github.com/MarlinFirmware/Marlin).
15 19
 
16 20
 ## Current Status: Bug Fixing
17 21
 
18 22
 Marlin development is being accelerated to catch up with a long list of issues. Check the Issues and Pull Requests links on the right to to see what we are currently working on.
19 23
 
20 24
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224)
21
-[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin)
25
+[![Travis Build Status](https://travis-ci.org/MarlinFirmware/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev)
22 26
 
23 27
 ##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
24 28
 

Loading…
取消
儲存