commit b35886978c706bce2efb2a906c44a49dd7734ea2
Author: Ben Tindell <btindell@umn.edu>
Date:   Thu May 7 12:27:34 2015 -0500

    Creating patch for User Profile > Text Editor

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index e8c5544..3fa5275 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1806,6 +1806,7 @@ $string['teacheronly'] = 'for the {$a} only';
 $string['teacherroles'] = '{$a} roles';
 $string['teachers'] = 'Teachers';
 $string['textediting'] = 'Text editor';
+$string['textediting_help'] = 'Use this option to select the editor that you would like to use when entering text. This will include, but is not limited to, areas such as labels, descriptions, and summaries. If you select "Plain text area", all text entry areas with allow you to use HTML format, Moodle auto-format, Plain text format, or Markdown format.';
 $string['texteditor'] = 'Use standard web forms';
 $string['textformat'] = 'Plain text format';
 $string['thanks'] = 'Thanks';
@@ -2029,4 +2030,3 @@ $string['zippingbackup'] = 'Zipping backup';
 //                 TODO: Consider way to eliminate since not a user-level attribute anyway.
 $string['ppsftsection'] = 'PeopleSoft';
 // <<< SDLC-84396
-
diff --git a/user/editlib.php b/user/editlib.php
index 62c114c..f002138 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -352,7 +352,7 @@ function useredit_shared_definition(&$mform, $editoroptions = null, $filemanager
  * @param array|null $filemanageroptions
  */
 function useredit_shared_definition_preferences($user, &$mform, $editoroptions = null, $filemanageroptions = null) {
-    global $CFG;
+    global $CFG, $OUTPUT;
 
     $choices = array();
     $choices['0'] = get_string('emaildisplayno');
@@ -411,7 +411,7 @@ function useredit_shared_definition_preferences($user, &$mform, $editoroptions =
             }
             $choices[$editor] = get_string('pluginname', 'editor_' . $editor);
         }
-        $mform->addElement('select', 'preference_htmleditor', get_string('textediting'), $choices);
+        $mform->addElement('select', 'preference_htmleditor', get_string('textediting').$OUTPUT->help_icon('textediting'), $choices);
         $mform->setDefault('preference_htmleditor', '');
     } else {
         // Empty string means use the first chosen text editor.