Merge remote-tracking branch 'orig/master'

fiorix · Sep 11, 2014 · fe4276b · fe4276b
2 parents 62c6333 + c273d58
commit fe4276b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cyclone/mail.py b/cyclone/mail.py
@@ -49,6 +49,7 @@ class Message(object):
                 from_addr="root@localhost",
                 to_addrs=["user1", "user2", "user3"],
                 subject="Test, 123",
+                message="Hello thar!",
                 mime="text/html")
     """
 

diff --git a/cyclone/web.py b/cyclone/web.py
@@ -808,7 +808,9 @@ def write_error(self, status_code, **kwargs):
 
         In order for error pages to be generated for paths that do not match any
         handlers, you can use the `error_handler` keyword argument when
-        instantiating the ``cyclone.web.Application`` object. For example:
+        instantiating the ``cyclone.web.Application`` object.
+
+        For example::
 
             import cyclone.web
             import httplib
@@ -831,15 +833,15 @@ class CustomErrorHandler(CustomErrorPageMixin, cyclone.web.ErrorHandler):
             class BaseHandler(CustomErrorPageMixin, cyclone.web.RequestHandler):
                 ...
 
-        Then, when constructing the ``cyclone.web.Application`` object:
+        Then, when constructing the ``cyclone.web.Application`` object::
 
             from cyclone import web
 
             application = web.Application([
                 (r"/", MainPageHandler),
             ], error_handler=CustomErrorHandler)
 
-        This technique is also compatible with Bottle-style applications:
+        This technique is also compatible with Bottle-style applications::
 
             from cyclone.bottle import create_app