diff --git a/PreferencesPlugin/data/System/DefaultPreferencesForm.txt b/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
index 822ff497a6..7f9a4a686d 100644
--- a/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
+++ b/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
@@ -8,8 +8,8 @@
 | NOAUTOLINK | select | 1 | off,on | Boolean | S |
 | INCLUDEWARNING | text | 30 | on, off | Boolean | S |
 | LINKTOOLTIPINFO | text | 30 | | Format of tooltip info | S |
-| EDITBOXWIDTH | text | 30 | 70 | Horizontal size of text edit box. | S |
-| EDITBOXHEIGHT | text | 30 | 15 | Vertical size of text edit box. | S |
+| EDITBOXWIDTH | text | 30 | 70 | Horizontal size of text edit box. Deprecated, ignored if editor box size is set using buttons in lower right corner of the window. | S |
+| EDITBOXHEIGHT | text | 30 | 15 | Vertical size of text edit box. Deprecated, ignored if editor box size is set using buttons in lower right corner of the window. | S |
 | EDITBOXSTYLE | text | 30 | width: 99% | CSS style | S |
 | PREVIEWBGIMAGE | text | 30 | %PUBURLPATH%/%SYSTEMWEB%/PreviewBackground/preview2bg.gif | Image URL | S |
 | FORCENEWREVISIONCHECKBOX | select | 1 | , checked="checked" | Select checked to enable | S |
diff --git a/core/data/System/DefaultPreferences.txt b/core/data/System/DefaultPreferences.txt
index 362d323aa8..30c6468cf0 100644
--- a/core/data/System/DefaultPreferences.txt
+++ b/core/data/System/DefaultPreferences.txt
@@ -83,12 +83,21 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
          * This is exactly equivalent to:
       * #Set LINKTOOLTIPINFO = on
 
+<blockquote>
+---+++ Deprecated editor settings
+These settings are overridden by an editor cookie that is set when using the
+Sizing and font buttons on the lower right corner of the edit window.  These
+settings will be ignored once a =FOSWIKIPREF= cooke has been set.  They will
+be removed from Foswiki 1.2.0.
+
    * Horizontal size of text edit box: (can be overwritten by user preferences)
       * Set EDITBOXWIDTH = 70
 
    * Vertical size of text edit box: (can be overwritten by user preferences)
       * Set EDITBOXHEIGHT = 22
 
+</blockquote>
+
    * Style of text edit box. Set to =width: 99%= for full window width (default; this will override the EDITBOXWIDTH setting), or =width: auto= to disable. This setting works for IE and some other recent browsers. (can be overwritten by user preferences)
       * Set EDITBOXSTYLE = width:99%
 
diff --git a/core/data/System/PreferenceSettings.txt b/core/data/System/PreferenceSettings.txt
index 6613d50fac..daac425594 100644
--- a/core/data/System/PreferenceSettings.txt
+++ b/core/data/System/PreferenceSettings.txt
@@ -95,4 +95,11 @@ Then, when they are editing any other topic, they will get a 10 high edit box. H
 Use this powerful feature with great care! =%<nop>ALLVARIABLES%= can be used to get a listing of the values of all macros in their evaluation order, so you can see macro scope if you get confused.
 <!-- %JQREQUIRE{"chili"}% -->
 
+<blockquote class="foswikiHelp"> *Deprecation warning*.  The setting used in
+this example, EDITBOXHEIGHT, is being deprecated and will be remove from
+Foswiki 1.2.  Note that if the edit box size is changed using the javascript
+controls in the lower right corner of the edit box window, those settings will
+be used, and the EDITBOX* settings will be ignored.
+</blockquote>
+
 %META:FILEATTACHMENT{name="prefs-stack.jpg" attachment="prefs-stack.jpg" attr="h" comment="" date="1350962092" path="prefs-stack.jpg" size="52064" user="ProjectContributor" version="1"}%