Index: /CKEditor/trunk/_source/core/config.js
===================================================================
--- /CKEditor/trunk/_source/core/config.js	(revision 3013)
+++ /CKEditor/trunk/_source/core/config.js	(revision 3014)
@@ -144,9 +144,8 @@
 	 * instance.
 	 * @type String
-	 * @default 'editingblock,elementspath,sourcearea,toolbar,wysiwygarea'
 	 * @example
-	 * config.plugins = 'elementspath,toolbar,wysiwygarea';
+	 * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
 	 */
-	plugins : 'basicstyles,button,dialog,elementspath,horizontalrule,htmldataprocessor,keystrokes,removeformat,smiley,link,sourcearea,tab,toolbar,wysiwygarea,forms,image,find,table,specialchar,flash,print,pagebreak,newpage',
+	plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,removeformat,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea',
 
 	/**
Index: /CKEditor/trunk/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/toolbar/plugin.js	(revision 3013)
+++ /CKEditor/trunk/_source/plugins/toolbar/plugin.js	(revision 3014)
@@ -206,7 +206,11 @@
 CKEDITOR.config.toolbar =
 [
-	[ 'Source', '-', 'NewPage', '-', 'Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript', '-', 'Print', 'Find', 'Replace', '-',
-	'SelectAll', 'RemoveFormat', '-',
-	'Link', 'Unlink', 'Anchor', 'Image', 'Flash', 'Table', 'Smiley', 'HorizontalRule', 'SpecialChar', 'PageBreak', '-',
-	'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ]
+	[
+		'Source', '-',
+		'NewPage', '-',
+		'Bold', 'Italic', 'Underline', 'Strike', '-',
+		'Subscript', 'Superscript', '-',
+		'SelectAll', 'RemoveFormat', '-',
+		'Smiley', 'HorizontalRule', 'SpecialChar'
+	]
 ];
Index: /CKEditor/trunk/config.js
===================================================================
--- /CKEditor/trunk/config.js	(revision 3013)
+++ /CKEditor/trunk/config.js	(revision 3014)
@@ -6,8 +6,4 @@
 CKEDITOR.editorConfig = function( config )
 {
-	// This is a temporary setting we'll have while moving plugins from the
-	// prototype to trunk.
-	config.plugins = 'basicstyles,button,editingblock,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,removeformat,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea';
-
 	// Define changes to default configuration here. For example:
 	// config.autoLanguage = false;