Documentation updates

Author: JukkaL

docs/source/faq.rst

@@ -86,14 +86,13 @@ existing Python VMs to take advantage of static type information, but
 whether this is feasible is still unknown. This is nontrivial since
 the runtime types do not necessarily correspond to the static types.
 
-All of my code is still in Python 2. What are my options?
-*********************************************************
-
-Mypy currently supports Python 3 syntax. Python 2 support is still in
-early stages of development. However, Python 2 support will be
-improving. Mypy includes a custom codec that lets you use Python 3
-function annotations in Python 2 code. The codec just removes the
-annotations before bytecode compilation.
+How do I type check my Python 2 code?
+*************************************
+
+You can use a `comment-based function annotation syntax
+<https://www.python.org/dev/peps/pep-0484/#suggested-syntax-for-python-2-7-and-straddling-code>`_
+and use the ``--py2`` command-line option to type check your Python 2 code.
+You'll also need to install ``typing`` for Python 2 via ``pip install typing``.
 
 Is mypy free?
 *************

docs/source/planned_features.rst

@@ -43,22 +43,3 @@ benefit from more powerful type inference:
 
 We would infer the type of ``x`` to be int in the else block due to the
 check against ``None`` in the if condition.
-
-More general type inference
----------------------------
-
-It may be useful to support type inference also for variables defined
-in multiple locations in an if/else statement, even if the initializer
-types are different:
-
-.. code-block:: python
-
-   if x:
-       y = None     # First definition of y
-   else:
-       y = 'a'      # Second definition of y
-
-In the above example, both of the assignments would be used in type
-inference, and the type of ``y`` would be ``str``. However, it is not
-obvious whether this would be generally desirable in more complex
-cases.