Index: lib/editor/tinymce/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/lib.php,v
retrieving revision 1.7
diff -u -r1.7 lib.php
--- lib/editor/tinymce/lib.php	24 Jun 2009 23:17:06 -0000	1.7
+++ lib/editor/tinymce/lib.php	20 Aug 2009 18:22:31 -0000
@@ -115,12 +115,11 @@
                     'theme_advanced_font_sizes' => "1,2,3,4,5,6,7",
                     'theme_advanced_layout_manager' => "SimpleLayout",
                     'theme_advanced_toolbar_align' => "left",
-                    'theme_advanced_buttons1' => "fontselect,fontsizeselect,formatselect,styleselect",
-                    'theme_advanced_buttons1_add' => "|,undo,redo,|,search,replace,|,fullscreen",
-                    'theme_advanced_buttons2' => "bold,italic,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,justifyfull,|,cite,abbr,acronym",
-                    'theme_advanced_buttons2_add' => "|,selectall,cleanup,removeformat,pastetext,pasteword,|,forecolor,backcolor,|,ltr,rtl",
-                    'theme_advanced_buttons3' => "bullist,numlist,outdent,indent,|,link,unlink,moodlenolink,anchor,|,emotions,image,{$xmedia}{$xdragmath}advhr,nonbreaking,charmap",
-                    'theme_advanced_buttons3_add' => "|,table,insertlayer,styleprops,visualchars,|,code,preview",
+                    'theme_advanced_buttons1' => "fontselect,fontsizeselect,formatselect,bold,italic,underline,strikethrough,removeformat",
+                    'theme_advanced_buttons1_add' => "|,cut,copy,paste,|,pastetext,pasteword,|,cleanup,code,|,undo,redo",
+                    'theme_advanced_buttons2' => "justifyleft,justifycenter,justifyright,justifyful,|,ltr,rtl,|,numlist,bullist,outdent,indent",
+                    'theme_advanced_buttons2_add' => "|,forecolor,backcolor,|,sub,sup,|,link,unlink,moodlenolink,table,image,{$xmedia}{$xdragmath}|,nonbreaking,hr,charmap,emotions,spellchecker,|,search,replace,|,fullscreen",
+                    'theme_advanced_buttons3' => "",
                     'theme_advanced_fonts' => "Trebuchet=Trebuchet MS,Verdana,Arial,Helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;Wingdings=wingdings",
                     'theme_advanced_resize_horizontal' => true,
                     'theme_advanced_resizing' => true,