Index: comments.php
===================================================================
--- comments.php	(revision 948)
+++ comments.php	(working copy)
@@ -58,7 +58,7 @@
 	<p id="add-user-note" style="display:none;"><a href=""><?php _e( 'Have a note to contribute?', 'wporg' ); ?></a></p>
 
 	<?php comment_form( array(
-		'comment_field'       => '<p class="comment-form-comment"><label for="comment">' . _x( 'Add Note', 'noun', 'wporg' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
+		'comment_field'       => DevHub_User_Submitted_Content::wp_editor_comments(),
 		'comment_notes_after' => '<p>' .
 			__( 'Notes should supplement code reference entries, for example examples, tips, explanations, use-cases, and best practices.', 'wporg' ) .
 			'</p><p>' .
Index: inc/user-content.php
===================================================================
--- inc/user-content.php	(revision 948)
+++ inc/user-content.php	(working copy)
@@ -66,7 +66,7 @@
 			wp_enqueue_style( 'syntaxhighlighter-core' );
 			wp_enqueue_style( 'syntaxhighlighter-theme-default' );
 
-			wp_enqueue_script( 'wporg-developer-user-notes', get_template_directory_uri() . '/js/user-notes.js', array(), '20140912', true );
+			wp_enqueue_script( 'wporg-developer-user-notes', get_template_directory_uri() . '/js/user-notes.js', array( 'quicktags' ), '20140912', true );
 			if ( get_option( 'thread_comments' ) ) {
 				wp_enqueue_script( 'comment-reply' );
 			}
@@ -108,6 +108,39 @@
 		return str_replace( 'Wordpress', 'Word&#112;ress', $code );
 	}
 
+	/**
+	 * Capture an {@see wp_editor()} instance as the 'User Contributed Notes' comment form.
+	 *
+	 * Uses output buffering to capture the editor instance for use with the {@see comments_form()}.
+	 *
+	 * @return string HTML output for the wp_editor-ized comment form.
+	 */
+	public static function wp_editor_comments() {
+		ob_start();
+		echo '<p class="comment-form-comment"><label for="comment">' . _x( 'Add Note', 'noun', 'wporg' ) . '</label>';
+		wp_editor( '', 'comment', array(
+			'media_buttons' => false,
+			'textarea_name' => 'comment',
+			'textarea_rows' => 8,
+			'quicktags'     => array(
+				'buttons' => 'strong,em,ul,ol,li,wporg_php,js'
+			),
+			'teeny'         => true,
+			'tinymce'       => false,
+		) );
+		echo '</p>';
+		return ob_get_clean();
+	}
+
+	public static function mce_buttons( $buttons ) {
+		$buttons = array_merge( $buttons, array( 'wporg_php' ) );
+		return $buttons;
+	}
+
+	public static function mce_plugins( $plugins ) {
+		$plugins['wporg_php'] = get_stylesheet_directory_uri() . '/js/user-notes.js';
+		return $plugins;
+	}
 } // DevHub_User_Submitted_Content
 
 DevHub_User_Submitted_Content::init();
Index: js/user-notes.js
===================================================================
--- js/user-notes.js	(revision 948)
+++ js/user-notes.js	(working copy)
@@ -20,4 +20,9 @@
 			}
 		}
 	} );
+
+	// Add php and js buttons to QuickTags.
+	QTags.addButton( 'php', 'php', '[php]', '[/php]' );
+	QTags.addButton( 'js', 'js', '[js]', '[/js]' );
+
 } )( jQuery );