merge upstream

docs/writing/style.rst

@@ -1,4 +1,5 @@
-.. code_style:
+.. _code_style:
+
 Code Style
 ==========
 
@@ -456,7 +457,7 @@ list of what is considered false.
     if not attr:
         print 'attr is falsey!'
 
-    # or, since None is considered false, explicity check for it
+    # or, since None is considered false, explicitly check for it
     if attr is None:
         print 'attr is None!'