Bump docker/build-push-action from 4 to 5 (#3894)

[etc/vim.git] / docs / the_black_code_style / current_style.md

diff --git a/docs/the_black_code_style/current_style.md b/docs/the_black_code_style/current_style.md
index 0fb59fe5aaed953d4472cea271cbf8882a50a34f..ff757a8276bd89dd96908857d9da4215b26cb756 100644 (file)
--- a/docs/the_black_code_style/current_style.md
+++ b/docs/the_black_code_style/current_style.md
@@ -173,7 +173,7 @@ If you use Flake8, you have a few options:
    max-line-length = 80
    ...
    select = C,E,F,W,B,B950
-   extend-ignore = E203, E501
+   extend-ignore = E203, E501, E704
    ```
 
    The rationale for E950 is explained in
@@ -184,7 +184,7 @@ If you use Flake8, you have a few options:
    ```ini
    [flake8]
    max-line-length = 88
-   extend-ignore = E203
+   extend-ignore = E203, E704
    ```
 
 An explanation of why E203 is disabled can be found in the [Slices section](#slices) of
@@ -254,11 +254,12 @@ required due to an inner function starting immediately after.
 
 _Black_ does not format comment contents, but it enforces two spaces between code and a
 comment on the same line, and a space before the comment text begins. Some types of
-comments that require specific spacing rules are respected: doc comments (`#: comment`),
-section comments with long runs of hashes, and Spyder cells. Non-breaking spaces after
-hashes are also preserved. Comments may sometimes be moved because of formatting
-changes, which can break tools that assign special meaning to them. See
-[AST before and after formatting](#ast-before-and-after-formatting) for more discussion.
+comments that require specific spacing rules are respected: shebangs (`#! comment`), doc
+comments (`#: comment`), section comments with long runs of hashes, and Spyder cells.
+Non-breaking spaces after hashes are also preserved. Comments may sometimes be moved
+because of formatting changes, which can break tools that assign special meaning to
+them. See [AST before and after formatting](#ast-before-and-after-formatting) for more
+discussion.
 
 ### Trailing commas