diff options
| author | Georg Brandl <georg@python.org> | 2010-01-02 21:40:03 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-01-02 21:40:03 +0100 |
| commit | c6e26d449170965d686c0fc3edbeaedc04cf9675 (patch) | |
| tree | 163b069b8b83b68f19a1ea817b27540e631c75ad | |
| parent | b2ef99b6c2bc791466083ae05e38a22e0636b24e (diff) | |
| parent | 1fe1261938de22b1ec97ef6b42500d78f3610536 (diff) | |
| download | sphinx-c6e26d449170965d686c0fc3edbeaedc04cf9675.tar.gz | |
merge with 0.6
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sphinx/themes/default/static/default.css_t | 8 | ||||
| -rwxr-xr-x | utils/check_sources.py | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -8,7 +8,7 @@ all: clean-pyc check test check: @$(PYTHON) utils/check_sources.py -i build -i dist -i sphinx/style/jquery.js \ - -i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py \ + -i sphinx/pycode/pgen2 -i sphinx/util/smartypants.py -i .ropeproject \ -i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py . clean: clean-pyc clean-patchfiles diff --git a/sphinx/themes/default/static/default.css_t b/sphinx/themes/default/static/default.css_t index fbfd64a8..cd1db7ec 100644 --- a/sphinx/themes/default/static/default.css_t +++ b/sphinx/themes/default/static/default.css_t @@ -250,3 +250,11 @@ tt { th { background-color: #ede; } + +.warning tt { + background: #efc2c2; +} + +.note tt { + background: #d6d6d6; +} diff --git a/utils/check_sources.py b/utils/check_sources.py index d89396f2..ec7695d5 100755 --- a/utils/check_sources.py +++ b/utils/check_sources.py @@ -30,7 +30,7 @@ def checker(*suffixes, **kwds): name_mail_re = r'[\w ]+(<.*?>)?' -copyright_re = re.compile(r'^ :copyright: Copyright 200\d(-200\d)? ' +copyright_re = re.compile(r'^ :copyright: Copyright 200\d(-20\d\d)? ' r'by %s(, %s)*[,.]$' % (name_mail_re, name_mail_re)) license_re = re.compile(r" :license: (.*?).\n") |