Skip to content

Commit

Permalink
Update documentation to use main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
niccokunzmann committed Jun 20, 2024
1 parent b0d8e54 commit 6181f3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Changelog
Minor changes:

- Test that all code works with both ``pytz`` and ``zoneinfo``.
- Rename ``master`` branch to ``main``, see `Issue
<https://github.com/collective/icalendar/issues/627>`_

Breaking changes:

Expand Down
12 changes: 6 additions & 6 deletions docs/maintenance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ However, only people with ``PyPI environment access for GitHub Actions`` can app

.. code-block:: bash
git checkout master
git checkout main
git pull
git checkout -b release master
git checkout -b release main
git add CHANGES.rst src/icalendar/__init__.py docs/install.rst
git commit -m"version 5.0.0"
Expand All @@ -90,7 +90,7 @@ However, only people with ``PyPI environment access for GitHub Actions`` can app

.. code-block:: bash
git checkout master
git checkout main
git pull
git branch -d release
git push -d origin release
Expand All @@ -99,7 +99,7 @@ However, only people with ``PyPI environment access for GitHub Actions`` can app

.. code-block:: bash
git checkout master
git checkout main
git pull
git tag v5.0.0
git push upstream v5.0.0 # could be origin or whatever reference
Expand Down Expand Up @@ -137,13 +137,13 @@ However, only people with ``PyPI environment access for GitHub Actions`` can app

.. code-block:: bash
git checkout master
git checkout main
git pull
git add CHANGES.rst
git commit -m"Add new CHANGELOG section for future release
See https://icalendar.readthedocs.io/en/latest/maintenance.html#new-releases"
git push upstream master # could be origin or whatever reference
git push upstream main # could be origin or whatever reference
Links
-----
Expand Down

0 comments on commit 6181f3b

Please sign in to comment.