Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 18561)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -266,7 +266,7 @@
 <?php if ( post_type_supports($post_type, 'editor') ) { ?>
 <div id="postdivrich" class="postarea">
 
-<?php wp_editor($post->post_content, 'content'); ?>
+<?php the_editor($post->post_content, 'content'); ?>
 
 <table id="post-status-info" cellspacing="0"><tbody><tr>
 	<td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 18561)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -121,8 +121,8 @@
 
 <div id="postdiv" class="postarea">
 <?php
-	$quicktags_settings = array( 'quicktags_buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
-	wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+	the_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
 	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
 
Index: wp-admin/includes/deprecated.php
===================================================================
--- wp-admin/includes/deprecated.php	(revision 18561)
+++ wp-admin/includes/deprecated.php	(working copy)
@@ -15,13 +15,13 @@
 /**
  * @since 2.1
  * @deprecated 2.1
- * @deprecated Use wp_editor().
- * @see wp_editor()
+ * @deprecated Use the_editor().
+ * @see the_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_editor()' );
+	_deprecated_function( __FUNCTION__, '2.1', 'the_editor()' );
 
-	wp_editor('', 'content');
+	the_editor('');
 }
 
 /**
@@ -705,13 +705,11 @@
 /**
  * @since 2.7
  * @deprecated 3.3
- * @deprecated Use wp_editor().
- * @see wp_editor()
+ * @deprecated Use the_editor().
+ * @see the_editor()
  */
 function wp_tiny_mce() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
-	
-	wp_editor('', 'content');
+	_deprecated_function( __FUNCTION__, '3.3' );
 }
 
 // see WP_Editor for the next 4
Index: wp-includes/deprecated.php
===================================================================
--- wp-includes/deprecated.php	(revision 18561)
+++ wp-includes/deprecated.php	(working copy)
@@ -2621,7 +2621,7 @@
  *
  * @see WP_Editor::wp_default_editor()
  * @since 2.5.0
- * @deprecated 3.5
+ * @deprecated 3.3
  *
  * @return bool
  */
@@ -2637,21 +2637,3 @@
 	return $wp_editor->wp_default_editor();
 }
 
-/**
- * Display editor: TinyMCE, HTML, or both.
- *
- * @since 2.1.0
- * @deprecated 3.3 
- *
- * @param string $content Textarea content.
- * @param string $id Optional, default is 'content'. HTML ID attribute value.
- * @param string $prev_id Optional, not used
- * @param bool $media_buttons Optional, default is true. Whether to display media buttons.
- * @param int $tab_index Optional, not used
- */
-function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
-	return;
-}
-
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 18561)
+++ wp-includes/general-template.php	(working copy)
@@ -1750,18 +1750,28 @@
 }
 
 /**
- * Loads and initializes WP_Editor class if needed, passes the settings for an instance of the editor
+ * Display editor: Visual, HTML, or both.
+ *   
+ * Loads and initializes WP_Editor class, passes the settings for an instance of the editor
  *
  * @see wp-includes/class-wp-editor.php
- * @since 3.3
+ * @since 2.1.0
  *
  * @param string $content Initial content for the editor.
- * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE.
- * @param array $settings See WP_Editor::editor().
+ * @param string $editor_id HTML ID for the textarea, TinyMCE and Quicktags, also used to construct the HTML IDs for all surounding elements.
+ * @param array $settings Settings for both editors (TinyMCE and Quicktags) and for the surrounding HTML, see WP_Editor::editor() for description.
  */
-function wp_editor( $content, $editor_id, $settings = array() ) {
+function the_editor( $content, $editor_id = 'content', $settings = array() ) {
 	global $wp_editor;
 
+	if ( !is_array($settings) ) {
+		$settings = array(); // the old arg $prev_id = 'title' is not used
+		$args = func_get_args();
+
+		$settings['media_buttons'] = !empty($args[3]) ? $args[3] : true;
+		$settings['tabindex'] = !empty($args[4]) ? $args[4] : 2;
+	}
+
 	if ( !is_a($wp_editor, 'WP_Editor') ) {
 		require( ABSPATH . WPINC . '/class-wp-editor.php' );
 		$wp_editor = new WP_Editor;