Merge branch '7.4' into 8.0

* 7.4:
  Add missing config formats
  Example of allowed element with attributes disallowed

Author: javiereguiluz

html_sanitizer.rst

@@ -314,6 +314,8 @@ attributes from the `W3C Standard Proposal`_ are allowed.
                             img: 'src'
                             # allow the <h1> element with all safe attributes
                             h1: '*'
+                            # allow the <div> element with no attributes
+                            div: []
 
     .. code-block:: xml
 
@@ -343,9 +345,12 @@ attributes from the `W3C Standard Proposal`_ are allowed.
                         </framework:allow-element>
 
                         <!-- allow the <h1> element with all safe attributes -->
-                        <framework:allow-element name="img">
+                        <framework:allow-element name="h1">
                             <framework:attribute>*</framework:attribute>
                         </framework:allow-element>
+
+                        <!-- allow the <div> element with no attributes -->
+                        <framework:allow-element name="div"/>
                     </framework:sanitizer>
                 </framework:html-sanitizer>
             </framework:config>
@@ -367,6 +372,9 @@ attributes from the `W3C Standard Proposal`_ are allowed.
 
                     // allow the <h1> element with all safe attributes
                     ->allowElement('h1', '*')
+
+                    // allow the <div> element with no attributes
+                    ->allowElement('div', [])
             ;
         };
 
@@ -385,6 +393,9 @@ attributes from the `W3C Standard Proposal`_ are allowed.
 
                 // allow the <h1> element with all safe attributes
                 ->allowElement('h1')
+
+                // allow the <div> element with no attributes
+                ->allowElement('div', [])
         );
 
 Block and Drop Elements