From 179a7694903a7571163fff0aaea342fd352babbd Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Fri, 3 Mar 2017 11:05:04 +0100
Subject: [PATCH] Fix other error in merging 'stable'

	modified:   sphinx/ext/intersphinx.py
---
 sphinx/ext/intersphinx.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py
index 5493e6782..4c8941134 100644
--- a/sphinx/ext/intersphinx.py
+++ b/sphinx/ext/intersphinx.py
@@ -373,6 +373,9 @@ def missing_reference(app, env, node, contnode):
         if not objtypes:
             return
         objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes]
+    if 'std:cmdoption' in objtypes:
+        # until Sphinx-1.6, cmdoptions are stored as std:option
+        objtypes.append('std:option')
     to_try = [(inventories.main_inventory, target)]
     in_set = None
     if ':' in target: