diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-23 13:31:02 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2016-11-23 13:31:02 +0900 |
| commit | e63afbc60ec6534f3f09bb5cad1f5400da0988f1 (patch) | |
| tree | d269de11f798dede9f6216829d1cb4f98081d352 /sphinx/config.py | |
| parent | 43fe104501912077dde3890b392a2518f784bef9 (diff) | |
| parent | 0ee524e3922089b7ffbd6081c92968ae7dd510c7 (diff) | |
| download | sphinx-git-e63afbc60ec6534f3f09bb5cad1f5400da0988f1.tar.gz | |
Merge branch '1.5-release'
Diffstat (limited to 'sphinx/config.py')
| -rw-r--r-- | sphinx/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 9bfdd2976..5872ce8bb 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -119,6 +119,9 @@ class Config(object): 'code-block': l_('Listing %s')}, 'env'), + tls_verify = (True, 'env'), + tls_cacerts = (None, 'env'), + # pre-initialized confval for HTML builder html_translator_class = (None, 'html', string_classes), ) # type: Dict[unicode, Tuple] |