Backporting patches from production system.

- Legacy-Id: 4487

ietf/idrfc/urls.py

@@ -68,7 +68,7 @@ urlpatterns = patterns('',
     url(r'^(?P<name>[A-Za-z0-9._-]+)/edit/approveballot/$', views_ballot.approve_ballot, name='doc_approve_ballot'),
     url(r'^(?P<name>[A-Za-z0-9._-]+)/edit/makelastcall/$', views_ballot.make_last_call, name='doc_make_last_call'),
 
-    (r'^(?P<name>[A-Za-z0-9._-]+)/charter/', include('ietf.wgcharter.urls')),
+    (r'^(?P<name>charter-[A-Za-z0-9.-]+)/', include('ietf.wgcharter.urls')),
 )
 
 urlpatterns += patterns('django.views.generic.simple',

ietf/idrfc/views_doc.py

@@ -356,7 +356,7 @@ def _get_html(key, filename, split=True):
         f = open(filename, 'rb')
         raw_content = f.read()
     except IOError:
-        error = "Error; cannot read ("+key+")"
+        error = "Error; cannot read '%s'" % key
         if split:
             return (error, "")
         else:

ietf/templates/idrfc/document_charter.html

@@ -120,7 +120,7 @@
 
 {% if doc.rev %}
 <div class="markup_draft">
-{{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
+  {{ content|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
 </div>
 {% endif %}