From 11a69288dd891a1645c23d989aa3f85a41e48421 Mon Sep 17 00:00:00 2001
From: Pey Lian Lim <2090236+pllim@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:37:31 -0500
Subject: [PATCH 1/2] MNT: Replace master with main

---
 .github/workflows/publish.yml | 2 +-
 docs/astrowidgets/index.rst   | 6 +++---
 docs/conf.py                  | 2 +-
 docs/install.rst              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2e20ae1..adff192 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -31,7 +31,7 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@main
       with:
         user: __token__
         password: ${{ secrets.PYPI_TOKEN }}
diff --git a/docs/astrowidgets/index.rst b/docs/astrowidgets/index.rst
index e76cd3e..1c8bc64 100644
--- a/docs/astrowidgets/index.rst
+++ b/docs/astrowidgets/index.rst
@@ -63,8 +63,8 @@ A more detailed description of the interface and the :ref:`api-docs` are availab
 Example Notebooks
 -----------------
 
-* `astrowidgets using the Ginga backend <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/ginga_widget.ipynb>`_
-* `Using named markers to keep track of logically related markers <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/named_markers.ipynb>`_
-* `Demonstration of GUI interactions <https://github.com/astropy/astrowidgets/blob/master/example_notebooks/gui_interactions.ipynb>`_
+* `astrowidgets using the Ginga backend <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/ginga_widget.ipynb>`_
+* `Using named markers to keep track of logically related markers <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/named_markers.ipynb>`_
+* `Demonstration of GUI interactions <https://github.com/astropy/astrowidgets/blob/main/example_notebooks/gui_interactions.ipynb>`_
 
 
diff --git a/docs/conf.py b/docs/conf.py
index 306c630..e5c6b1f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -151,7 +151,7 @@
 #     if versionmod.version.release:
 #         edit_on_github_branch = "v" + versionmod.version.version
 #     else:
-#         edit_on_github_branch = "master"
+#         edit_on_github_branch = "main"
 
 #     edit_on_github_source_root = ""
 #     edit_on_github_doc_root = "docs"
diff --git a/docs/install.rst b/docs/install.rst
index a119e49..2a251e4 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -62,7 +62,7 @@ should be sufficient unless stated otherwise.
 Using OpenCV
 ------------
 
-If you wish to use `OpenCV <https://docs.opencv.org/master/index.html>`_ to handle the
+If you wish to use `OpenCV <https://docs.opencv.org/main/index.html>`_ to handle the
 drawing in Ginga, you have two options:
 
 Install OpenCV with pip

From 0ad2b4fcd3418cbc0e9803a9455a7f44f7ad6d3d Mon Sep 17 00:00:00 2001
From: Pey Lian Lim <2090236+pllim@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:39:55 -0500
Subject: [PATCH 2/2] Revert out-of-scope change.

Update tag for publish action.
---
 .github/workflows/publish.yml | 2 +-
 docs/install.rst              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index adff192..49bf698 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -31,7 +31,7 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@main
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_TOKEN }}
diff --git a/docs/install.rst b/docs/install.rst
index 2a251e4..a119e49 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -62,7 +62,7 @@ should be sufficient unless stated otherwise.
 Using OpenCV
 ------------
 
-If you wish to use `OpenCV <https://docs.opencv.org/main/index.html>`_ to handle the
+If you wish to use `OpenCV <https://docs.opencv.org/master/index.html>`_ to handle the
 drawing in Ginga, you have two options:
 
 Install OpenCV with pip