Changelog/docs update.

Instagram · May 16, 2020 · 3e6f16c · 3e6f16c
1 parent 47f4237
commit 3e6f16c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,11 @@ Changelog
 master
 ------
 
+* Require ``libcst>=0.3.5``.
+
+* Add ``--ignore-existing-annotations`` flag to ``apply`` command.
+
+
 20.4.2
 ------
 

diff --git a/doc/generation.rst b/doc/generation.rst
@@ -91,17 +91,13 @@ Both ``monkeytype stub`` and ``monkeytype apply`` accept the following options:
 
   Don't apply your configured :ref:`rewriters` to the output types.
 
-Additionally, ``monkeytype stub`` accepts:
-
 .. option:: --ignore-existing-annotations
 
-  Generate a stub based only on traced calls, ignoring any existing type
-  annotations in the code. (By default, existing annotations in the code take
-  precedence over traced types.) This can be useful for validating the
-  correctness of existing annotations.
+  Generate a stub based only on traced calls, ignoring (and overwriting, if
+  applying stubs) any existing type annotations in the code. (By default,
+  existing annotations in the code take precedence over traced types.)
 
-  This option is not usable with ``monkeytype apply``, since it would
-  frequently result in a conflict when attempting to apply annotations.
+Additionally, ``monkeytype stub`` accepts:
 
 .. option:: --omit-existing-annotations