Upgrade isort (#3534)

[etc/vim.git] / docs / contributing / issue_triage.md

diff --git a/docs/contributing/issue_triage.md b/docs/contributing/issue_triage.md
index 780b2b5e959b1e3e5df283804e6d00ddd024d5c5..865a47935ed7fe0d97ed3a23bcb8f5aa3f8e90cc 100644 (file)
--- a/docs/contributing/issue_triage.md
+++ b/docs/contributing/issue_triage.md
@@ -42,7 +42,7 @@ The lifecycle of a bug report or user support issue typically goes something lik
 1. _the issue is waiting for triage_
 2. **identified** - has been marked with a type label and other relevant labels, more
    details or a functional reproduction may be still needed (and therefore should be
-   marked with `S: needs repro` or `S: awaiting reponse`)
+   marked with `S: needs repro` or `S: awaiting response`)
 3. **confirmed** - the issue can reproduced and necessary details have been provided
 4. **discussion** - initial triage has been done and now the general details on how the
    issue should be best resolved are being hashed out
@@ -116,7 +116,9 @@ it's totally cool to go with it instead.
 
 For most issues, closing the issue manually or automatically after a resolving PR is
 ideal. For bug reports specifically, if the bug has already been fixed, try to check in
-with the issue opener that their specific case has been resolved before closing.
+with the issue opener that their specific case has been resolved before closing. Note
+that we close issues as soon as they're fixed in the `main` branch. This doesn't
+necessarily mean they've been released yet.
 
 Design and enhancement issues should be also closed when it's clear the proposed change
 won't be implemented, whether that has been determined after a lot of discussion or just
@@ -146,7 +148,7 @@ Here's some of the most common issues and also pre-made responses you can use:
 ```text
 Black used to remove the trailing comma if the expression fits in a single line, but this was changed by #826 and #1288. Now a trailing comma tells Black to always explode the expression. This change was made mostly for the cases where you _know_ a collection or whatever will grow in the future. Having it always exploded as one element per line reduces diff noise when adding elements. Before the "magic trailing comma" feature, you couldn't anticipate a collection's growth reliably since collections that fitted in one line were ruthlessly collapsed regardless of your intentions. One of Black's goals is reducing diff noise, so this was a good pragmatic change.
 
-So no, this is not a bug, but an intended feature. Anyway, [here's the documentation](https://github.com/psf/black/blob/master/docs/the_black_code_style.md#the-magic-trailing-comma) on the "magic trailing comma". Hopefully that helps and sorry for the possible confusion.
+So no, this is not a bug, but an intended feature. Anyway, [here's the documentation](https://github.com/psf/black/blob/master/docs/the_black_code_style.md#the-magic-trailing-comma) on the "magic trailing comma", including the ability to skip this functionality with the `--skip-magic-trailing-comma` option. Hopefully that helps solve the possible confusion.
 ```
 
 ### "Black formatted code is violating Flake8's E203!"