Merge branch 'master' of github.com:kennethreitz/python-guide

docs/scenarios/web.rst

@@ -366,7 +366,7 @@ into the corresponding block in the :file:`base.html` page.
 
 .. code-block:: html
 
-    <!{% extends "base.html" %}
+    {% extends "base.html" %}
     {% block content %}
         <p class="important">
         <div id="content">

docs/writing/gotchas.rst

@@ -76,6 +76,7 @@ signal that no argument was provided (:py:data:`None` is often a good choice).
         to.append(element)
         return to
 
+Do not forget, you are passing a *list* object as the second argument.
 
 When the Gotcha Isn't a Gotcha
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~