Merge remote branch 'upstream/master' into dev

2011-05-10 00:13:15 -04:00
parent 6f7d7537f2 e9ad04f763
commit c379ff883a
5 changed files with 62 additions and 6 deletions
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -134,8 +134,8 @@ document class as the first argument::
    class Page(Document):
        comments = ListField(EmbeddedDocumentField(Comment))

-    comment1 = Comment('Good work!')
-    comment2 = Comment('Nice article!')
+    comment1 = Comment(content='Good work!')
+    comment2 = Comment(content='Nice article!')
    page = Page(comments=[comment1, comment2])

 Dictionary Fields