Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6307)
+++ /CKEditor/trunk/CHANGES.html	(revision 6308)
@@ -42,4 +42,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/5590">#5590</a> : Remove format command works in collapsed selections.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6641">#6641</a> : The <a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.dialog_buttonsOrder">dialog_buttonsOrder</a> now works on IE.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6869">#6869</a> : The "data-cke-nostyle" attribute (which was introduced for escaping element from been touched by the style system since 3.5) is deprecated in favor of  the new one <strong>"data-nostyle"</strong>.</li>
 	</ul>
 	<p>
Index: /CKEditor/trunk/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/colorbutton/plugin.js	(revision 6307)
+++ /CKEditor/trunk/_source/plugins/colorbutton/plugin.js	(revision 6308)
@@ -221,5 +221,5 @@
 		function isUnstylable( ele )
 		{
-			return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-cke-nostyle' );
+			return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
 		}
 	}
Index: /CKEditor/trunk/_source/plugins/styles/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/styles/plugin.js	(revision 6307)
+++ /CKEditor/trunk/_source/plugins/styles/plugin.js	(revision 6308)
@@ -368,5 +368,5 @@
 	// Gets the parent element which blocks the styling for an element. This
 	// can be done through read-only elements (contenteditable=false) or
-	// elements with the "data-cke-nostyle" attribute.
+	// elements with the "data-nostyle" attribute.
 	function getUnstylableParent( element )
 	{
@@ -379,5 +379,5 @@
 				break;
 
-			if ( element.getAttribute( 'data-cke-nostyle' ) )
+			if ( element.getAttribute( 'data-nostyle' ) )
 				unstylable = element;
 			else if ( !editable )
@@ -474,5 +474,5 @@
 				var nodeName = nodeType == CKEDITOR.NODE_ELEMENT ? currentNode.getName() : null;
 				var nodeIsReadonly = nodeName && ( currentNode.getAttribute( 'contentEditable' ) == 'false' );
-				var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-cke-nostyle' );
+				var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-nostyle' );
 
 				if ( nodeName && currentNode.data( 'cke-bookmark' ) )