[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/bd56b182c7f8
changeset:   86284:bd56b182c7f8
parent:      86282:b51218966201
parent:      86283:5257cc2425be
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 13 09:32:00 2013 +0200
summary:
  merge with 3.3

files:
  Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css |  2 +-
  Doc/tools/sphinxext/static/basic.css                 |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css b/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
--- a/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
+++ b/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
@@ -122,7 +122,7 @@
     font-weight: normal;
 }
 
-p.deprecated {
+.deprecated {
     border-radius: 3px;
 }
 
diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -334,7 +334,7 @@
     font-style: italic;
 }
 
-p.deprecated, p.deprecated-removed {
+.deprecated, .deprecated-removed {
     background-color: #ffe4e4;
     border: 1px solid #f66;
     padding: 7px

-- 
Repository URL: http://hg.python.org/cpython