From 4176abbaa80287ec3e82edb380e7974b549e1d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Koszuli=C5=84ski?= <pkoszulinski@gmail.com>
Date: Wed, 25 Feb 2015 14:06:51 +0100
Subject: [PATCH] Post merge fixes.

---
 samples/datafiltering.html | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/samples/datafiltering.html b/samples/datafiltering.html
index 5466d1d4ebd..d52488aff05 100644
--- a/samples/datafiltering.html
+++ b/samples/datafiltering.html
@@ -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: {
@@ -450,16 +450,15 @@ <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,
@@ -467,7 +466,7 @@ <h1 id="editor5" contenteditable="true">
 			classes: true
 		}
 	},
-	disallowedContent: 'img table'
+	disallowedContent: 'img a'
 } );
 </pre>
 		</div>