diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-06-25 10:51:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 10:51:46 -0700 |
| commit | bc4c74517a261e2eb80a1829877d4ad3b29763d2 (patch) | |
| tree | 7d7a8ef4b545448846142631ab6c3ead3acfc176 /README.rst | |
| parent | 07eb7d653cad9e1381dce4ab544b9bd0012b3a4b (diff) | |
| parent | 66d031fc1890381cbdf14b1abce3436bc7d23abb (diff) | |
Merge pull request #3034 from jepler/terminology-cleanup6.0.0-alpha.0
M/S Terminology cleanup
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/README.rst b/README.rst index dfddd1337..347b8b8c6 100644 --- a/README.rst +++ b/README.rst @@ -55,12 +55,12 @@ Contributing ------------ See -`CONTRIBUTING.md <https://github.com/adafruit/circuitpython/blob/master/CONTRIBUTING.md>`__ +`CONTRIBUTING.md <https://github.com/adafruit/circuitpython/blob/main/CONTRIBUTING.md>`__ for full guidelines but please be aware that by contributing to this project you are agreeing to the `Code of -Conduct <https://github.com/adafruit/circuitpython/blob/master/CODE_OF_CONDUCT.md>`__. +Conduct <https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md>`__. Contributors who follow the `Code of -Conduct <https://github.com/adafruit/circuitpython/blob/master/CODE_OF_CONDUCT.md>`__ +Conduct <https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md>`__ are welcome to submit pull requests and they will be promptly reviewed by project admins. Please join the `Discord <https://adafru.it/discord>`__ too. @@ -96,7 +96,6 @@ CircuitPython: - Supports native USB on all boards, allowing file editing without special tools. - Supports only SAMD21, SAMD51, nRF52840, CXD56, STM32F4 and i.MX RT ports. -- Tracks MicroPython's releases (not master). - Floats (aka decimals) are enabled for all builds. - Error messages are translated into 10+ languages. - Does not support concurrency within Python (including interrupts and threading). Some concurrency @@ -211,8 +210,8 @@ The remaining port directories not listed above are in the repo to maintain comp `back to top <#circuitpython>`__ -.. |Build Status| image:: https://travis-ci.com/adafruit/circuitpython.svg?branch=master - :target: https://travis-ci.org/adafruit/circuitpython +.. |Build Status| image:: https://github.com/adafruit/circuitpython/workflows/Build%20CI/badge.svg + :target: https://github.com/adafruit/circuitpython/actions?query=branch%3Amain .. |Doc Status| image:: https://readthedocs.org/projects/circuitpython/badge/?version=latest :target: http://circuitpython.readthedocs.io/ .. |Discord| image:: https://img.shields.io/discord/327254708534116352.svg |