diff --git a/docs_theme/base.html b/docs_theme/base.html
index 369927b41..00cef246b 100644
--- a/docs_theme/base.html
+++ b/docs_theme/base.html
@@ -2,20 +2,20 @@
 <html lang="en">
 
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta charset="utf-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta charset="utf-8" />
   <title>{% if page_title %}{{ page_title }} - {% endif %}{{ site_name }}</title>
-  <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon">
+  <link href="{{ base_url }}/img/favicon.ico" rel="icon" type="image/x-icon" />
   <link rel="canonical" href="{{ canonical_url }}" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="Django, API, REST{% if current_page %}, {{ current_page.title }}{% endif %}">
-  <meta name="author" content="Tom Christie">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="description" content="Django, API, REST{% if current_page %}, {{ current_page.title }}{% endif %}" />
+  <meta name="author" content="Tom Christie" />
 
   <!-- Le styles -->
-  <link href="{{ base_url }}/css/prettify.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/bootstrap.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet">
-  <link href="{{ base_url }}/css/default.css" rel="stylesheet">
+  <link href="{{ base_url }}/css/prettify.css" rel="stylesheet" />
+  <link href="{{ base_url }}/css/bootstrap.css" rel="stylesheet" />
+  <link href="{{ base_url }}/css/bootstrap-responsive.css" rel="stylesheet" />
+  <link href="{{ base_url }}/css/default.css" rel="stylesheet" />
 
   <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
   <!--[if lt IE 9]>
@@ -71,7 +71,7 @@
           <div class="modal-body">
             <form role="form" autocomplete="off">
               <div class="form-group">
-                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query">
+                <input type="text" name="q" class="form-control" placeholder="Search..." id="mkdocs-search-query" />
               </div>
             </form>
             <div id="mkdocs-search-results"></div>
diff --git a/rest_framework/templates/rest_framework/filters/search.html b/rest_framework/templates/rest_framework/filters/search.html
index edb28d45d..844d96d2d 100644
--- a/rest_framework/templates/rest_framework/filters/search.html
+++ b/rest_framework/templates/rest_framework/filters/search.html
@@ -3,7 +3,7 @@
 <form class="form-inline">
   <div class="form-group">
     <div class="input-group">
-      <input type="text" class="form-control" style="width: 350px" name="{{ param }}" value="{{ term }}">
+      <input type="text" class="form-control" style="width: 350px" name="{{ param }}" value="{{ term }}" />
       <span class="input-group-btn">
         <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Search</button>
       </span>
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html
index d84539588..5e068ae35 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox.html
@@ -6,7 +6,7 @@
   {% endif %}
 
   <div class="col-sm-10">
-    <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+    <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %} />
 
     {% if field.errors %}
       {% for error in field.errors %}
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
index 59a9acd89..a9736e99b 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
@@ -9,7 +9,7 @@
     {% if style.inline %}
       {% for key, text in field.choices.items %}
         <label class="checkbox-inline">
-          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %} />
           {{ text }}
         </label>
       {% endfor %}
@@ -17,7 +17,7 @@
       {% for key, text in field.choices.items %}
         <div class="checkbox">
           <label>
-            <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+            <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %} />
             {{ text }}
           </label>
         </div>
diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html
index 82e6dc67c..7b75bcbae 100644
--- a/rest_framework/templates/rest_framework/horizontal/input.html
+++ b/rest_framework/templates/rest_framework/horizontal/input.html
@@ -6,7 +6,7 @@
   {% endif %}
 
   <div class="col-sm-10">
-    <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+    <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %} />
 
     {% if field.errors %}
       {% for error in field.errors %}
diff --git a/rest_framework/templates/rest_framework/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html
index 665249a52..21835b267 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox.html
@@ -1,7 +1,7 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
   <div class="checkbox">
     <label>
-      <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
+      <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %} />
       {% if field.label %}{{ field.label }}{% endif %}
     </label>
   </div>
diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
index b02425a62..382e9bf1e 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
@@ -6,7 +6,7 @@
   {% for key, text in field.choices.items %}
     <div class="checkbox">
       <label>
-        <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+        <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %} />
         {{ text }}
       </label>
     </div>
diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html
index f28e8f11c..0862d08b5 100644
--- a/rest_framework/templates/rest_framework/inline/input.html
+++ b/rest_framework/templates/rest_framework/inline/input.html
@@ -5,5 +5,5 @@
     </label>
   {% endif %}
 
-  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %} />
 </div>
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
index efaef6c9b..3b6204106 100644
--- a/rest_framework/templates/rest_framework/inline/radio.html
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -11,7 +11,7 @@
   {% if field.allow_null or field.allow_blank %}
     <div class="radio">
       <label>
-        <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %}>
+        <input type="radio" name="{{ field.name }}" value="" {% if not field.value %}checked{% endif %} />
         {{ none_choice }}
       </label>
     </div>
@@ -20,7 +20,7 @@
   {% for key, text in field.choices.items %}
     <div class="radio">
       <label>
-        <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+        <input type="radio" name="{{ field.name }}" value="{{ key }}"{% if key == field.value %}checked{% endif %} />
         {{ text }}
       </label>
     </div>
diff --git a/rest_framework/templates/rest_framework/inline/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html
index bce427faa..25d66f84f 100644
--- a/rest_framework/templates/rest_framework/inline/textarea.html
+++ b/rest_framework/templates/rest_framework/inline/textarea.html
@@ -5,5 +5,5 @@
     </label>
   {% endif %}
 
-  <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+  <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %} />
 </div>
diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 7f2bfb51b..9583cae63 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -26,7 +26,7 @@
                       autocapitalize="off"
                       autocorrect="off" class="form-control textinput textInput"
                       id="id_username" required
-                      {% if form.username.value %}value="{{ form.username.value }}"{% endif %}>
+                      {% if form.username.value %}value="{{ form.username.value }}"{% endif %} />
                   {% if form.username.errors %}
                     <p class="text-error">
                       {{ form.username.errors|striptags }}
@@ -38,7 +38,7 @@
               <div id="div_id_password" class="clearfix control-group {% if form.password.errors %}error{% endif %}">
                 <div class="form-group">
                   <label for="id_password">Password:</label>
-                  <input type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required>
+                  <input type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required />
                   {% if form.password.errors %}
                     <p class="text-error">
                       {{ form.password.errors|striptags }}
@@ -54,7 +54,7 @@
               {% endif %}
 
               <div class="form-actions-no-box">
-                <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit">
+                <button type="submit" name="submit" class="btn btn-primary form-control" id="submit-id-submit">Log in</button>
               </div>
             </form>
           </div>
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html
index 69f19dfb3..d8cd0db67 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox.html
@@ -1,7 +1,7 @@
 <div class="form-group {% if field.errors %}has-error{% endif %}">
   <div class="checkbox">
     <label>
-      <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
+      <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %} />
         {% if field.label %}{{ field.label }}{% endif %}
     </label>
   </div>
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
index a3a3a08ae..c2dcc5ee3 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
@@ -7,7 +7,7 @@
     <div>
       {% for key, text in field.choices.items %}
         <label class="checkbox-inline">
-          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %} />
             {{ text }}
         </label>
       {% endfor %}
@@ -16,7 +16,7 @@
     {% for key, text in field.choices.items %}
       <div class="checkbox">
         <label>
-          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+          <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %} />
           {{ text }}
         </label>
       </div>
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html
index 71e132fe9..9614113fe 100644
--- a/rest_framework/templates/rest_framework/vertical/input.html
+++ b/rest_framework/templates/rest_framework/vertical/input.html
@@ -3,7 +3,7 @@
     <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
   {% endif %}
 
-  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}>
+  <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %} />
 
   {% if field.errors %}
     {% for error in field.errors %}
