Merge branch 'main' into openqasm_documentation

cirq-google/cirq_google/devices/grid_device.py

@@ -430,7 +430,7 @@ class GridDevice(cirq.Device):
 
     For Google devices, the
     [DeviceSpecification proto](
-        https://github.com/quantumlib/Cirq/blob/master/cirq-google/cirq_google/api/v2/device.proto
+        https://github.com/quantumlib/Cirq/blob/main/cirq-google/cirq_google/api/v2/device.proto
     )
     is the main specification for device information surfaced by the Quantum Computing Service.
     Thus, this class should typically be instantiated using a `DeviceSpecification` proto via the

cirq-web/README.rst

@@ -1,4 +1,4 @@
-.. image:: https://raw.githubusercontent.com/quantumlib/Cirq/master/docs/images/Cirq_logo_color.png
+.. image:: https://raw.githubusercontent.com/quantumlib/Cirq/main/docs/images/Cirq_logo_color.png
   :target: https://github.com/quantumlib/cirq
   :alt: Cirq
   :width: 500px

dev_tools/conf/.pylintrc

@@ -1,4 +1,4 @@
-[MASTER]
+[MAIN]
 load-plugins=pylint.extensions.docstyle,pylint.extensions.docparams,pylint_copyright_checker
 max-line-length=100
 disable=all

dev_tools/triage-party/README.md

@@ -5,7 +5,7 @@ See the [triaging process](../../docs/dev/triage.md)
 # Configuration 
 
 For the dashboard you will have to edit the embedded YAML config in [configmap.yaml](kubernetes/02_deployment/configmap.yaml).
-Please refer to the [triage party docs](https://github.com/google/triage-party/blob/master/docs/config.md) for configuration details.
+Please refer to the [triage party docs](https://github.com/google/triage-party/blob/main/docs/config.md) for configuration details.
 
 ## Secret 
 

docs/google/engine.md

@@ -2,7 +2,7 @@
 
 Google's Quantum Computing Service provides the Quantum Engine API to execute
 circuits on Google's quantum processor or simulator backends and
-to access or manage the jobs, programs, reservations and calibrations. As of Cirq is
+to access or manage the jobs, programs, reservations and calibrations. Cirq is
 the only supported client for this API, using the `cirq_google.Engine` class.
 For other use cases (e.g. from a different language), contact
 [[email protected]](mailto:[email protected])
@@ -13,7 +13,7 @@ Note: the Quantum Engine API is not yet open for public access.
 ## Authenticating to Google Cloud
 
 Before you begin, you will need to create a Google Cloud project with the API
-enabled and billing enabled.  You will then to create credentials in order to
+enabled and billing enabled.  You will then need to create credentials in order to
 access the API.
 
 You can create application default credentials from the command line using the

release.md

@@ -58,7 +58,7 @@ We use github's release system for creating releases.  Release are listed
 [on the Cirq release page](https://github.com/quantumlib/Cirq/releases).
 
 Our development process uses the `main` branch for development.
-Master will always use the next unreleased minor version with the suffix
+Main will always use the next unreleased minor version with the suffix
 of ".dev".  When a release is performed, the ".dev" will be removed and tagged
 in a release branch with a version tag (vX.X.X).  Then, main will be updated
 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}"
 git push origin "version_bump_${NEXT_VER}"
 ```
 
-Master branch should never see a non-dev version specifier.
+The main branch should never see a non-dev version specifier.
 
 ### Create distribution wheel