diff --git a/README.rst b/README.rst index 3101cbd..40da57a 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ django-admin2 .. image:: https://github.com/jazzband/django-admin2/workflows/Test/badge.svg :target: https://github.com/jazzband/django-admin2/actions :alt: GitHub Actions -.. image:: https://codecov.io/gh/jazzband/django-admin2/branch/develop/graph/badge.svg?token=PcC594rhI4 +.. image:: https://codecov.io/gh/jazzband/django-admin2/branch/main/graph/badge.svg?token=PcC594rhI4 :target: https://codecov.io/gh/jazzband/django-admin2 :alt: Code coverage @@ -30,17 +30,17 @@ Features Screenshots =========== -.. image:: https://github.com/jazzband/django-admin2/raw/develop/screenshots/Site_administration.png +.. image:: https://github.com/jazzband/django-admin2/raw/main/screenshots/Site_administration.png :width: 722px :alt: Site administration :align: center - :target: https://github.com/jazzband/django-admin2/raw/develop/screenshots/Site_administration.png + :target: https://github.com/jazzband/django-admin2/raw/main/screenshots/Site_administration.png -.. image:: https://github.com/jazzband/django-admin2/raw/develop/screenshots/Select_user.png +.. image:: https://github.com/jazzband/django-admin2/raw/main/screenshots/Select_user.png :width: 722px :alt: Select user :align: center - :target: https://github.com/jazzband/django-admin2/raw/develop/screenshots/Select_user.png + :target: https://github.com/jazzband/django-admin2/raw/main/screenshots/Select_user.png Requirements ============ diff --git a/docs/contributing.rst b/docs/contributing.rst index 2fc6d41..f33cb58 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -109,8 +109,7 @@ Now when you go to your fork on GitHub, you will see this branch listed under the "Source" tab where it says "Switch Branches". Go ahead and select your topic branch from this list, and then click the "Pull request" button. -Your pull request should be applied to the **develop** branch of django-admin2. -Be sure to change from the default of ``master`` to ``develop``. +Your pull request should be applied to the **main** branch of django-admin2. Next, you can add a comment about your branch. If this in response to a submitted issue, it is good to put a link to that issue in this initial @@ -133,7 +132,7 @@ Pull upstream changes into your fork regularly To pull in upstream changes:: git remote add upstream https://github.com/jazzband/django-admin2.git - git pull upstream develop + git pull upstream main For more info, see http://help.github.com/fork-a-repo/ @@ -145,7 +144,7 @@ Advanced git users: Pull with rebase This will pull and then reapply your work on top of the upcoming changes:: - git pull --rebase upstream develop + git pull --rebase upstream main It saves you from an extra merge, keeping the history cleaner, but it's potentially dangerous because you're rewriting history. For more info, see http://gitready.com/advanced/2009/02/11/pull-with-rebase.html @@ -262,8 +261,8 @@ How pull requests are checked, tested, and done First we pull the code into a local branch:: - git checkout develop - git checkout -b - develop + git checkout main + git checkout -b - main git pull git://github.com//django-admin2.git Then we run the tests:: @@ -279,9 +278,9 @@ We do the following: We finish with a merge and push to GitHub:: - git checkout develop + git checkout main git merge - git push origin develop + git push origin main .. _installation: install.html .. _GitHub project: https://github.com/jazzband/django-admin2