Skip to content

Commit e446d74

Browse files
authored
Replace references to "master" branch with "main" (#6888)
Not all cases can be replaced; some refer to repositories where the main branch is still called master. This changes all the ones that I could find and that can be done.
1 parent 686766f commit e446d74

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

cirq-google/cirq_google/devices/grid_device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ class GridDevice(cirq.Device):
430430
431431
For Google devices, the
432432
[DeviceSpecification proto](
433-
https://github.com/quantumlib/Cirq/blob/master/cirq-google/cirq_google/api/v2/device.proto
433+
https://github.com/quantumlib/Cirq/blob/main/cirq-google/cirq_google/api/v2/device.proto
434434
)
435435
is the main specification for device information surfaced by the Quantum Computing Service.
436436
Thus, this class should typically be instantiated using a `DeviceSpecification` proto via the

cirq-web/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. image:: https://raw.githubusercontent.com/quantumlib/Cirq/master/docs/images/Cirq_logo_color.png
1+
.. image:: https://raw.githubusercontent.com/quantumlib/Cirq/main/docs/images/Cirq_logo_color.png
22
:target: https://github.com/quantumlib/cirq
33
:alt: Cirq
44
:width: 500px

dev_tools/conf/.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[MASTER]
1+
[MAIN]
22
load-plugins=pylint.extensions.docstyle,pylint.extensions.docparams,pylint_copyright_checker
33
max-line-length=100
44
disable=all

dev_tools/triage-party/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ See the [triaging process](../../docs/dev/triage.md)
55
# Configuration
66

77
For the dashboard you will have to edit the embedded YAML config in [configmap.yaml](kubernetes/02_deployment/configmap.yaml).
8-
Please refer to the [triage party docs](https://github.com/google/triage-party/blob/master/docs/config.md) for configuration details.
8+
Please refer to the [triage party docs](https://github.com/google/triage-party/blob/main/docs/config.md) for configuration details.
99

1010
## Secret
1111

release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ We use github's release system for creating releases. Release are listed
5858
[on the Cirq release page](https://github.com/quantumlib/Cirq/releases).
5959

6060
Our development process uses the `main` branch for development.
61-
Master will always use the next unreleased minor version with the suffix
61+
Main will always use the next unreleased minor version with the suffix
6262
of ".dev". When a release is performed, the ".dev" will be removed and tagged
6363
in a release branch with a version tag (vX.X.X). Then, main will be updated
6464
to the next minor version. This can always be found in the
@@ -158,7 +158,7 @@ git commit -m "Bump cirq version to ${NEXT_VER}"
158158
git push origin "version_bump_${NEXT_VER}"
159159
```
160160

161-
Master branch should never see a non-dev version specifier.
161+
The main branch should never see a non-dev version specifier.
162162

163163
### Create distribution wheel
164164

0 commit comments

Comments
 (0)