switch to main branch

Author: glaslos

.github/workflows/xmllint.yml

@@ -6,7 +6,7 @@ jobs:
   xmllint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
     - name: Run XMLLint
       uses: ChristophWurst/xmllint-action@v1
       with:

README.md

@@ -2,7 +2,7 @@
 
 ![Test Status](https://github.com/mushorg/conpot/workflows/Code%20tests/badge.svg)
 [![Docs](https://readthedocs.org/projects/conpot/badge/?version=latest)](https://conpot.readthedocs.io/en/latest/)
-[![Coverage Status](https://coveralls.io/repos/github/mushorg/conpot/badge.svg?branch=master)](https://coveralls.io/github/mushorg/conpot?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/mushorg/conpot/badge.svg?branch=main)](https://coveralls.io/github/mushorg/conpot?branch=main)
 [![Docker Build Status](https://img.shields.io/docker/build/honeynet/conpot.svg)](https://hub.docker.com/r/honeynet/conpot)
 
 ## About

docs/source/development/guidelines.rst

@@ -47,7 +47,7 @@ Recommended git workflow
 For contributors
 ~~~~~~~~~~~~~~~~
 
-0, You can do this step when you are on master, or feature_branch, anytime there are new commits in original project.
+0, You can do this step when you are on main, or feature_branch, anytime there are new commits in original project.
 
 Just one-time add of remote:
 
@@ -60,9 +60,9 @@ And rebase:
 ::
 
   git fetch mushorg
-  git rebase mushorg/master feature_branch
+  git rebase mushorg/main feature_branch
 
-This way, your feature_branch or master will be up-to-date.
+This way, your feature_branch or main will be up-to-date.
 
 1, For every feature, create new branch:
 
@@ -121,20 +121,20 @@ To avoid additional Merge commits, use cherry-pick:
 
 ::
 
-  git checkout master
+  git checkout main
   git remote add user https://github.com/user/conpot.git
   git fetch user
   (look at 'git log user/feature_branch')
   git cherry-pick commit_hash
-  git push origin master
+  git push origin main
   git remote rm user
 
-Comment on pull request that you added it to master, and close pull request.
+Comment on pull request that you added it to main, and close pull request.
 
 This approach is usefull for majority of pull requests (1-3 commits).
 
 If you expect conflicts (a lot of commits in feature branch with a lot of changes) you can use GitHub Merge button.
 
 Revert will be easier too.
 
-Conflicts should not happen, if feature branch is rebased on current master.
+Conflicts should not happen, if feature branch is rebased on current main.

docs/source/faq.rst

@@ -27,7 +27,7 @@ Raw data in JSON formatting.
 
 **How do I get the data?**
 
-There is a Python `client <https://github.com/mushorg/conpot/blob/master/bin/conpot_hpf_client>`_
+There is a Python `client <https://github.com/mushorg/conpot/blob/main/bin/conpot_hpf_client>`_
 which uses the HPFeeds library. About 40 lines of code. From there it's
 quite easy to write the data to a database.
 You can find an explanation on how it works