Refer to "main" branch of circuitpython

This commit is contained in:
Jeff Epler 2020-06-14 14:25:58 -05:00 committed by Jeff Epler
parent 07eb7d653c
commit ce95b9379d
5 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
# Contributing # Contributing
Please note that this project is released with a Please note that this project is released with a
[Contributor Code of Conduct](https://github.com/adafruit/circuitpython/blob/master/CODE_OF_CONDUCT.md). [Contributor Code of Conduct](https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md).
By participating in this project you agree to abide by its terms. Participation By participating in this project you agree to abide by its terms. Participation
covers any forum used to converse about CircuitPython including unofficial and official spaces. Failure to do covers any forum used to converse about CircuitPython including unofficial and official spaces. Failure to do
so will result in corrective actions such as time out or ban from the project. so will result in corrective actions such as time out or ban from the project.

View File

@ -55,12 +55,12 @@ Contributing
------------ ------------
See 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 for full guidelines but please be aware that by contributing to this
project you are agreeing to the `Code of 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 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 are welcome to submit pull requests and they will be promptly reviewed
by project admins. Please join the by project admins. Please join the
`Discord <https://adafru.it/discord>`__ too. `Discord <https://adafru.it/discord>`__ too.

View File

@ -5,7 +5,7 @@ The latest documentation can be found at:
http://circuitpython.readthedocs.io/en/latest/ http://circuitpython.readthedocs.io/en/latest/
The documentation you see there is generated from the files in the whole tree: The documentation you see there is generated from the files in the whole tree:
https://github.com/adafruit/circuitpython/tree/master https://github.com/adafruit/circuitpython/tree/main
Building the documentation locally Building the documentation locally
---------------------------------- ----------------------------------

View File

@ -3,7 +3,7 @@ Design Guide
This guide covers a variety of development practices for CircuitPython core and library APIs. These This guide covers a variety of development practices for CircuitPython core and library APIs. These
APIs are both `built-into CircuitPython APIs are both `built-into CircuitPython
<https://github.com/adafruit/circuitpython/tree/master/shared-bindings>`_ and those that are <https://github.com/adafruit/circuitpython/tree/main/shared-bindings>`_ and those that are
`distributed on GitHub <https://github.com/search?utf8=%E2%9C%93&q=topic%3Acircuitpython&type=>`_ `distributed on GitHub <https://github.com/search?utf8=%E2%9C%93&q=topic%3Acircuitpython&type=>`_
and in the `Adafruit <https://github.com/adafruit/Adafruit_CircuitPython_Bundle>`_ and `Community and in the `Adafruit <https://github.com/adafruit/Adafruit_CircuitPython_Bundle>`_ and `Community
<https://github.com/adafruit/CircuitPython_Community_Bundle/>`_ bundles. Consistency with these <https://github.com/adafruit/CircuitPython_Community_Bundle/>`_ bundles. Consistency with these

View File

@ -90,9 +90,9 @@ else
last_rev="v1.0" last_rev="v1.0"
fi fi
# get a list of hashes between last revision (exclusive) and master # get a list of hashes between last revision (exclusive) and main
hashes=$(git log --format=format:"%H" --reverse ${last_rev}..master) hashes=$(git log --format=format:"%H" --reverse ${last_rev}..main)
#hashes=$(git log --format=format:"%H" --reverse ${last_rev}..master | $AWK '{if (NR % 10 == 0) print $0}') # do every 10th one #hashes=$(git log --format=format:"%H" --reverse ${last_rev}..main | $AWK '{if (NR % 10 == 0) print $0}') # do every 10th one
for hash in $hashes; do for hash in $hashes; do
@ -182,6 +182,6 @@ EOF
done done
# checkout master and cleanup # checkout main and cleanup
git checkout master git checkout main
$RM $pystoneavg $RM $pystoneavg