merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/doc/_themes/blue/static/default.css_t
+++ b/doc/_themes/blue/static/default.css_t
@@ -30,7 +30,7 @@ div.documentwrapper {
 }

 div.bodywrapper {
-    margin: 0 0 0 230px;
+    margin: 0 0 0 270px;
 }

 div.body {
@@ -85,7 +85,7 @@ div.related a {

 div.sphinxsidebar {
    word-wrap: break-word;
-    width: 240px;
+    width: 270px;
    {%- if theme_stickysidebar|tobool %}
    top: 30px;
    margin: 0;