changeset:   79985:7cabdb58fb23
branch:      3.3
parent:      79981:5c30f8fdd896
parent:      79984:36a35b86e3b0
user:        Ezio Melotti <ezio.melotti@gmail.com>
date:        Sat Oct 27 23:13:22 2012 +0300
description:
#8040: merge with 3.2.


diff -r 5c30f8fdd896 -r 7cabdb58fb23 Doc/tools/sphinxext/static/version_switch.js
--- a/Doc/tools/sphinxext/static/version_switch.js	Sat Oct 27 22:29:50 2012 +0300
+++ b/Doc/tools/sphinxext/static/version_switch.js	Sat Oct 27 23:13:22 2012 +0300
@@ -52,8 +52,12 @@
   }
 
   $(document).ready(function() {
-    var select = build_select(DOCUMENTATION_OPTIONS.VERSION,
-                              DOCUMENTATION_OPTIONS.RELEASE);
+    var version = DOCUMENTATION_OPTIONS.VERSION.split('.'),
+        release = DOCUMENTATION_OPTIONS.RELEASE || DOCUMENTATION_OPTIONS.VERSION;
+
+    version = version[0] + '.' + version[1];
+    var select = build_select(version, release);
+
     $('.version_switcher_placeholder').html(select);
     $('.version_switcher_placeholder select').bind('change', on_switch);
   });