Don't show option-role warnings in 1.3.x too

CHANGES

@@ -20,7 +20,7 @@ Bugs fixed
   support parsers that specified source_parsers.
 * #2290: Fix ``sphinx.ext.mathbase`` use of amsfonts may break user choice of math fonts
 * #2324: Print a hint how to increase the recursion limit when it is hit.
-* #1565: Revert new warning; the new warning will be triggered from version 1.4 on.
+* #1565, #2229: Revert new warning; the new warning will be triggered from version 1.4 on.
 * #2329: Refresh environment forcely if source directory has changed.
 
 

sphinx/domains/std.py

@@ -453,7 +453,7 @@ class StandardDomain(Domain):
         'productionlist': ProductionList,
     }
     roles = {
-        'option':  OptionXRefRole(warn_dangling=True),
+        'option':  OptionXRefRole(),
         'envvar':  EnvVarXRefRole(),
         # links to tokens in grammar productions
         'token':   XRefRole(),
@@ -491,7 +491,6 @@ class StandardDomain(Domain):
                 'the label must precede a section header)',
         'numref':  'undefined label: %(target)s',
         'keyword': 'unknown keyword: %(target)s',
-        'option': 'unknown option: %(target)s',
     }
 
     def clear_doc(self, docname):

tests/test_build_html.py

@@ -39,7 +39,6 @@ with "\\?": b?'here: >>>(\\\\|/)xbb<<<'
 HTML_WARNINGS = ENV_WARNINGS + """\
 %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
 %(root)s/footnote.txt:60: WARNING: citation not found: missing
-%(root)s/markup.txt:158: WARNING: unknown option: &option
 """
 
 if PY3:

tests/test_build_latex.py

@@ -24,7 +24,6 @@ from test_build_html import ENV_WARNINGS
 
 
 LATEX_WARNINGS = ENV_WARNINGS + """\
-%(root)s/markup.txt:158: WARNING: unknown option: &option
 %(root)s/footnote.txt:60: WARNING: citation not found: missing
 %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
 """

tests/test_build_texinfo.py

@@ -23,7 +23,6 @@ from test_build_html import ENV_WARNINGS
 
 
 TEXINFO_WARNINGS = ENV_WARNINGS + """\
-%(root)s/markup.txt:158: WARNING: unknown option: &option
 %(root)s/footnote.txt:60: WARNING: citation not found: missing
 %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
 %(root)s/images.txt:29: WARNING: no matching candidate for image URI u'svgimg.\\*'