Merge branch 'master' into dev

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 1. [Fork](https://help.github.com/articles/fork-a-repo) the [antlr/antlr4 repo](https://github.com/antlr/antlr4), which will give you both key branches, `master` and `dev`
 2. Make sure to `git checkout dev` in your fork so that you are working from the latest development branch
-3. Create and work from a branch from `dev` such as `git checkout -b your-branch-name`
+3. Create and work from a branch derived from `dev` such as `git checkout -b your-branch-name`
 4. Install and configure [EditorConfig](http://editorconfig.org/) so your text editor or IDE uses the ANTLR 4 coding style
 5. [Build ANTLR 4](doc/building-antlr.md)
 6. [Run the ANTLR project unit tests](doc/antlr-project-testing.md)

README.md

@@ -8,12 +8,10 @@
 
 **Build status**
 
-[![Github CI Build Status (MacOSX)](https://img.shields.io/github/workflow/status/antlr/antlr4/MacOSX)](https://github.com/antlr/antlr4/actions) 
-[![Github CI Build Status (Windows)](https://img.shields.io/github/workflow/status/antlr/antlr4/Windows)](https://github.com/antlr/antlr4/actions) 
+OS X: [![Github CI Build Status (MacOSX)](https://img.shields.io/github/workflow/status/antlr/antlr4/MacOSX)](https://github.com/antlr/antlr4/actions), Windows: [![Github CI Build Status (Windows)](https://img.shields.io/github/workflow/status/antlr/antlr4/Windows)](https://github.com/antlr/antlr4/actions), Linux: [![Circle CI Build Status (Linux)](https://img.shields.io/circleci/build/gh/antlr/antlr4/master?label=Linux)](https://app.circleci.com/pipelines/github/antlr/antlr4)
 <!--
 [![AppVeyor CI Build Status (Windows)](https://img.shields.io/appveyor/build/parrt/antlr4?label=Windows)](https://ci.appveyor.com/project/parrt/antlr4) 
 -->
-[![Circle CI Build Status (Linux)](https://img.shields.io/circleci/build/gh/antlr/antlr4/master?label=Linux)](https://app.circleci.com/pipelines/github/antlr/antlr4)
 <!--
 [![Travis-CI Build Status (Swift-Linux)](https://img.shields.io/travis/antlr/antlr4.svg?label=Linux-Swift&branch=master)](https://travis-ci.com/github/antlr/antlr4)
 -->

doc/releasing-antlr.md

@@ -2,15 +2,23 @@
 
 ## Github
 
-Create a pre-release or full release at github; e.g., [tag 4.9](https://github.com/antlr/antlr4/tree/4.9).
+### Get dev merged into master
+
+Do this or make a PR:
+
+```bash
+cd ~/antlr/code/antlr4
+git checkout master
+git merge master
+```
 
 ### Turn on DCO Enforcement
 
 As of 4.10, we will be using the Linux DCO not the previous contributors license agreement that required signing the file. Now, we use the DCO and contributors must use `-s` on each commit to the branch associated with a pull request.
 
 See [GitHub App DCO](https://github.com/apps/dco).
 
-Make sure this feature is turned on for the `dev` and `master` branch upon release.
+Make sure this feature is turned on for the `antlr4` repo upon release.
 
 ### Delete existing release tag