Resolve merge conflict and merge.

[mediagoblin.git] / mediagoblin / media_types / blog / forms.py

diff --git a/mediagoblin/media_types/blog/forms.py b/mediagoblin/media_types/blog/forms.py
index 3b27907189f59b6e4ed2e69517b8cbf687ddc9e2..9f595fcf518215b356e480e3facc653a0656a781 100644 (file)
--- a/mediagoblin/media_types/blog/forms.py
+++ b/mediagoblin/media_types/blog/forms.py
@@ -23,7 +23,7 @@ from mediagoblin.tools.licenses import licenses_as_choices
 class BlogPostEditForm(wtforms.Form):
     title = wtforms.TextField(_('Title'),
                [wtforms.validators.Length(min=0, max=500)])
-    description = wtforms.TextAreaField(_('Content'))
+    description = wtforms.TextAreaField(_('Description'))
     tags = wtforms.TextField(_('Tags'), [tag_length_validator], 
                description="Seperate tags by commas.")
     license = wtforms.SelectField(_('License'),