diff options
| author | Georg Brandl <georg@python.org> | 2014-01-12 20:46:50 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-12 20:46:50 +0100 |
| commit | 0ce3e1b81e8105ccf99e497b6c82c1ef8d9201ba (patch) | |
| tree | 0ce8237ff67cff3ef0871472677f3f3ff88c7633 /sphinx | |
| parent | d68a60584728f81beffc95debdfe54b37c03be05 (diff) | |
| parent | e49c27d634c942f36bcbc72e659bbb5bcd39066f (diff) | |
| download | sphinx-0ce3e1b81e8105ccf99e497b6c82c1ef8d9201ba.tar.gz | |
merge with stable
Diffstat (limited to 'sphinx')
| -rw-r--r-- | sphinx/config.py | 2 | ||||
| -rw-r--r-- | sphinx/environment.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 9ea2226e..df74e914 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -72,7 +72,7 @@ class Config(object): primary_domain = ('py', 'env'), needs_sphinx = (None, None), nitpicky = (False, 'env'), - nitpick_ignore = ([], 'env'), + nitpick_ignore = ([], 'html'), # HTML options html_theme = ('default', 'html'), diff --git a/sphinx/environment.py b/sphinx/environment.py index 919ae710..a319ef3c 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -177,9 +177,6 @@ class BuildEnvironment: # this is to invalidate old pickles self.version = ENV_VERSION - # make this a set for faster testing - self._nitpick_ignore = set(self.config.nitpick_ignore) - # All "docnames" here are /-separated and relative and exclude # the source suffix. @@ -440,6 +437,9 @@ class BuildEnvironment: self.find_files(config) self.config = config + # this cache also needs to be updated every time + self._nitpick_ignore = set(self.config.nitpick_ignore) + added, changed, removed = self.get_outdated_files(config_changed) # allow user intervention as well @@ -1385,6 +1385,9 @@ class BuildEnvironment: dtype = domain and '%s:%s' % (domain.name, typ) or typ if (dtype, target) in self._nitpick_ignore: warn = False + # for "std" types also try without domain name + if domain.name == 'std' and (typ, target) in self._nitpick_ignore: + warn = False if not warn: return if domain and typ in domain.dangling_warnings: |