merge with 0.6

This commit is contained in:
Georg Brandl 2010-01-02 21:40:03 +01:00
commit 34987eed86
3 changed files with 10 additions and 2 deletions

View File

@ -8,7 +8,7 @@ all: clean-pyc check test
check: check:
@$(PYTHON) utils/check_sources.py -i build -i dist -i sphinx/style/jquery.js \ @$(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 . -i doc/_build -i ez_setup.py -i tests/path.py -i tests/coverage.py .
clean: clean-pyc clean-patchfiles clean: clean-pyc clean-patchfiles

View File

@ -250,3 +250,11 @@ tt {
th { th {
background-color: #ede; background-color: #ede;
} }
.warning tt {
background: #efc2c2;
}
.note tt {
background: #d6d6d6;
}

View File

@ -30,7 +30,7 @@ def checker(*suffixes, **kwds):
name_mail_re = r'[\w ]+(<.*?>)?' 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)*[,.]$' % r'by %s(, %s)*[,.]$' %
(name_mail_re, name_mail_re)) (name_mail_re, name_mail_re))
license_re = re.compile(r" :license: (.*?).\n") license_re = re.compile(r" :license: (.*?).\n")