Skip to content

Commit

Permalink
Post merge fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Feb 25, 2015
1 parent 2a7cbf6 commit 4176abb
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions samples/datafiltering.html
Expand Up @@ -395,11 +395,11 @@ <h1 id="editor5" contenteditable="true">
</label>
<div class="description">
<p>
This editor is using a custom configuration for
<abbr title="Advanced Content Filter">ACF</abbr>.
This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" target="_blank">
Disallowed Content</a> property of the filter to eliminate all <code>title</code> attributes
Disallowed Content</a> property of the filter to eliminate all <code>title</code> attributes.
</p>

<pre class="samples">
CKEDITOR.replace( 'editor6', {
allowedContent: {
Expand Down Expand Up @@ -450,24 +450,23 @@ <h1 id="editor5" contenteditable="true">
</label>
<div class="description">
<p>
This editor is using a custom configuration for
<abbr title="Advanced Content Filter">ACF</abbr>.
This editor is using a custom configuration for <abbr title="Advanced Content Filter">ACF</abbr>.
It's using the <a href="http://docs.ckeditor.com/#!/guide/dev_disallowed_content" target="_blank">
Disallowed Content</a> property of the filter to
eliminate all <code>a</code> and <code>img</code> tags.
Disallowed Content</a> property of the filter to eliminate all <code>a</code> and <code>img</code> tags,
while allowing all other tags.
</p>
<pre class="samples">
CKEDITOR.replace( 'editor7', {
allowedContent: {
// allow all content
// Allow all content.
$1: {
elements: CKEDITOR.dtd,
attributes: true,
styles: true,
classes: true
}
},
disallowedContent: 'img table'
disallowedContent: 'img a'
} );
</pre>
</div>
Expand Down

0 comments on commit 4176abb

Please sign in to comment.