@@ -311,15 +311,24 @@ class DeprecatedRemoved(Directive):
311311 final_argument_whitespace = True
312312 option_spec = {}
313313
314- _label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
314+ _deprecated_label = 'Deprecated since version {deprecated}, will be removed in version {removed}'
315+ _removed_label = 'Deprecated since version {deprecated}, removed in version {removed}'
315316
316317 def run (self ):
317318 node = addnodes .versionmodified ()
318319 node .document = self .state .document
319320 node ['type' ] = 'deprecated-removed'
320321 version = (self .arguments [0 ], self .arguments [1 ])
321322 node ['version' ] = version
322- label = translators ['sphinx' ].gettext (self ._label )
323+ env = self .state .document .settings .env
324+ current_version = tuple (int (e ) for e in env .config .version .split ('.' ))
325+ removed_version = tuple (int (e ) for e in self .arguments [1 ].split ('.' ))
326+ if current_version < removed_version :
327+ label = self ._deprecated_label
328+ else :
329+ label = self ._removed_label
330+
331+ label = translators ['sphinx' ].gettext (label )
323332 text = label .format (deprecated = self .arguments [0 ], removed = self .arguments [1 ])
324333 if len (self .arguments ) == 3 :
325334 inodes , messages = self .state .inline_text (self .arguments [2 ],
0 commit comments