diff -r 37905786b34b Doc/tutorial/controlflow.rst
--- a/Doc/tutorial/controlflow.rst	Sun Apr 12 23:24:17 2015 -0500
+++ b/Doc/tutorial/controlflow.rst	Mon Apr 13 12:00:06 2015 -0400
@@ -673,11 +673,8 @@
 pair: function; annotations
 single: -> (return annotation assignment)
 
-:ref:`Function annotations <function>` are completely optional,
-arbitrary metadata information about user-defined functions. Neither Python
-itself nor the standard library use function annotations in any way; this
-section just shows the syntax. Third-party projects are free to use function
-annotations for documentation, type checking, and other uses.
+:ref:`Function annotations <function>` are completely optional metadata
+information about the types used by user-defined functions. (:pep:`484`)
 
 Annotations are stored in the :attr:`__annotations__` attribute of the function
 as a dictionary and have no effect on any other part of the function. Parameter
@@ -686,16 +683,17 @@
 defined by a literal ``->``, followed by an expression, between the parameter
 list and the colon denoting the end of the :keyword:`def` statement. The
 following example has a positional argument, a keyword argument, and the return
-value annotated with nonsense::
+value annotated::
 
->>> def f(ham: 42, eggs: int = 'spam') -> "Nothing to see here":
+>>> def f(spam: str, egg: str = 'egg') -> str:
 ... print("Annotations:", f.__annotations__)
- ... print("Arguments:", ham, eggs)
+ ... print("Arguments:", spam, egg)
+ ... return spam + ' ' + egg
 ...
->>> f('wonderful')
- Annotations: {'eggs': <class 'int'>, 'return': 'Nothing to see here', 'ham': 42}
- Arguments: wonderful spam
-
+>>> f('flying')
+ Annotations: {'spam': <class 'str'>, 'return': <class 'str'>, 'egg': <class 'str'>}
+ Arguments: flying egg
+ 'flying egg'
 
 .. _tut-codingstyle:
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file38923/issue23932.r2.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file38923/issue23932.r2.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>