--- a/libinterp/corefcn/graphics.in.h	Sun Apr 08 19:53:57 2018 -0700
+++ b/libinterp/corefcn/graphics.in.h	Mon Apr 09 08:22:32 2018 -0400
@@ -3181,7 +3181,7 @@
 
       // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
       //                      xdisplay, xvisual, xvisualmode
-      // FIXME: Remove in version 4.6
+      // FIXME: DEPRECATED: Remove in version 5.
       bool_property doublebuffer hd , "on"
       double_property mincolormap hd , 64
       string_property wvisual hmd , ""
@@ -4288,9 +4288,10 @@
     BEGIN_PROPERTIES (line)
       color_property color , color_property (color_values (0, 0, 0), radio_values ("none"))
       string_property displayname , ""
-      // FIXME: Remove erasemode property in version 4.6.  (rm all instances in file)
+      // FIXME: DEPRECATED: Remove erasemode property in version 5
+      // (rm all instances in file).
       radio_property erasemode h , "{normal}|none|xor|background"
-      // FIXME: Remove interpreter property in version 4.8
+      // FIXME: DEPRECATED: Remove interpreter property in version 6.
       radio_property interpreter hd , "{tex}|none|latex"
       radio_property linejoin , "{round}|miter|chamfer"
       radio_property linestyle , "{-}|--|:|-.|none"
@@ -4501,7 +4502,8 @@
     {
       update_font ();
       update_text_extent ();
-      // FIXME: Remove warning with demi and light in 4.7+
+      // FIXME: DEPRECATED: Remove warning with demi and light in
+      // version 6.
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
                          "Setting 'fontweight' to '%s' is deprecated, \
@@ -4857,7 +4859,7 @@
       array_property faces u , default_patch_faces ()
       array_property facevertexalphadata , Matrix ()
       array_property facevertexcdata u , Matrix ()
-      // FIXME: Remove interpreter property in version 4.8
+      // FIXME: DEPRECATED: Remove interpreter property in version 6.
       radio_property interpreter hd , "{tex}|none|latex"
       radio_property linestyle , "{-}|--|:|-.|none"
       double_property linewidth , 0.5
@@ -5051,7 +5053,7 @@
       radio_property facelighting , "none|{flat}|gouraud|phong"
       array_property facenormals m , Matrix ()
       radio_property facenormalsmode , "{auto}|manual"
-      // FIXME: Remove interpreter property in version 4.8
+      // FIXME: DEPRECATED: Remove interpreter property in version 6.
       radio_property interpreter hd , "{tex}|none|latex"
       radio_property linestyle , "{-}|--|:|-.|none"
       double_property linewidth , 0.5
@@ -5477,7 +5479,8 @@
     void update_fontweight (void)
     {
       update_text_extent ();
-      // FIXME: Remove warning with demi and light in 4.7+
+      // FIXME: DEPRECATED: Remove warning with demi and light in
+      // version 6.
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
                          "Setting 'fontweight' to '%s' is deprecated, \
@@ -5574,7 +5577,7 @@
 
     void update_fontweight (void)
     {
-      // FIXME: Remove this warning in 4.7+
+      // FIXME: DEPRECATED: Remove this warning in version 6.
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
                          "Setting 'fontweight' to '%s' is deprecated, \
@@ -5663,7 +5666,7 @@
 
     void update_fontweight (void)
     {
-      // FIXME: Remove this warning in 4.7+
+      // FIXME: DEPRECATED: Remove this warning in version 6.
       if (fontweight.is ("demi") || fontweight.is ("light"))
         warning_with_id ("Octave:deprecated-property",
                          "Setting 'fontweight' to '%s' is deprecated, \