Refresh development documentation

docs/development/release-checklist.md

@@ -16,28 +16,24 @@ The other file is `requirements.txt`, which lists each of the required packages
 Every minor version release should refresh `requirements.txt` so that it lists the most recent stable release of each package. To do this:
 
 1. Create a new virtual environment.
-2. Install the latest version of all required packages via pip:
-
-```
-pip install -U -r base_requirements.txt
-```
-
+2. Install the latest version of all required packages `pip install -U -r base_requirements.txt`).
 3. Run all tests and check that the UI and API function as expected.
-4. Update the package versions in `requirements.txt` as appropriate.
+4. Review each requirement's release notes for any breaking or otherwise noteworthy changes.
+5. Update the package versions in `requirements.txt` as appropriate.
 
 ### Update Static Libraries
 
 Update the following static libraries to their most recent stable release:
 
 * Bootstrap 3
-* Font Awesome 4
+* Material Design Icons
 * Select2
 * jQuery
 * jQuery UI
 
-### Create a new Release Notes Page
+### Link to the Release Notes Page
 
-Create a file at `/docs/release-notes/X.Y.md` to establish the release notes for the new release. Add the file to the table of contents within `mkdocs.yml`, and point `index.md` to the new file.
+Add the release notes (`/docs/release-notes/X.Y.md`) to the table of contents within `mkdocs.yml`, and point `index.md` to the new file.
 
 ### Manually Perform a New Install
 
@@ -52,7 +48,14 @@ Follow these instructions to perform a new installation of NetBox. This process
 
 ### Close the Release Milestone
 
-Close the release milestone on GitHub. Ensure that there are no remaining open issues associated with it.
+Close the release milestone on GitHub after ensuring there are no remaining open issues associated with it.
+
+### Merge the Release Branch
+
+Submit a pull request to merge the release branch `develop-x.y` into the `develop` branch in preparation for its releases.
+
+!!! warning
+    No further releases for the current major version can be published once this pull request is merged.
 
 ---
 
@@ -64,11 +67,11 @@ Ensure that continuous integration testing on the `develop` branch is completing
 
 ### Update Version and Changelog
 
-Update the `VERSION` constant in `settings.py` to the new release version and annotate the current data in the release notes for the new version.
+Update the `VERSION` constant in `settings.py` to the new release version and annotate the current data in the release notes for the new version. Commit these changes to the `develop` branch.
 
 ### Submit a Pull Request
 
-Submit a pull request title **"Release vX.Y.Z"** to merge the `develop` branch into `master`. Include a brief change log listing the features, improvements, and/or bugs addressed in the release.
+Submit a pull request title **"Release vX.Y.Z"** to merge the `develop` branch into `master`. Copy the documented release notes into the pull request's body.
 
 Once CI has completed on the PR, merge it.
 
@@ -76,16 +79,16 @@ Once CI has completed on the PR, merge it.
 
 Draft a [new release](https://github.com/netbox-community/netbox/releases/new) with the following parameters.
 
-* **Tag:** Current version (e.g. `v2.3.4`)
+* **Tag:** Current version (e.g. `v2.9.9`)
 * **Target:** `master`
-* **Title:** Version and date (e.g. `v2.3.4 - 2018-08-02`)
+* **Title:** Version and date (e.g. `v2.9.9 - 2020-11-09`)
 
-Copy the description from the pull request into the release notes.
+Copy the description from the pull request to the release.
 
 ### Update the Development Version
 
-On the `develop` branch, update `VERSION` in `settings.py` to point to the next release. For example, if you just released v2.3.4, set:
+On the `develop` branch, update `VERSION` in `settings.py` to point to the next release. For example, if you just released v2.9.9, set:
 
 ```
-VERSION = 'v2.3.5-dev'
+VERSION = 'v2.9.10-dev'
 ```