Fix typos (#2603)

[etc/vim.git] / docs / faq.md

diff --git a/docs/faq.md b/docs/faq.md
index d7e6a16351fb2e901de0c28faea3f667d588c589..77f9df51fd4ad1413e2c160f8b9cafb70a7c4f8e 100644 (file)
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -31,6 +31,10 @@ pragmatism. However, _Black_ is still in beta so style changes are both planned
 still proposed on the issue tracker. See
 [The Black Code Style](the_black_code_style/index.rst) for more details.
 
 still proposed on the issue tracker. See
 [The Black Code Style](the_black_code_style/index.rst) for more details.
 

+Starting in 2022, the formatting output will be stable for the releases made in the same
+year (other than unintentional bugs). It is possible to opt-in to the latest formatting
+styles, using the `--future` flag.
+

 ## Why is my file not formatted?
 
 Most likely because it is ignored in `.gitignore` or excluded with configuration. See
 ## Why is my file not formatted?
 
 Most likely because it is ignored in `.gitignore` or excluded with configuration. See


@@ -57,7 +61,7 @@ following will not be formatted:
   get_ipython().system('ls')
   ```
 
   get_ipython().system('ls')
   ```
 

-- invalid syntax, as it can't be safely distinguished from automagics in the absense of
+- invalid syntax, as it can't be safely distinguished from automagics in the absence of

   a running `IPython` kernel.
 
 ## Why are Flake8's E203 and W503 violated?
   a running `IPython` kernel.
 
 ## Why are Flake8's E203 and W503 violated?


@@ -70,10 +74,16 @@ disabled-by-default counterpart W504. E203 should be disabled while changes are
 
 ## Does Black support Python 2?
 
 
 ## Does Black support Python 2?
 

+```{warning}
+Python 2 support has been deprecated since 21.10b0.
+
+This support will be dropped in the first stable release, expected for January 2022.
+See [The Black Code Style](the_black_code_style/index.rst) for details.
+```
+

 For formatting, yes! [Install](getting_started.md#installation) with the `python2` extra
 For formatting, yes! [Install](getting_started.md#installation) with the `python2` extra

-to format Python 2 files too! There are no current plans to drop support, but most
-likely it is bound to happen. Sometime. Eventually. In terms of running _Black_ though,
-Python 3.6 or newer is required.
+to format Python 2 files too! In terms of running _Black_ though, Python 3.6 or newer is
+required.

 
 ## Why does my linter or typechecker complain after I format my code?
 
 
 ## Why does my linter or typechecker complain after I format my code?